diff --git a/__fixtures__/outputv2/akash/audit/v1beta1/audit.amino.ts b/__fixtures__/outputv2/akash/audit/v1beta1/audit.amino.ts index 270a121eb9..12b3215ff7 100644 --- a/__fixtures__/outputv2/akash/audit/v1beta1/audit.amino.ts +++ b/__fixtures__/outputv2/akash/audit/v1beta1/audit.amino.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import { Attribute, AttributeAmino, AttributeSDKType } from "../../base/v1beta1/attribute"; -import { MsgSignProviderAttributes, MsgSignProviderAttributesAmino, MsgSignProviderAttributesSDKType, MsgDeleteProviderAttributes, MsgDeleteProviderAttributesAmino, MsgDeleteProviderAttributesSDKType } from "./audit"; +import { Attribute, AttributeSDKType } from "../../base/v1beta1/attribute"; +import { MsgSignProviderAttributes, MsgSignProviderAttributesSDKType, MsgDeleteProviderAttributes, MsgDeleteProviderAttributesSDKType } from "./audit"; export const AminoConverter = { "/akash.audit.v1beta1.MsgSignProviderAttributes": { aminoType: "/akash.audit.v1beta1.MsgSignProviderAttributes", diff --git a/__fixtures__/outputv2/akash/audit/v1beta1/audit.registry.ts b/__fixtures__/outputv2/akash/audit/v1beta1/audit.registry.ts index 89da53b103..c97c00047c 100644 --- a/__fixtures__/outputv2/akash/audit/v1beta1/audit.registry.ts +++ b/__fixtures__/outputv2/akash/audit/v1beta1/audit.registry.ts @@ -1,6 +1,6 @@ -import { Attribute, AttributeAmino, AttributeSDKType } from "../../base/v1beta1/attribute"; +import { Attribute, AttributeSDKType } from "../../base/v1beta1/attribute"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgSignProviderAttributes, MsgSignProviderAttributesAmino, MsgSignProviderAttributesSDKType, MsgDeleteProviderAttributes, MsgDeleteProviderAttributesAmino, MsgDeleteProviderAttributesSDKType } from "./audit"; +import { MsgSignProviderAttributes, MsgSignProviderAttributesSDKType, MsgDeleteProviderAttributes, MsgDeleteProviderAttributesSDKType } from "./audit"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/akash.audit.v1beta1.MsgSignProviderAttributes", MsgSignProviderAttributes], ["/akash.audit.v1beta1.MsgDeleteProviderAttributes", MsgDeleteProviderAttributes]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/akash/audit/v1beta1/audit.rpc.msg.ts b/__fixtures__/outputv2/akash/audit/v1beta1/audit.rpc.msg.ts index 5f93f5ccce..51e016b205 100644 --- a/__fixtures__/outputv2/akash/audit/v1beta1/audit.rpc.msg.ts +++ b/__fixtures__/outputv2/akash/audit/v1beta1/audit.rpc.msg.ts @@ -1,7 +1,7 @@ -import { Attribute, AttributeAmino, AttributeSDKType } from "../../base/v1beta1/attribute"; +import { Attribute, AttributeSDKType } from "../../base/v1beta1/attribute"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgSignProviderAttributes, MsgSignProviderAttributesAmino, MsgSignProviderAttributesSDKType, MsgSignProviderAttributesResponse, MsgSignProviderAttributesResponseAmino, MsgSignProviderAttributesResponseSDKType, MsgDeleteProviderAttributes, MsgDeleteProviderAttributesAmino, MsgDeleteProviderAttributesSDKType, MsgDeleteProviderAttributesResponse, MsgDeleteProviderAttributesResponseAmino, MsgDeleteProviderAttributesResponseSDKType } from "./audit"; +import { MsgSignProviderAttributes, MsgSignProviderAttributesSDKType, MsgSignProviderAttributesResponse, MsgSignProviderAttributesResponseSDKType, MsgDeleteProviderAttributes, MsgDeleteProviderAttributesSDKType, MsgDeleteProviderAttributesResponse, MsgDeleteProviderAttributesResponseSDKType } from "./audit"; /** Msg defines the provider Msg service */ export interface Msg { diff --git a/__fixtures__/outputv2/akash/audit/v1beta2/audit.amino.ts b/__fixtures__/outputv2/akash/audit/v1beta2/audit.amino.ts index d3e3a2d65d..971d025545 100644 --- a/__fixtures__/outputv2/akash/audit/v1beta2/audit.amino.ts +++ b/__fixtures__/outputv2/akash/audit/v1beta2/audit.amino.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import { Attribute, AttributeAmino, AttributeSDKType } from "../../base/v1beta2/attribute"; -import { MsgSignProviderAttributes, MsgSignProviderAttributesAmino, MsgSignProviderAttributesSDKType, MsgDeleteProviderAttributes, MsgDeleteProviderAttributesAmino, MsgDeleteProviderAttributesSDKType } from "./audit"; +import { Attribute, AttributeSDKType } from "../../base/v1beta2/attribute"; +import { MsgSignProviderAttributes, MsgSignProviderAttributesSDKType, MsgDeleteProviderAttributes, MsgDeleteProviderAttributesSDKType } from "./audit"; export const AminoConverter = { "/akash.audit.v1beta2.MsgSignProviderAttributes": { aminoType: "/akash.audit.v1beta2.MsgSignProviderAttributes", diff --git a/__fixtures__/outputv2/akash/audit/v1beta2/audit.registry.ts b/__fixtures__/outputv2/akash/audit/v1beta2/audit.registry.ts index 566138b3a9..160f1a5ee5 100644 --- a/__fixtures__/outputv2/akash/audit/v1beta2/audit.registry.ts +++ b/__fixtures__/outputv2/akash/audit/v1beta2/audit.registry.ts @@ -1,6 +1,6 @@ -import { Attribute, AttributeAmino, AttributeSDKType } from "../../base/v1beta2/attribute"; +import { Attribute, AttributeSDKType } from "../../base/v1beta2/attribute"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgSignProviderAttributes, MsgSignProviderAttributesAmino, MsgSignProviderAttributesSDKType, MsgDeleteProviderAttributes, MsgDeleteProviderAttributesAmino, MsgDeleteProviderAttributesSDKType } from "./audit"; +import { MsgSignProviderAttributes, MsgSignProviderAttributesSDKType, MsgDeleteProviderAttributes, MsgDeleteProviderAttributesSDKType } from "./audit"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/akash.audit.v1beta2.MsgSignProviderAttributes", MsgSignProviderAttributes], ["/akash.audit.v1beta2.MsgDeleteProviderAttributes", MsgDeleteProviderAttributes]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/akash/audit/v1beta2/audit.rpc.msg.ts b/__fixtures__/outputv2/akash/audit/v1beta2/audit.rpc.msg.ts index 4e24d46b36..7d9233400d 100644 --- a/__fixtures__/outputv2/akash/audit/v1beta2/audit.rpc.msg.ts +++ b/__fixtures__/outputv2/akash/audit/v1beta2/audit.rpc.msg.ts @@ -1,7 +1,7 @@ -import { Attribute, AttributeAmino, AttributeSDKType } from "../../base/v1beta2/attribute"; +import { Attribute, AttributeSDKType } from "../../base/v1beta2/attribute"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgSignProviderAttributes, MsgSignProviderAttributesAmino, MsgSignProviderAttributesSDKType, MsgSignProviderAttributesResponse, MsgSignProviderAttributesResponseAmino, MsgSignProviderAttributesResponseSDKType, MsgDeleteProviderAttributes, MsgDeleteProviderAttributesAmino, MsgDeleteProviderAttributesSDKType, MsgDeleteProviderAttributesResponse, MsgDeleteProviderAttributesResponseAmino, MsgDeleteProviderAttributesResponseSDKType } from "./audit"; +import { MsgSignProviderAttributes, MsgSignProviderAttributesSDKType, MsgSignProviderAttributesResponse, MsgSignProviderAttributesResponseSDKType, MsgDeleteProviderAttributes, MsgDeleteProviderAttributesSDKType, MsgDeleteProviderAttributesResponse, MsgDeleteProviderAttributesResponseSDKType } from "./audit"; /** Msg defines the provider Msg service */ export interface Msg { diff --git a/__fixtures__/outputv2/akash/audit/v1beta2/query.lcd.ts b/__fixtures__/outputv2/akash/audit/v1beta2/query.lcd.ts index e79c56ad9b..21d7dc452b 100644 --- a/__fixtures__/outputv2/akash/audit/v1beta2/query.lcd.ts +++ b/__fixtures__/outputv2/akash/audit/v1beta2/query.lcd.ts @@ -1,8 +1,8 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { Provider, ProviderAmino, ProviderSDKType } from "./audit"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { Provider, ProviderSDKType } from "./audit"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryAllProvidersAttributesRequest, QueryAllProvidersAttributesRequestAmino, QueryAllProvidersAttributesRequestSDKType, QueryProvidersResponse, QueryProvidersResponseAmino, QueryProvidersResponseSDKType, QueryProviderAttributesRequest, QueryProviderAttributesRequestAmino, QueryProviderAttributesRequestSDKType, QueryProviderAuditorRequest, QueryProviderAuditorRequestAmino, QueryProviderAuditorRequestSDKType, QueryAuditorAttributesRequest, QueryAuditorAttributesRequestAmino, QueryAuditorAttributesRequestSDKType } from "./query"; +import { QueryAllProvidersAttributesRequest, QueryAllProvidersAttributesRequestSDKType, QueryProvidersResponse, QueryProvidersResponseSDKType, QueryProviderAttributesRequest, QueryProviderAttributesRequestSDKType, QueryProviderAuditorRequest, QueryProviderAuditorRequestSDKType, QueryAuditorAttributesRequest, QueryAuditorAttributesRequestSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/akash/audit/v1beta2/query.rpc.Query.ts b/__fixtures__/outputv2/akash/audit/v1beta2/query.rpc.Query.ts index eda58c7324..b264a7ccb3 100644 --- a/__fixtures__/outputv2/akash/audit/v1beta2/query.rpc.Query.ts +++ b/__fixtures__/outputv2/akash/audit/v1beta2/query.rpc.Query.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { Provider, ProviderAmino, ProviderSDKType } from "./audit"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { Provider, ProviderSDKType } from "./audit"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryAllProvidersAttributesRequest, QueryAllProvidersAttributesRequestAmino, QueryAllProvidersAttributesRequestSDKType, QueryProvidersResponse, QueryProvidersResponseAmino, QueryProvidersResponseSDKType, QueryProviderAttributesRequest, QueryProviderAttributesRequestAmino, QueryProviderAttributesRequestSDKType, QueryProviderAuditorRequest, QueryProviderAuditorRequestAmino, QueryProviderAuditorRequestSDKType, QueryAuditorAttributesRequest, QueryAuditorAttributesRequestAmino, QueryAuditorAttributesRequestSDKType } from "./query"; +import { QueryAllProvidersAttributesRequest, QueryAllProvidersAttributesRequestSDKType, QueryProvidersResponse, QueryProvidersResponseSDKType, QueryProviderAttributesRequest, QueryProviderAttributesRequestSDKType, QueryProviderAuditorRequest, QueryProviderAuditorRequestSDKType, QueryAuditorAttributesRequest, QueryAuditorAttributesRequestSDKType } from "./query"; /** Query defines the gRPC querier service */ export interface Query { diff --git a/__fixtures__/outputv2/akash/cert/v1beta2/cert.amino.ts b/__fixtures__/outputv2/akash/cert/v1beta2/cert.amino.ts index dcf70118af..f174ec43bd 100644 --- a/__fixtures__/outputv2/akash/cert/v1beta2/cert.amino.ts +++ b/__fixtures__/outputv2/akash/cert/v1beta2/cert.amino.ts @@ -1,5 +1,5 @@ /* eslint-disable */ -import { MsgCreateCertificate, MsgCreateCertificateAmino, MsgCreateCertificateSDKType, MsgRevokeCertificate, MsgRevokeCertificateAmino, MsgRevokeCertificateSDKType } from "./cert"; +import { MsgCreateCertificate, MsgCreateCertificateSDKType, MsgRevokeCertificate, MsgRevokeCertificateSDKType } from "./cert"; export const AminoConverter = { "/akash.cert.v1beta2.MsgCreateCertificate": { aminoType: "/akash.cert.v1beta2.MsgCreateCertificate", diff --git a/__fixtures__/outputv2/akash/cert/v1beta2/cert.registry.ts b/__fixtures__/outputv2/akash/cert/v1beta2/cert.registry.ts index c1d8d76d57..821900fc81 100644 --- a/__fixtures__/outputv2/akash/cert/v1beta2/cert.registry.ts +++ b/__fixtures__/outputv2/akash/cert/v1beta2/cert.registry.ts @@ -1,5 +1,5 @@ import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgCreateCertificate, MsgCreateCertificateAmino, MsgCreateCertificateSDKType, MsgRevokeCertificate, MsgRevokeCertificateAmino, MsgRevokeCertificateSDKType } from "./cert"; +import { MsgCreateCertificate, MsgCreateCertificateSDKType, MsgRevokeCertificate, MsgRevokeCertificateSDKType } from "./cert"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/akash.cert.v1beta2.MsgCreateCertificate", MsgCreateCertificate], ["/akash.cert.v1beta2.MsgRevokeCertificate", MsgRevokeCertificate]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/akash/cert/v1beta2/cert.rpc.msg.ts b/__fixtures__/outputv2/akash/cert/v1beta2/cert.rpc.msg.ts index d3132448e7..b0f7c7b375 100644 --- a/__fixtures__/outputv2/akash/cert/v1beta2/cert.rpc.msg.ts +++ b/__fixtures__/outputv2/akash/cert/v1beta2/cert.rpc.msg.ts @@ -1,6 +1,6 @@ import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgCreateCertificate, MsgCreateCertificateAmino, MsgCreateCertificateSDKType, MsgCreateCertificateResponse, MsgCreateCertificateResponseAmino, MsgCreateCertificateResponseSDKType, MsgRevokeCertificate, MsgRevokeCertificateAmino, MsgRevokeCertificateSDKType, MsgRevokeCertificateResponse, MsgRevokeCertificateResponseAmino, MsgRevokeCertificateResponseSDKType } from "./cert"; +import { MsgCreateCertificate, MsgCreateCertificateSDKType, MsgCreateCertificateResponse, MsgCreateCertificateResponseSDKType, MsgRevokeCertificate, MsgRevokeCertificateSDKType, MsgRevokeCertificateResponse, MsgRevokeCertificateResponseSDKType } from "./cert"; /** Msg defines the provider Msg service */ export interface Msg { diff --git a/__fixtures__/outputv2/akash/cert/v1beta2/query.lcd.ts b/__fixtures__/outputv2/akash/cert/v1beta2/query.lcd.ts index 8360481d35..052122cbb5 100644 --- a/__fixtures__/outputv2/akash/cert/v1beta2/query.lcd.ts +++ b/__fixtures__/outputv2/akash/cert/v1beta2/query.lcd.ts @@ -1,8 +1,8 @@ -import { CertificateFilter, CertificateFilterAmino, CertificateFilterSDKType, Certificate, CertificateAmino, CertificateSDKType } from "./cert"; -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { CertificateFilter, CertificateFilterSDKType, Certificate, CertificateSDKType } from "./cert"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryCertificatesRequest, QueryCertificatesRequestAmino, QueryCertificatesRequestSDKType, QueryCertificatesResponse, QueryCertificatesResponseAmino, QueryCertificatesResponseSDKType } from "./query"; +import { QueryCertificatesRequest, QueryCertificatesRequestSDKType, QueryCertificatesResponse, QueryCertificatesResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/akash/cert/v1beta2/query.rpc.Query.ts b/__fixtures__/outputv2/akash/cert/v1beta2/query.rpc.Query.ts index 90eab8dbb0..b8ced4d256 100644 --- a/__fixtures__/outputv2/akash/cert/v1beta2/query.rpc.Query.ts +++ b/__fixtures__/outputv2/akash/cert/v1beta2/query.rpc.Query.ts @@ -1,11 +1,11 @@ -import { CertificateFilter, CertificateFilterAmino, CertificateFilterSDKType, Certificate, CertificateAmino, CertificateSDKType } from "./cert"; -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { CertificateFilter, CertificateFilterSDKType, Certificate, CertificateSDKType } from "./cert"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient, ProtobufRpcClient } from "@cosmjs/stargate"; import { ReactQueryParams } from "../../../react-query"; import { useQuery } from "@tanstack/react-query"; -import { QueryCertificatesRequest, QueryCertificatesRequestAmino, QueryCertificatesRequestSDKType, QueryCertificatesResponse, QueryCertificatesResponseAmino, QueryCertificatesResponseSDKType } from "./query"; +import { QueryCertificatesRequest, QueryCertificatesRequestSDKType, QueryCertificatesResponse, QueryCertificatesResponseSDKType } from "./query"; /** Query defines the gRPC querier service */ export interface Query { diff --git a/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.amino.ts b/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.amino.ts index 214ac26c24..7037a7b6aa 100644 --- a/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.amino.ts +++ b/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.amino.ts @@ -1,7 +1,7 @@ /* eslint-disable */ -import { GroupSpec, GroupSpecAmino, GroupSpecSDKType, GroupID, GroupIDAmino, GroupIDSDKType, MsgCloseGroup, MsgCloseGroupAmino, MsgCloseGroupSDKType, MsgPauseGroup, MsgPauseGroupAmino, MsgPauseGroupSDKType, MsgStartGroup, MsgStartGroupAmino, MsgStartGroupSDKType } from "./group"; -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { MsgCreateDeployment, MsgCreateDeploymentAmino, MsgCreateDeploymentSDKType, MsgDepositDeployment, MsgDepositDeploymentAmino, MsgDepositDeploymentSDKType, MsgUpdateDeployment, MsgUpdateDeploymentAmino, MsgUpdateDeploymentSDKType, MsgCloseDeployment, MsgCloseDeploymentAmino, MsgCloseDeploymentSDKType } from "./deployment"; +import { GroupSpec, GroupSpecSDKType, GroupID, GroupIDSDKType, MsgCloseGroup, MsgCloseGroupSDKType, MsgPauseGroup, MsgPauseGroupSDKType, MsgStartGroup, MsgStartGroupSDKType } from "./group"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { MsgCreateDeployment, MsgCreateDeploymentSDKType, MsgDepositDeployment, MsgDepositDeploymentSDKType, MsgUpdateDeployment, MsgUpdateDeploymentSDKType, MsgCloseDeployment, MsgCloseDeploymentSDKType } from "./deployment"; export const AminoConverter = { "/akash.deployment.v1beta1.MsgCreateDeployment": { aminoType: "/akash.deployment.v1beta1.MsgCreateDeployment", diff --git a/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.registry.ts b/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.registry.ts index 5aadf841eb..c1ff12a666 100644 --- a/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.registry.ts +++ b/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.registry.ts @@ -1,7 +1,7 @@ -import { GroupSpec, GroupSpecAmino, GroupSpecSDKType, GroupID, GroupIDAmino, GroupIDSDKType, MsgCloseGroup, MsgCloseGroupAmino, MsgCloseGroupSDKType, MsgPauseGroup, MsgPauseGroupAmino, MsgPauseGroupSDKType, MsgStartGroup, MsgStartGroupAmino, MsgStartGroupSDKType } from "./group"; -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { GroupSpec, GroupSpecSDKType, GroupID, GroupIDSDKType, MsgCloseGroup, MsgCloseGroupSDKType, MsgPauseGroup, MsgPauseGroupSDKType, MsgStartGroup, MsgStartGroupSDKType } from "./group"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgCreateDeployment, MsgCreateDeploymentAmino, MsgCreateDeploymentSDKType, MsgDepositDeployment, MsgDepositDeploymentAmino, MsgDepositDeploymentSDKType, MsgUpdateDeployment, MsgUpdateDeploymentAmino, MsgUpdateDeploymentSDKType, MsgCloseDeployment, MsgCloseDeploymentAmino, MsgCloseDeploymentSDKType } from "./deployment"; +import { MsgCreateDeployment, MsgCreateDeploymentSDKType, MsgDepositDeployment, MsgDepositDeploymentSDKType, MsgUpdateDeployment, MsgUpdateDeploymentSDKType, MsgCloseDeployment, MsgCloseDeploymentSDKType } from "./deployment"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/akash.deployment.v1beta1.MsgCreateDeployment", MsgCreateDeployment], ["/akash.deployment.v1beta1.MsgDepositDeployment", MsgDepositDeployment], ["/akash.deployment.v1beta1.MsgUpdateDeployment", MsgUpdateDeployment], ["/akash.deployment.v1beta1.MsgCloseDeployment", MsgCloseDeployment], ["/akash.deployment.v1beta1.MsgCloseGroup", MsgCloseGroup], ["/akash.deployment.v1beta1.MsgPauseGroup", MsgPauseGroup], ["/akash.deployment.v1beta1.MsgStartGroup", MsgStartGroup]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.rpc.msg.ts b/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.rpc.msg.ts index 09c645089a..4ebbbf67ae 100644 --- a/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.rpc.msg.ts +++ b/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.rpc.msg.ts @@ -1,8 +1,8 @@ -import { GroupSpec, GroupSpecAmino, GroupSpecSDKType, GroupID, GroupIDAmino, GroupIDSDKType, MsgCloseGroup, MsgCloseGroupAmino, MsgCloseGroupSDKType, MsgCloseGroupResponse, MsgCloseGroupResponseAmino, MsgCloseGroupResponseSDKType, MsgPauseGroup, MsgPauseGroupAmino, MsgPauseGroupSDKType, MsgPauseGroupResponse, MsgPauseGroupResponseAmino, MsgPauseGroupResponseSDKType, MsgStartGroup, MsgStartGroupAmino, MsgStartGroupSDKType, MsgStartGroupResponse, MsgStartGroupResponseAmino, MsgStartGroupResponseSDKType } from "./group"; -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { GroupSpec, GroupSpecSDKType, GroupID, GroupIDSDKType, MsgCloseGroup, MsgCloseGroupSDKType, MsgCloseGroupResponse, MsgCloseGroupResponseSDKType, MsgPauseGroup, MsgPauseGroupSDKType, MsgPauseGroupResponse, MsgPauseGroupResponseSDKType, MsgStartGroup, MsgStartGroupSDKType, MsgStartGroupResponse, MsgStartGroupResponseSDKType } from "./group"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgCreateDeployment, MsgCreateDeploymentAmino, MsgCreateDeploymentSDKType, MsgCreateDeploymentResponse, MsgCreateDeploymentResponseAmino, MsgCreateDeploymentResponseSDKType, MsgDepositDeployment, MsgDepositDeploymentAmino, MsgDepositDeploymentSDKType, MsgDepositDeploymentResponse, MsgDepositDeploymentResponseAmino, MsgDepositDeploymentResponseSDKType, MsgUpdateDeployment, MsgUpdateDeploymentAmino, MsgUpdateDeploymentSDKType, MsgUpdateDeploymentResponse, MsgUpdateDeploymentResponseAmino, MsgUpdateDeploymentResponseSDKType, MsgCloseDeployment, MsgCloseDeploymentAmino, MsgCloseDeploymentSDKType, MsgCloseDeploymentResponse, MsgCloseDeploymentResponseAmino, MsgCloseDeploymentResponseSDKType } from "./deployment"; +import { MsgCreateDeployment, MsgCreateDeploymentSDKType, MsgCreateDeploymentResponse, MsgCreateDeploymentResponseSDKType, MsgDepositDeployment, MsgDepositDeploymentSDKType, MsgDepositDeploymentResponse, MsgDepositDeploymentResponseSDKType, MsgUpdateDeployment, MsgUpdateDeploymentSDKType, MsgUpdateDeploymentResponse, MsgUpdateDeploymentResponseSDKType, MsgCloseDeployment, MsgCloseDeploymentSDKType, MsgCloseDeploymentResponse, MsgCloseDeploymentResponseSDKType } from "./deployment"; /** Msg defines the deployment Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.ts b/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.ts index 7967e3974f..9852d15cdd 100644 --- a/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.ts +++ b/__fixtures__/outputv2/akash/deployment/v1beta1/deployment.ts @@ -1,6 +1,6 @@ //@ts-nocheck /* eslint-disable */ -import { GroupSpec, GroupSpecAmino, GroupSpecSDKType, GroupID, GroupIDAmino, GroupIDSDKType } from "./group"; +import { GroupSpec, GroupSpecAmino, GroupSpecSDKType, GroupID, GroupIDSDKType } from "./group"; import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import * as _m0 from "protobufjs/minimal"; import { isSet, bytesFromBase64, base64FromBytes, DeepPartial, Long } from "../../../helpers"; diff --git a/__fixtures__/outputv2/akash/deployment/v1beta1/query.lcd.ts b/__fixtures__/outputv2/akash/deployment/v1beta1/query.lcd.ts index 5a696dc838..ee18bb14e6 100644 --- a/__fixtures__/outputv2/akash/deployment/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/akash/deployment/v1beta1/query.lcd.ts @@ -1,10 +1,10 @@ -import { DeploymentFilters, DeploymentFiltersAmino, DeploymentFiltersSDKType, DeploymentID, DeploymentIDAmino, DeploymentIDSDKType, Deployment, DeploymentAmino, DeploymentSDKType } from "./deployment"; -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { GroupID, GroupIDAmino, GroupIDSDKType, Group, GroupAmino, GroupSDKType } from "./group"; -import { Account, AccountAmino, AccountSDKType } from "../../escrow/v1beta1/types"; +import { DeploymentFilters, DeploymentFiltersSDKType, DeploymentID, DeploymentIDSDKType, Deployment, DeploymentSDKType } from "./deployment"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { GroupID, GroupIDSDKType, Group, GroupSDKType } from "./group"; +import { Account, AccountSDKType } from "../../escrow/v1beta1/types"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryDeploymentsRequest, QueryDeploymentsRequestAmino, QueryDeploymentsRequestSDKType, QueryDeploymentsResponse, QueryDeploymentsResponseAmino, QueryDeploymentsResponseSDKType, QueryDeploymentRequest, QueryDeploymentRequestAmino, QueryDeploymentRequestSDKType, QueryDeploymentResponse, QueryDeploymentResponseAmino, QueryDeploymentResponseSDKType, QueryGroupRequest, QueryGroupRequestAmino, QueryGroupRequestSDKType, QueryGroupResponse, QueryGroupResponseAmino, QueryGroupResponseSDKType } from "./query"; +import { QueryDeploymentsRequest, QueryDeploymentsRequestSDKType, QueryDeploymentsResponse, QueryDeploymentsResponseSDKType, QueryDeploymentRequest, QueryDeploymentRequestSDKType, QueryDeploymentResponse, QueryDeploymentResponseSDKType, QueryGroupRequest, QueryGroupRequestSDKType, QueryGroupResponse, QueryGroupResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/akash/deployment/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/akash/deployment/v1beta1/query.rpc.Query.ts index 06f5f95f1b..4b256f9aa0 100644 --- a/__fixtures__/outputv2/akash/deployment/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/akash/deployment/v1beta1/query.rpc.Query.ts @@ -1,11 +1,11 @@ -import { DeploymentFilters, DeploymentFiltersAmino, DeploymentFiltersSDKType, DeploymentID, DeploymentIDAmino, DeploymentIDSDKType, Deployment, DeploymentAmino, DeploymentSDKType } from "./deployment"; -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { GroupID, GroupIDAmino, GroupIDSDKType, Group, GroupAmino, GroupSDKType } from "./group"; -import { Account, AccountAmino, AccountSDKType } from "../../escrow/v1beta1/types"; +import { DeploymentFilters, DeploymentFiltersSDKType, DeploymentID, DeploymentIDSDKType, Deployment, DeploymentSDKType } from "./deployment"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { GroupID, GroupIDSDKType, Group, GroupSDKType } from "./group"; +import { Account, AccountSDKType } from "../../escrow/v1beta1/types"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryDeploymentsRequest, QueryDeploymentsRequestAmino, QueryDeploymentsRequestSDKType, QueryDeploymentsResponse, QueryDeploymentsResponseAmino, QueryDeploymentsResponseSDKType, QueryDeploymentRequest, QueryDeploymentRequestAmino, QueryDeploymentRequestSDKType, QueryDeploymentResponse, QueryDeploymentResponseAmino, QueryDeploymentResponseSDKType, QueryGroupRequest, QueryGroupRequestAmino, QueryGroupRequestSDKType, QueryGroupResponse, QueryGroupResponseAmino, QueryGroupResponseSDKType } from "./query"; +import { QueryDeploymentsRequest, QueryDeploymentsRequestSDKType, QueryDeploymentsResponse, QueryDeploymentsResponseSDKType, QueryDeploymentRequest, QueryDeploymentRequestSDKType, QueryDeploymentResponse, QueryDeploymentResponseSDKType, QueryGroupRequest, QueryGroupRequestSDKType, QueryGroupResponse, QueryGroupResponseSDKType } from "./query"; /** Query defines the gRPC querier service */ export interface Query { diff --git a/__fixtures__/outputv2/akash/deployment/v1beta2/query.lcd.ts b/__fixtures__/outputv2/akash/deployment/v1beta2/query.lcd.ts index e55fe8e5bd..14aebb1769 100644 --- a/__fixtures__/outputv2/akash/deployment/v1beta2/query.lcd.ts +++ b/__fixtures__/outputv2/akash/deployment/v1beta2/query.lcd.ts @@ -1,11 +1,11 @@ -import { DeploymentFilters, DeploymentFiltersAmino, DeploymentFiltersSDKType, DeploymentID, DeploymentIDAmino, DeploymentIDSDKType, Deployment, DeploymentAmino, DeploymentSDKType } from "./deployment"; -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { GroupID, GroupIDAmino, GroupIDSDKType } from "./groupid"; -import { Group, GroupAmino, GroupSDKType } from "./group"; -import { Account, AccountAmino, AccountSDKType } from "../../escrow/v1beta2/types"; +import { DeploymentFilters, DeploymentFiltersSDKType, DeploymentID, DeploymentIDSDKType, Deployment, DeploymentSDKType } from "./deployment"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { GroupID, GroupIDSDKType } from "./groupid"; +import { Group, GroupSDKType } from "./group"; +import { Account, AccountSDKType } from "../../escrow/v1beta2/types"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryDeploymentsRequest, QueryDeploymentsRequestAmino, QueryDeploymentsRequestSDKType, QueryDeploymentsResponse, QueryDeploymentsResponseAmino, QueryDeploymentsResponseSDKType, QueryDeploymentRequest, QueryDeploymentRequestAmino, QueryDeploymentRequestSDKType, QueryDeploymentResponse, QueryDeploymentResponseAmino, QueryDeploymentResponseSDKType, QueryGroupRequest, QueryGroupRequestAmino, QueryGroupRequestSDKType, QueryGroupResponse, QueryGroupResponseAmino, QueryGroupResponseSDKType } from "./query"; +import { QueryDeploymentsRequest, QueryDeploymentsRequestSDKType, QueryDeploymentsResponse, QueryDeploymentsResponseSDKType, QueryDeploymentRequest, QueryDeploymentRequestSDKType, QueryDeploymentResponse, QueryDeploymentResponseSDKType, QueryGroupRequest, QueryGroupRequestSDKType, QueryGroupResponse, QueryGroupResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/akash/deployment/v1beta2/query.rpc.Query.ts b/__fixtures__/outputv2/akash/deployment/v1beta2/query.rpc.Query.ts index 45cd17a14a..004c3db58b 100644 --- a/__fixtures__/outputv2/akash/deployment/v1beta2/query.rpc.Query.ts +++ b/__fixtures__/outputv2/akash/deployment/v1beta2/query.rpc.Query.ts @@ -1,12 +1,12 @@ -import { DeploymentFilters, DeploymentFiltersAmino, DeploymentFiltersSDKType, DeploymentID, DeploymentIDAmino, DeploymentIDSDKType, Deployment, DeploymentAmino, DeploymentSDKType } from "./deployment"; -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { GroupID, GroupIDAmino, GroupIDSDKType } from "./groupid"; -import { Group, GroupAmino, GroupSDKType } from "./group"; -import { Account, AccountAmino, AccountSDKType } from "../../escrow/v1beta2/types"; +import { DeploymentFilters, DeploymentFiltersSDKType, DeploymentID, DeploymentIDSDKType, Deployment, DeploymentSDKType } from "./deployment"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { GroupID, GroupIDSDKType } from "./groupid"; +import { Group, GroupSDKType } from "./group"; +import { Account, AccountSDKType } from "../../escrow/v1beta2/types"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryDeploymentsRequest, QueryDeploymentsRequestAmino, QueryDeploymentsRequestSDKType, QueryDeploymentsResponse, QueryDeploymentsResponseAmino, QueryDeploymentsResponseSDKType, QueryDeploymentRequest, QueryDeploymentRequestAmino, QueryDeploymentRequestSDKType, QueryDeploymentResponse, QueryDeploymentResponseAmino, QueryDeploymentResponseSDKType, QueryGroupRequest, QueryGroupRequestAmino, QueryGroupRequestSDKType, QueryGroupResponse, QueryGroupResponseAmino, QueryGroupResponseSDKType } from "./query"; +import { QueryDeploymentsRequest, QueryDeploymentsRequestSDKType, QueryDeploymentsResponse, QueryDeploymentsResponseSDKType, QueryDeploymentRequest, QueryDeploymentRequestSDKType, QueryDeploymentResponse, QueryDeploymentResponseSDKType, QueryGroupRequest, QueryGroupRequestSDKType, QueryGroupResponse, QueryGroupResponseSDKType } from "./query"; /** Query defines the gRPC querier service */ export interface Query { diff --git a/__fixtures__/outputv2/akash/deployment/v1beta2/service.amino.ts b/__fixtures__/outputv2/akash/deployment/v1beta2/service.amino.ts index b0d575fd25..e852822aef 100644 --- a/__fixtures__/outputv2/akash/deployment/v1beta2/service.amino.ts +++ b/__fixtures__/outputv2/akash/deployment/v1beta2/service.amino.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { DeploymentID, DeploymentIDAmino, DeploymentIDSDKType } from "./deployment"; -import { GroupSpec, GroupSpecAmino, GroupSpecSDKType } from "./groupspec"; -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { GroupID, GroupIDAmino, GroupIDSDKType } from "./groupid"; -import { MsgCreateDeployment, MsgCreateDeploymentAmino, MsgCreateDeploymentSDKType, MsgDepositDeployment, MsgDepositDeploymentAmino, MsgDepositDeploymentSDKType, MsgUpdateDeployment, MsgUpdateDeploymentAmino, MsgUpdateDeploymentSDKType, MsgCloseDeployment, MsgCloseDeploymentAmino, MsgCloseDeploymentSDKType } from "./deploymentmsg"; -import { MsgCloseGroup, MsgCloseGroupAmino, MsgCloseGroupSDKType, MsgPauseGroup, MsgPauseGroupAmino, MsgPauseGroupSDKType, MsgStartGroup, MsgStartGroupAmino, MsgStartGroupSDKType } from "./groupmsg"; +import { DeploymentID, DeploymentIDSDKType } from "./deployment"; +import { GroupSpec, GroupSpecSDKType } from "./groupspec"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { GroupID, GroupIDSDKType } from "./groupid"; +import { MsgCreateDeployment, MsgCreateDeploymentSDKType, MsgDepositDeployment, MsgDepositDeploymentSDKType, MsgUpdateDeployment, MsgUpdateDeploymentSDKType, MsgCloseDeployment, MsgCloseDeploymentSDKType } from "./deploymentmsg"; +import { MsgCloseGroup, MsgCloseGroupSDKType, MsgPauseGroup, MsgPauseGroupSDKType, MsgStartGroup, MsgStartGroupSDKType } from "./groupmsg"; export const AminoConverter = { "/akash.deployment.v1beta2.MsgCreateDeployment": { aminoType: "/akash.deployment.v1beta2.MsgCreateDeployment", diff --git a/__fixtures__/outputv2/akash/deployment/v1beta2/service.registry.ts b/__fixtures__/outputv2/akash/deployment/v1beta2/service.registry.ts index 84e892fd52..fb29572364 100644 --- a/__fixtures__/outputv2/akash/deployment/v1beta2/service.registry.ts +++ b/__fixtures__/outputv2/akash/deployment/v1beta2/service.registry.ts @@ -1,10 +1,10 @@ -import { DeploymentID, DeploymentIDAmino, DeploymentIDSDKType } from "./deployment"; -import { GroupSpec, GroupSpecAmino, GroupSpecSDKType } from "./groupspec"; -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { GroupID, GroupIDAmino, GroupIDSDKType } from "./groupid"; +import { DeploymentID, DeploymentIDSDKType } from "./deployment"; +import { GroupSpec, GroupSpecSDKType } from "./groupspec"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { GroupID, GroupIDSDKType } from "./groupid"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgCreateDeployment, MsgCreateDeploymentAmino, MsgCreateDeploymentSDKType, MsgDepositDeployment, MsgDepositDeploymentAmino, MsgDepositDeploymentSDKType, MsgUpdateDeployment, MsgUpdateDeploymentAmino, MsgUpdateDeploymentSDKType, MsgCloseDeployment, MsgCloseDeploymentAmino, MsgCloseDeploymentSDKType } from "./deploymentmsg"; -import { MsgCloseGroup, MsgCloseGroupAmino, MsgCloseGroupSDKType, MsgPauseGroup, MsgPauseGroupAmino, MsgPauseGroupSDKType, MsgStartGroup, MsgStartGroupAmino, MsgStartGroupSDKType } from "./groupmsg"; +import { MsgCreateDeployment, MsgCreateDeploymentSDKType, MsgDepositDeployment, MsgDepositDeploymentSDKType, MsgUpdateDeployment, MsgUpdateDeploymentSDKType, MsgCloseDeployment, MsgCloseDeploymentSDKType } from "./deploymentmsg"; +import { MsgCloseGroup, MsgCloseGroupSDKType, MsgPauseGroup, MsgPauseGroupSDKType, MsgStartGroup, MsgStartGroupSDKType } from "./groupmsg"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/akash.deployment.v1beta2.MsgCreateDeployment", MsgCreateDeployment], ["/akash.deployment.v1beta2.MsgDepositDeployment", MsgDepositDeployment], ["/akash.deployment.v1beta2.MsgUpdateDeployment", MsgUpdateDeployment], ["/akash.deployment.v1beta2.MsgCloseDeployment", MsgCloseDeployment], ["/akash.deployment.v1beta2.MsgCloseGroup", MsgCloseGroup], ["/akash.deployment.v1beta2.MsgPauseGroup", MsgPauseGroup], ["/akash.deployment.v1beta2.MsgStartGroup", MsgStartGroup]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/akash/deployment/v1beta2/service.rpc.msg.ts b/__fixtures__/outputv2/akash/deployment/v1beta2/service.rpc.msg.ts index 1e61c7771f..4c8bb77ed3 100644 --- a/__fixtures__/outputv2/akash/deployment/v1beta2/service.rpc.msg.ts +++ b/__fixtures__/outputv2/akash/deployment/v1beta2/service.rpc.msg.ts @@ -1,11 +1,11 @@ -import { DeploymentID, DeploymentIDAmino, DeploymentIDSDKType } from "./deployment"; -import { GroupSpec, GroupSpecAmino, GroupSpecSDKType } from "./groupspec"; -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { GroupID, GroupIDAmino, GroupIDSDKType } from "./groupid"; +import { DeploymentID, DeploymentIDSDKType } from "./deployment"; +import { GroupSpec, GroupSpecSDKType } from "./groupspec"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { GroupID, GroupIDSDKType } from "./groupid"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgCreateDeployment, MsgCreateDeploymentAmino, MsgCreateDeploymentSDKType, MsgCreateDeploymentResponse, MsgCreateDeploymentResponseAmino, MsgCreateDeploymentResponseSDKType, MsgDepositDeployment, MsgDepositDeploymentAmino, MsgDepositDeploymentSDKType, MsgDepositDeploymentResponse, MsgDepositDeploymentResponseAmino, MsgDepositDeploymentResponseSDKType, MsgUpdateDeployment, MsgUpdateDeploymentAmino, MsgUpdateDeploymentSDKType, MsgUpdateDeploymentResponse, MsgUpdateDeploymentResponseAmino, MsgUpdateDeploymentResponseSDKType, MsgCloseDeployment, MsgCloseDeploymentAmino, MsgCloseDeploymentSDKType, MsgCloseDeploymentResponse, MsgCloseDeploymentResponseAmino, MsgCloseDeploymentResponseSDKType } from "./deploymentmsg"; -import { MsgCloseGroup, MsgCloseGroupAmino, MsgCloseGroupSDKType, MsgCloseGroupResponse, MsgCloseGroupResponseAmino, MsgCloseGroupResponseSDKType, MsgPauseGroup, MsgPauseGroupAmino, MsgPauseGroupSDKType, MsgPauseGroupResponse, MsgPauseGroupResponseAmino, MsgPauseGroupResponseSDKType, MsgStartGroup, MsgStartGroupAmino, MsgStartGroupSDKType, MsgStartGroupResponse, MsgStartGroupResponseAmino, MsgStartGroupResponseSDKType } from "./groupmsg"; +import { MsgCreateDeployment, MsgCreateDeploymentSDKType, MsgCreateDeploymentResponse, MsgCreateDeploymentResponseSDKType, MsgDepositDeployment, MsgDepositDeploymentSDKType, MsgDepositDeploymentResponse, MsgDepositDeploymentResponseSDKType, MsgUpdateDeployment, MsgUpdateDeploymentSDKType, MsgUpdateDeploymentResponse, MsgUpdateDeploymentResponseSDKType, MsgCloseDeployment, MsgCloseDeploymentSDKType, MsgCloseDeploymentResponse, MsgCloseDeploymentResponseSDKType } from "./deploymentmsg"; +import { MsgCloseGroup, MsgCloseGroupSDKType, MsgCloseGroupResponse, MsgCloseGroupResponseSDKType, MsgPauseGroup, MsgPauseGroupSDKType, MsgPauseGroupResponse, MsgPauseGroupResponseSDKType, MsgStartGroup, MsgStartGroupSDKType, MsgStartGroupResponse, MsgStartGroupResponseSDKType } from "./groupmsg"; /** Msg defines the deployment Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/akash/escrow/v1beta1/query.lcd.ts b/__fixtures__/outputv2/akash/escrow/v1beta1/query.lcd.ts index 3b653ec90e..e5b960d290 100644 --- a/__fixtures__/outputv2/akash/escrow/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/akash/escrow/v1beta1/query.lcd.ts @@ -1,8 +1,8 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { Account, AccountAmino, AccountSDKType, Payment, PaymentAmino, PaymentSDKType } from "./types"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { Account, AccountSDKType, Payment, PaymentSDKType } from "./types"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryAccountsRequest, QueryAccountsRequestAmino, QueryAccountsRequestSDKType, QueryAccountsResponse, QueryAccountsResponseAmino, QueryAccountsResponseSDKType, QueryPaymentsRequest, QueryPaymentsRequestAmino, QueryPaymentsRequestSDKType, QueryPaymentsResponse, QueryPaymentsResponseAmino, QueryPaymentsResponseSDKType } from "./query"; +import { QueryAccountsRequest, QueryAccountsRequestSDKType, QueryAccountsResponse, QueryAccountsResponseSDKType, QueryPaymentsRequest, QueryPaymentsRequestSDKType, QueryPaymentsResponse, QueryPaymentsResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/akash/escrow/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/akash/escrow/v1beta1/query.rpc.Query.ts index a1d1d91dbe..7d31ad7937 100644 --- a/__fixtures__/outputv2/akash/escrow/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/akash/escrow/v1beta1/query.rpc.Query.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { Account, AccountAmino, AccountSDKType, Payment, PaymentAmino, PaymentSDKType } from "./types"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { Account, AccountSDKType, Payment, PaymentSDKType } from "./types"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryAccountsRequest, QueryAccountsRequestAmino, QueryAccountsRequestSDKType, QueryAccountsResponse, QueryAccountsResponseAmino, QueryAccountsResponseSDKType, QueryPaymentsRequest, QueryPaymentsRequestAmino, QueryPaymentsRequestSDKType, QueryPaymentsResponse, QueryPaymentsResponseAmino, QueryPaymentsResponseSDKType } from "./query"; +import { QueryAccountsRequest, QueryAccountsRequestSDKType, QueryAccountsResponse, QueryAccountsResponseSDKType, QueryPaymentsRequest, QueryPaymentsRequestSDKType, QueryPaymentsResponse, QueryPaymentsResponseSDKType } from "./query"; /** Query defines the gRPC querier service */ export interface Query { diff --git a/__fixtures__/outputv2/akash/escrow/v1beta2/query.lcd.ts b/__fixtures__/outputv2/akash/escrow/v1beta2/query.lcd.ts index 63995aa046..5c4c8019c7 100644 --- a/__fixtures__/outputv2/akash/escrow/v1beta2/query.lcd.ts +++ b/__fixtures__/outputv2/akash/escrow/v1beta2/query.lcd.ts @@ -1,8 +1,8 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { Account, AccountAmino, AccountSDKType, FractionalPayment, FractionalPaymentAmino, FractionalPaymentSDKType } from "./types"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { Account, AccountSDKType, FractionalPayment, FractionalPaymentSDKType } from "./types"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryAccountsRequest, QueryAccountsRequestAmino, QueryAccountsRequestSDKType, QueryAccountsResponse, QueryAccountsResponseAmino, QueryAccountsResponseSDKType, QueryPaymentsRequest, QueryPaymentsRequestAmino, QueryPaymentsRequestSDKType, QueryPaymentsResponse, QueryPaymentsResponseAmino, QueryPaymentsResponseSDKType } from "./query"; +import { QueryAccountsRequest, QueryAccountsRequestSDKType, QueryAccountsResponse, QueryAccountsResponseSDKType, QueryPaymentsRequest, QueryPaymentsRequestSDKType, QueryPaymentsResponse, QueryPaymentsResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/akash/escrow/v1beta2/query.rpc.Query.ts b/__fixtures__/outputv2/akash/escrow/v1beta2/query.rpc.Query.ts index 6e17300e26..cd621c1fa5 100644 --- a/__fixtures__/outputv2/akash/escrow/v1beta2/query.rpc.Query.ts +++ b/__fixtures__/outputv2/akash/escrow/v1beta2/query.rpc.Query.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { Account, AccountAmino, AccountSDKType, FractionalPayment, FractionalPaymentAmino, FractionalPaymentSDKType } from "./types"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { Account, AccountSDKType, FractionalPayment, FractionalPaymentSDKType } from "./types"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryAccountsRequest, QueryAccountsRequestAmino, QueryAccountsRequestSDKType, QueryAccountsResponse, QueryAccountsResponseAmino, QueryAccountsResponseSDKType, QueryPaymentsRequest, QueryPaymentsRequestAmino, QueryPaymentsRequestSDKType, QueryPaymentsResponse, QueryPaymentsResponseAmino, QueryPaymentsResponseSDKType } from "./query"; +import { QueryAccountsRequest, QueryAccountsRequestSDKType, QueryAccountsResponse, QueryAccountsResponseSDKType, QueryPaymentsRequest, QueryPaymentsRequestSDKType, QueryPaymentsResponse, QueryPaymentsResponseSDKType } from "./query"; /** Query defines the gRPC querier service */ export interface Query { diff --git a/__fixtures__/outputv2/akash/market/v1beta2/query.lcd.ts b/__fixtures__/outputv2/akash/market/v1beta2/query.lcd.ts index b88bd13458..88999b18b1 100644 --- a/__fixtures__/outputv2/akash/market/v1beta2/query.lcd.ts +++ b/__fixtures__/outputv2/akash/market/v1beta2/query.lcd.ts @@ -1,11 +1,11 @@ -import { OrderFilters, OrderFiltersAmino, OrderFiltersSDKType, OrderID, OrderIDAmino, OrderIDSDKType, Order, OrderAmino, OrderSDKType } from "./order"; -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { BidFilters, BidFiltersAmino, BidFiltersSDKType, BidID, BidIDAmino, BidIDSDKType, Bid, BidAmino, BidSDKType } from "./bid"; -import { LeaseFilters, LeaseFiltersAmino, LeaseFiltersSDKType, LeaseID, LeaseIDAmino, LeaseIDSDKType, Lease, LeaseAmino, LeaseSDKType } from "./lease"; -import { Account, AccountAmino, AccountSDKType, FractionalPayment, FractionalPaymentAmino, FractionalPaymentSDKType } from "../../escrow/v1beta2/types"; +import { OrderFilters, OrderFiltersSDKType, OrderID, OrderIDSDKType, Order, OrderSDKType } from "./order"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { BidFilters, BidFiltersSDKType, BidID, BidIDSDKType, Bid, BidSDKType } from "./bid"; +import { LeaseFilters, LeaseFiltersSDKType, LeaseID, LeaseIDSDKType, Lease, LeaseSDKType } from "./lease"; +import { Account, AccountSDKType, FractionalPayment, FractionalPaymentSDKType } from "../../escrow/v1beta2/types"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryOrdersRequest, QueryOrdersRequestAmino, QueryOrdersRequestSDKType, QueryOrdersResponse, QueryOrdersResponseAmino, QueryOrdersResponseSDKType, QueryOrderRequest, QueryOrderRequestAmino, QueryOrderRequestSDKType, QueryOrderResponse, QueryOrderResponseAmino, QueryOrderResponseSDKType, QueryBidsRequest, QueryBidsRequestAmino, QueryBidsRequestSDKType, QueryBidsResponse, QueryBidsResponseAmino, QueryBidsResponseSDKType, QueryBidRequest, QueryBidRequestAmino, QueryBidRequestSDKType, QueryBidResponse, QueryBidResponseAmino, QueryBidResponseSDKType, QueryLeasesRequest, QueryLeasesRequestAmino, QueryLeasesRequestSDKType, QueryLeasesResponse, QueryLeasesResponseAmino, QueryLeasesResponseSDKType, QueryLeaseRequest, QueryLeaseRequestAmino, QueryLeaseRequestSDKType, QueryLeaseResponse, QueryLeaseResponseAmino, QueryLeaseResponseSDKType } from "./query"; +import { QueryOrdersRequest, QueryOrdersRequestSDKType, QueryOrdersResponse, QueryOrdersResponseSDKType, QueryOrderRequest, QueryOrderRequestSDKType, QueryOrderResponse, QueryOrderResponseSDKType, QueryBidsRequest, QueryBidsRequestSDKType, QueryBidsResponse, QueryBidsResponseSDKType, QueryBidRequest, QueryBidRequestSDKType, QueryBidResponse, QueryBidResponseSDKType, QueryLeasesRequest, QueryLeasesRequestSDKType, QueryLeasesResponse, QueryLeasesResponseSDKType, QueryLeaseRequest, QueryLeaseRequestSDKType, QueryLeaseResponse, QueryLeaseResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/akash/market/v1beta2/query.rpc.Query.ts b/__fixtures__/outputv2/akash/market/v1beta2/query.rpc.Query.ts index 42613a9f01..6700686040 100644 --- a/__fixtures__/outputv2/akash/market/v1beta2/query.rpc.Query.ts +++ b/__fixtures__/outputv2/akash/market/v1beta2/query.rpc.Query.ts @@ -1,12 +1,12 @@ -import { OrderFilters, OrderFiltersAmino, OrderFiltersSDKType, OrderID, OrderIDAmino, OrderIDSDKType, Order, OrderAmino, OrderSDKType } from "./order"; -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { BidFilters, BidFiltersAmino, BidFiltersSDKType, BidID, BidIDAmino, BidIDSDKType, Bid, BidAmino, BidSDKType } from "./bid"; -import { LeaseFilters, LeaseFiltersAmino, LeaseFiltersSDKType, LeaseID, LeaseIDAmino, LeaseIDSDKType, Lease, LeaseAmino, LeaseSDKType } from "./lease"; -import { Account, AccountAmino, AccountSDKType, FractionalPayment, FractionalPaymentAmino, FractionalPaymentSDKType } from "../../escrow/v1beta2/types"; +import { OrderFilters, OrderFiltersSDKType, OrderID, OrderIDSDKType, Order, OrderSDKType } from "./order"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { BidFilters, BidFiltersSDKType, BidID, BidIDSDKType, Bid, BidSDKType } from "./bid"; +import { LeaseFilters, LeaseFiltersSDKType, LeaseID, LeaseIDSDKType, Lease, LeaseSDKType } from "./lease"; +import { Account, AccountSDKType, FractionalPayment, FractionalPaymentSDKType } from "../../escrow/v1beta2/types"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryOrdersRequest, QueryOrdersRequestAmino, QueryOrdersRequestSDKType, QueryOrdersResponse, QueryOrdersResponseAmino, QueryOrdersResponseSDKType, QueryOrderRequest, QueryOrderRequestAmino, QueryOrderRequestSDKType, QueryOrderResponse, QueryOrderResponseAmino, QueryOrderResponseSDKType, QueryBidsRequest, QueryBidsRequestAmino, QueryBidsRequestSDKType, QueryBidsResponse, QueryBidsResponseAmino, QueryBidsResponseSDKType, QueryBidRequest, QueryBidRequestAmino, QueryBidRequestSDKType, QueryBidResponse, QueryBidResponseAmino, QueryBidResponseSDKType, QueryLeasesRequest, QueryLeasesRequestAmino, QueryLeasesRequestSDKType, QueryLeasesResponse, QueryLeasesResponseAmino, QueryLeasesResponseSDKType, QueryLeaseRequest, QueryLeaseRequestAmino, QueryLeaseRequestSDKType, QueryLeaseResponse, QueryLeaseResponseAmino, QueryLeaseResponseSDKType } from "./query"; +import { QueryOrdersRequest, QueryOrdersRequestSDKType, QueryOrdersResponse, QueryOrdersResponseSDKType, QueryOrderRequest, QueryOrderRequestSDKType, QueryOrderResponse, QueryOrderResponseSDKType, QueryBidsRequest, QueryBidsRequestSDKType, QueryBidsResponse, QueryBidsResponseSDKType, QueryBidRequest, QueryBidRequestSDKType, QueryBidResponse, QueryBidResponseSDKType, QueryLeasesRequest, QueryLeasesRequestSDKType, QueryLeasesResponse, QueryLeasesResponseSDKType, QueryLeaseRequest, QueryLeaseRequestSDKType, QueryLeaseResponse, QueryLeaseResponseSDKType } from "./query"; /** Query defines the gRPC querier service */ export interface Query { diff --git a/__fixtures__/outputv2/akash/market/v1beta2/service.amino.ts b/__fixtures__/outputv2/akash/market/v1beta2/service.amino.ts index 8a87a11af1..c6e22f7a06 100644 --- a/__fixtures__/outputv2/akash/market/v1beta2/service.amino.ts +++ b/__fixtures__/outputv2/akash/market/v1beta2/service.amino.ts @@ -1,8 +1,8 @@ /* eslint-disable */ -import { OrderID, OrderIDAmino, OrderIDSDKType } from "./order"; -import { DecCoin, DecCoinAmino, DecCoinSDKType, Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { BidID, BidIDAmino, BidIDSDKType, MsgCreateBid, MsgCreateBidAmino, MsgCreateBidSDKType, MsgCloseBid, MsgCloseBidAmino, MsgCloseBidSDKType } from "./bid"; -import { LeaseID, LeaseIDAmino, LeaseIDSDKType, MsgWithdrawLease, MsgWithdrawLeaseAmino, MsgWithdrawLeaseSDKType, MsgCreateLease, MsgCreateLeaseAmino, MsgCreateLeaseSDKType, MsgCloseLease, MsgCloseLeaseAmino, MsgCloseLeaseSDKType } from "./lease"; +import { OrderID, OrderIDSDKType } from "./order"; +import { DecCoin, DecCoinSDKType, Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { BidID, BidIDSDKType, MsgCreateBid, MsgCreateBidSDKType, MsgCloseBid, MsgCloseBidSDKType } from "./bid"; +import { LeaseID, LeaseIDSDKType, MsgWithdrawLease, MsgWithdrawLeaseSDKType, MsgCreateLease, MsgCreateLeaseSDKType, MsgCloseLease, MsgCloseLeaseSDKType } from "./lease"; export const AminoConverter = { "/akash.market.v1beta2.MsgCreateBid": { aminoType: "/akash.market.v1beta2.MsgCreateBid", diff --git a/__fixtures__/outputv2/akash/market/v1beta2/service.registry.ts b/__fixtures__/outputv2/akash/market/v1beta2/service.registry.ts index 97193c4048..46e327ae50 100644 --- a/__fixtures__/outputv2/akash/market/v1beta2/service.registry.ts +++ b/__fixtures__/outputv2/akash/market/v1beta2/service.registry.ts @@ -1,7 +1,7 @@ -import { OrderID, OrderIDAmino, OrderIDSDKType } from "./order"; -import { DecCoin, DecCoinAmino, DecCoinSDKType, Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { BidID, BidIDAmino, BidIDSDKType, MsgCreateBid, MsgCreateBidAmino, MsgCreateBidSDKType, MsgCloseBid, MsgCloseBidAmino, MsgCloseBidSDKType } from "./bid"; -import { LeaseID, LeaseIDAmino, LeaseIDSDKType, MsgWithdrawLease, MsgWithdrawLeaseAmino, MsgWithdrawLeaseSDKType, MsgCreateLease, MsgCreateLeaseAmino, MsgCreateLeaseSDKType, MsgCloseLease, MsgCloseLeaseAmino, MsgCloseLeaseSDKType } from "./lease"; +import { OrderID, OrderIDSDKType } from "./order"; +import { DecCoin, DecCoinSDKType, Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { BidID, BidIDSDKType, MsgCreateBid, MsgCreateBidSDKType, MsgCloseBid, MsgCloseBidSDKType } from "./bid"; +import { LeaseID, LeaseIDSDKType, MsgWithdrawLease, MsgWithdrawLeaseSDKType, MsgCreateLease, MsgCreateLeaseSDKType, MsgCloseLease, MsgCloseLeaseSDKType } from "./lease"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/akash.market.v1beta2.MsgCreateBid", MsgCreateBid], ["/akash.market.v1beta2.MsgCloseBid", MsgCloseBid], ["/akash.market.v1beta2.MsgWithdrawLease", MsgWithdrawLease], ["/akash.market.v1beta2.MsgCreateLease", MsgCreateLease], ["/akash.market.v1beta2.MsgCloseLease", MsgCloseLease]]; export const load = (protoRegistry: Registry) => { diff --git a/__fixtures__/outputv2/akash/market/v1beta2/service.rpc.msg.ts b/__fixtures__/outputv2/akash/market/v1beta2/service.rpc.msg.ts index 82954a5da5..70e3472538 100644 --- a/__fixtures__/outputv2/akash/market/v1beta2/service.rpc.msg.ts +++ b/__fixtures__/outputv2/akash/market/v1beta2/service.rpc.msg.ts @@ -1,7 +1,7 @@ -import { OrderID, OrderIDAmino, OrderIDSDKType } from "./order"; -import { DecCoin, DecCoinAmino, DecCoinSDKType, Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { BidID, BidIDAmino, BidIDSDKType, MsgCreateBid, MsgCreateBidAmino, MsgCreateBidSDKType, MsgCreateBidResponse, MsgCreateBidResponseAmino, MsgCreateBidResponseSDKType, MsgCloseBid, MsgCloseBidAmino, MsgCloseBidSDKType, MsgCloseBidResponse, MsgCloseBidResponseAmino, MsgCloseBidResponseSDKType } from "./bid"; -import { LeaseID, LeaseIDAmino, LeaseIDSDKType, MsgWithdrawLease, MsgWithdrawLeaseAmino, MsgWithdrawLeaseSDKType, MsgWithdrawLeaseResponse, MsgWithdrawLeaseResponseAmino, MsgWithdrawLeaseResponseSDKType, MsgCreateLease, MsgCreateLeaseAmino, MsgCreateLeaseSDKType, MsgCreateLeaseResponse, MsgCreateLeaseResponseAmino, MsgCreateLeaseResponseSDKType, MsgCloseLease, MsgCloseLeaseAmino, MsgCloseLeaseSDKType, MsgCloseLeaseResponse, MsgCloseLeaseResponseAmino, MsgCloseLeaseResponseSDKType } from "./lease"; +import { OrderID, OrderIDSDKType } from "./order"; +import { DecCoin, DecCoinSDKType, Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { BidID, BidIDSDKType, MsgCreateBid, MsgCreateBidSDKType, MsgCreateBidResponse, MsgCreateBidResponseSDKType, MsgCloseBid, MsgCloseBidSDKType, MsgCloseBidResponse, MsgCloseBidResponseSDKType } from "./bid"; +import { LeaseID, LeaseIDSDKType, MsgWithdrawLease, MsgWithdrawLeaseSDKType, MsgWithdrawLeaseResponse, MsgWithdrawLeaseResponseSDKType, MsgCreateLease, MsgCreateLeaseSDKType, MsgCreateLeaseResponse, MsgCreateLeaseResponseSDKType, MsgCloseLease, MsgCloseLeaseSDKType, MsgCloseLeaseResponse, MsgCloseLeaseResponseSDKType } from "./lease"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; diff --git a/__fixtures__/outputv2/akash/provider/v1beta1/provider.amino.ts b/__fixtures__/outputv2/akash/provider/v1beta1/provider.amino.ts index bf541c47d0..60e0be31be 100644 --- a/__fixtures__/outputv2/akash/provider/v1beta1/provider.amino.ts +++ b/__fixtures__/outputv2/akash/provider/v1beta1/provider.amino.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import { Attribute, AttributeAmino, AttributeSDKType } from "../../base/v1beta1/attribute"; -import { MsgCreateProvider, MsgCreateProviderAmino, MsgCreateProviderSDKType, MsgUpdateProvider, MsgUpdateProviderAmino, MsgUpdateProviderSDKType, MsgDeleteProvider, MsgDeleteProviderAmino, MsgDeleteProviderSDKType } from "./provider"; +import { Attribute, AttributeSDKType } from "../../base/v1beta1/attribute"; +import { MsgCreateProvider, MsgCreateProviderSDKType, MsgUpdateProvider, MsgUpdateProviderSDKType, MsgDeleteProvider, MsgDeleteProviderSDKType } from "./provider"; export const AminoConverter = { "/akash.provider.v1beta1.MsgCreateProvider": { aminoType: "/akash.provider.v1beta1.MsgCreateProvider", diff --git a/__fixtures__/outputv2/akash/provider/v1beta1/provider.registry.ts b/__fixtures__/outputv2/akash/provider/v1beta1/provider.registry.ts index 44dc5cff60..7bc4789ab0 100644 --- a/__fixtures__/outputv2/akash/provider/v1beta1/provider.registry.ts +++ b/__fixtures__/outputv2/akash/provider/v1beta1/provider.registry.ts @@ -1,6 +1,6 @@ -import { Attribute, AttributeAmino, AttributeSDKType } from "../../base/v1beta1/attribute"; +import { Attribute, AttributeSDKType } from "../../base/v1beta1/attribute"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgCreateProvider, MsgCreateProviderAmino, MsgCreateProviderSDKType, MsgUpdateProvider, MsgUpdateProviderAmino, MsgUpdateProviderSDKType, MsgDeleteProvider, MsgDeleteProviderAmino, MsgDeleteProviderSDKType } from "./provider"; +import { MsgCreateProvider, MsgCreateProviderSDKType, MsgUpdateProvider, MsgUpdateProviderSDKType, MsgDeleteProvider, MsgDeleteProviderSDKType } from "./provider"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/akash.provider.v1beta1.MsgCreateProvider", MsgCreateProvider], ["/akash.provider.v1beta1.MsgUpdateProvider", MsgUpdateProvider], ["/akash.provider.v1beta1.MsgDeleteProvider", MsgDeleteProvider]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/akash/provider/v1beta1/provider.rpc.msg.ts b/__fixtures__/outputv2/akash/provider/v1beta1/provider.rpc.msg.ts index 88e1c3a162..b922152737 100644 --- a/__fixtures__/outputv2/akash/provider/v1beta1/provider.rpc.msg.ts +++ b/__fixtures__/outputv2/akash/provider/v1beta1/provider.rpc.msg.ts @@ -1,7 +1,7 @@ -import { Attribute, AttributeAmino, AttributeSDKType } from "../../base/v1beta1/attribute"; +import { Attribute, AttributeSDKType } from "../../base/v1beta1/attribute"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgCreateProvider, MsgCreateProviderAmino, MsgCreateProviderSDKType, MsgCreateProviderResponse, MsgCreateProviderResponseAmino, MsgCreateProviderResponseSDKType, MsgUpdateProvider, MsgUpdateProviderAmino, MsgUpdateProviderSDKType, MsgUpdateProviderResponse, MsgUpdateProviderResponseAmino, MsgUpdateProviderResponseSDKType, MsgDeleteProvider, MsgDeleteProviderAmino, MsgDeleteProviderSDKType, MsgDeleteProviderResponse, MsgDeleteProviderResponseAmino, MsgDeleteProviderResponseSDKType } from "./provider"; +import { MsgCreateProvider, MsgCreateProviderSDKType, MsgCreateProviderResponse, MsgCreateProviderResponseSDKType, MsgUpdateProvider, MsgUpdateProviderSDKType, MsgUpdateProviderResponse, MsgUpdateProviderResponseSDKType, MsgDeleteProvider, MsgDeleteProviderSDKType, MsgDeleteProviderResponse, MsgDeleteProviderResponseSDKType } from "./provider"; /** Msg defines the provider Msg service */ export interface Msg { diff --git a/__fixtures__/outputv2/akash/provider/v1beta2/provider.amino.ts b/__fixtures__/outputv2/akash/provider/v1beta2/provider.amino.ts index cd538fa9fe..1abb8dc806 100644 --- a/__fixtures__/outputv2/akash/provider/v1beta2/provider.amino.ts +++ b/__fixtures__/outputv2/akash/provider/v1beta2/provider.amino.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import { Attribute, AttributeAmino, AttributeSDKType } from "../../base/v1beta2/attribute"; -import { MsgCreateProvider, MsgCreateProviderAmino, MsgCreateProviderSDKType, MsgUpdateProvider, MsgUpdateProviderAmino, MsgUpdateProviderSDKType, MsgDeleteProvider, MsgDeleteProviderAmino, MsgDeleteProviderSDKType } from "./provider"; +import { Attribute, AttributeSDKType } from "../../base/v1beta2/attribute"; +import { MsgCreateProvider, MsgCreateProviderSDKType, MsgUpdateProvider, MsgUpdateProviderSDKType, MsgDeleteProvider, MsgDeleteProviderSDKType } from "./provider"; export const AminoConverter = { "/akash.provider.v1beta2.MsgCreateProvider": { aminoType: "/akash.provider.v1beta2.MsgCreateProvider", diff --git a/__fixtures__/outputv2/akash/provider/v1beta2/provider.registry.ts b/__fixtures__/outputv2/akash/provider/v1beta2/provider.registry.ts index ee3075a834..b50870b35c 100644 --- a/__fixtures__/outputv2/akash/provider/v1beta2/provider.registry.ts +++ b/__fixtures__/outputv2/akash/provider/v1beta2/provider.registry.ts @@ -1,6 +1,6 @@ -import { Attribute, AttributeAmino, AttributeSDKType } from "../../base/v1beta2/attribute"; +import { Attribute, AttributeSDKType } from "../../base/v1beta2/attribute"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgCreateProvider, MsgCreateProviderAmino, MsgCreateProviderSDKType, MsgUpdateProvider, MsgUpdateProviderAmino, MsgUpdateProviderSDKType, MsgDeleteProvider, MsgDeleteProviderAmino, MsgDeleteProviderSDKType } from "./provider"; +import { MsgCreateProvider, MsgCreateProviderSDKType, MsgUpdateProvider, MsgUpdateProviderSDKType, MsgDeleteProvider, MsgDeleteProviderSDKType } from "./provider"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/akash.provider.v1beta2.MsgCreateProvider", MsgCreateProvider], ["/akash.provider.v1beta2.MsgUpdateProvider", MsgUpdateProvider], ["/akash.provider.v1beta2.MsgDeleteProvider", MsgDeleteProvider]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/akash/provider/v1beta2/provider.rpc.msg.ts b/__fixtures__/outputv2/akash/provider/v1beta2/provider.rpc.msg.ts index fc6ea4b366..86410150ec 100644 --- a/__fixtures__/outputv2/akash/provider/v1beta2/provider.rpc.msg.ts +++ b/__fixtures__/outputv2/akash/provider/v1beta2/provider.rpc.msg.ts @@ -1,7 +1,7 @@ -import { Attribute, AttributeAmino, AttributeSDKType } from "../../base/v1beta2/attribute"; +import { Attribute, AttributeSDKType } from "../../base/v1beta2/attribute"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgCreateProvider, MsgCreateProviderAmino, MsgCreateProviderSDKType, MsgCreateProviderResponse, MsgCreateProviderResponseAmino, MsgCreateProviderResponseSDKType, MsgUpdateProvider, MsgUpdateProviderAmino, MsgUpdateProviderSDKType, MsgUpdateProviderResponse, MsgUpdateProviderResponseAmino, MsgUpdateProviderResponseSDKType, MsgDeleteProvider, MsgDeleteProviderAmino, MsgDeleteProviderSDKType, MsgDeleteProviderResponse, MsgDeleteProviderResponseAmino, MsgDeleteProviderResponseSDKType } from "./provider"; +import { MsgCreateProvider, MsgCreateProviderSDKType, MsgCreateProviderResponse, MsgCreateProviderResponseSDKType, MsgUpdateProvider, MsgUpdateProviderSDKType, MsgUpdateProviderResponse, MsgUpdateProviderResponseSDKType, MsgDeleteProvider, MsgDeleteProviderSDKType, MsgDeleteProviderResponse, MsgDeleteProviderResponseSDKType } from "./provider"; /** Msg defines the provider Msg service */ export interface Msg { diff --git a/__fixtures__/outputv2/akash/provider/v1beta2/query.lcd.ts b/__fixtures__/outputv2/akash/provider/v1beta2/query.lcd.ts index 5839a8fa35..2b0e008699 100644 --- a/__fixtures__/outputv2/akash/provider/v1beta2/query.lcd.ts +++ b/__fixtures__/outputv2/akash/provider/v1beta2/query.lcd.ts @@ -1,8 +1,8 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { Provider, ProviderAmino, ProviderSDKType } from "./provider"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { Provider, ProviderSDKType } from "./provider"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryProvidersRequest, QueryProvidersRequestAmino, QueryProvidersRequestSDKType, QueryProvidersResponse, QueryProvidersResponseAmino, QueryProvidersResponseSDKType, QueryProviderRequest, QueryProviderRequestAmino, QueryProviderRequestSDKType, QueryProviderResponse, QueryProviderResponseAmino, QueryProviderResponseSDKType } from "./query"; +import { QueryProvidersRequest, QueryProvidersRequestSDKType, QueryProvidersResponse, QueryProvidersResponseSDKType, QueryProviderRequest, QueryProviderRequestSDKType, QueryProviderResponse, QueryProviderResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/akash/provider/v1beta2/query.rpc.Query.ts b/__fixtures__/outputv2/akash/provider/v1beta2/query.rpc.Query.ts index fea87a27cb..2da1092eda 100644 --- a/__fixtures__/outputv2/akash/provider/v1beta2/query.rpc.Query.ts +++ b/__fixtures__/outputv2/akash/provider/v1beta2/query.rpc.Query.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { Provider, ProviderAmino, ProviderSDKType } from "./provider"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { Provider, ProviderSDKType } from "./provider"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryProvidersRequest, QueryProvidersRequestAmino, QueryProvidersRequestSDKType, QueryProvidersResponse, QueryProvidersResponseAmino, QueryProvidersResponseSDKType, QueryProviderRequest, QueryProviderRequestAmino, QueryProviderRequestSDKType, QueryProviderResponse, QueryProviderResponseAmino, QueryProviderResponseSDKType } from "./query"; +import { QueryProvidersRequest, QueryProvidersRequestSDKType, QueryProvidersResponse, QueryProvidersResponseSDKType, QueryProviderRequest, QueryProviderRequestSDKType, QueryProviderResponse, QueryProviderResponseSDKType } from "./query"; /** Query defines the gRPC querier service */ export interface Query { diff --git a/__fixtures__/outputv2/cosmos/app/v1alpha1/config.ts b/__fixtures__/outputv2/cosmos/app/v1alpha1/config.ts index f28e8dd43a..de63ac3b9e 100644 --- a/__fixtures__/outputv2/cosmos/app/v1alpha1/config.ts +++ b/__fixtures__/outputv2/cosmos/app/v1alpha1/config.ts @@ -1,4 +1,4 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { DeepPartial, isSet } from "../../../helpers"; export const protobufPackage = "cosmos.app.v1alpha1"; diff --git a/__fixtures__/outputv2/cosmos/app/v1alpha1/query.rpc.Query.ts b/__fixtures__/outputv2/cosmos/app/v1alpha1/query.rpc.Query.ts index 3ef7b66a81..9692c53583 100644 --- a/__fixtures__/outputv2/cosmos/app/v1alpha1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/cosmos/app/v1alpha1/query.rpc.Query.ts @@ -1,8 +1,8 @@ -import { Config, ConfigAmino, ConfigSDKType } from "./config"; +import { Config, ConfigSDKType } from "./config"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryConfigRequest, QueryConfigRequestAmino, QueryConfigRequestSDKType, QueryConfigResponse, QueryConfigResponseAmino, QueryConfigResponseSDKType } from "./query"; +import { QueryConfigRequest, QueryConfigRequestSDKType, QueryConfigResponse, QueryConfigResponseSDKType } from "./query"; /** Query is the app module query service. */ export interface Query { diff --git a/__fixtures__/outputv2/cosmos/auth/v1beta1/auth.ts b/__fixtures__/outputv2/cosmos/auth/v1beta1/auth.ts index 822499844b..9fe7430323 100644 --- a/__fixtures__/outputv2/cosmos/auth/v1beta1/auth.ts +++ b/__fixtures__/outputv2/cosmos/auth/v1beta1/auth.ts @@ -1,4 +1,4 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Long, isSet, DeepPartial } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; export const protobufPackage = "cosmos.auth.v1beta1"; diff --git a/__fixtures__/outputv2/cosmos/auth/v1beta1/genesis.ts b/__fixtures__/outputv2/cosmos/auth/v1beta1/genesis.ts index 75113169ed..c327d5f531 100644 --- a/__fixtures__/outputv2/cosmos/auth/v1beta1/genesis.ts +++ b/__fixtures__/outputv2/cosmos/auth/v1beta1/genesis.ts @@ -1,5 +1,5 @@ import { Params, ParamsAmino, ParamsSDKType } from "./auth"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.auth.v1beta1"; diff --git a/__fixtures__/outputv2/cosmos/auth/v1beta1/query.lcd.ts b/__fixtures__/outputv2/cosmos/auth/v1beta1/query.lcd.ts index da2c363bb6..c89e389738 100644 --- a/__fixtures__/outputv2/cosmos/auth/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/cosmos/auth/v1beta1/query.lcd.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { Params, ParamsAmino, ParamsSDKType, BaseAccount, BaseAccountAmino, BaseAccountSDKType, ModuleAccount, ModuleAccountAmino, ModuleAccountSDKType } from "./auth"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Params, ParamsSDKType, BaseAccount, BaseAccountSDKType, ModuleAccount, ModuleAccountSDKType } from "./auth"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryAccountsRequest, QueryAccountsRequestAmino, QueryAccountsRequestSDKType, QueryAccountsResponse, QueryAccountsResponseAmino, QueryAccountsResponseSDKType, QueryAccountRequest, QueryAccountRequestAmino, QueryAccountRequestSDKType, QueryAccountResponse, QueryAccountResponseAmino, QueryAccountResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryModuleAccountsRequest, QueryModuleAccountsRequestAmino, QueryModuleAccountsRequestSDKType, QueryModuleAccountsResponse, QueryModuleAccountsResponseAmino, QueryModuleAccountsResponseSDKType, Bech32PrefixRequest, Bech32PrefixRequestAmino, Bech32PrefixRequestSDKType, Bech32PrefixResponse, Bech32PrefixResponseAmino, Bech32PrefixResponseSDKType, AddressBytesToStringRequest, AddressBytesToStringRequestAmino, AddressBytesToStringRequestSDKType, AddressBytesToStringResponse, AddressBytesToStringResponseAmino, AddressBytesToStringResponseSDKType, AddressStringToBytesRequest, AddressStringToBytesRequestAmino, AddressStringToBytesRequestSDKType, AddressStringToBytesResponse, AddressStringToBytesResponseAmino, AddressStringToBytesResponseSDKType } from "./query"; +import { QueryAccountsRequest, QueryAccountsRequestSDKType, QueryAccountsResponse, QueryAccountsResponseSDKType, QueryAccountRequest, QueryAccountRequestSDKType, QueryAccountResponse, QueryAccountResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryModuleAccountsRequest, QueryModuleAccountsRequestSDKType, QueryModuleAccountsResponse, QueryModuleAccountsResponseSDKType, Bech32PrefixRequest, Bech32PrefixRequestSDKType, Bech32PrefixResponse, Bech32PrefixResponseSDKType, AddressBytesToStringRequest, AddressBytesToStringRequestSDKType, AddressBytesToStringResponse, AddressBytesToStringResponseSDKType, AddressStringToBytesRequest, AddressStringToBytesRequestSDKType, AddressStringToBytesResponse, AddressStringToBytesResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/cosmos/auth/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/cosmos/auth/v1beta1/query.rpc.Query.ts index b324e0872b..3f3a4b289f 100644 --- a/__fixtures__/outputv2/cosmos/auth/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/cosmos/auth/v1beta1/query.rpc.Query.ts @@ -1,10 +1,10 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { Params, ParamsAmino, ParamsSDKType, BaseAccount, BaseAccountAmino, BaseAccountSDKType, ModuleAccount, ModuleAccountAmino, ModuleAccountSDKType } from "./auth"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Params, ParamsSDKType, BaseAccount, BaseAccountSDKType, ModuleAccount, ModuleAccountSDKType } from "./auth"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryAccountsRequest, QueryAccountsRequestAmino, QueryAccountsRequestSDKType, QueryAccountsResponse, QueryAccountsResponseAmino, QueryAccountsResponseSDKType, QueryAccountRequest, QueryAccountRequestAmino, QueryAccountRequestSDKType, QueryAccountResponse, QueryAccountResponseAmino, QueryAccountResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryModuleAccountsRequest, QueryModuleAccountsRequestAmino, QueryModuleAccountsRequestSDKType, QueryModuleAccountsResponse, QueryModuleAccountsResponseAmino, QueryModuleAccountsResponseSDKType, Bech32PrefixRequest, Bech32PrefixRequestAmino, Bech32PrefixRequestSDKType, Bech32PrefixResponse, Bech32PrefixResponseAmino, Bech32PrefixResponseSDKType, AddressBytesToStringRequest, AddressBytesToStringRequestAmino, AddressBytesToStringRequestSDKType, AddressBytesToStringResponse, AddressBytesToStringResponseAmino, AddressBytesToStringResponseSDKType, AddressStringToBytesRequest, AddressStringToBytesRequestAmino, AddressStringToBytesRequestSDKType, AddressStringToBytesResponse, AddressStringToBytesResponseAmino, AddressStringToBytesResponseSDKType } from "./query"; +import { QueryAccountsRequest, QueryAccountsRequestSDKType, QueryAccountsResponse, QueryAccountsResponseSDKType, QueryAccountRequest, QueryAccountRequestSDKType, QueryAccountResponse, QueryAccountResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryModuleAccountsRequest, QueryModuleAccountsRequestSDKType, QueryModuleAccountsResponse, QueryModuleAccountsResponseSDKType, Bech32PrefixRequest, Bech32PrefixRequestSDKType, Bech32PrefixResponse, Bech32PrefixResponseSDKType, AddressBytesToStringRequest, AddressBytesToStringRequestSDKType, AddressBytesToStringResponse, AddressBytesToStringResponseSDKType, AddressStringToBytesRequest, AddressStringToBytesRequestSDKType, AddressStringToBytesResponse, AddressStringToBytesResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/cosmos/auth/v1beta1/query.ts b/__fixtures__/outputv2/cosmos/auth/v1beta1/query.ts index 06d28e43d3..885b3106b6 100644 --- a/__fixtures__/outputv2/cosmos/auth/v1beta1/query.ts +++ b/__fixtures__/outputv2/cosmos/auth/v1beta1/query.ts @@ -1,6 +1,6 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { Params, ParamsAmino, ParamsSDKType, BaseAccount, BaseAccountAmino, BaseAccountSDKType, ModuleAccount, ModuleAccountAmino, ModuleAccountSDKType } from "./auth"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Params, ParamsAmino, ParamsSDKType, BaseAccount, BaseAccountProtoMsg, BaseAccountSDKType, ModuleAccount, ModuleAccountProtoMsg, ModuleAccountSDKType } from "./auth"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; export const protobufPackage = "cosmos.auth.v1beta1"; @@ -58,6 +58,10 @@ export interface QueryAccountsResponseProtoMsg { typeUrl: "/cosmos.auth.v1beta1.QueryAccountsResponse"; value: Uint8Array; } +export type QueryAccountsResponseEncoded = Omit & { + /** accounts are the existing accounts */ + accounts: (BaseAccountProtoMsg | AnyProtoMsg)[]; +}; /** * QueryAccountsResponse is the response type for the Query/Accounts RPC method. @@ -82,7 +86,7 @@ export interface QueryAccountsResponseAminoMsg { * Since: cosmos-sdk 0.43 */ export interface QueryAccountsResponseSDKType { - accounts: AnySDKType[]; + accounts: (BaseAccountSDKType | AnySDKType)[]; pagination?: PageResponseSDKType; } @@ -162,6 +166,10 @@ export interface QueryAccountResponseProtoMsg { typeUrl: "/cosmos.auth.v1beta1.QueryAccountResponse"; value: Uint8Array; } +export type QueryAccountResponseEncoded = Omit & { + /** account defines the account of the corresponding address. */ + account?: BaseAccountProtoMsg | AnyProtoMsg | undefined; +}; /** QueryAccountResponse is the response type for the Query/Account RPC method. */ export interface QueryAccountResponseAmino { @@ -175,7 +183,7 @@ export interface QueryAccountResponseAminoMsg { /** QueryAccountResponse is the response type for the Query/Account RPC method. */ export interface QueryAccountResponseSDKType { - account?: AnySDKType; + account?: BaseAccountSDKType | AnySDKType | undefined; } /** QueryParamsRequest is the request type for the Query/Params RPC method. */ @@ -203,6 +211,9 @@ export interface QueryModuleAccountsResponseProtoMsg { typeUrl: "/cosmos.auth.v1beta1.QueryModuleAccountsResponse"; value: Uint8Array; } +export type QueryModuleAccountsResponseEncoded = Omit & { + accounts: (ModuleAccountProtoMsg | AnyProtoMsg)[]; +}; /** QueryModuleAccountsResponse is the response type for the Query/ModuleAccounts RPC method. */ export interface QueryModuleAccountsResponseAmino { @@ -215,7 +226,7 @@ export interface QueryModuleAccountsResponseAminoMsg { /** QueryModuleAccountsResponse is the response type for the Query/ModuleAccounts RPC method. */ export interface QueryModuleAccountsResponseSDKType { - accounts: AnySDKType[]; + accounts: (ModuleAccountSDKType | AnySDKType)[]; } /** Bech32PrefixRequest is the request type for Bech32Prefix rpc method */ diff --git a/__fixtures__/outputv2/cosmos/authz/v1beta1/authz.ts b/__fixtures__/outputv2/cosmos/authz/v1beta1/authz.ts index c63205ccbd..7c39cb289e 100644 --- a/__fixtures__/outputv2/cosmos/authz/v1beta1/authz.ts +++ b/__fixtures__/outputv2/cosmos/authz/v1beta1/authz.ts @@ -1,13 +1,13 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../google/protobuf/timestamp"; import { DepositDeploymentAuthorization as DepositDeploymentAuthorization1 } from "../../../akash/deployment/v1beta1/authz"; -import { DepositDeploymentAuthorizationAmino as DepositDeploymentAuthorization1Amino } from "../../../akash/deployment/v1beta1/authz"; +import { DepositDeploymentAuthorizationProtoMsg as DepositDeploymentAuthorization1ProtoMsg } from "../../../akash/deployment/v1beta1/authz"; import { DepositDeploymentAuthorizationSDKType as DepositDeploymentAuthorization1SDKType } from "../../../akash/deployment/v1beta1/authz"; import { DepositDeploymentAuthorization as DepositDeploymentAuthorization2 } from "../../../akash/deployment/v1beta2/authz"; -import { DepositDeploymentAuthorizationAmino as DepositDeploymentAuthorization2Amino } from "../../../akash/deployment/v1beta2/authz"; +import { DepositDeploymentAuthorizationProtoMsg as DepositDeploymentAuthorization2ProtoMsg } from "../../../akash/deployment/v1beta2/authz"; import { DepositDeploymentAuthorizationSDKType as DepositDeploymentAuthorization2SDKType } from "../../../akash/deployment/v1beta2/authz"; -import { SendAuthorization, SendAuthorizationAmino, SendAuthorizationSDKType } from "../../bank/v1beta1/authz"; -import { StakeAuthorization, StakeAuthorizationAmino, StakeAuthorizationSDKType } from "../../staking/v1beta1/authz"; +import { SendAuthorization, SendAuthorizationProtoMsg, SendAuthorizationSDKType } from "../../bank/v1beta1/authz"; +import { StakeAuthorization, StakeAuthorizationProtoMsg, StakeAuthorizationSDKType } from "../../staking/v1beta1/authz"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, toTimestamp, fromTimestamp, fromJsonTimestamp } from "../../../helpers"; export const protobufPackage = "cosmos.authz.v1beta1"; @@ -64,6 +64,9 @@ export interface GrantProtoMsg { typeUrl: "/cosmos.authz.v1beta1.Grant"; value: Uint8Array; } +export type GrantEncoded = Omit & { + authorization?: GenericAuthorizationProtoMsg | DepositDeploymentAuthorization1ProtoMsg | DepositDeploymentAuthorization2ProtoMsg | SendAuthorizationProtoMsg | StakeAuthorizationProtoMsg | AnyProtoMsg | undefined; +}; /** * Grant gives permissions to execute @@ -89,7 +92,7 @@ export interface GrantAminoMsg { * the provide method with expiration time. */ export interface GrantSDKType { - authorization?: AnySDKType; + authorization?: GenericAuthorizationSDKType | DepositDeploymentAuthorization1SDKType | DepositDeploymentAuthorization2SDKType | SendAuthorizationSDKType | StakeAuthorizationSDKType | AnySDKType | undefined; expiration?: Date; } @@ -107,6 +110,9 @@ export interface GrantAuthorizationProtoMsg { typeUrl: "/cosmos.authz.v1beta1.GrantAuthorization"; value: Uint8Array; } +export type GrantAuthorizationEncoded = Omit & { + authorization?: GenericAuthorizationProtoMsg | DepositDeploymentAuthorization1ProtoMsg | DepositDeploymentAuthorization2ProtoMsg | SendAuthorizationProtoMsg | StakeAuthorizationProtoMsg | AnyProtoMsg | undefined; +}; /** * GrantAuthorization extends a grant with both the addresses of the grantee and granter. @@ -130,7 +136,7 @@ export interface GrantAuthorizationAminoMsg { export interface GrantAuthorizationSDKType { granter: string; grantee: string; - authorization?: AnySDKType; + authorization?: GenericAuthorizationSDKType | DepositDeploymentAuthorization1SDKType | DepositDeploymentAuthorization2SDKType | SendAuthorizationSDKType | StakeAuthorizationSDKType | AnySDKType | undefined; expiration?: Date; } diff --git a/__fixtures__/outputv2/cosmos/authz/v1beta1/query.lcd.ts b/__fixtures__/outputv2/cosmos/authz/v1beta1/query.lcd.ts index a3d70cd96d..e204af7568 100644 --- a/__fixtures__/outputv2/cosmos/authz/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/cosmos/authz/v1beta1/query.lcd.ts @@ -1,8 +1,8 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Grant, GrantAmino, GrantSDKType, GrantAuthorization, GrantAuthorizationAmino, GrantAuthorizationSDKType } from "./authz"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { Grant, GrantSDKType, GrantAuthorization, GrantAuthorizationSDKType } from "./authz"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryGrantsRequest, QueryGrantsRequestAmino, QueryGrantsRequestSDKType, QueryGrantsResponse, QueryGrantsResponseAmino, QueryGrantsResponseSDKType, QueryGranterGrantsRequest, QueryGranterGrantsRequestAmino, QueryGranterGrantsRequestSDKType, QueryGranterGrantsResponse, QueryGranterGrantsResponseAmino, QueryGranterGrantsResponseSDKType, QueryGranteeGrantsRequest, QueryGranteeGrantsRequestAmino, QueryGranteeGrantsRequestSDKType, QueryGranteeGrantsResponse, QueryGranteeGrantsResponseAmino, QueryGranteeGrantsResponseSDKType } from "./query"; +import { QueryGrantsRequest, QueryGrantsRequestSDKType, QueryGrantsResponse, QueryGrantsResponseSDKType, QueryGranterGrantsRequest, QueryGranterGrantsRequestSDKType, QueryGranterGrantsResponse, QueryGranterGrantsResponseSDKType, QueryGranteeGrantsRequest, QueryGranteeGrantsRequestSDKType, QueryGranteeGrantsResponse, QueryGranteeGrantsResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/cosmos/authz/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/cosmos/authz/v1beta1/query.rpc.Query.ts index 510bd3584a..464122c7e9 100644 --- a/__fixtures__/outputv2/cosmos/authz/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/cosmos/authz/v1beta1/query.rpc.Query.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Grant, GrantAmino, GrantSDKType, GrantAuthorization, GrantAuthorizationAmino, GrantAuthorizationSDKType } from "./authz"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { Grant, GrantSDKType, GrantAuthorization, GrantAuthorizationSDKType } from "./authz"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryGrantsRequest, QueryGrantsRequestAmino, QueryGrantsRequestSDKType, QueryGrantsResponse, QueryGrantsResponseAmino, QueryGrantsResponseSDKType, QueryGranterGrantsRequest, QueryGranterGrantsRequestAmino, QueryGranterGrantsRequestSDKType, QueryGranterGrantsResponse, QueryGranterGrantsResponseAmino, QueryGranterGrantsResponseSDKType, QueryGranteeGrantsRequest, QueryGranteeGrantsRequestAmino, QueryGranteeGrantsRequestSDKType, QueryGranteeGrantsResponse, QueryGranteeGrantsResponseAmino, QueryGranteeGrantsResponseSDKType } from "./query"; +import { QueryGrantsRequest, QueryGrantsRequestSDKType, QueryGrantsResponse, QueryGrantsResponseSDKType, QueryGranterGrantsRequest, QueryGranterGrantsRequestSDKType, QueryGranterGrantsResponse, QueryGranterGrantsResponseSDKType, QueryGranteeGrantsRequest, QueryGranteeGrantsRequestSDKType, QueryGranteeGrantsResponse, QueryGranteeGrantsResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.amino.ts b/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.amino.ts index 50b56c3bdf..046b599313 100644 --- a/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.amino.ts +++ b/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.amino.ts @@ -1,6 +1,6 @@ -import { Grant, GrantAmino, GrantSDKType } from "./authz"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { MsgGrant, MsgGrantAmino, MsgGrantSDKType, MsgExec, MsgExecAmino, MsgExecSDKType, MsgRevoke, MsgRevokeAmino, MsgRevokeSDKType } from "./tx"; +import { Grant, GrantSDKType } from "./authz"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { MsgGrant, MsgGrantSDKType, MsgExec, MsgExecSDKType, MsgRevoke, MsgRevokeSDKType } from "./tx"; export const AminoConverter = { "/cosmos.authz.v1beta1.MsgGrant": { aminoType: "cosmos-sdk/MsgGrant", diff --git a/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.registry.ts b/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.registry.ts index e9183707ed..058d07ef86 100644 --- a/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.registry.ts +++ b/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.registry.ts @@ -1,7 +1,7 @@ -import { Grant, GrantAmino, GrantSDKType } from "./authz"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Grant, GrantSDKType } from "./authz"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgGrant, MsgGrantAmino, MsgGrantSDKType, MsgExec, MsgExecAmino, MsgExecSDKType, MsgRevoke, MsgRevokeAmino, MsgRevokeSDKType } from "./tx"; +import { MsgGrant, MsgGrantSDKType, MsgExec, MsgExecSDKType, MsgRevoke, MsgRevokeSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/cosmos.authz.v1beta1.MsgGrant", MsgGrant], ["/cosmos.authz.v1beta1.MsgExec", MsgExec], ["/cosmos.authz.v1beta1.MsgRevoke", MsgRevoke]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.rpc.msg.ts b/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.rpc.msg.ts index ed0442f439..ad919ece01 100644 --- a/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.rpc.msg.ts @@ -1,8 +1,8 @@ -import { Grant, GrantAmino, GrantSDKType } from "./authz"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Grant, GrantSDKType } from "./authz"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgGrant, MsgGrantAmino, MsgGrantSDKType, MsgGrantResponse, MsgGrantResponseAmino, MsgGrantResponseSDKType, MsgExec, MsgExecAmino, MsgExecSDKType, MsgExecResponse, MsgExecResponseAmino, MsgExecResponseSDKType, MsgRevoke, MsgRevokeAmino, MsgRevokeSDKType, MsgRevokeResponse, MsgRevokeResponseAmino, MsgRevokeResponseSDKType } from "./tx"; +import { MsgGrant, MsgGrantSDKType, MsgGrantResponse, MsgGrantResponseSDKType, MsgExec, MsgExecSDKType, MsgExecResponse, MsgExecResponseSDKType, MsgRevoke, MsgRevokeSDKType, MsgRevokeResponse, MsgRevokeResponseSDKType } from "./tx"; /** Msg defines the authz Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.ts b/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.ts index 546e977dda..86f7c32d68 100644 --- a/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.ts +++ b/__fixtures__/outputv2/cosmos/authz/v1beta1/tx.ts @@ -1,5 +1,5 @@ import { Grant, GrantAmino, GrantSDKType } from "./authz"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; export const protobufPackage = "cosmos.authz.v1beta1"; @@ -84,6 +84,14 @@ export interface MsgExecProtoMsg { typeUrl: "/cosmos.authz.v1beta1.MsgExec"; value: Uint8Array; } +export type MsgExecEncoded = Omit & { + /** + * Authorization Msg requests to execute. Each msg must implement Authorization interface + * The x/authz will try to find a grant matching (msg.signers[0], grantee, MsgTypeURL(msg)) + * triple and validate it. + */ + msgs: (AnyProtoMsg)[]; +}; /** * MsgExec attempts to execute the provided messages using @@ -112,7 +120,7 @@ export interface MsgExecAminoMsg { */ export interface MsgExecSDKType { grantee: string; - msgs: AnySDKType[]; + msgs: (AnySDKType)[]; } /** MsgGrantResponse defines the Msg/MsgGrant response type. */ diff --git a/__fixtures__/outputv2/cosmos/bank/v1beta1/query.lcd.ts b/__fixtures__/outputv2/cosmos/bank/v1beta1/query.lcd.ts index ad4a18b308..a7acba3fe1 100644 --- a/__fixtures__/outputv2/cosmos/bank/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/cosmos/bank/v1beta1/query.lcd.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { Params, ParamsAmino, ParamsSDKType, Metadata, MetadataAmino, MetadataSDKType } from "./bank"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; +import { Params, ParamsSDKType, Metadata, MetadataSDKType } from "./bank"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryBalanceRequest, QueryBalanceRequestAmino, QueryBalanceRequestSDKType, QueryBalanceResponse, QueryBalanceResponseAmino, QueryBalanceResponseSDKType, QueryAllBalancesRequest, QueryAllBalancesRequestAmino, QueryAllBalancesRequestSDKType, QueryAllBalancesResponse, QueryAllBalancesResponseAmino, QueryAllBalancesResponseSDKType, QuerySpendableBalancesRequest, QuerySpendableBalancesRequestAmino, QuerySpendableBalancesRequestSDKType, QuerySpendableBalancesResponse, QuerySpendableBalancesResponseAmino, QuerySpendableBalancesResponseSDKType, QueryTotalSupplyRequest, QueryTotalSupplyRequestAmino, QueryTotalSupplyRequestSDKType, QueryTotalSupplyResponse, QueryTotalSupplyResponseAmino, QueryTotalSupplyResponseSDKType, QuerySupplyOfRequest, QuerySupplyOfRequestAmino, QuerySupplyOfRequestSDKType, QuerySupplyOfResponse, QuerySupplyOfResponseAmino, QuerySupplyOfResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryDenomMetadataRequest, QueryDenomMetadataRequestAmino, QueryDenomMetadataRequestSDKType, QueryDenomMetadataResponse, QueryDenomMetadataResponseAmino, QueryDenomMetadataResponseSDKType, QueryDenomsMetadataRequest, QueryDenomsMetadataRequestAmino, QueryDenomsMetadataRequestSDKType, QueryDenomsMetadataResponse, QueryDenomsMetadataResponseAmino, QueryDenomsMetadataResponseSDKType, QueryDenomOwnersRequest, QueryDenomOwnersRequestAmino, QueryDenomOwnersRequestSDKType, QueryDenomOwnersResponse, QueryDenomOwnersResponseAmino, QueryDenomOwnersResponseSDKType } from "./query"; +import { QueryBalanceRequest, QueryBalanceRequestSDKType, QueryBalanceResponse, QueryBalanceResponseSDKType, QueryAllBalancesRequest, QueryAllBalancesRequestSDKType, QueryAllBalancesResponse, QueryAllBalancesResponseSDKType, QuerySpendableBalancesRequest, QuerySpendableBalancesRequestSDKType, QuerySpendableBalancesResponse, QuerySpendableBalancesResponseSDKType, QueryTotalSupplyRequest, QueryTotalSupplyRequestSDKType, QueryTotalSupplyResponse, QueryTotalSupplyResponseSDKType, QuerySupplyOfRequest, QuerySupplyOfRequestSDKType, QuerySupplyOfResponse, QuerySupplyOfResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryDenomMetadataRequest, QueryDenomMetadataRequestSDKType, QueryDenomMetadataResponse, QueryDenomMetadataResponseSDKType, QueryDenomsMetadataRequest, QueryDenomsMetadataRequestSDKType, QueryDenomsMetadataResponse, QueryDenomsMetadataResponseSDKType, QueryDenomOwnersRequest, QueryDenomOwnersRequestSDKType, QueryDenomOwnersResponse, QueryDenomOwnersResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/cosmos/bank/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/cosmos/bank/v1beta1/query.rpc.Query.ts index 3d51444346..1f51b033c4 100644 --- a/__fixtures__/outputv2/cosmos/bank/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/cosmos/bank/v1beta1/query.rpc.Query.ts @@ -1,12 +1,12 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { Params, ParamsAmino, ParamsSDKType, Metadata, MetadataAmino, MetadataSDKType } from "./bank"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; +import { Params, ParamsSDKType, Metadata, MetadataSDKType } from "./bank"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient, ProtobufRpcClient } from "@cosmjs/stargate"; import { ReactQueryParams } from "../../../react-query"; import { useQuery } from "@tanstack/react-query"; -import { QueryBalanceRequest, QueryBalanceRequestAmino, QueryBalanceRequestSDKType, QueryBalanceResponse, QueryBalanceResponseAmino, QueryBalanceResponseSDKType, QueryAllBalancesRequest, QueryAllBalancesRequestAmino, QueryAllBalancesRequestSDKType, QueryAllBalancesResponse, QueryAllBalancesResponseAmino, QueryAllBalancesResponseSDKType, QuerySpendableBalancesRequest, QuerySpendableBalancesRequestAmino, QuerySpendableBalancesRequestSDKType, QuerySpendableBalancesResponse, QuerySpendableBalancesResponseAmino, QuerySpendableBalancesResponseSDKType, QueryTotalSupplyRequest, QueryTotalSupplyRequestAmino, QueryTotalSupplyRequestSDKType, QueryTotalSupplyResponse, QueryTotalSupplyResponseAmino, QueryTotalSupplyResponseSDKType, QuerySupplyOfRequest, QuerySupplyOfRequestAmino, QuerySupplyOfRequestSDKType, QuerySupplyOfResponse, QuerySupplyOfResponseAmino, QuerySupplyOfResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryDenomMetadataRequest, QueryDenomMetadataRequestAmino, QueryDenomMetadataRequestSDKType, QueryDenomMetadataResponse, QueryDenomMetadataResponseAmino, QueryDenomMetadataResponseSDKType, QueryDenomsMetadataRequest, QueryDenomsMetadataRequestAmino, QueryDenomsMetadataRequestSDKType, QueryDenomsMetadataResponse, QueryDenomsMetadataResponseAmino, QueryDenomsMetadataResponseSDKType, QueryDenomOwnersRequest, QueryDenomOwnersRequestAmino, QueryDenomOwnersRequestSDKType, QueryDenomOwnersResponse, QueryDenomOwnersResponseAmino, QueryDenomOwnersResponseSDKType } from "./query"; +import { QueryBalanceRequest, QueryBalanceRequestSDKType, QueryBalanceResponse, QueryBalanceResponseSDKType, QueryAllBalancesRequest, QueryAllBalancesRequestSDKType, QueryAllBalancesResponse, QueryAllBalancesResponseSDKType, QuerySpendableBalancesRequest, QuerySpendableBalancesRequestSDKType, QuerySpendableBalancesResponse, QuerySpendableBalancesResponseSDKType, QueryTotalSupplyRequest, QueryTotalSupplyRequestSDKType, QueryTotalSupplyResponse, QueryTotalSupplyResponseSDKType, QuerySupplyOfRequest, QuerySupplyOfRequestSDKType, QuerySupplyOfResponse, QuerySupplyOfResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryDenomMetadataRequest, QueryDenomMetadataRequestSDKType, QueryDenomMetadataResponse, QueryDenomMetadataResponseSDKType, QueryDenomsMetadataRequest, QueryDenomsMetadataRequestSDKType, QueryDenomsMetadataResponse, QueryDenomsMetadataResponseSDKType, QueryDenomOwnersRequest, QueryDenomOwnersRequestSDKType, QueryDenomOwnersResponse, QueryDenomOwnersResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/cosmos/bank/v1beta1/tx.amino.ts b/__fixtures__/outputv2/cosmos/bank/v1beta1/tx.amino.ts index 72edeaec28..e5ad64ef6f 100644 --- a/__fixtures__/outputv2/cosmos/bank/v1beta1/tx.amino.ts +++ b/__fixtures__/outputv2/cosmos/bank/v1beta1/tx.amino.ts @@ -1,6 +1,6 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { Input, InputAmino, InputSDKType, Output, OutputAmino, OutputSDKType } from "./bank"; -import { MsgSend, MsgSendAmino, MsgSendSDKType, MsgMultiSend, MsgMultiSendAmino, MsgMultiSendSDKType } from "./tx"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; +import { Input, InputSDKType, Output, OutputSDKType } from "./bank"; +import { MsgSend, MsgSendSDKType, MsgMultiSend, MsgMultiSendSDKType } from "./tx"; export const AminoConverter = { "/cosmos.bank.v1beta1.MsgSend": { aminoType: "cosmos-sdk/MsgSend", diff --git a/__fixtures__/outputv2/cosmos/bank/v1beta1/tx.registry.ts b/__fixtures__/outputv2/cosmos/bank/v1beta1/tx.registry.ts index 421aa59eef..63566f75e9 100644 --- a/__fixtures__/outputv2/cosmos/bank/v1beta1/tx.registry.ts +++ b/__fixtures__/outputv2/cosmos/bank/v1beta1/tx.registry.ts @@ -1,7 +1,7 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { Input, InputAmino, InputSDKType, Output, OutputAmino, OutputSDKType } from "./bank"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; +import { Input, InputSDKType, Output, OutputSDKType } from "./bank"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgSend, MsgSendAmino, MsgSendSDKType, MsgMultiSend, MsgMultiSendAmino, MsgMultiSendSDKType } from "./tx"; +import { MsgSend, MsgSendSDKType, MsgMultiSend, MsgMultiSendSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/cosmos.bank.v1beta1.MsgSend", MsgSend], ["/cosmos.bank.v1beta1.MsgMultiSend", MsgMultiSend]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/cosmos/bank/v1beta1/tx.rpc.msg.ts b/__fixtures__/outputv2/cosmos/bank/v1beta1/tx.rpc.msg.ts index fd1d6ce992..e1838d3f13 100644 --- a/__fixtures__/outputv2/cosmos/bank/v1beta1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/cosmos/bank/v1beta1/tx.rpc.msg.ts @@ -1,8 +1,8 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { Input, InputAmino, InputSDKType, Output, OutputAmino, OutputSDKType } from "./bank"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; +import { Input, InputSDKType, Output, OutputSDKType } from "./bank"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgSend, MsgSendAmino, MsgSendSDKType, MsgSendResponse, MsgSendResponseAmino, MsgSendResponseSDKType, MsgMultiSend, MsgMultiSendAmino, MsgMultiSendSDKType, MsgMultiSendResponse, MsgMultiSendResponseAmino, MsgMultiSendResponseSDKType } from "./tx"; +import { MsgSend, MsgSendSDKType, MsgSendResponse, MsgSendResponseSDKType, MsgMultiSend, MsgMultiSendSDKType, MsgMultiSendResponse, MsgMultiSendResponseSDKType } from "./tx"; /** Msg defines the bank Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/cosmos/base/abci/v1beta1/abci.ts b/__fixtures__/outputv2/cosmos/base/abci/v1beta1/abci.ts index 6a29f1484e..e2a221f9af 100644 --- a/__fixtures__/outputv2/cosmos/base/abci/v1beta1/abci.ts +++ b/__fixtures__/outputv2/cosmos/base/abci/v1beta1/abci.ts @@ -1,4 +1,4 @@ -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import { Event, EventAmino, EventSDKType } from "../../../../tendermint/abci/types"; import { Long, isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../../helpers"; import * as _m0 from "protobufjs/minimal"; diff --git a/__fixtures__/outputv2/cosmos/base/tendermint/v1beta1/query.lcd.ts b/__fixtures__/outputv2/cosmos/base/tendermint/v1beta1/query.lcd.ts index 5ff66342c6..541ab7e4b9 100644 --- a/__fixtures__/outputv2/cosmos/base/tendermint/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/cosmos/base/tendermint/v1beta1/query.lcd.ts @@ -1,11 +1,11 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../query/v1beta1/pagination"; -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; -import { BlockID, BlockIDAmino, BlockIDSDKType } from "../../../../tendermint/types/types"; -import { Block, BlockAmino, BlockSDKType } from "../../../../tendermint/types/block"; -import { NodeInfo, NodeInfoAmino, NodeInfoSDKType } from "../../../../tendermint/p2p/types"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../query/v1beta1/pagination"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { BlockID, BlockIDSDKType } from "../../../../tendermint/types/types"; +import { Block, BlockSDKType } from "../../../../tendermint/types/block"; +import { NodeInfo, NodeInfoSDKType } from "../../../../tendermint/p2p/types"; import { setPaginationParams } from "../../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { GetNodeInfoRequest, GetNodeInfoRequestAmino, GetNodeInfoRequestSDKType, GetNodeInfoResponse, GetNodeInfoResponseAmino, GetNodeInfoResponseSDKType, GetSyncingRequest, GetSyncingRequestAmino, GetSyncingRequestSDKType, GetSyncingResponse, GetSyncingResponseAmino, GetSyncingResponseSDKType, GetLatestBlockRequest, GetLatestBlockRequestAmino, GetLatestBlockRequestSDKType, GetLatestBlockResponse, GetLatestBlockResponseAmino, GetLatestBlockResponseSDKType, GetBlockByHeightRequest, GetBlockByHeightRequestAmino, GetBlockByHeightRequestSDKType, GetBlockByHeightResponse, GetBlockByHeightResponseAmino, GetBlockByHeightResponseSDKType, GetLatestValidatorSetRequest, GetLatestValidatorSetRequestAmino, GetLatestValidatorSetRequestSDKType, GetLatestValidatorSetResponse, GetLatestValidatorSetResponseAmino, GetLatestValidatorSetResponseSDKType, GetValidatorSetByHeightRequest, GetValidatorSetByHeightRequestAmino, GetValidatorSetByHeightRequestSDKType, GetValidatorSetByHeightResponse, GetValidatorSetByHeightResponseAmino, GetValidatorSetByHeightResponseSDKType } from "./query"; +import { GetNodeInfoRequest, GetNodeInfoRequestSDKType, GetNodeInfoResponse, GetNodeInfoResponseSDKType, GetSyncingRequest, GetSyncingRequestSDKType, GetSyncingResponse, GetSyncingResponseSDKType, GetLatestBlockRequest, GetLatestBlockRequestSDKType, GetLatestBlockResponse, GetLatestBlockResponseSDKType, GetBlockByHeightRequest, GetBlockByHeightRequestSDKType, GetBlockByHeightResponse, GetBlockByHeightResponseSDKType, GetLatestValidatorSetRequest, GetLatestValidatorSetRequestSDKType, GetLatestValidatorSetResponse, GetLatestValidatorSetResponseSDKType, GetValidatorSetByHeightRequest, GetValidatorSetByHeightRequestSDKType, GetValidatorSetByHeightResponse, GetValidatorSetByHeightResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/cosmos/base/tendermint/v1beta1/query.rpc.Service.ts b/__fixtures__/outputv2/cosmos/base/tendermint/v1beta1/query.rpc.Service.ts index f88f8a053e..9f34612190 100644 --- a/__fixtures__/outputv2/cosmos/base/tendermint/v1beta1/query.rpc.Service.ts +++ b/__fixtures__/outputv2/cosmos/base/tendermint/v1beta1/query.rpc.Service.ts @@ -1,12 +1,12 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../query/v1beta1/pagination"; -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; -import { BlockID, BlockIDAmino, BlockIDSDKType } from "../../../../tendermint/types/types"; -import { Block, BlockAmino, BlockSDKType } from "../../../../tendermint/types/block"; -import { NodeInfo, NodeInfoAmino, NodeInfoSDKType } from "../../../../tendermint/p2p/types"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../query/v1beta1/pagination"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { BlockID, BlockIDSDKType } from "../../../../tendermint/types/types"; +import { Block, BlockSDKType } from "../../../../tendermint/types/block"; +import { NodeInfo, NodeInfoSDKType } from "../../../../tendermint/p2p/types"; import { Rpc } from "../../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { GetNodeInfoRequest, GetNodeInfoRequestAmino, GetNodeInfoRequestSDKType, GetNodeInfoResponse, GetNodeInfoResponseAmino, GetNodeInfoResponseSDKType, GetSyncingRequest, GetSyncingRequestAmino, GetSyncingRequestSDKType, GetSyncingResponse, GetSyncingResponseAmino, GetSyncingResponseSDKType, GetLatestBlockRequest, GetLatestBlockRequestAmino, GetLatestBlockRequestSDKType, GetLatestBlockResponse, GetLatestBlockResponseAmino, GetLatestBlockResponseSDKType, GetBlockByHeightRequest, GetBlockByHeightRequestAmino, GetBlockByHeightRequestSDKType, GetBlockByHeightResponse, GetBlockByHeightResponseAmino, GetBlockByHeightResponseSDKType, GetLatestValidatorSetRequest, GetLatestValidatorSetRequestAmino, GetLatestValidatorSetRequestSDKType, GetLatestValidatorSetResponse, GetLatestValidatorSetResponseAmino, GetLatestValidatorSetResponseSDKType, GetValidatorSetByHeightRequest, GetValidatorSetByHeightRequestAmino, GetValidatorSetByHeightRequestSDKType, GetValidatorSetByHeightResponse, GetValidatorSetByHeightResponseAmino, GetValidatorSetByHeightResponseSDKType } from "./query"; +import { GetNodeInfoRequest, GetNodeInfoRequestSDKType, GetNodeInfoResponse, GetNodeInfoResponseSDKType, GetSyncingRequest, GetSyncingRequestSDKType, GetSyncingResponse, GetSyncingResponseSDKType, GetLatestBlockRequest, GetLatestBlockRequestSDKType, GetLatestBlockResponse, GetLatestBlockResponseSDKType, GetBlockByHeightRequest, GetBlockByHeightRequestSDKType, GetBlockByHeightResponse, GetBlockByHeightResponseSDKType, GetLatestValidatorSetRequest, GetLatestValidatorSetRequestSDKType, GetLatestValidatorSetResponse, GetLatestValidatorSetResponseSDKType, GetValidatorSetByHeightRequest, GetValidatorSetByHeightRequestSDKType, GetValidatorSetByHeightResponse, GetValidatorSetByHeightResponseSDKType } from "./query"; /** Service defines the gRPC querier service for tendermint queries. */ export interface Service { diff --git a/__fixtures__/outputv2/cosmos/base/tendermint/v1beta1/query.ts b/__fixtures__/outputv2/cosmos/base/tendermint/v1beta1/query.ts index 515a37edc6..4db99c23cc 100644 --- a/__fixtures__/outputv2/cosmos/base/tendermint/v1beta1/query.ts +++ b/__fixtures__/outputv2/cosmos/base/tendermint/v1beta1/query.ts @@ -1,5 +1,5 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../query/v1beta1/pagination"; -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import { BlockID, BlockIDAmino, BlockIDSDKType } from "../../../../tendermint/types/types"; import { Block, BlockAmino, BlockSDKType } from "../../../../tendermint/types/block"; import { NodeInfo, NodeInfoAmino, NodeInfoSDKType } from "../../../../tendermint/p2p/types"; diff --git a/__fixtures__/outputv2/cosmos/crisis/v1beta1/tx.amino.ts b/__fixtures__/outputv2/cosmos/crisis/v1beta1/tx.amino.ts index d3f7e203ff..5fb627a750 100644 --- a/__fixtures__/outputv2/cosmos/crisis/v1beta1/tx.amino.ts +++ b/__fixtures__/outputv2/cosmos/crisis/v1beta1/tx.amino.ts @@ -1,4 +1,4 @@ -import { MsgVerifyInvariant, MsgVerifyInvariantAmino, MsgVerifyInvariantSDKType } from "./tx"; +import { MsgVerifyInvariant, MsgVerifyInvariantSDKType } from "./tx"; export const AminoConverter = { "/cosmos.crisis.v1beta1.MsgVerifyInvariant": { aminoType: "cosmos-sdk/MsgVerifyInvariant", diff --git a/__fixtures__/outputv2/cosmos/crisis/v1beta1/tx.registry.ts b/__fixtures__/outputv2/cosmos/crisis/v1beta1/tx.registry.ts index 8d021965ae..7d821bc0af 100644 --- a/__fixtures__/outputv2/cosmos/crisis/v1beta1/tx.registry.ts +++ b/__fixtures__/outputv2/cosmos/crisis/v1beta1/tx.registry.ts @@ -1,5 +1,5 @@ import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgVerifyInvariant, MsgVerifyInvariantAmino, MsgVerifyInvariantSDKType } from "./tx"; +import { MsgVerifyInvariant, MsgVerifyInvariantSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/cosmos.crisis.v1beta1.MsgVerifyInvariant", MsgVerifyInvariant]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/cosmos/crisis/v1beta1/tx.rpc.msg.ts b/__fixtures__/outputv2/cosmos/crisis/v1beta1/tx.rpc.msg.ts index e5873ee26e..702c5d94a8 100644 --- a/__fixtures__/outputv2/cosmos/crisis/v1beta1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/cosmos/crisis/v1beta1/tx.rpc.msg.ts @@ -1,6 +1,6 @@ import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgVerifyInvariant, MsgVerifyInvariantAmino, MsgVerifyInvariantSDKType, MsgVerifyInvariantResponse, MsgVerifyInvariantResponseAmino, MsgVerifyInvariantResponseSDKType } from "./tx"; +import { MsgVerifyInvariant, MsgVerifyInvariantSDKType, MsgVerifyInvariantResponse, MsgVerifyInvariantResponseSDKType } from "./tx"; /** Msg defines the bank Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/cosmos/crypto/keyring/v1/record.ts b/__fixtures__/outputv2/cosmos/crypto/keyring/v1/record.ts index fd67c76aac..588240f735 100644 --- a/__fixtures__/outputv2/cosmos/crypto/keyring/v1/record.ts +++ b/__fixtures__/outputv2/cosmos/crypto/keyring/v1/record.ts @@ -1,4 +1,4 @@ -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import { BIP44Params, BIP44ParamsAmino, BIP44ParamsSDKType } from "../../hd/v1/hd"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial } from "../../../../helpers"; diff --git a/__fixtures__/outputv2/cosmos/crypto/multisig/keys.ts b/__fixtures__/outputv2/cosmos/crypto/multisig/keys.ts index 1d4d7f48dc..3e58a50809 100644 --- a/__fixtures__/outputv2/cosmos/crypto/multisig/keys.ts +++ b/__fixtures__/outputv2/cosmos/crypto/multisig/keys.ts @@ -1,4 +1,4 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.crypto.multisig"; diff --git a/__fixtures__/outputv2/cosmos/distribution/v1beta1/query.lcd.ts b/__fixtures__/outputv2/cosmos/distribution/v1beta1/query.lcd.ts index c8e2710e9d..1e213a3a33 100644 --- a/__fixtures__/outputv2/cosmos/distribution/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/cosmos/distribution/v1beta1/query.lcd.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Params, ParamsAmino, ParamsSDKType, ValidatorOutstandingRewards, ValidatorOutstandingRewardsAmino, ValidatorOutstandingRewardsSDKType, ValidatorAccumulatedCommission, ValidatorAccumulatedCommissionAmino, ValidatorAccumulatedCommissionSDKType, ValidatorSlashEvent, ValidatorSlashEventAmino, ValidatorSlashEventSDKType, DelegationDelegatorReward, DelegationDelegatorRewardAmino, DelegationDelegatorRewardSDKType } from "./distribution"; -import { DecCoin, DecCoinAmino, DecCoinSDKType } from "../../base/v1beta1/coin"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { Params, ParamsSDKType, ValidatorOutstandingRewards, ValidatorOutstandingRewardsSDKType, ValidatorAccumulatedCommission, ValidatorAccumulatedCommissionSDKType, ValidatorSlashEvent, ValidatorSlashEventSDKType, DelegationDelegatorReward, DelegationDelegatorRewardSDKType } from "./distribution"; +import { DecCoin, DecCoinSDKType } from "../../base/v1beta1/coin"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryValidatorOutstandingRewardsRequest, QueryValidatorOutstandingRewardsRequestAmino, QueryValidatorOutstandingRewardsRequestSDKType, QueryValidatorOutstandingRewardsResponse, QueryValidatorOutstandingRewardsResponseAmino, QueryValidatorOutstandingRewardsResponseSDKType, QueryValidatorCommissionRequest, QueryValidatorCommissionRequestAmino, QueryValidatorCommissionRequestSDKType, QueryValidatorCommissionResponse, QueryValidatorCommissionResponseAmino, QueryValidatorCommissionResponseSDKType, QueryValidatorSlashesRequest, QueryValidatorSlashesRequestAmino, QueryValidatorSlashesRequestSDKType, QueryValidatorSlashesResponse, QueryValidatorSlashesResponseAmino, QueryValidatorSlashesResponseSDKType, QueryDelegationRewardsRequest, QueryDelegationRewardsRequestAmino, QueryDelegationRewardsRequestSDKType, QueryDelegationRewardsResponse, QueryDelegationRewardsResponseAmino, QueryDelegationRewardsResponseSDKType, QueryDelegationTotalRewardsRequest, QueryDelegationTotalRewardsRequestAmino, QueryDelegationTotalRewardsRequestSDKType, QueryDelegationTotalRewardsResponse, QueryDelegationTotalRewardsResponseAmino, QueryDelegationTotalRewardsResponseSDKType, QueryDelegatorValidatorsRequest, QueryDelegatorValidatorsRequestAmino, QueryDelegatorValidatorsRequestSDKType, QueryDelegatorValidatorsResponse, QueryDelegatorValidatorsResponseAmino, QueryDelegatorValidatorsResponseSDKType, QueryDelegatorWithdrawAddressRequest, QueryDelegatorWithdrawAddressRequestAmino, QueryDelegatorWithdrawAddressRequestSDKType, QueryDelegatorWithdrawAddressResponse, QueryDelegatorWithdrawAddressResponseAmino, QueryDelegatorWithdrawAddressResponseSDKType, QueryCommunityPoolRequest, QueryCommunityPoolRequestAmino, QueryCommunityPoolRequestSDKType, QueryCommunityPoolResponse, QueryCommunityPoolResponseAmino, QueryCommunityPoolResponseSDKType } from "./query"; +import { QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryValidatorOutstandingRewardsRequest, QueryValidatorOutstandingRewardsRequestSDKType, QueryValidatorOutstandingRewardsResponse, QueryValidatorOutstandingRewardsResponseSDKType, QueryValidatorCommissionRequest, QueryValidatorCommissionRequestSDKType, QueryValidatorCommissionResponse, QueryValidatorCommissionResponseSDKType, QueryValidatorSlashesRequest, QueryValidatorSlashesRequestSDKType, QueryValidatorSlashesResponse, QueryValidatorSlashesResponseSDKType, QueryDelegationRewardsRequest, QueryDelegationRewardsRequestSDKType, QueryDelegationRewardsResponse, QueryDelegationRewardsResponseSDKType, QueryDelegationTotalRewardsRequest, QueryDelegationTotalRewardsRequestSDKType, QueryDelegationTotalRewardsResponse, QueryDelegationTotalRewardsResponseSDKType, QueryDelegatorValidatorsRequest, QueryDelegatorValidatorsRequestSDKType, QueryDelegatorValidatorsResponse, QueryDelegatorValidatorsResponseSDKType, QueryDelegatorWithdrawAddressRequest, QueryDelegatorWithdrawAddressRequestSDKType, QueryDelegatorWithdrawAddressResponse, QueryDelegatorWithdrawAddressResponseSDKType, QueryCommunityPoolRequest, QueryCommunityPoolRequestSDKType, QueryCommunityPoolResponse, QueryCommunityPoolResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/cosmos/distribution/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/cosmos/distribution/v1beta1/query.rpc.Query.ts index 046fee6905..e765981cc6 100644 --- a/__fixtures__/outputv2/cosmos/distribution/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/cosmos/distribution/v1beta1/query.rpc.Query.ts @@ -1,10 +1,10 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Params, ParamsAmino, ParamsSDKType, ValidatorOutstandingRewards, ValidatorOutstandingRewardsAmino, ValidatorOutstandingRewardsSDKType, ValidatorAccumulatedCommission, ValidatorAccumulatedCommissionAmino, ValidatorAccumulatedCommissionSDKType, ValidatorSlashEvent, ValidatorSlashEventAmino, ValidatorSlashEventSDKType, DelegationDelegatorReward, DelegationDelegatorRewardAmino, DelegationDelegatorRewardSDKType } from "./distribution"; -import { DecCoin, DecCoinAmino, DecCoinSDKType } from "../../base/v1beta1/coin"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { Params, ParamsSDKType, ValidatorOutstandingRewards, ValidatorOutstandingRewardsSDKType, ValidatorAccumulatedCommission, ValidatorAccumulatedCommissionSDKType, ValidatorSlashEvent, ValidatorSlashEventSDKType, DelegationDelegatorReward, DelegationDelegatorRewardSDKType } from "./distribution"; +import { DecCoin, DecCoinSDKType } from "../../base/v1beta1/coin"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryValidatorOutstandingRewardsRequest, QueryValidatorOutstandingRewardsRequestAmino, QueryValidatorOutstandingRewardsRequestSDKType, QueryValidatorOutstandingRewardsResponse, QueryValidatorOutstandingRewardsResponseAmino, QueryValidatorOutstandingRewardsResponseSDKType, QueryValidatorCommissionRequest, QueryValidatorCommissionRequestAmino, QueryValidatorCommissionRequestSDKType, QueryValidatorCommissionResponse, QueryValidatorCommissionResponseAmino, QueryValidatorCommissionResponseSDKType, QueryValidatorSlashesRequest, QueryValidatorSlashesRequestAmino, QueryValidatorSlashesRequestSDKType, QueryValidatorSlashesResponse, QueryValidatorSlashesResponseAmino, QueryValidatorSlashesResponseSDKType, QueryDelegationRewardsRequest, QueryDelegationRewardsRequestAmino, QueryDelegationRewardsRequestSDKType, QueryDelegationRewardsResponse, QueryDelegationRewardsResponseAmino, QueryDelegationRewardsResponseSDKType, QueryDelegationTotalRewardsRequest, QueryDelegationTotalRewardsRequestAmino, QueryDelegationTotalRewardsRequestSDKType, QueryDelegationTotalRewardsResponse, QueryDelegationTotalRewardsResponseAmino, QueryDelegationTotalRewardsResponseSDKType, QueryDelegatorValidatorsRequest, QueryDelegatorValidatorsRequestAmino, QueryDelegatorValidatorsRequestSDKType, QueryDelegatorValidatorsResponse, QueryDelegatorValidatorsResponseAmino, QueryDelegatorValidatorsResponseSDKType, QueryDelegatorWithdrawAddressRequest, QueryDelegatorWithdrawAddressRequestAmino, QueryDelegatorWithdrawAddressRequestSDKType, QueryDelegatorWithdrawAddressResponse, QueryDelegatorWithdrawAddressResponseAmino, QueryDelegatorWithdrawAddressResponseSDKType, QueryCommunityPoolRequest, QueryCommunityPoolRequestAmino, QueryCommunityPoolRequestSDKType, QueryCommunityPoolResponse, QueryCommunityPoolResponseAmino, QueryCommunityPoolResponseSDKType } from "./query"; +import { QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryValidatorOutstandingRewardsRequest, QueryValidatorOutstandingRewardsRequestSDKType, QueryValidatorOutstandingRewardsResponse, QueryValidatorOutstandingRewardsResponseSDKType, QueryValidatorCommissionRequest, QueryValidatorCommissionRequestSDKType, QueryValidatorCommissionResponse, QueryValidatorCommissionResponseSDKType, QueryValidatorSlashesRequest, QueryValidatorSlashesRequestSDKType, QueryValidatorSlashesResponse, QueryValidatorSlashesResponseSDKType, QueryDelegationRewardsRequest, QueryDelegationRewardsRequestSDKType, QueryDelegationRewardsResponse, QueryDelegationRewardsResponseSDKType, QueryDelegationTotalRewardsRequest, QueryDelegationTotalRewardsRequestSDKType, QueryDelegationTotalRewardsResponse, QueryDelegationTotalRewardsResponseSDKType, QueryDelegatorValidatorsRequest, QueryDelegatorValidatorsRequestSDKType, QueryDelegatorValidatorsResponse, QueryDelegatorValidatorsResponseSDKType, QueryDelegatorWithdrawAddressRequest, QueryDelegatorWithdrawAddressRequestSDKType, QueryDelegatorWithdrawAddressResponse, QueryDelegatorWithdrawAddressResponseSDKType, QueryCommunityPoolRequest, QueryCommunityPoolRequestSDKType, QueryCommunityPoolResponse, QueryCommunityPoolResponseSDKType } from "./query"; /** Query defines the gRPC querier service for distribution module. */ export interface Query { diff --git a/__fixtures__/outputv2/cosmos/distribution/v1beta1/tx.amino.ts b/__fixtures__/outputv2/cosmos/distribution/v1beta1/tx.amino.ts index 5240110871..f63c12e94b 100644 --- a/__fixtures__/outputv2/cosmos/distribution/v1beta1/tx.amino.ts +++ b/__fixtures__/outputv2/cosmos/distribution/v1beta1/tx.amino.ts @@ -1,5 +1,5 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { MsgSetWithdrawAddress, MsgSetWithdrawAddressAmino, MsgSetWithdrawAddressSDKType, MsgWithdrawDelegatorReward, MsgWithdrawDelegatorRewardAmino, MsgWithdrawDelegatorRewardSDKType, MsgWithdrawValidatorCommission, MsgWithdrawValidatorCommissionAmino, MsgWithdrawValidatorCommissionSDKType, MsgFundCommunityPool, MsgFundCommunityPoolAmino, MsgFundCommunityPoolSDKType } from "./tx"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; +import { MsgSetWithdrawAddress, MsgSetWithdrawAddressSDKType, MsgWithdrawDelegatorReward, MsgWithdrawDelegatorRewardSDKType, MsgWithdrawValidatorCommission, MsgWithdrawValidatorCommissionSDKType, MsgFundCommunityPool, MsgFundCommunityPoolSDKType } from "./tx"; export const AminoConverter = { "/cosmos.distribution.v1beta1.MsgSetWithdrawAddress": { aminoType: "cosmos-sdk/MsgModifyWithdrawAddress", diff --git a/__fixtures__/outputv2/cosmos/distribution/v1beta1/tx.registry.ts b/__fixtures__/outputv2/cosmos/distribution/v1beta1/tx.registry.ts index b001135fa5..de3001c90b 100644 --- a/__fixtures__/outputv2/cosmos/distribution/v1beta1/tx.registry.ts +++ b/__fixtures__/outputv2/cosmos/distribution/v1beta1/tx.registry.ts @@ -1,6 +1,6 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgSetWithdrawAddress, MsgSetWithdrawAddressAmino, MsgSetWithdrawAddressSDKType, MsgWithdrawDelegatorReward, MsgWithdrawDelegatorRewardAmino, MsgWithdrawDelegatorRewardSDKType, MsgWithdrawValidatorCommission, MsgWithdrawValidatorCommissionAmino, MsgWithdrawValidatorCommissionSDKType, MsgFundCommunityPool, MsgFundCommunityPoolAmino, MsgFundCommunityPoolSDKType } from "./tx"; +import { MsgSetWithdrawAddress, MsgSetWithdrawAddressSDKType, MsgWithdrawDelegatorReward, MsgWithdrawDelegatorRewardSDKType, MsgWithdrawValidatorCommission, MsgWithdrawValidatorCommissionSDKType, MsgFundCommunityPool, MsgFundCommunityPoolSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/cosmos.distribution.v1beta1.MsgSetWithdrawAddress", MsgSetWithdrawAddress], ["/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward", MsgWithdrawDelegatorReward], ["/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommission", MsgWithdrawValidatorCommission], ["/cosmos.distribution.v1beta1.MsgFundCommunityPool", MsgFundCommunityPool]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/cosmos/distribution/v1beta1/tx.rpc.msg.ts b/__fixtures__/outputv2/cosmos/distribution/v1beta1/tx.rpc.msg.ts index 1f1306ae84..ae46871c3a 100644 --- a/__fixtures__/outputv2/cosmos/distribution/v1beta1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/cosmos/distribution/v1beta1/tx.rpc.msg.ts @@ -1,7 +1,7 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgSetWithdrawAddress, MsgSetWithdrawAddressAmino, MsgSetWithdrawAddressSDKType, MsgSetWithdrawAddressResponse, MsgSetWithdrawAddressResponseAmino, MsgSetWithdrawAddressResponseSDKType, MsgWithdrawDelegatorReward, MsgWithdrawDelegatorRewardAmino, MsgWithdrawDelegatorRewardSDKType, MsgWithdrawDelegatorRewardResponse, MsgWithdrawDelegatorRewardResponseAmino, MsgWithdrawDelegatorRewardResponseSDKType, MsgWithdrawValidatorCommission, MsgWithdrawValidatorCommissionAmino, MsgWithdrawValidatorCommissionSDKType, MsgWithdrawValidatorCommissionResponse, MsgWithdrawValidatorCommissionResponseAmino, MsgWithdrawValidatorCommissionResponseSDKType, MsgFundCommunityPool, MsgFundCommunityPoolAmino, MsgFundCommunityPoolSDKType, MsgFundCommunityPoolResponse, MsgFundCommunityPoolResponseAmino, MsgFundCommunityPoolResponseSDKType } from "./tx"; +import { MsgSetWithdrawAddress, MsgSetWithdrawAddressSDKType, MsgSetWithdrawAddressResponse, MsgSetWithdrawAddressResponseSDKType, MsgWithdrawDelegatorReward, MsgWithdrawDelegatorRewardSDKType, MsgWithdrawDelegatorRewardResponse, MsgWithdrawDelegatorRewardResponseSDKType, MsgWithdrawValidatorCommission, MsgWithdrawValidatorCommissionSDKType, MsgWithdrawValidatorCommissionResponse, MsgWithdrawValidatorCommissionResponseSDKType, MsgFundCommunityPool, MsgFundCommunityPoolSDKType, MsgFundCommunityPoolResponse, MsgFundCommunityPoolResponseSDKType } from "./tx"; /** Msg defines the distribution Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/cosmos/evidence/v1beta1/genesis.ts b/__fixtures__/outputv2/cosmos/evidence/v1beta1/genesis.ts index 7b90bd76fc..26b040f894 100644 --- a/__fixtures__/outputv2/cosmos/evidence/v1beta1/genesis.ts +++ b/__fixtures__/outputv2/cosmos/evidence/v1beta1/genesis.ts @@ -1,4 +1,4 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.evidence.v1beta1"; diff --git a/__fixtures__/outputv2/cosmos/evidence/v1beta1/query.lcd.ts b/__fixtures__/outputv2/cosmos/evidence/v1beta1/query.lcd.ts index 34ee167fcb..1bbb3ec2dd 100644 --- a/__fixtures__/outputv2/cosmos/evidence/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/cosmos/evidence/v1beta1/query.lcd.ts @@ -1,8 +1,8 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryEvidenceRequest, QueryEvidenceRequestAmino, QueryEvidenceRequestSDKType, QueryEvidenceResponse, QueryEvidenceResponseAmino, QueryEvidenceResponseSDKType, QueryAllEvidenceRequest, QueryAllEvidenceRequestAmino, QueryAllEvidenceRequestSDKType, QueryAllEvidenceResponse, QueryAllEvidenceResponseAmino, QueryAllEvidenceResponseSDKType } from "./query"; +import { QueryEvidenceRequest, QueryEvidenceRequestSDKType, QueryEvidenceResponse, QueryEvidenceResponseSDKType, QueryAllEvidenceRequest, QueryAllEvidenceRequestSDKType, QueryAllEvidenceResponse, QueryAllEvidenceResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/cosmos/evidence/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/cosmos/evidence/v1beta1/query.rpc.Query.ts index f59afacab1..b63829e116 100644 --- a/__fixtures__/outputv2/cosmos/evidence/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/cosmos/evidence/v1beta1/query.rpc.Query.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryEvidenceRequest, QueryEvidenceRequestAmino, QueryEvidenceRequestSDKType, QueryEvidenceResponse, QueryEvidenceResponseAmino, QueryEvidenceResponseSDKType, QueryAllEvidenceRequest, QueryAllEvidenceRequestAmino, QueryAllEvidenceRequestSDKType, QueryAllEvidenceResponse, QueryAllEvidenceResponseAmino, QueryAllEvidenceResponseSDKType } from "./query"; +import { QueryEvidenceRequest, QueryEvidenceRequestSDKType, QueryEvidenceResponse, QueryEvidenceResponseSDKType, QueryAllEvidenceRequest, QueryAllEvidenceRequestSDKType, QueryAllEvidenceResponse, QueryAllEvidenceResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/cosmos/evidence/v1beta1/query.ts b/__fixtures__/outputv2/cosmos/evidence/v1beta1/query.ts index 9459932971..226ec6c959 100644 --- a/__fixtures__/outputv2/cosmos/evidence/v1beta1/query.ts +++ b/__fixtures__/outputv2/cosmos/evidence/v1beta1/query.ts @@ -1,5 +1,5 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.evidence.v1beta1"; diff --git a/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.amino.ts b/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.amino.ts index dccf45d26b..5d4b94f4fe 100644 --- a/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.amino.ts +++ b/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.amino.ts @@ -1,5 +1,5 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { MsgSubmitEvidence, MsgSubmitEvidenceAmino, MsgSubmitEvidenceSDKType } from "./tx"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { MsgSubmitEvidence, MsgSubmitEvidenceSDKType } from "./tx"; export const AminoConverter = { "/cosmos.evidence.v1beta1.MsgSubmitEvidence": { aminoType: "cosmos-sdk/MsgSubmitEvidence", diff --git a/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.registry.ts b/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.registry.ts index e09a8d8947..78c636adc9 100644 --- a/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.registry.ts +++ b/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.registry.ts @@ -1,6 +1,6 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgSubmitEvidence, MsgSubmitEvidenceAmino, MsgSubmitEvidenceSDKType } from "./tx"; +import { MsgSubmitEvidence, MsgSubmitEvidenceSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/cosmos.evidence.v1beta1.MsgSubmitEvidence", MsgSubmitEvidence]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.rpc.msg.ts b/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.rpc.msg.ts index fb8e704f9e..d1b6c6ae45 100644 --- a/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.rpc.msg.ts @@ -1,7 +1,7 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgSubmitEvidence, MsgSubmitEvidenceAmino, MsgSubmitEvidenceSDKType, MsgSubmitEvidenceResponse, MsgSubmitEvidenceResponseAmino, MsgSubmitEvidenceResponseSDKType } from "./tx"; +import { MsgSubmitEvidence, MsgSubmitEvidenceSDKType, MsgSubmitEvidenceResponse, MsgSubmitEvidenceResponseSDKType } from "./tx"; /** Msg defines the evidence Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.ts b/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.ts index f050c08d6c..f97532a84b 100644 --- a/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.ts +++ b/__fixtures__/outputv2/cosmos/evidence/v1beta1/tx.ts @@ -1,4 +1,4 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; export const protobufPackage = "cosmos.evidence.v1beta1"; @@ -15,6 +15,9 @@ export interface MsgSubmitEvidenceProtoMsg { typeUrl: "/cosmos.evidence.v1beta1.MsgSubmitEvidence"; value: Uint8Array; } +export type MsgSubmitEvidenceEncoded = Omit & { + evidence?: AnyProtoMsg | undefined; +}; /** * MsgSubmitEvidence represents a message that supports submitting arbitrary @@ -35,7 +38,7 @@ export interface MsgSubmitEvidenceAminoMsg { */ export interface MsgSubmitEvidenceSDKType { submitter: string; - evidence?: AnySDKType; + evidence?: AnySDKType | undefined; } /** MsgSubmitEvidenceResponse defines the Msg/SubmitEvidence response type. */ diff --git a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/feegrant.ts b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/feegrant.ts index 2b998e115b..7eec1704c2 100644 --- a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/feegrant.ts +++ b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/feegrant.ts @@ -1,7 +1,7 @@ import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../google/protobuf/timestamp"; import { Duration, DurationAmino, DurationSDKType } from "../../../google/protobuf/duration"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { toTimestamp, fromTimestamp, isSet, fromJsonTimestamp, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.feegrant.v1beta1"; @@ -149,6 +149,10 @@ export interface AllowedMsgAllowanceProtoMsg { typeUrl: "/cosmos.feegrant.v1beta1.AllowedMsgAllowance"; value: Uint8Array; } +export type AllowedMsgAllowanceEncoded = Omit & { + /** allowance can be any of basic and periodic fee allowance. */ + allowance?: BasicAllowanceProtoMsg | PeriodicAllowanceProtoMsg | AllowedMsgAllowanceProtoMsg | AnyProtoMsg | undefined; +}; /** AllowedMsgAllowance creates allowance only for specified message types. */ export interface AllowedMsgAllowanceAmino { @@ -165,7 +169,7 @@ export interface AllowedMsgAllowanceAminoMsg { /** AllowedMsgAllowance creates allowance only for specified message types. */ export interface AllowedMsgAllowanceSDKType { - allowance?: AnySDKType; + allowance?: BasicAllowanceSDKType | PeriodicAllowanceSDKType | AllowedMsgAllowanceSDKType | AnySDKType | undefined; allowed_messages: string[]; } @@ -184,6 +188,10 @@ export interface GrantProtoMsg { typeUrl: "/cosmos.feegrant.v1beta1.Grant"; value: Uint8Array; } +export type GrantEncoded = Omit & { + /** allowance can be any of basic, periodic, allowed fee allowance. */ + allowance?: BasicAllowanceProtoMsg | PeriodicAllowanceProtoMsg | AllowedMsgAllowanceProtoMsg | AnyProtoMsg | undefined; +}; /** Grant is stored in the KVStore to record a grant with full context */ export interface GrantAmino { @@ -205,7 +213,7 @@ export interface GrantAminoMsg { export interface GrantSDKType { granter: string; grantee: string; - allowance?: AnySDKType; + allowance?: BasicAllowanceSDKType | PeriodicAllowanceSDKType | AllowedMsgAllowanceSDKType | AnySDKType | undefined; } function createBaseBasicAllowance(): BasicAllowance { diff --git a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/query.lcd.ts b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/query.lcd.ts index 51a2901bc8..2575e7f031 100644 --- a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/query.lcd.ts @@ -1,8 +1,8 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Grant, GrantAmino, GrantSDKType } from "./feegrant"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { Grant, GrantSDKType } from "./feegrant"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryAllowanceRequest, QueryAllowanceRequestAmino, QueryAllowanceRequestSDKType, QueryAllowanceResponse, QueryAllowanceResponseAmino, QueryAllowanceResponseSDKType, QueryAllowancesRequest, QueryAllowancesRequestAmino, QueryAllowancesRequestSDKType, QueryAllowancesResponse, QueryAllowancesResponseAmino, QueryAllowancesResponseSDKType, QueryAllowancesByGranterRequest, QueryAllowancesByGranterRequestAmino, QueryAllowancesByGranterRequestSDKType, QueryAllowancesByGranterResponse, QueryAllowancesByGranterResponseAmino, QueryAllowancesByGranterResponseSDKType } from "./query"; +import { QueryAllowanceRequest, QueryAllowanceRequestSDKType, QueryAllowanceResponse, QueryAllowanceResponseSDKType, QueryAllowancesRequest, QueryAllowancesRequestSDKType, QueryAllowancesResponse, QueryAllowancesResponseSDKType, QueryAllowancesByGranterRequest, QueryAllowancesByGranterRequestSDKType, QueryAllowancesByGranterResponse, QueryAllowancesByGranterResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/query.rpc.Query.ts index 5f4b2be836..b755e38c8e 100644 --- a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/query.rpc.Query.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Grant, GrantAmino, GrantSDKType } from "./feegrant"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { Grant, GrantSDKType } from "./feegrant"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryAllowanceRequest, QueryAllowanceRequestAmino, QueryAllowanceRequestSDKType, QueryAllowanceResponse, QueryAllowanceResponseAmino, QueryAllowanceResponseSDKType, QueryAllowancesRequest, QueryAllowancesRequestAmino, QueryAllowancesRequestSDKType, QueryAllowancesResponse, QueryAllowancesResponseAmino, QueryAllowancesResponseSDKType, QueryAllowancesByGranterRequest, QueryAllowancesByGranterRequestAmino, QueryAllowancesByGranterRequestSDKType, QueryAllowancesByGranterResponse, QueryAllowancesByGranterResponseAmino, QueryAllowancesByGranterResponseSDKType } from "./query"; +import { QueryAllowanceRequest, QueryAllowanceRequestSDKType, QueryAllowanceResponse, QueryAllowanceResponseSDKType, QueryAllowancesRequest, QueryAllowancesRequestSDKType, QueryAllowancesResponse, QueryAllowancesResponseSDKType, QueryAllowancesByGranterRequest, QueryAllowancesByGranterRequestSDKType, QueryAllowancesByGranterResponse, QueryAllowancesByGranterResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.amino.ts b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.amino.ts index 3a89705865..69515c535e 100644 --- a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.amino.ts +++ b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.amino.ts @@ -1,6 +1,6 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { BasicAllowance, BasicAllowanceAmino, BasicAllowanceSDKType, PeriodicAllowance, PeriodicAllowanceAmino, PeriodicAllowanceSDKType, AllowedMsgAllowance, AllowedMsgAllowanceAmino, AllowedMsgAllowanceSDKType } from "./feegrant"; -import { MsgGrantAllowance, MsgGrantAllowanceAmino, MsgGrantAllowanceSDKType, MsgRevokeAllowance, MsgRevokeAllowanceAmino, MsgRevokeAllowanceSDKType } from "./tx"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { BasicAllowance, BasicAllowanceSDKType, PeriodicAllowance, PeriodicAllowanceSDKType, AllowedMsgAllowance, AllowedMsgAllowanceSDKType } from "./feegrant"; +import { MsgGrantAllowance, MsgGrantAllowanceSDKType, MsgRevokeAllowance, MsgRevokeAllowanceSDKType } from "./tx"; export const AminoConverter = { "/cosmos.feegrant.v1beta1.MsgGrantAllowance": { aminoType: "cosmos-sdk/MsgGrantAllowance", diff --git a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.registry.ts b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.registry.ts index 55f0dafc73..9584f69f94 100644 --- a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.registry.ts +++ b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.registry.ts @@ -1,7 +1,7 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { BasicAllowance, BasicAllowanceAmino, BasicAllowanceSDKType, PeriodicAllowance, PeriodicAllowanceAmino, PeriodicAllowanceSDKType, AllowedMsgAllowance, AllowedMsgAllowanceAmino, AllowedMsgAllowanceSDKType } from "./feegrant"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { BasicAllowance, BasicAllowanceSDKType, PeriodicAllowance, PeriodicAllowanceSDKType, AllowedMsgAllowance, AllowedMsgAllowanceSDKType } from "./feegrant"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgGrantAllowance, MsgGrantAllowanceAmino, MsgGrantAllowanceSDKType, MsgRevokeAllowance, MsgRevokeAllowanceAmino, MsgRevokeAllowanceSDKType } from "./tx"; +import { MsgGrantAllowance, MsgGrantAllowanceSDKType, MsgRevokeAllowance, MsgRevokeAllowanceSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/cosmos.feegrant.v1beta1.MsgGrantAllowance", MsgGrantAllowance], ["/cosmos.feegrant.v1beta1.MsgRevokeAllowance", MsgRevokeAllowance]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.rpc.msg.ts b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.rpc.msg.ts index c20411abfd..dfae5d1d26 100644 --- a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.rpc.msg.ts @@ -1,8 +1,8 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { BasicAllowance, BasicAllowanceAmino, BasicAllowanceSDKType, PeriodicAllowance, PeriodicAllowanceAmino, PeriodicAllowanceSDKType, AllowedMsgAllowance, AllowedMsgAllowanceAmino, AllowedMsgAllowanceSDKType } from "./feegrant"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { BasicAllowance, BasicAllowanceSDKType, PeriodicAllowance, PeriodicAllowanceSDKType, AllowedMsgAllowance, AllowedMsgAllowanceSDKType } from "./feegrant"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgGrantAllowance, MsgGrantAllowanceAmino, MsgGrantAllowanceSDKType, MsgGrantAllowanceResponse, MsgGrantAllowanceResponseAmino, MsgGrantAllowanceResponseSDKType, MsgRevokeAllowance, MsgRevokeAllowanceAmino, MsgRevokeAllowanceSDKType, MsgRevokeAllowanceResponse, MsgRevokeAllowanceResponseAmino, MsgRevokeAllowanceResponseSDKType } from "./tx"; +import { MsgGrantAllowance, MsgGrantAllowanceSDKType, MsgGrantAllowanceResponse, MsgGrantAllowanceResponseSDKType, MsgRevokeAllowance, MsgRevokeAllowanceSDKType, MsgRevokeAllowanceResponse, MsgRevokeAllowanceResponseSDKType } from "./tx"; /** Msg defines the feegrant msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.ts b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.ts index b63d9168d2..1bf107913a 100644 --- a/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.ts +++ b/__fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.ts @@ -1,5 +1,5 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { BasicAllowance, BasicAllowanceAmino, BasicAllowanceSDKType, PeriodicAllowance, PeriodicAllowanceAmino, PeriodicAllowanceSDKType, AllowedMsgAllowance, AllowedMsgAllowanceAmino, AllowedMsgAllowanceSDKType } from "./feegrant"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { BasicAllowance, BasicAllowanceProtoMsg, BasicAllowanceSDKType, PeriodicAllowance, PeriodicAllowanceProtoMsg, PeriodicAllowanceSDKType, AllowedMsgAllowance, AllowedMsgAllowanceProtoMsg, AllowedMsgAllowanceSDKType } from "./feegrant"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.feegrant.v1beta1"; @@ -22,6 +22,10 @@ export interface MsgGrantAllowanceProtoMsg { typeUrl: "/cosmos.feegrant.v1beta1.MsgGrantAllowance"; value: Uint8Array; } +export type MsgGrantAllowanceEncoded = Omit & { + /** allowance can be any of basic, periodic, allowed fee allowance. */ + allowance?: BasicAllowanceProtoMsg | PeriodicAllowanceProtoMsg | AllowedMsgAllowanceProtoMsg | AnyProtoMsg | undefined; +}; /** * MsgGrantAllowance adds permission for Grantee to spend up to Allowance @@ -49,7 +53,7 @@ export interface MsgGrantAllowanceAminoMsg { export interface MsgGrantAllowanceSDKType { granter: string; grantee: string; - allowance?: AnySDKType; + allowance?: BasicAllowanceSDKType | PeriodicAllowanceSDKType | AllowedMsgAllowanceSDKType | AnySDKType | undefined; } /** MsgGrantAllowanceResponse defines the Msg/GrantAllowanceResponse response type. */ diff --git a/__fixtures__/outputv2/cosmos/gov/v1/gov.ts b/__fixtures__/outputv2/cosmos/gov/v1/gov.ts index d55f0b28ae..cf3994ed27 100644 --- a/__fixtures__/outputv2/cosmos/gov/v1/gov.ts +++ b/__fixtures__/outputv2/cosmos/gov/v1/gov.ts @@ -1,5 +1,5 @@ import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../google/protobuf/timestamp"; import { Duration, DurationAmino, DurationSDKType } from "../../../google/protobuf/duration"; import * as _m0 from "protobufjs/minimal"; diff --git a/__fixtures__/outputv2/cosmos/gov/v1/query.lcd.ts b/__fixtures__/outputv2/cosmos/gov/v1/query.lcd.ts index 3809ffb786..2fcbfa3cca 100644 --- a/__fixtures__/outputv2/cosmos/gov/v1/query.lcd.ts +++ b/__fixtures__/outputv2/cosmos/gov/v1/query.lcd.ts @@ -1,8 +1,8 @@ -import { ProposalStatus, ProposalStatusAmino, 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 { ProposalStatus, ProposalStatusSDKType, Proposal, ProposalSDKType, Vote, VoteSDKType, VotingParams, VotingParamsSDKType, DepositParams, DepositParamsSDKType, TallyParams, TallyParamsSDKType, Deposit, DepositSDKType, TallyResult, TallyResultSDKType } from "./gov"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryProposalRequest, QueryProposalRequestAmino, QueryProposalRequestSDKType, QueryProposalResponse, QueryProposalResponseAmino, QueryProposalResponseSDKType, QueryProposalsRequest, QueryProposalsRequestAmino, QueryProposalsRequestSDKType, QueryProposalsResponse, QueryProposalsResponseAmino, QueryProposalsResponseSDKType, QueryVoteRequest, QueryVoteRequestAmino, QueryVoteRequestSDKType, QueryVoteResponse, QueryVoteResponseAmino, QueryVoteResponseSDKType, QueryVotesRequest, QueryVotesRequestAmino, QueryVotesRequestSDKType, QueryVotesResponse, QueryVotesResponseAmino, QueryVotesResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryDepositRequest, QueryDepositRequestAmino, QueryDepositRequestSDKType, QueryDepositResponse, QueryDepositResponseAmino, QueryDepositResponseSDKType, QueryDepositsRequest, QueryDepositsRequestAmino, QueryDepositsRequestSDKType, QueryDepositsResponse, QueryDepositsResponseAmino, QueryDepositsResponseSDKType, QueryTallyResultRequest, QueryTallyResultRequestAmino, QueryTallyResultRequestSDKType, QueryTallyResultResponse, QueryTallyResultResponseAmino, QueryTallyResultResponseSDKType } from "./query"; +import { QueryProposalRequest, QueryProposalRequestSDKType, QueryProposalResponse, QueryProposalResponseSDKType, QueryProposalsRequest, QueryProposalsRequestSDKType, QueryProposalsResponse, QueryProposalsResponseSDKType, QueryVoteRequest, QueryVoteRequestSDKType, QueryVoteResponse, QueryVoteResponseSDKType, QueryVotesRequest, QueryVotesRequestSDKType, QueryVotesResponse, QueryVotesResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryDepositRequest, QueryDepositRequestSDKType, QueryDepositResponse, QueryDepositResponseSDKType, QueryDepositsRequest, QueryDepositsRequestSDKType, QueryDepositsResponse, QueryDepositsResponseSDKType, QueryTallyResultRequest, QueryTallyResultRequestSDKType, QueryTallyResultResponse, QueryTallyResultResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/cosmos/gov/v1/query.rpc.Query.ts b/__fixtures__/outputv2/cosmos/gov/v1/query.rpc.Query.ts index 63f78facaa..d67566d857 100644 --- a/__fixtures__/outputv2/cosmos/gov/v1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/cosmos/gov/v1/query.rpc.Query.ts @@ -1,9 +1,9 @@ -import { ProposalStatus, ProposalStatusAmino, 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 { ProposalStatus, ProposalStatusSDKType, Proposal, ProposalSDKType, Vote, VoteSDKType, VotingParams, VotingParamsSDKType, DepositParams, DepositParamsSDKType, TallyParams, TallyParamsSDKType, Deposit, DepositSDKType, TallyResult, TallyResultSDKType } from "./gov"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryProposalRequest, QueryProposalRequestAmino, QueryProposalRequestSDKType, QueryProposalResponse, QueryProposalResponseAmino, QueryProposalResponseSDKType, QueryProposalsRequest, QueryProposalsRequestAmino, QueryProposalsRequestSDKType, QueryProposalsResponse, QueryProposalsResponseAmino, QueryProposalsResponseSDKType, QueryVoteRequest, QueryVoteRequestAmino, QueryVoteRequestSDKType, QueryVoteResponse, QueryVoteResponseAmino, QueryVoteResponseSDKType, QueryVotesRequest, QueryVotesRequestAmino, QueryVotesRequestSDKType, QueryVotesResponse, QueryVotesResponseAmino, QueryVotesResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryDepositRequest, QueryDepositRequestAmino, QueryDepositRequestSDKType, QueryDepositResponse, QueryDepositResponseAmino, QueryDepositResponseSDKType, QueryDepositsRequest, QueryDepositsRequestAmino, QueryDepositsRequestSDKType, QueryDepositsResponse, QueryDepositsResponseAmino, QueryDepositsResponseSDKType, QueryTallyResultRequest, QueryTallyResultRequestAmino, QueryTallyResultRequestSDKType, QueryTallyResultResponse, QueryTallyResultResponseAmino, QueryTallyResultResponseSDKType } from "./query"; +import { QueryProposalRequest, QueryProposalRequestSDKType, QueryProposalResponse, QueryProposalResponseSDKType, QueryProposalsRequest, QueryProposalsRequestSDKType, QueryProposalsResponse, QueryProposalsResponseSDKType, QueryVoteRequest, QueryVoteRequestSDKType, QueryVoteResponse, QueryVoteResponseSDKType, QueryVotesRequest, QueryVotesRequestSDKType, QueryVotesResponse, QueryVotesResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryDepositRequest, QueryDepositRequestSDKType, QueryDepositResponse, QueryDepositResponseSDKType, QueryDepositsRequest, QueryDepositsRequestSDKType, QueryDepositsResponse, QueryDepositsResponseSDKType, QueryTallyResultRequest, QueryTallyResultRequestSDKType, QueryTallyResultResponse, QueryTallyResultResponseSDKType } from "./query"; /** Query defines the gRPC querier service for gov module */ export interface Query { diff --git a/__fixtures__/outputv2/cosmos/gov/v1/query.ts b/__fixtures__/outputv2/cosmos/gov/v1/query.ts index 6c409776bf..0b77735470 100644 --- a/__fixtures__/outputv2/cosmos/gov/v1/query.ts +++ b/__fixtures__/outputv2/cosmos/gov/v1/query.ts @@ -1,4 +1,4 @@ -import { ProposalStatus, ProposalStatusAmino, ProposalStatusSDKType, Proposal, ProposalAmino, ProposalSDKType, Vote, VoteAmino, VoteSDKType, VotingParams, VotingParamsAmino, VotingParamsSDKType, DepositParams, DepositParamsAmino, DepositParamsSDKType, TallyParams, TallyParamsAmino, TallyParamsSDKType, Deposit, DepositAmino, DepositSDKType, TallyResult, TallyResultAmino, TallyResultSDKType, proposalStatusFromJSON, proposalStatusToJSON } from "./gov"; +import { ProposalStatus, ProposalStatusSDKType, Proposal, ProposalAmino, ProposalSDKType, Vote, VoteAmino, VoteSDKType, VotingParams, VotingParamsAmino, VotingParamsSDKType, DepositParams, DepositParamsAmino, DepositParamsSDKType, TallyParams, TallyParamsAmino, TallyParamsSDKType, Deposit, DepositAmino, DepositSDKType, TallyResult, TallyResultAmino, TallyResultSDKType, proposalStatusFromJSON, proposalStatusToJSON } from "./gov"; import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; import { Long, isSet, DeepPartial } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; diff --git a/__fixtures__/outputv2/cosmos/gov/v1/tx.amino.ts b/__fixtures__/outputv2/cosmos/gov/v1/tx.amino.ts index fd4a3fb0e3..ac79d3d963 100644 --- a/__fixtures__/outputv2/cosmos/gov/v1/tx.amino.ts +++ b/__fixtures__/outputv2/cosmos/gov/v1/tx.amino.ts @@ -1,13 +1,13 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { VoteOption, VoteOptionAmino, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionAmino, WeightedVoteOptionSDKType } from "./gov"; -import { TextProposal, TextProposalAmino, TextProposalSDKType } from "../v1beta1/gov"; -import { RegisterIncentiveProposal, RegisterIncentiveProposalAmino, RegisterIncentiveProposalSDKType } from "../../../evmos/incentives/v1/incentives"; -import { ClientUpdateProposal, ClientUpdateProposalAmino, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalAmino, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; -import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalAmino, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalAmino, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; -import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalAmino, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalAmino, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalAmino, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; -import { UpdateFeeTokenProposal, UpdateFeeTokenProposalAmino, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; -import { MsgSubmitProposal, MsgSubmitProposalAmino, MsgSubmitProposalSDKType, MsgExecLegacyContent, MsgExecLegacyContentAmino, MsgExecLegacyContentSDKType, MsgVote, MsgVoteAmino, MsgVoteSDKType, MsgVoteWeighted, MsgVoteWeightedAmino, MsgVoteWeightedSDKType, MsgDeposit, MsgDepositAmino, MsgDepositSDKType } from "./tx"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; +import { VoteOption, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionSDKType } from "./gov"; +import { TextProposal, TextProposalSDKType } from "../v1beta1/gov"; +import { RegisterIncentiveProposal, RegisterIncentiveProposalSDKType } from "../../../evmos/incentives/v1/incentives"; +import { ClientUpdateProposal, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; +import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; +import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; +import { UpdateFeeTokenProposal, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; +import { MsgSubmitProposal, MsgSubmitProposalSDKType, MsgExecLegacyContent, MsgExecLegacyContentSDKType, MsgVote, MsgVoteSDKType, MsgVoteWeighted, MsgVoteWeightedSDKType, MsgDeposit, MsgDepositSDKType } from "./tx"; export const AminoConverter = { "/cosmos.gov.v1.MsgSubmitProposal": { aminoType: "cosmos-sdk/v1/MsgSubmitProposal", diff --git a/__fixtures__/outputv2/cosmos/gov/v1/tx.registry.ts b/__fixtures__/outputv2/cosmos/gov/v1/tx.registry.ts index 2fc3567641..f9fd6b74fc 100644 --- a/__fixtures__/outputv2/cosmos/gov/v1/tx.registry.ts +++ b/__fixtures__/outputv2/cosmos/gov/v1/tx.registry.ts @@ -1,14 +1,14 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { VoteOption, VoteOptionAmino, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionAmino, WeightedVoteOptionSDKType } from "./gov"; -import { TextProposal, TextProposalAmino, TextProposalSDKType } from "../v1beta1/gov"; -import { RegisterIncentiveProposal, RegisterIncentiveProposalAmino, RegisterIncentiveProposalSDKType } from "../../../evmos/incentives/v1/incentives"; -import { ClientUpdateProposal, ClientUpdateProposalAmino, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalAmino, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; -import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalAmino, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalAmino, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; -import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalAmino, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalAmino, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalAmino, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; -import { UpdateFeeTokenProposal, UpdateFeeTokenProposalAmino, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; +import { VoteOption, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionSDKType } from "./gov"; +import { TextProposal, TextProposalSDKType } from "../v1beta1/gov"; +import { RegisterIncentiveProposal, RegisterIncentiveProposalSDKType } from "../../../evmos/incentives/v1/incentives"; +import { ClientUpdateProposal, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; +import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; +import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; +import { UpdateFeeTokenProposal, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgSubmitProposal, MsgSubmitProposalAmino, MsgSubmitProposalSDKType, MsgExecLegacyContent, MsgExecLegacyContentAmino, MsgExecLegacyContentSDKType, MsgVote, MsgVoteAmino, MsgVoteSDKType, MsgVoteWeighted, MsgVoteWeightedAmino, MsgVoteWeightedSDKType, MsgDeposit, MsgDepositAmino, MsgDepositSDKType } from "./tx"; +import { MsgSubmitProposal, MsgSubmitProposalSDKType, MsgExecLegacyContent, MsgExecLegacyContentSDKType, MsgVote, MsgVoteSDKType, MsgVoteWeighted, MsgVoteWeightedSDKType, MsgDeposit, MsgDepositSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/cosmos.gov.v1.MsgSubmitProposal", MsgSubmitProposal], ["/cosmos.gov.v1.MsgExecLegacyContent", MsgExecLegacyContent], ["/cosmos.gov.v1.MsgVote", MsgVote], ["/cosmos.gov.v1.MsgVoteWeighted", MsgVoteWeighted], ["/cosmos.gov.v1.MsgDeposit", MsgDeposit]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/cosmos/gov/v1/tx.rpc.msg.ts b/__fixtures__/outputv2/cosmos/gov/v1/tx.rpc.msg.ts index 3ece6f26be..c85b12fc9d 100644 --- a/__fixtures__/outputv2/cosmos/gov/v1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/cosmos/gov/v1/tx.rpc.msg.ts @@ -1,15 +1,15 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { VoteOption, VoteOptionAmino, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionAmino, WeightedVoteOptionSDKType } from "./gov"; -import { TextProposal, TextProposalAmino, TextProposalSDKType } from "../v1beta1/gov"; -import { RegisterIncentiveProposal, RegisterIncentiveProposalAmino, RegisterIncentiveProposalSDKType } from "../../../evmos/incentives/v1/incentives"; -import { ClientUpdateProposal, ClientUpdateProposalAmino, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalAmino, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; -import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalAmino, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalAmino, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; -import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalAmino, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalAmino, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalAmino, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; -import { UpdateFeeTokenProposal, UpdateFeeTokenProposalAmino, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; +import { VoteOption, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionSDKType } from "./gov"; +import { TextProposal, TextProposalSDKType } from "../v1beta1/gov"; +import { RegisterIncentiveProposal, RegisterIncentiveProposalSDKType } from "../../../evmos/incentives/v1/incentives"; +import { ClientUpdateProposal, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; +import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; +import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; +import { UpdateFeeTokenProposal, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgSubmitProposal, MsgSubmitProposalAmino, MsgSubmitProposalSDKType, MsgSubmitProposalResponse, MsgSubmitProposalResponseAmino, MsgSubmitProposalResponseSDKType, MsgExecLegacyContent, MsgExecLegacyContentAmino, MsgExecLegacyContentSDKType, MsgExecLegacyContentResponse, MsgExecLegacyContentResponseAmino, MsgExecLegacyContentResponseSDKType, MsgVote, MsgVoteAmino, MsgVoteSDKType, MsgVoteResponse, MsgVoteResponseAmino, MsgVoteResponseSDKType, MsgVoteWeighted, MsgVoteWeightedAmino, MsgVoteWeightedSDKType, MsgVoteWeightedResponse, MsgVoteWeightedResponseAmino, MsgVoteWeightedResponseSDKType, MsgDeposit, MsgDepositAmino, MsgDepositSDKType, MsgDepositResponse, MsgDepositResponseAmino, MsgDepositResponseSDKType } from "./tx"; +import { MsgSubmitProposal, MsgSubmitProposalSDKType, MsgSubmitProposalResponse, MsgSubmitProposalResponseSDKType, MsgExecLegacyContent, MsgExecLegacyContentSDKType, MsgExecLegacyContentResponse, MsgExecLegacyContentResponseSDKType, MsgVote, MsgVoteSDKType, MsgVoteResponse, MsgVoteResponseSDKType, MsgVoteWeighted, MsgVoteWeightedSDKType, MsgVoteWeightedResponse, MsgVoteWeightedResponseSDKType, MsgDeposit, MsgDepositSDKType, MsgDepositResponse, MsgDepositResponseSDKType } from "./tx"; /** Msg defines the gov Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/cosmos/gov/v1/tx.ts b/__fixtures__/outputv2/cosmos/gov/v1/tx.ts index b7855287d1..5515c5328a 100644 --- a/__fixtures__/outputv2/cosmos/gov/v1/tx.ts +++ b/__fixtures__/outputv2/cosmos/gov/v1/tx.ts @@ -1,12 +1,12 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { VoteOption, VoteOptionAmino, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionAmino, WeightedVoteOptionSDKType, voteOptionFromJSON, voteOptionToJSON } from "./gov"; -import { TextProposal, TextProposalAmino, TextProposalSDKType } from "../v1beta1/gov"; -import { RegisterIncentiveProposal, RegisterIncentiveProposalAmino, RegisterIncentiveProposalSDKType } from "../../../evmos/incentives/v1/incentives"; -import { ClientUpdateProposal, ClientUpdateProposalAmino, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalAmino, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; -import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalAmino, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalAmino, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; -import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalAmino, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalAmino, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalAmino, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; -import { UpdateFeeTokenProposal, UpdateFeeTokenProposalAmino, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; +import { VoteOption, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionAmino, WeightedVoteOptionSDKType, voteOptionFromJSON, voteOptionToJSON } from "./gov"; +import { TextProposal, TextProposalProtoMsg, TextProposalSDKType } from "../v1beta1/gov"; +import { RegisterIncentiveProposal, RegisterIncentiveProposalProtoMsg, RegisterIncentiveProposalSDKType } from "../../../evmos/incentives/v1/incentives"; +import { ClientUpdateProposal, ClientUpdateProposalProtoMsg, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalProtoMsg, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; +import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalProtoMsg, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalProtoMsg, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; +import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalProtoMsg, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalProtoMsg, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalProtoMsg, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; +import { UpdateFeeTokenProposal, UpdateFeeTokenProposalProtoMsg, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, Long } from "../../../helpers"; export const protobufPackage = "cosmos.gov.v1"; @@ -27,6 +27,9 @@ export interface MsgSubmitProposalProtoMsg { typeUrl: "/cosmos.gov.v1.MsgSubmitProposal"; value: Uint8Array; } +export type MsgSubmitProposalEncoded = Omit & { + messages: (TextProposalProtoMsg | RegisterIncentiveProposalProtoMsg | ClientUpdateProposalProtoMsg | UpgradeProposalProtoMsg | ReplacePoolIncentivesProposalProtoMsg | UpdatePoolIncentivesProposalProtoMsg | SetSuperfluidAssetsProposalProtoMsg | RemoveSuperfluidAssetsProposalProtoMsg | UpdateUnpoolWhiteListProposalProtoMsg | UpdateFeeTokenProposalProtoMsg | AnyProtoMsg)[]; +}; /** * MsgSubmitProposal defines an sdk.Msg type that supports submitting arbitrary @@ -50,7 +53,7 @@ export interface MsgSubmitProposalAminoMsg { * proposal Content. */ export interface MsgSubmitProposalSDKType { - messages: AnySDKType[]; + messages: (TextProposalSDKType | RegisterIncentiveProposalSDKType | ClientUpdateProposalSDKType | UpgradeProposalSDKType | ReplacePoolIncentivesProposalSDKType | UpdatePoolIncentivesProposalSDKType | SetSuperfluidAssetsProposalSDKType | RemoveSuperfluidAssetsProposalSDKType | UpdateUnpoolWhiteListProposalSDKType | UpdateFeeTokenProposalSDKType | AnySDKType)[]; initial_deposit: CoinSDKType[]; proposer: string; metadata: string; @@ -94,6 +97,10 @@ export interface MsgExecLegacyContentProtoMsg { typeUrl: "/cosmos.gov.v1.MsgExecLegacyContent"; value: Uint8Array; } +export type MsgExecLegacyContentEncoded = Omit & { + /** content is the proposal's content. */ + content?: TextProposalProtoMsg | RegisterIncentiveProposalProtoMsg | ClientUpdateProposalProtoMsg | UpgradeProposalProtoMsg | ReplacePoolIncentivesProposalProtoMsg | UpdatePoolIncentivesProposalProtoMsg | SetSuperfluidAssetsProposalProtoMsg | RemoveSuperfluidAssetsProposalProtoMsg | UpdateUnpoolWhiteListProposalProtoMsg | UpdateFeeTokenProposalProtoMsg | AnyProtoMsg | undefined; +}; /** * MsgExecLegacyContent is used to wrap the legacy content field into a message. @@ -116,7 +123,7 @@ export interface MsgExecLegacyContentAminoMsg { * This ensures backwards compatibility with v1beta1.MsgSubmitProposal. */ export interface MsgExecLegacyContentSDKType { - content?: AnySDKType; + content?: TextProposalSDKType | RegisterIncentiveProposalSDKType | ClientUpdateProposalSDKType | UpgradeProposalSDKType | ReplacePoolIncentivesProposalSDKType | UpdatePoolIncentivesProposalSDKType | SetSuperfluidAssetsProposalSDKType | RemoveSuperfluidAssetsProposalSDKType | UpdateUnpoolWhiteListProposalSDKType | UpdateFeeTokenProposalSDKType | AnySDKType | undefined; authority: string; } diff --git a/__fixtures__/outputv2/cosmos/gov/v1beta1/gov.ts b/__fixtures__/outputv2/cosmos/gov/v1beta1/gov.ts index 9fae9a153e..4fef52d53e 100644 --- a/__fixtures__/outputv2/cosmos/gov/v1beta1/gov.ts +++ b/__fixtures__/outputv2/cosmos/gov/v1beta1/gov.ts @@ -1,12 +1,12 @@ import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../google/protobuf/timestamp"; import { Duration, DurationAmino, DurationSDKType } from "../../../google/protobuf/duration"; -import { RegisterIncentiveProposal, RegisterIncentiveProposalAmino, RegisterIncentiveProposalSDKType } from "../../../evmos/incentives/v1/incentives"; -import { ClientUpdateProposal, ClientUpdateProposalAmino, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalAmino, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; -import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalAmino, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalAmino, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; -import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalAmino, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalAmino, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalAmino, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; -import { UpdateFeeTokenProposal, UpdateFeeTokenProposalAmino, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; +import { RegisterIncentiveProposal, RegisterIncentiveProposalProtoMsg, RegisterIncentiveProposalSDKType } from "../../../evmos/incentives/v1/incentives"; +import { ClientUpdateProposal, ClientUpdateProposalProtoMsg, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalProtoMsg, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; +import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalProtoMsg, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalProtoMsg, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; +import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalProtoMsg, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalProtoMsg, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalProtoMsg, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; +import { UpdateFeeTokenProposal, UpdateFeeTokenProposalProtoMsg, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, Long, toTimestamp, fromTimestamp, fromJsonTimestamp, bytesFromBase64, base64FromBytes } from "../../../helpers"; export const protobufPackage = "cosmos.gov.v1beta1"; @@ -311,6 +311,9 @@ export interface ProposalProtoMsg { typeUrl: "/cosmos.gov.v1beta1.Proposal"; value: Uint8Array; } +export type ProposalEncoded = Omit & { + content?: TextProposalProtoMsg | RegisterIncentiveProposalProtoMsg | ClientUpdateProposalProtoMsg | UpgradeProposalProtoMsg | ReplacePoolIncentivesProposalProtoMsg | UpdatePoolIncentivesProposalProtoMsg | SetSuperfluidAssetsProposalProtoMsg | RemoveSuperfluidAssetsProposalProtoMsg | UpdateUnpoolWhiteListProposalProtoMsg | UpdateFeeTokenProposalProtoMsg | AnyProtoMsg | undefined; +}; /** Proposal defines the core field members of a governance proposal. */ export interface ProposalAmino { @@ -338,7 +341,7 @@ export interface ProposalAminoMsg { /** Proposal defines the core field members of a governance proposal. */ export interface ProposalSDKType { proposal_id: Long; - content?: AnySDKType; + content?: TextProposalSDKType | RegisterIncentiveProposalSDKType | ClientUpdateProposalSDKType | UpgradeProposalSDKType | ReplacePoolIncentivesProposalSDKType | UpdatePoolIncentivesProposalSDKType | SetSuperfluidAssetsProposalSDKType | RemoveSuperfluidAssetsProposalSDKType | UpdateUnpoolWhiteListProposalSDKType | UpdateFeeTokenProposalSDKType | AnySDKType | undefined; status: ProposalStatus; final_tally_result?: TallyResultSDKType; submit_time?: Date; diff --git a/__fixtures__/outputv2/cosmos/gov/v1beta1/query.lcd.ts b/__fixtures__/outputv2/cosmos/gov/v1beta1/query.lcd.ts index a7886e36ce..df2ba451f0 100644 --- a/__fixtures__/outputv2/cosmos/gov/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/cosmos/gov/v1beta1/query.lcd.ts @@ -1,8 +1,8 @@ -import { ProposalStatus, ProposalStatusAmino, 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 { ProposalStatus, ProposalStatusSDKType, Proposal, ProposalSDKType, Vote, VoteSDKType, VotingParams, VotingParamsSDKType, DepositParams, DepositParamsSDKType, TallyParams, TallyParamsSDKType, Deposit, DepositSDKType, TallyResult, TallyResultSDKType } from "./gov"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryProposalRequest, QueryProposalRequestAmino, QueryProposalRequestSDKType, QueryProposalResponse, QueryProposalResponseAmino, QueryProposalResponseSDKType, QueryProposalsRequest, QueryProposalsRequestAmino, QueryProposalsRequestSDKType, QueryProposalsResponse, QueryProposalsResponseAmino, QueryProposalsResponseSDKType, QueryVoteRequest, QueryVoteRequestAmino, QueryVoteRequestSDKType, QueryVoteResponse, QueryVoteResponseAmino, QueryVoteResponseSDKType, QueryVotesRequest, QueryVotesRequestAmino, QueryVotesRequestSDKType, QueryVotesResponse, QueryVotesResponseAmino, QueryVotesResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryDepositRequest, QueryDepositRequestAmino, QueryDepositRequestSDKType, QueryDepositResponse, QueryDepositResponseAmino, QueryDepositResponseSDKType, QueryDepositsRequest, QueryDepositsRequestAmino, QueryDepositsRequestSDKType, QueryDepositsResponse, QueryDepositsResponseAmino, QueryDepositsResponseSDKType, QueryTallyResultRequest, QueryTallyResultRequestAmino, QueryTallyResultRequestSDKType, QueryTallyResultResponse, QueryTallyResultResponseAmino, QueryTallyResultResponseSDKType } from "./query"; +import { QueryProposalRequest, QueryProposalRequestSDKType, QueryProposalResponse, QueryProposalResponseSDKType, QueryProposalsRequest, QueryProposalsRequestSDKType, QueryProposalsResponse, QueryProposalsResponseSDKType, QueryVoteRequest, QueryVoteRequestSDKType, QueryVoteResponse, QueryVoteResponseSDKType, QueryVotesRequest, QueryVotesRequestSDKType, QueryVotesResponse, QueryVotesResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryDepositRequest, QueryDepositRequestSDKType, QueryDepositResponse, QueryDepositResponseSDKType, QueryDepositsRequest, QueryDepositsRequestSDKType, QueryDepositsResponse, QueryDepositsResponseSDKType, QueryTallyResultRequest, QueryTallyResultRequestSDKType, QueryTallyResultResponse, QueryTallyResultResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/cosmos/gov/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/cosmos/gov/v1beta1/query.rpc.Query.ts index f46a2a4292..4c81611394 100644 --- a/__fixtures__/outputv2/cosmos/gov/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/cosmos/gov/v1beta1/query.rpc.Query.ts @@ -1,11 +1,11 @@ -import { ProposalStatus, ProposalStatusAmino, 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 { ProposalStatus, ProposalStatusSDKType, Proposal, ProposalSDKType, Vote, VoteSDKType, VotingParams, VotingParamsSDKType, DepositParams, DepositParamsSDKType, TallyParams, TallyParamsSDKType, Deposit, DepositSDKType, TallyResult, TallyResultSDKType } from "./gov"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient, ProtobufRpcClient } from "@cosmjs/stargate"; import { ReactQueryParams } from "../../../react-query"; import { useQuery } from "@tanstack/react-query"; -import { QueryProposalRequest, QueryProposalRequestAmino, QueryProposalRequestSDKType, QueryProposalResponse, QueryProposalResponseAmino, QueryProposalResponseSDKType, QueryProposalsRequest, QueryProposalsRequestAmino, QueryProposalsRequestSDKType, QueryProposalsResponse, QueryProposalsResponseAmino, QueryProposalsResponseSDKType, QueryVoteRequest, QueryVoteRequestAmino, QueryVoteRequestSDKType, QueryVoteResponse, QueryVoteResponseAmino, QueryVoteResponseSDKType, QueryVotesRequest, QueryVotesRequestAmino, QueryVotesRequestSDKType, QueryVotesResponse, QueryVotesResponseAmino, QueryVotesResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryDepositRequest, QueryDepositRequestAmino, QueryDepositRequestSDKType, QueryDepositResponse, QueryDepositResponseAmino, QueryDepositResponseSDKType, QueryDepositsRequest, QueryDepositsRequestAmino, QueryDepositsRequestSDKType, QueryDepositsResponse, QueryDepositsResponseAmino, QueryDepositsResponseSDKType, QueryTallyResultRequest, QueryTallyResultRequestAmino, QueryTallyResultRequestSDKType, QueryTallyResultResponse, QueryTallyResultResponseAmino, QueryTallyResultResponseSDKType } from "./query"; +import { QueryProposalRequest, QueryProposalRequestSDKType, QueryProposalResponse, QueryProposalResponseSDKType, QueryProposalsRequest, QueryProposalsRequestSDKType, QueryProposalsResponse, QueryProposalsResponseSDKType, QueryVoteRequest, QueryVoteRequestSDKType, QueryVoteResponse, QueryVoteResponseSDKType, QueryVotesRequest, QueryVotesRequestSDKType, QueryVotesResponse, QueryVotesResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryDepositRequest, QueryDepositRequestSDKType, QueryDepositResponse, QueryDepositResponseSDKType, QueryDepositsRequest, QueryDepositsRequestSDKType, QueryDepositsResponse, QueryDepositsResponseSDKType, QueryTallyResultRequest, QueryTallyResultRequestSDKType, QueryTallyResultResponse, QueryTallyResultResponseSDKType } from "./query"; /** Query defines the gRPC querier service for gov module */ export interface Query { diff --git a/__fixtures__/outputv2/cosmos/gov/v1beta1/query.ts b/__fixtures__/outputv2/cosmos/gov/v1beta1/query.ts index b85bef9acb..ce82c99f2e 100644 --- a/__fixtures__/outputv2/cosmos/gov/v1beta1/query.ts +++ b/__fixtures__/outputv2/cosmos/gov/v1beta1/query.ts @@ -1,4 +1,4 @@ -import { ProposalStatus, ProposalStatusAmino, ProposalStatusSDKType, Proposal, ProposalAmino, ProposalSDKType, Vote, VoteAmino, VoteSDKType, VotingParams, VotingParamsAmino, VotingParamsSDKType, DepositParams, DepositParamsAmino, DepositParamsSDKType, TallyParams, TallyParamsAmino, TallyParamsSDKType, Deposit, DepositAmino, DepositSDKType, TallyResult, TallyResultAmino, TallyResultSDKType, proposalStatusFromJSON, proposalStatusToJSON } from "./gov"; +import { ProposalStatus, ProposalStatusSDKType, Proposal, ProposalAmino, ProposalSDKType, Vote, VoteAmino, VoteSDKType, VotingParams, VotingParamsAmino, VotingParamsSDKType, DepositParams, DepositParamsAmino, DepositParamsSDKType, TallyParams, TallyParamsAmino, TallyParamsSDKType, Deposit, DepositAmino, DepositSDKType, TallyResult, TallyResultAmino, TallyResultSDKType, proposalStatusFromJSON, proposalStatusToJSON } from "./gov"; import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; import { Long, isSet, DeepPartial } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; diff --git a/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.amino.ts b/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.amino.ts index e0dd40c573..a5e714f41c 100644 --- a/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.amino.ts +++ b/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.amino.ts @@ -1,12 +1,12 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { VoteOption, VoteOptionAmino, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionAmino, WeightedVoteOptionSDKType, TextProposal, TextProposalAmino, TextProposalSDKType } from "./gov"; -import { RegisterIncentiveProposal, RegisterIncentiveProposalAmino, RegisterIncentiveProposalSDKType } from "../../../evmos/incentives/v1/incentives"; -import { ClientUpdateProposal, ClientUpdateProposalAmino, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalAmino, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; -import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalAmino, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalAmino, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; -import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalAmino, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalAmino, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalAmino, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; -import { UpdateFeeTokenProposal, UpdateFeeTokenProposalAmino, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; -import { MsgSubmitProposal, MsgSubmitProposalAmino, MsgSubmitProposalSDKType, MsgVote, MsgVoteAmino, MsgVoteSDKType, MsgVoteWeighted, MsgVoteWeightedAmino, MsgVoteWeightedSDKType, MsgDeposit, MsgDepositAmino, MsgDepositSDKType } from "./tx"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; +import { VoteOption, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionSDKType, TextProposal, TextProposalSDKType } from "./gov"; +import { RegisterIncentiveProposal, RegisterIncentiveProposalSDKType } from "../../../evmos/incentives/v1/incentives"; +import { ClientUpdateProposal, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; +import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; +import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; +import { UpdateFeeTokenProposal, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; +import { MsgSubmitProposal, MsgSubmitProposalSDKType, MsgVote, MsgVoteSDKType, MsgVoteWeighted, MsgVoteWeightedSDKType, MsgDeposit, MsgDepositSDKType } from "./tx"; export const AminoConverter = { "/cosmos.gov.v1beta1.MsgSubmitProposal": { aminoType: "cosmos-sdk/MsgSubmitProposal", diff --git a/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.registry.ts b/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.registry.ts index 1ae15424ff..711107f89d 100644 --- a/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.registry.ts +++ b/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.registry.ts @@ -1,13 +1,13 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { VoteOption, VoteOptionAmino, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionAmino, WeightedVoteOptionSDKType, TextProposal, TextProposalAmino, TextProposalSDKType } from "./gov"; -import { RegisterIncentiveProposal, RegisterIncentiveProposalAmino, RegisterIncentiveProposalSDKType } from "../../../evmos/incentives/v1/incentives"; -import { ClientUpdateProposal, ClientUpdateProposalAmino, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalAmino, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; -import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalAmino, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalAmino, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; -import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalAmino, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalAmino, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalAmino, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; -import { UpdateFeeTokenProposal, UpdateFeeTokenProposalAmino, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; +import { VoteOption, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionSDKType, TextProposal, TextProposalSDKType } from "./gov"; +import { RegisterIncentiveProposal, RegisterIncentiveProposalSDKType } from "../../../evmos/incentives/v1/incentives"; +import { ClientUpdateProposal, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; +import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; +import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; +import { UpdateFeeTokenProposal, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgSubmitProposal, MsgSubmitProposalAmino, MsgSubmitProposalSDKType, MsgVote, MsgVoteAmino, MsgVoteSDKType, MsgVoteWeighted, MsgVoteWeightedAmino, MsgVoteWeightedSDKType, MsgDeposit, MsgDepositAmino, MsgDepositSDKType } from "./tx"; +import { MsgSubmitProposal, MsgSubmitProposalSDKType, MsgVote, MsgVoteSDKType, MsgVoteWeighted, MsgVoteWeightedSDKType, MsgDeposit, MsgDepositSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/cosmos.gov.v1beta1.MsgSubmitProposal", MsgSubmitProposal], ["/cosmos.gov.v1beta1.MsgVote", MsgVote], ["/cosmos.gov.v1beta1.MsgVoteWeighted", MsgVoteWeighted], ["/cosmos.gov.v1beta1.MsgDeposit", MsgDeposit]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.rpc.msg.ts b/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.rpc.msg.ts index d69068f592..b6f0558fb3 100644 --- a/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.rpc.msg.ts @@ -1,14 +1,14 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { VoteOption, VoteOptionAmino, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionAmino, WeightedVoteOptionSDKType, TextProposal, TextProposalAmino, TextProposalSDKType } from "./gov"; -import { RegisterIncentiveProposal, RegisterIncentiveProposalAmino, RegisterIncentiveProposalSDKType } from "../../../evmos/incentives/v1/incentives"; -import { ClientUpdateProposal, ClientUpdateProposalAmino, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalAmino, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; -import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalAmino, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalAmino, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; -import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalAmino, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalAmino, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalAmino, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; -import { UpdateFeeTokenProposal, UpdateFeeTokenProposalAmino, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; +import { VoteOption, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionSDKType, TextProposal, TextProposalSDKType } from "./gov"; +import { RegisterIncentiveProposal, RegisterIncentiveProposalSDKType } from "../../../evmos/incentives/v1/incentives"; +import { ClientUpdateProposal, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; +import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; +import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; +import { UpdateFeeTokenProposal, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgSubmitProposal, MsgSubmitProposalAmino, MsgSubmitProposalSDKType, MsgSubmitProposalResponse, MsgSubmitProposalResponseAmino, MsgSubmitProposalResponseSDKType, MsgVote, MsgVoteAmino, MsgVoteSDKType, MsgVoteResponse, MsgVoteResponseAmino, MsgVoteResponseSDKType, MsgVoteWeighted, MsgVoteWeightedAmino, MsgVoteWeightedSDKType, MsgVoteWeightedResponse, MsgVoteWeightedResponseAmino, MsgVoteWeightedResponseSDKType, MsgDeposit, MsgDepositAmino, MsgDepositSDKType, MsgDepositResponse, MsgDepositResponseAmino, MsgDepositResponseSDKType } from "./tx"; +import { MsgSubmitProposal, MsgSubmitProposalSDKType, MsgSubmitProposalResponse, MsgSubmitProposalResponseSDKType, MsgVote, MsgVoteSDKType, MsgVoteResponse, MsgVoteResponseSDKType, MsgVoteWeighted, MsgVoteWeightedSDKType, MsgVoteWeightedResponse, MsgVoteWeightedResponseSDKType, MsgDeposit, MsgDepositSDKType, MsgDepositResponse, MsgDepositResponseSDKType } from "./tx"; /** Msg defines the bank Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.ts b/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.ts index 001d45ff13..027f970bfa 100644 --- a/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.ts +++ b/__fixtures__/outputv2/cosmos/gov/v1beta1/tx.ts @@ -1,11 +1,11 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { VoteOption, VoteOptionAmino, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionAmino, WeightedVoteOptionSDKType, TextProposal, TextProposalAmino, TextProposalSDKType, voteOptionFromJSON, voteOptionToJSON } from "./gov"; -import { RegisterIncentiveProposal, RegisterIncentiveProposalAmino, RegisterIncentiveProposalSDKType } from "../../../evmos/incentives/v1/incentives"; -import { ClientUpdateProposal, ClientUpdateProposalAmino, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalAmino, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; -import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalAmino, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalAmino, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; -import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalAmino, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalAmino, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalAmino, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; -import { UpdateFeeTokenProposal, UpdateFeeTokenProposalAmino, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; +import { VoteOption, VoteOptionSDKType, WeightedVoteOption, WeightedVoteOptionAmino, WeightedVoteOptionSDKType, TextProposal, TextProposalProtoMsg, TextProposalSDKType, voteOptionFromJSON, voteOptionToJSON } from "./gov"; +import { RegisterIncentiveProposal, RegisterIncentiveProposalProtoMsg, RegisterIncentiveProposalSDKType } from "../../../evmos/incentives/v1/incentives"; +import { ClientUpdateProposal, ClientUpdateProposalProtoMsg, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalProtoMsg, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; +import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalProtoMsg, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalProtoMsg, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; +import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalProtoMsg, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalProtoMsg, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalProtoMsg, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; +import { UpdateFeeTokenProposal, UpdateFeeTokenProposalProtoMsg, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, Long } from "../../../helpers"; export const protobufPackage = "cosmos.gov.v1beta1"; @@ -23,6 +23,9 @@ export interface MsgSubmitProposalProtoMsg { typeUrl: "/cosmos.gov.v1beta1.MsgSubmitProposal"; value: Uint8Array; } +export type MsgSubmitProposalEncoded = Omit & { + content?: TextProposalProtoMsg | RegisterIncentiveProposalProtoMsg | ClientUpdateProposalProtoMsg | UpgradeProposalProtoMsg | ReplacePoolIncentivesProposalProtoMsg | UpdatePoolIncentivesProposalProtoMsg | SetSuperfluidAssetsProposalProtoMsg | RemoveSuperfluidAssetsProposalProtoMsg | UpdateUnpoolWhiteListProposalProtoMsg | UpdateFeeTokenProposalProtoMsg | AnyProtoMsg | undefined; +}; /** * MsgSubmitProposal defines an sdk.Msg type that supports submitting arbitrary @@ -43,7 +46,7 @@ export interface MsgSubmitProposalAminoMsg { * proposal Content. */ export interface MsgSubmitProposalSDKType { - content?: AnySDKType; + content?: TextProposalSDKType | RegisterIncentiveProposalSDKType | ClientUpdateProposalSDKType | UpgradeProposalSDKType | ReplacePoolIncentivesProposalSDKType | UpdatePoolIncentivesProposalSDKType | SetSuperfluidAssetsProposalSDKType | RemoveSuperfluidAssetsProposalSDKType | UpdateUnpoolWhiteListProposalSDKType | UpdateFeeTokenProposalSDKType | AnySDKType | undefined; initial_deposit: CoinSDKType[]; proposer: string; } diff --git a/__fixtures__/outputv2/cosmos/group/v1/events.ts b/__fixtures__/outputv2/cosmos/group/v1/events.ts index 43f5069582..a638d0c53a 100644 --- a/__fixtures__/outputv2/cosmos/group/v1/events.ts +++ b/__fixtures__/outputv2/cosmos/group/v1/events.ts @@ -1,4 +1,4 @@ -import { ProposalExecutorResult, ProposalExecutorResultAmino, ProposalExecutorResultSDKType, proposalExecutorResultFromJSON, proposalExecutorResultToJSON } from "./types"; +import { ProposalExecutorResult, ProposalExecutorResultSDKType, proposalExecutorResultFromJSON, proposalExecutorResultToJSON } from "./types"; import { Long, isSet, DeepPartial } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; export const protobufPackage = "cosmos.group.v1"; diff --git a/__fixtures__/outputv2/cosmos/group/v1/query.lcd.ts b/__fixtures__/outputv2/cosmos/group/v1/query.lcd.ts index c44874d7ca..eafb7df1eb 100644 --- a/__fixtures__/outputv2/cosmos/group/v1/query.lcd.ts +++ b/__fixtures__/outputv2/cosmos/group/v1/query.lcd.ts @@ -1,8 +1,8 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { GroupInfo, GroupInfoAmino, GroupInfoSDKType, GroupPolicyInfo, GroupPolicyInfoAmino, GroupPolicyInfoSDKType, GroupMember, GroupMemberAmino, GroupMemberSDKType, Proposal, ProposalAmino, ProposalSDKType, Vote, VoteAmino, VoteSDKType, TallyResult, TallyResultAmino, TallyResultSDKType } from "./types"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { GroupInfo, GroupInfoSDKType, GroupPolicyInfo, GroupPolicyInfoSDKType, GroupMember, GroupMemberSDKType, Proposal, ProposalSDKType, Vote, VoteSDKType, TallyResult, TallyResultSDKType } from "./types"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryGroupInfoRequest, QueryGroupInfoRequestAmino, QueryGroupInfoRequestSDKType, QueryGroupInfoResponse, QueryGroupInfoResponseAmino, QueryGroupInfoResponseSDKType, QueryGroupPolicyInfoRequest, QueryGroupPolicyInfoRequestAmino, QueryGroupPolicyInfoRequestSDKType, QueryGroupPolicyInfoResponse, QueryGroupPolicyInfoResponseAmino, QueryGroupPolicyInfoResponseSDKType, QueryGroupMembersRequest, QueryGroupMembersRequestAmino, QueryGroupMembersRequestSDKType, QueryGroupMembersResponse, QueryGroupMembersResponseAmino, QueryGroupMembersResponseSDKType, QueryGroupsByAdminRequest, QueryGroupsByAdminRequestAmino, QueryGroupsByAdminRequestSDKType, QueryGroupsByAdminResponse, QueryGroupsByAdminResponseAmino, QueryGroupsByAdminResponseSDKType, QueryGroupPoliciesByGroupRequest, QueryGroupPoliciesByGroupRequestAmino, QueryGroupPoliciesByGroupRequestSDKType, QueryGroupPoliciesByGroupResponse, QueryGroupPoliciesByGroupResponseAmino, QueryGroupPoliciesByGroupResponseSDKType, QueryGroupPoliciesByAdminRequest, QueryGroupPoliciesByAdminRequestAmino, QueryGroupPoliciesByAdminRequestSDKType, QueryGroupPoliciesByAdminResponse, QueryGroupPoliciesByAdminResponseAmino, QueryGroupPoliciesByAdminResponseSDKType, QueryProposalRequest, QueryProposalRequestAmino, QueryProposalRequestSDKType, QueryProposalResponse, QueryProposalResponseAmino, QueryProposalResponseSDKType, QueryProposalsByGroupPolicyRequest, QueryProposalsByGroupPolicyRequestAmino, QueryProposalsByGroupPolicyRequestSDKType, QueryProposalsByGroupPolicyResponse, QueryProposalsByGroupPolicyResponseAmino, QueryProposalsByGroupPolicyResponseSDKType, QueryVoteByProposalVoterRequest, QueryVoteByProposalVoterRequestAmino, QueryVoteByProposalVoterRequestSDKType, QueryVoteByProposalVoterResponse, QueryVoteByProposalVoterResponseAmino, QueryVoteByProposalVoterResponseSDKType, QueryVotesByProposalRequest, QueryVotesByProposalRequestAmino, QueryVotesByProposalRequestSDKType, QueryVotesByProposalResponse, QueryVotesByProposalResponseAmino, QueryVotesByProposalResponseSDKType, QueryVotesByVoterRequest, QueryVotesByVoterRequestAmino, QueryVotesByVoterRequestSDKType, QueryVotesByVoterResponse, QueryVotesByVoterResponseAmino, QueryVotesByVoterResponseSDKType, QueryGroupsByMemberRequest, QueryGroupsByMemberRequestAmino, QueryGroupsByMemberRequestSDKType, QueryGroupsByMemberResponse, QueryGroupsByMemberResponseAmino, QueryGroupsByMemberResponseSDKType, QueryTallyResultRequest, QueryTallyResultRequestAmino, QueryTallyResultRequestSDKType, QueryTallyResultResponse, QueryTallyResultResponseAmino, QueryTallyResultResponseSDKType } from "./query"; +import { QueryGroupInfoRequest, QueryGroupInfoRequestSDKType, QueryGroupInfoResponse, QueryGroupInfoResponseSDKType, QueryGroupPolicyInfoRequest, QueryGroupPolicyInfoRequestSDKType, QueryGroupPolicyInfoResponse, QueryGroupPolicyInfoResponseSDKType, QueryGroupMembersRequest, QueryGroupMembersRequestSDKType, QueryGroupMembersResponse, QueryGroupMembersResponseSDKType, QueryGroupsByAdminRequest, QueryGroupsByAdminRequestSDKType, QueryGroupsByAdminResponse, QueryGroupsByAdminResponseSDKType, QueryGroupPoliciesByGroupRequest, QueryGroupPoliciesByGroupRequestSDKType, QueryGroupPoliciesByGroupResponse, QueryGroupPoliciesByGroupResponseSDKType, QueryGroupPoliciesByAdminRequest, QueryGroupPoliciesByAdminRequestSDKType, QueryGroupPoliciesByAdminResponse, QueryGroupPoliciesByAdminResponseSDKType, QueryProposalRequest, QueryProposalRequestSDKType, QueryProposalResponse, QueryProposalResponseSDKType, QueryProposalsByGroupPolicyRequest, QueryProposalsByGroupPolicyRequestSDKType, QueryProposalsByGroupPolicyResponse, QueryProposalsByGroupPolicyResponseSDKType, QueryVoteByProposalVoterRequest, QueryVoteByProposalVoterRequestSDKType, QueryVoteByProposalVoterResponse, QueryVoteByProposalVoterResponseSDKType, QueryVotesByProposalRequest, QueryVotesByProposalRequestSDKType, QueryVotesByProposalResponse, QueryVotesByProposalResponseSDKType, QueryVotesByVoterRequest, QueryVotesByVoterRequestSDKType, QueryVotesByVoterResponse, QueryVotesByVoterResponseSDKType, QueryGroupsByMemberRequest, QueryGroupsByMemberRequestSDKType, QueryGroupsByMemberResponse, QueryGroupsByMemberResponseSDKType, QueryTallyResultRequest, QueryTallyResultRequestSDKType, QueryTallyResultResponse, QueryTallyResultResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/cosmos/group/v1/query.rpc.Query.ts b/__fixtures__/outputv2/cosmos/group/v1/query.rpc.Query.ts index f07e5e266c..1ad4d14790 100644 --- a/__fixtures__/outputv2/cosmos/group/v1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/cosmos/group/v1/query.rpc.Query.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { GroupInfo, GroupInfoAmino, GroupInfoSDKType, GroupPolicyInfo, GroupPolicyInfoAmino, GroupPolicyInfoSDKType, GroupMember, GroupMemberAmino, GroupMemberSDKType, Proposal, ProposalAmino, ProposalSDKType, Vote, VoteAmino, VoteSDKType, TallyResult, TallyResultAmino, TallyResultSDKType } from "./types"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { GroupInfo, GroupInfoSDKType, GroupPolicyInfo, GroupPolicyInfoSDKType, GroupMember, GroupMemberSDKType, Proposal, ProposalSDKType, Vote, VoteSDKType, TallyResult, TallyResultSDKType } from "./types"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryGroupInfoRequest, QueryGroupInfoRequestAmino, QueryGroupInfoRequestSDKType, QueryGroupInfoResponse, QueryGroupInfoResponseAmino, QueryGroupInfoResponseSDKType, QueryGroupPolicyInfoRequest, QueryGroupPolicyInfoRequestAmino, QueryGroupPolicyInfoRequestSDKType, QueryGroupPolicyInfoResponse, QueryGroupPolicyInfoResponseAmino, QueryGroupPolicyInfoResponseSDKType, QueryGroupMembersRequest, QueryGroupMembersRequestAmino, QueryGroupMembersRequestSDKType, QueryGroupMembersResponse, QueryGroupMembersResponseAmino, QueryGroupMembersResponseSDKType, QueryGroupsByAdminRequest, QueryGroupsByAdminRequestAmino, QueryGroupsByAdminRequestSDKType, QueryGroupsByAdminResponse, QueryGroupsByAdminResponseAmino, QueryGroupsByAdminResponseSDKType, QueryGroupPoliciesByGroupRequest, QueryGroupPoliciesByGroupRequestAmino, QueryGroupPoliciesByGroupRequestSDKType, QueryGroupPoliciesByGroupResponse, QueryGroupPoliciesByGroupResponseAmino, QueryGroupPoliciesByGroupResponseSDKType, QueryGroupPoliciesByAdminRequest, QueryGroupPoliciesByAdminRequestAmino, QueryGroupPoliciesByAdminRequestSDKType, QueryGroupPoliciesByAdminResponse, QueryGroupPoliciesByAdminResponseAmino, QueryGroupPoliciesByAdminResponseSDKType, QueryProposalRequest, QueryProposalRequestAmino, QueryProposalRequestSDKType, QueryProposalResponse, QueryProposalResponseAmino, QueryProposalResponseSDKType, QueryProposalsByGroupPolicyRequest, QueryProposalsByGroupPolicyRequestAmino, QueryProposalsByGroupPolicyRequestSDKType, QueryProposalsByGroupPolicyResponse, QueryProposalsByGroupPolicyResponseAmino, QueryProposalsByGroupPolicyResponseSDKType, QueryVoteByProposalVoterRequest, QueryVoteByProposalVoterRequestAmino, QueryVoteByProposalVoterRequestSDKType, QueryVoteByProposalVoterResponse, QueryVoteByProposalVoterResponseAmino, QueryVoteByProposalVoterResponseSDKType, QueryVotesByProposalRequest, QueryVotesByProposalRequestAmino, QueryVotesByProposalRequestSDKType, QueryVotesByProposalResponse, QueryVotesByProposalResponseAmino, QueryVotesByProposalResponseSDKType, QueryVotesByVoterRequest, QueryVotesByVoterRequestAmino, QueryVotesByVoterRequestSDKType, QueryVotesByVoterResponse, QueryVotesByVoterResponseAmino, QueryVotesByVoterResponseSDKType, QueryGroupsByMemberRequest, QueryGroupsByMemberRequestAmino, QueryGroupsByMemberRequestSDKType, QueryGroupsByMemberResponse, QueryGroupsByMemberResponseAmino, QueryGroupsByMemberResponseSDKType, QueryTallyResultRequest, QueryTallyResultRequestAmino, QueryTallyResultRequestSDKType, QueryTallyResultResponse, QueryTallyResultResponseAmino, QueryTallyResultResponseSDKType } from "./query"; +import { QueryGroupInfoRequest, QueryGroupInfoRequestSDKType, QueryGroupInfoResponse, QueryGroupInfoResponseSDKType, QueryGroupPolicyInfoRequest, QueryGroupPolicyInfoRequestSDKType, QueryGroupPolicyInfoResponse, QueryGroupPolicyInfoResponseSDKType, QueryGroupMembersRequest, QueryGroupMembersRequestSDKType, QueryGroupMembersResponse, QueryGroupMembersResponseSDKType, QueryGroupsByAdminRequest, QueryGroupsByAdminRequestSDKType, QueryGroupsByAdminResponse, QueryGroupsByAdminResponseSDKType, QueryGroupPoliciesByGroupRequest, QueryGroupPoliciesByGroupRequestSDKType, QueryGroupPoliciesByGroupResponse, QueryGroupPoliciesByGroupResponseSDKType, QueryGroupPoliciesByAdminRequest, QueryGroupPoliciesByAdminRequestSDKType, QueryGroupPoliciesByAdminResponse, QueryGroupPoliciesByAdminResponseSDKType, QueryProposalRequest, QueryProposalRequestSDKType, QueryProposalResponse, QueryProposalResponseSDKType, QueryProposalsByGroupPolicyRequest, QueryProposalsByGroupPolicyRequestSDKType, QueryProposalsByGroupPolicyResponse, QueryProposalsByGroupPolicyResponseSDKType, QueryVoteByProposalVoterRequest, QueryVoteByProposalVoterRequestSDKType, QueryVoteByProposalVoterResponse, QueryVoteByProposalVoterResponseSDKType, QueryVotesByProposalRequest, QueryVotesByProposalRequestSDKType, QueryVotesByProposalResponse, QueryVotesByProposalResponseSDKType, QueryVotesByVoterRequest, QueryVotesByVoterRequestSDKType, QueryVotesByVoterResponse, QueryVotesByVoterResponseSDKType, QueryGroupsByMemberRequest, QueryGroupsByMemberRequestSDKType, QueryGroupsByMemberResponse, QueryGroupsByMemberResponseSDKType, QueryTallyResultRequest, QueryTallyResultRequestSDKType, QueryTallyResultResponse, QueryTallyResultResponseSDKType } from "./query"; /** Query is the cosmos.group.v1 Query service. */ export interface Query { diff --git a/__fixtures__/outputv2/cosmos/group/v1/tx.amino.ts b/__fixtures__/outputv2/cosmos/group/v1/tx.amino.ts index 99f695c3c9..8a99b0a545 100644 --- a/__fixtures__/outputv2/cosmos/group/v1/tx.amino.ts +++ b/__fixtures__/outputv2/cosmos/group/v1/tx.amino.ts @@ -1,6 +1,6 @@ -import { Member, MemberAmino, MemberSDKType, VoteOption, VoteOptionAmino, VoteOptionSDKType, ThresholdDecisionPolicy, ThresholdDecisionPolicyAmino, ThresholdDecisionPolicySDKType, PercentageDecisionPolicy, PercentageDecisionPolicyAmino, PercentageDecisionPolicySDKType } from "./types"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { MsgCreateGroup, MsgCreateGroupAmino, MsgCreateGroupSDKType, MsgUpdateGroupMembers, MsgUpdateGroupMembersAmino, MsgUpdateGroupMembersSDKType, MsgUpdateGroupAdmin, MsgUpdateGroupAdminAmino, MsgUpdateGroupAdminSDKType, MsgUpdateGroupMetadata, MsgUpdateGroupMetadataAmino, MsgUpdateGroupMetadataSDKType, MsgCreateGroupPolicy, MsgCreateGroupPolicyAmino, MsgCreateGroupPolicySDKType, MsgCreateGroupWithPolicy, MsgCreateGroupWithPolicyAmino, MsgCreateGroupWithPolicySDKType, MsgUpdateGroupPolicyAdmin, MsgUpdateGroupPolicyAdminAmino, MsgUpdateGroupPolicyAdminSDKType, MsgUpdateGroupPolicyDecisionPolicy, MsgUpdateGroupPolicyDecisionPolicyAmino, MsgUpdateGroupPolicyDecisionPolicySDKType, MsgUpdateGroupPolicyMetadata, MsgUpdateGroupPolicyMetadataAmino, MsgUpdateGroupPolicyMetadataSDKType, MsgSubmitProposal, MsgSubmitProposalAmino, MsgSubmitProposalSDKType, MsgWithdrawProposal, MsgWithdrawProposalAmino, MsgWithdrawProposalSDKType, MsgVote, MsgVoteAmino, MsgVoteSDKType, MsgExec, MsgExecAmino, MsgExecSDKType, MsgLeaveGroup, MsgLeaveGroupAmino, MsgLeaveGroupSDKType } from "./tx"; +import { Member, MemberSDKType, VoteOption, VoteOptionSDKType, ThresholdDecisionPolicy, ThresholdDecisionPolicySDKType, PercentageDecisionPolicy, PercentageDecisionPolicySDKType } from "./types"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { 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 const AminoConverter = { "/cosmos.group.v1.MsgCreateGroup": { aminoType: "cosmos-sdk/MsgCreateGroup", diff --git a/__fixtures__/outputv2/cosmos/group/v1/tx.registry.ts b/__fixtures__/outputv2/cosmos/group/v1/tx.registry.ts index 47b3afe7ba..dd67bc8ecb 100644 --- a/__fixtures__/outputv2/cosmos/group/v1/tx.registry.ts +++ b/__fixtures__/outputv2/cosmos/group/v1/tx.registry.ts @@ -1,7 +1,7 @@ -import { Member, MemberAmino, MemberSDKType, VoteOption, VoteOptionAmino, VoteOptionSDKType, ThresholdDecisionPolicy, ThresholdDecisionPolicyAmino, ThresholdDecisionPolicySDKType, PercentageDecisionPolicy, PercentageDecisionPolicyAmino, PercentageDecisionPolicySDKType } from "./types"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Member, MemberSDKType, VoteOption, VoteOptionSDKType, ThresholdDecisionPolicy, ThresholdDecisionPolicySDKType, PercentageDecisionPolicy, PercentageDecisionPolicySDKType } from "./types"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgCreateGroup, MsgCreateGroupAmino, MsgCreateGroupSDKType, MsgUpdateGroupMembers, MsgUpdateGroupMembersAmino, MsgUpdateGroupMembersSDKType, MsgUpdateGroupAdmin, MsgUpdateGroupAdminAmino, MsgUpdateGroupAdminSDKType, MsgUpdateGroupMetadata, MsgUpdateGroupMetadataAmino, MsgUpdateGroupMetadataSDKType, MsgCreateGroupPolicy, MsgCreateGroupPolicyAmino, MsgCreateGroupPolicySDKType, MsgCreateGroupWithPolicy, MsgCreateGroupWithPolicyAmino, MsgCreateGroupWithPolicySDKType, MsgUpdateGroupPolicyAdmin, MsgUpdateGroupPolicyAdminAmino, MsgUpdateGroupPolicyAdminSDKType, MsgUpdateGroupPolicyDecisionPolicy, MsgUpdateGroupPolicyDecisionPolicyAmino, MsgUpdateGroupPolicyDecisionPolicySDKType, MsgUpdateGroupPolicyMetadata, MsgUpdateGroupPolicyMetadataAmino, MsgUpdateGroupPolicyMetadataSDKType, MsgSubmitProposal, MsgSubmitProposalAmino, MsgSubmitProposalSDKType, MsgWithdrawProposal, MsgWithdrawProposalAmino, MsgWithdrawProposalSDKType, MsgVote, MsgVoteAmino, MsgVoteSDKType, MsgExec, MsgExecAmino, MsgExecSDKType, MsgLeaveGroup, MsgLeaveGroupAmino, MsgLeaveGroupSDKType } from "./tx"; +import { 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 const registry: ReadonlyArray<[string, GeneratedType]> = [["/cosmos.group.v1.MsgCreateGroup", MsgCreateGroup], ["/cosmos.group.v1.MsgUpdateGroupMembers", MsgUpdateGroupMembers], ["/cosmos.group.v1.MsgUpdateGroupAdmin", MsgUpdateGroupAdmin], ["/cosmos.group.v1.MsgUpdateGroupMetadata", MsgUpdateGroupMetadata], ["/cosmos.group.v1.MsgCreateGroupPolicy", MsgCreateGroupPolicy], ["/cosmos.group.v1.MsgCreateGroupWithPolicy", MsgCreateGroupWithPolicy], ["/cosmos.group.v1.MsgUpdateGroupPolicyAdmin", MsgUpdateGroupPolicyAdmin], ["/cosmos.group.v1.MsgUpdateGroupPolicyDecisionPolicy", MsgUpdateGroupPolicyDecisionPolicy], ["/cosmos.group.v1.MsgUpdateGroupPolicyMetadata", MsgUpdateGroupPolicyMetadata], ["/cosmos.group.v1.MsgSubmitProposal", MsgSubmitProposal], ["/cosmos.group.v1.MsgWithdrawProposal", MsgWithdrawProposal], ["/cosmos.group.v1.MsgVote", MsgVote], ["/cosmos.group.v1.MsgExec", MsgExec], ["/cosmos.group.v1.MsgLeaveGroup", MsgLeaveGroup]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/cosmos/group/v1/tx.rpc.msg.ts b/__fixtures__/outputv2/cosmos/group/v1/tx.rpc.msg.ts index 2924ac5e08..66813f310c 100644 --- a/__fixtures__/outputv2/cosmos/group/v1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/cosmos/group/v1/tx.rpc.msg.ts @@ -1,8 +1,8 @@ -import { Member, MemberAmino, MemberSDKType, VoteOption, VoteOptionAmino, VoteOptionSDKType, ThresholdDecisionPolicy, ThresholdDecisionPolicyAmino, ThresholdDecisionPolicySDKType, PercentageDecisionPolicy, PercentageDecisionPolicyAmino, PercentageDecisionPolicySDKType } from "./types"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Member, MemberSDKType, VoteOption, VoteOptionSDKType, ThresholdDecisionPolicy, ThresholdDecisionPolicySDKType, PercentageDecisionPolicy, PercentageDecisionPolicySDKType } from "./types"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgCreateGroup, MsgCreateGroupAmino, MsgCreateGroupSDKType, MsgCreateGroupResponse, MsgCreateGroupResponseAmino, MsgCreateGroupResponseSDKType, MsgUpdateGroupMembers, MsgUpdateGroupMembersAmino, MsgUpdateGroupMembersSDKType, MsgUpdateGroupMembersResponse, MsgUpdateGroupMembersResponseAmino, MsgUpdateGroupMembersResponseSDKType, MsgUpdateGroupAdmin, MsgUpdateGroupAdminAmino, MsgUpdateGroupAdminSDKType, MsgUpdateGroupAdminResponse, MsgUpdateGroupAdminResponseAmino, MsgUpdateGroupAdminResponseSDKType, MsgUpdateGroupMetadata, MsgUpdateGroupMetadataAmino, MsgUpdateGroupMetadataSDKType, MsgUpdateGroupMetadataResponse, MsgUpdateGroupMetadataResponseAmino, MsgUpdateGroupMetadataResponseSDKType, MsgCreateGroupPolicy, MsgCreateGroupPolicyAmino, MsgCreateGroupPolicySDKType, MsgCreateGroupPolicyResponse, MsgCreateGroupPolicyResponseAmino, MsgCreateGroupPolicyResponseSDKType, MsgCreateGroupWithPolicy, MsgCreateGroupWithPolicyAmino, MsgCreateGroupWithPolicySDKType, MsgCreateGroupWithPolicyResponse, MsgCreateGroupWithPolicyResponseAmino, MsgCreateGroupWithPolicyResponseSDKType, MsgUpdateGroupPolicyAdmin, MsgUpdateGroupPolicyAdminAmino, MsgUpdateGroupPolicyAdminSDKType, MsgUpdateGroupPolicyAdminResponse, MsgUpdateGroupPolicyAdminResponseAmino, MsgUpdateGroupPolicyAdminResponseSDKType, MsgUpdateGroupPolicyDecisionPolicy, MsgUpdateGroupPolicyDecisionPolicyAmino, MsgUpdateGroupPolicyDecisionPolicySDKType, MsgUpdateGroupPolicyDecisionPolicyResponse, MsgUpdateGroupPolicyDecisionPolicyResponseAmino, MsgUpdateGroupPolicyDecisionPolicyResponseSDKType, MsgUpdateGroupPolicyMetadata, MsgUpdateGroupPolicyMetadataAmino, MsgUpdateGroupPolicyMetadataSDKType, MsgUpdateGroupPolicyMetadataResponse, MsgUpdateGroupPolicyMetadataResponseAmino, MsgUpdateGroupPolicyMetadataResponseSDKType, MsgSubmitProposal, MsgSubmitProposalAmino, MsgSubmitProposalSDKType, MsgSubmitProposalResponse, MsgSubmitProposalResponseAmino, MsgSubmitProposalResponseSDKType, MsgWithdrawProposal, MsgWithdrawProposalAmino, MsgWithdrawProposalSDKType, MsgWithdrawProposalResponse, MsgWithdrawProposalResponseAmino, MsgWithdrawProposalResponseSDKType, MsgVote, MsgVoteAmino, MsgVoteSDKType, MsgVoteResponse, MsgVoteResponseAmino, MsgVoteResponseSDKType, MsgExec, MsgExecAmino, MsgExecSDKType, MsgExecResponse, MsgExecResponseAmino, MsgExecResponseSDKType, MsgLeaveGroup, MsgLeaveGroupAmino, MsgLeaveGroupSDKType, MsgLeaveGroupResponse, MsgLeaveGroupResponseAmino, MsgLeaveGroupResponseSDKType } from "./tx"; +import { MsgCreateGroup, MsgCreateGroupSDKType, MsgCreateGroupResponse, MsgCreateGroupResponseSDKType, MsgUpdateGroupMembers, MsgUpdateGroupMembersSDKType, MsgUpdateGroupMembersResponse, MsgUpdateGroupMembersResponseSDKType, MsgUpdateGroupAdmin, MsgUpdateGroupAdminSDKType, MsgUpdateGroupAdminResponse, MsgUpdateGroupAdminResponseSDKType, MsgUpdateGroupMetadata, MsgUpdateGroupMetadataSDKType, MsgUpdateGroupMetadataResponse, MsgUpdateGroupMetadataResponseSDKType, MsgCreateGroupPolicy, MsgCreateGroupPolicySDKType, MsgCreateGroupPolicyResponse, MsgCreateGroupPolicyResponseSDKType, MsgCreateGroupWithPolicy, MsgCreateGroupWithPolicySDKType, MsgCreateGroupWithPolicyResponse, MsgCreateGroupWithPolicyResponseSDKType, MsgUpdateGroupPolicyAdmin, MsgUpdateGroupPolicyAdminSDKType, MsgUpdateGroupPolicyAdminResponse, MsgUpdateGroupPolicyAdminResponseSDKType, MsgUpdateGroupPolicyDecisionPolicy, MsgUpdateGroupPolicyDecisionPolicySDKType, MsgUpdateGroupPolicyDecisionPolicyResponse, MsgUpdateGroupPolicyDecisionPolicyResponseSDKType, MsgUpdateGroupPolicyMetadata, MsgUpdateGroupPolicyMetadataSDKType, MsgUpdateGroupPolicyMetadataResponse, MsgUpdateGroupPolicyMetadataResponseSDKType, MsgSubmitProposal, MsgSubmitProposalSDKType, MsgSubmitProposalResponse, MsgSubmitProposalResponseSDKType, MsgWithdrawProposal, MsgWithdrawProposalSDKType, MsgWithdrawProposalResponse, MsgWithdrawProposalResponseSDKType, MsgVote, MsgVoteSDKType, MsgVoteResponse, MsgVoteResponseSDKType, MsgExec, MsgExecSDKType, MsgExecResponse, MsgExecResponseSDKType, MsgLeaveGroup, MsgLeaveGroupSDKType, MsgLeaveGroupResponse, MsgLeaveGroupResponseSDKType } from "./tx"; /** Msg is the cosmos.group.v1 Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/cosmos/group/v1/tx.ts b/__fixtures__/outputv2/cosmos/group/v1/tx.ts index fd0ec52edd..47822437b1 100644 --- a/__fixtures__/outputv2/cosmos/group/v1/tx.ts +++ b/__fixtures__/outputv2/cosmos/group/v1/tx.ts @@ -1,5 +1,5 @@ -import { Member, MemberAmino, MemberSDKType, VoteOption, VoteOptionAmino, VoteOptionSDKType, ThresholdDecisionPolicy, ThresholdDecisionPolicyAmino, ThresholdDecisionPolicySDKType, PercentageDecisionPolicy, PercentageDecisionPolicyAmino, PercentageDecisionPolicySDKType, voteOptionFromJSON, voteOptionToJSON } from "./types"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Member, MemberAmino, MemberSDKType, VoteOption, VoteOptionSDKType, ThresholdDecisionPolicy, ThresholdDecisionPolicyProtoMsg, ThresholdDecisionPolicySDKType, PercentageDecisionPolicy, PercentageDecisionPolicyProtoMsg, PercentageDecisionPolicySDKType, voteOptionFromJSON, voteOptionToJSON } from "./types"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, Long } from "../../../helpers"; export const protobufPackage = "cosmos.group.v1"; @@ -309,6 +309,10 @@ export interface MsgCreateGroupPolicyProtoMsg { typeUrl: "/cosmos.group.v1.MsgCreateGroupPolicy"; value: Uint8Array; } +export type MsgCreateGroupPolicyEncoded = Omit & { + /** decision_policy specifies the group policy's decision policy. */ + decisionPolicy?: ThresholdDecisionPolicyProtoMsg | PercentageDecisionPolicyProtoMsg | AnyProtoMsg | undefined; +}; /** MsgCreateGroupPolicy is the Msg/CreateGroupPolicy request type. */ export interface MsgCreateGroupPolicyAmino { @@ -334,7 +338,7 @@ export interface MsgCreateGroupPolicySDKType { admin: string; group_id: Long; metadata: string; - decision_policy?: AnySDKType; + decision_policy?: ThresholdDecisionPolicySDKType | PercentageDecisionPolicySDKType | AnySDKType | undefined; } /** MsgCreateGroupPolicyResponse is the Msg/CreateGroupPolicy response type. */ @@ -425,6 +429,10 @@ export interface MsgCreateGroupWithPolicyProtoMsg { typeUrl: "/cosmos.group.v1.MsgCreateGroupWithPolicy"; value: Uint8Array; } +export type MsgCreateGroupWithPolicyEncoded = Omit & { + /** decision_policy specifies the group policy's decision policy. */ + decisionPolicy?: ThresholdDecisionPolicyProtoMsg | PercentageDecisionPolicyProtoMsg | AnyProtoMsg | undefined; +}; /** MsgCreateGroupWithPolicy is the Msg/CreateGroupWithPolicy request type. */ export interface MsgCreateGroupWithPolicyAmino { @@ -458,7 +466,7 @@ export interface MsgCreateGroupWithPolicySDKType { group_metadata: string; group_policy_metadata: string; group_policy_as_admin: boolean; - decision_policy?: AnySDKType; + decision_policy?: ThresholdDecisionPolicySDKType | PercentageDecisionPolicySDKType | AnySDKType | undefined; } /** MsgCreateGroupWithPolicyResponse is the Msg/CreateGroupWithPolicy response type. */ @@ -525,6 +533,10 @@ export interface MsgUpdateGroupPolicyDecisionPolicyProtoMsg { typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyDecisionPolicy"; value: Uint8Array; } +export type MsgUpdateGroupPolicyDecisionPolicyEncoded = Omit & { + /** decision_policy is the updated group policy's decision policy. */ + decisionPolicy?: ThresholdDecisionPolicyProtoMsg | PercentageDecisionPolicyProtoMsg | AnyProtoMsg | undefined; +}; /** MsgUpdateGroupPolicyDecisionPolicy is the Msg/UpdateGroupPolicyDecisionPolicy request type. */ export interface MsgUpdateGroupPolicyDecisionPolicyAmino { @@ -546,7 +558,7 @@ export interface MsgUpdateGroupPolicyDecisionPolicyAminoMsg { export interface MsgUpdateGroupPolicyDecisionPolicySDKType { admin: string; address: string; - decision_policy?: AnySDKType; + decision_policy?: ThresholdDecisionPolicySDKType | PercentageDecisionPolicySDKType | AnySDKType | undefined; } /** MsgUpdateGroupPolicyDecisionPolicyResponse is the Msg/UpdateGroupPolicyDecisionPolicy response type. */ diff --git a/__fixtures__/outputv2/cosmos/group/v1/types.ts b/__fixtures__/outputv2/cosmos/group/v1/types.ts index c302e62f8c..f591f91eb3 100644 --- a/__fixtures__/outputv2/cosmos/group/v1/types.ts +++ b/__fixtures__/outputv2/cosmos/group/v1/types.ts @@ -1,6 +1,6 @@ import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../google/protobuf/timestamp"; import { Duration, DurationAmino, DurationSDKType } from "../../../google/protobuf/duration"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { toTimestamp, fromTimestamp, isSet, fromJsonTimestamp, DeepPartial, Long } from "../../../helpers"; export const protobufPackage = "cosmos.group.v1"; @@ -610,6 +610,10 @@ export interface GroupPolicyInfoProtoMsg { typeUrl: "/cosmos.group.v1.GroupPolicyInfo"; value: Uint8Array; } +export type GroupPolicyInfoEncoded = Omit & { + /** decision_policy specifies the group policy's decision policy. */ + decisionPolicy?: ThresholdDecisionPolicyProtoMsg | PercentageDecisionPolicyProtoMsg | AnyProtoMsg | undefined; +}; /** GroupPolicyInfo represents the high-level on-chain information for a group policy. */ export interface GroupPolicyInfoAmino { @@ -649,7 +653,7 @@ export interface GroupPolicyInfoSDKType { admin: string; metadata: string; version: Long; - decision_policy?: AnySDKType; + decision_policy?: ThresholdDecisionPolicySDKType | PercentageDecisionPolicySDKType | AnySDKType | undefined; created_at?: Date; } diff --git a/__fixtures__/outputv2/cosmos/mint/v1beta1/query.lcd.ts b/__fixtures__/outputv2/cosmos/mint/v1beta1/query.lcd.ts index ab1e2b9c20..db7be9cf42 100644 --- a/__fixtures__/outputv2/cosmos/mint/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/cosmos/mint/v1beta1/query.lcd.ts @@ -1,6 +1,6 @@ -import { Params, ParamsAmino, ParamsSDKType } from "./mint"; +import { Params, ParamsSDKType } from "./mint"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryInflationRequest, QueryInflationRequestAmino, QueryInflationRequestSDKType, QueryInflationResponse, QueryInflationResponseAmino, QueryInflationResponseSDKType, QueryAnnualProvisionsRequest, QueryAnnualProvisionsRequestAmino, QueryAnnualProvisionsRequestSDKType, QueryAnnualProvisionsResponse, QueryAnnualProvisionsResponseAmino, QueryAnnualProvisionsResponseSDKType } from "./query"; +import { QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryInflationRequest, QueryInflationRequestSDKType, QueryInflationResponse, QueryInflationResponseSDKType, QueryAnnualProvisionsRequest, QueryAnnualProvisionsRequestSDKType, QueryAnnualProvisionsResponse, QueryAnnualProvisionsResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/cosmos/mint/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/cosmos/mint/v1beta1/query.rpc.Query.ts index aec424e729..60a158b498 100644 --- a/__fixtures__/outputv2/cosmos/mint/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/cosmos/mint/v1beta1/query.rpc.Query.ts @@ -1,8 +1,8 @@ -import { Params, ParamsAmino, ParamsSDKType } from "./mint"; +import { Params, ParamsSDKType } from "./mint"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryInflationRequest, QueryInflationRequestAmino, QueryInflationRequestSDKType, QueryInflationResponse, QueryInflationResponseAmino, QueryInflationResponseSDKType, QueryAnnualProvisionsRequest, QueryAnnualProvisionsRequestAmino, QueryAnnualProvisionsRequestSDKType, QueryAnnualProvisionsResponse, QueryAnnualProvisionsResponseAmino, QueryAnnualProvisionsResponseSDKType } from "./query"; +import { QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryInflationRequest, QueryInflationRequestSDKType, QueryInflationResponse, QueryInflationResponseSDKType, QueryAnnualProvisionsRequest, QueryAnnualProvisionsRequestSDKType, QueryAnnualProvisionsResponse, QueryAnnualProvisionsResponseSDKType } from "./query"; /** Query provides defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/cosmos/nft/v1beta1/nft.ts b/__fixtures__/outputv2/cosmos/nft/v1beta1/nft.ts index 0e34b38934..aa86268841 100644 --- a/__fixtures__/outputv2/cosmos/nft/v1beta1/nft.ts +++ b/__fixtures__/outputv2/cosmos/nft/v1beta1/nft.ts @@ -1,4 +1,4 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.nft.v1beta1"; diff --git a/__fixtures__/outputv2/cosmos/nft/v1beta1/query.lcd.ts b/__fixtures__/outputv2/cosmos/nft/v1beta1/query.lcd.ts index 81937b089d..ee4b887242 100644 --- a/__fixtures__/outputv2/cosmos/nft/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/cosmos/nft/v1beta1/query.lcd.ts @@ -1,8 +1,8 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { NFT, NFTAmino, NFTSDKType, Class, ClassAmino, ClassSDKType } from "./nft"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { NFT, NFTSDKType, Class, ClassSDKType } from "./nft"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryBalanceRequest, QueryBalanceRequestAmino, QueryBalanceRequestSDKType, QueryBalanceResponse, QueryBalanceResponseAmino, QueryBalanceResponseSDKType, QueryOwnerRequest, QueryOwnerRequestAmino, QueryOwnerRequestSDKType, QueryOwnerResponse, QueryOwnerResponseAmino, QueryOwnerResponseSDKType, QuerySupplyRequest, QuerySupplyRequestAmino, QuerySupplyRequestSDKType, QuerySupplyResponse, QuerySupplyResponseAmino, QuerySupplyResponseSDKType, QueryNFTsRequest, QueryNFTsRequestAmino, QueryNFTsRequestSDKType, QueryNFTsResponse, QueryNFTsResponseAmino, QueryNFTsResponseSDKType, QueryNFTRequest, QueryNFTRequestAmino, QueryNFTRequestSDKType, QueryNFTResponse, QueryNFTResponseAmino, QueryNFTResponseSDKType, QueryClassRequest, QueryClassRequestAmino, QueryClassRequestSDKType, QueryClassResponse, QueryClassResponseAmino, QueryClassResponseSDKType, QueryClassesRequest, QueryClassesRequestAmino, QueryClassesRequestSDKType, QueryClassesResponse, QueryClassesResponseAmino, QueryClassesResponseSDKType } from "./query"; +import { QueryBalanceRequest, QueryBalanceRequestSDKType, QueryBalanceResponse, QueryBalanceResponseSDKType, QueryOwnerRequest, QueryOwnerRequestSDKType, QueryOwnerResponse, QueryOwnerResponseSDKType, QuerySupplyRequest, QuerySupplyRequestSDKType, QuerySupplyResponse, QuerySupplyResponseSDKType, QueryNFTsRequest, QueryNFTsRequestSDKType, QueryNFTsResponse, QueryNFTsResponseSDKType, QueryNFTRequest, QueryNFTRequestSDKType, QueryNFTResponse, QueryNFTResponseSDKType, QueryClassRequest, QueryClassRequestSDKType, QueryClassResponse, QueryClassResponseSDKType, QueryClassesRequest, QueryClassesRequestSDKType, QueryClassesResponse, QueryClassesResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/cosmos/nft/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/cosmos/nft/v1beta1/query.rpc.Query.ts index a56c8a6649..f65b9efac6 100644 --- a/__fixtures__/outputv2/cosmos/nft/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/cosmos/nft/v1beta1/query.rpc.Query.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { NFT, NFTAmino, NFTSDKType, Class, ClassAmino, ClassSDKType } from "./nft"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { NFT, NFTSDKType, Class, ClassSDKType } from "./nft"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryBalanceRequest, QueryBalanceRequestAmino, QueryBalanceRequestSDKType, QueryBalanceResponse, QueryBalanceResponseAmino, QueryBalanceResponseSDKType, QueryOwnerRequest, QueryOwnerRequestAmino, QueryOwnerRequestSDKType, QueryOwnerResponse, QueryOwnerResponseAmino, QueryOwnerResponseSDKType, QuerySupplyRequest, QuerySupplyRequestAmino, QuerySupplyRequestSDKType, QuerySupplyResponse, QuerySupplyResponseAmino, QuerySupplyResponseSDKType, QueryNFTsRequest, QueryNFTsRequestAmino, QueryNFTsRequestSDKType, QueryNFTsResponse, QueryNFTsResponseAmino, QueryNFTsResponseSDKType, QueryNFTRequest, QueryNFTRequestAmino, QueryNFTRequestSDKType, QueryNFTResponse, QueryNFTResponseAmino, QueryNFTResponseSDKType, QueryClassRequest, QueryClassRequestAmino, QueryClassRequestSDKType, QueryClassResponse, QueryClassResponseAmino, QueryClassResponseSDKType, QueryClassesRequest, QueryClassesRequestAmino, QueryClassesRequestSDKType, QueryClassesResponse, QueryClassesResponseAmino, QueryClassesResponseSDKType } from "./query"; +import { QueryBalanceRequest, QueryBalanceRequestSDKType, QueryBalanceResponse, QueryBalanceResponseSDKType, QueryOwnerRequest, QueryOwnerRequestSDKType, QueryOwnerResponse, QueryOwnerResponseSDKType, QuerySupplyRequest, QuerySupplyRequestSDKType, QuerySupplyResponse, QuerySupplyResponseSDKType, QueryNFTsRequest, QueryNFTsRequestSDKType, QueryNFTsResponse, QueryNFTsResponseSDKType, QueryNFTRequest, QueryNFTRequestSDKType, QueryNFTResponse, QueryNFTResponseSDKType, QueryClassRequest, QueryClassRequestSDKType, QueryClassResponse, QueryClassResponseSDKType, QueryClassesRequest, QueryClassesRequestSDKType, QueryClassesResponse, QueryClassesResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/cosmos/nft/v1beta1/tx.amino.ts b/__fixtures__/outputv2/cosmos/nft/v1beta1/tx.amino.ts index e87987dd23..440fa6565b 100644 --- a/__fixtures__/outputv2/cosmos/nft/v1beta1/tx.amino.ts +++ b/__fixtures__/outputv2/cosmos/nft/v1beta1/tx.amino.ts @@ -1,4 +1,4 @@ -import { MsgSend, MsgSendAmino, MsgSendSDKType } from "./tx"; +import { MsgSend, MsgSendSDKType } from "./tx"; export const AminoConverter = { "/cosmos.nft.v1beta1.MsgSend": { aminoType: "cosmos-sdk/MsgNFTSend", diff --git a/__fixtures__/outputv2/cosmos/nft/v1beta1/tx.registry.ts b/__fixtures__/outputv2/cosmos/nft/v1beta1/tx.registry.ts index a5ce34c9d4..577fab14d7 100644 --- a/__fixtures__/outputv2/cosmos/nft/v1beta1/tx.registry.ts +++ b/__fixtures__/outputv2/cosmos/nft/v1beta1/tx.registry.ts @@ -1,5 +1,5 @@ import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgSend, MsgSendAmino, MsgSendSDKType } from "./tx"; +import { MsgSend, MsgSendSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/cosmos.nft.v1beta1.MsgSend", MsgSend]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/cosmos/nft/v1beta1/tx.rpc.msg.ts b/__fixtures__/outputv2/cosmos/nft/v1beta1/tx.rpc.msg.ts index 3ffd88b764..e249952ee3 100644 --- a/__fixtures__/outputv2/cosmos/nft/v1beta1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/cosmos/nft/v1beta1/tx.rpc.msg.ts @@ -1,6 +1,6 @@ import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgSend, MsgSendAmino, MsgSendSDKType, MsgSendResponse, MsgSendResponseAmino, MsgSendResponseSDKType } from "./tx"; +import { MsgSend, MsgSendSDKType, MsgSendResponse, MsgSendResponseSDKType } from "./tx"; /** Msg defines the nft Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/cosmos/params/v1beta1/query.lcd.ts b/__fixtures__/outputv2/cosmos/params/v1beta1/query.lcd.ts index 874ee94bc4..2d20c6ad50 100644 --- a/__fixtures__/outputv2/cosmos/params/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/cosmos/params/v1beta1/query.lcd.ts @@ -1,6 +1,6 @@ -import { ParamChange, ParamChangeAmino, ParamChangeSDKType } from "./params"; +import { ParamChange, ParamChangeSDKType } from "./params"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QuerySubspacesRequest, QuerySubspacesRequestAmino, QuerySubspacesRequestSDKType, QuerySubspacesResponse, QuerySubspacesResponseAmino, QuerySubspacesResponseSDKType } from "./query"; +import { QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QuerySubspacesRequest, QuerySubspacesRequestSDKType, QuerySubspacesResponse, QuerySubspacesResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/cosmos/params/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/cosmos/params/v1beta1/query.rpc.Query.ts index c7ba58ca6e..031d3f87d9 100644 --- a/__fixtures__/outputv2/cosmos/params/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/cosmos/params/v1beta1/query.rpc.Query.ts @@ -1,8 +1,8 @@ -import { ParamChange, ParamChangeAmino, ParamChangeSDKType } from "./params"; +import { ParamChange, ParamChangeSDKType } from "./params"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QuerySubspacesRequest, QuerySubspacesRequestAmino, QuerySubspacesRequestSDKType, QuerySubspacesResponse, QuerySubspacesResponseAmino, QuerySubspacesResponseSDKType } from "./query"; +import { QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QuerySubspacesRequest, QuerySubspacesRequestSDKType, QuerySubspacesResponse, QuerySubspacesResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/cosmos/slashing/v1beta1/query.lcd.ts b/__fixtures__/outputv2/cosmos/slashing/v1beta1/query.lcd.ts index c04b1a2b5a..aac3eb7be6 100644 --- a/__fixtures__/outputv2/cosmos/slashing/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/cosmos/slashing/v1beta1/query.lcd.ts @@ -1,8 +1,8 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Params, ParamsAmino, ParamsSDKType, ValidatorSigningInfo, ValidatorSigningInfoAmino, ValidatorSigningInfoSDKType } from "./slashing"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { Params, ParamsSDKType, ValidatorSigningInfo, ValidatorSigningInfoSDKType } from "./slashing"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QuerySigningInfoRequest, QuerySigningInfoRequestAmino, QuerySigningInfoRequestSDKType, QuerySigningInfoResponse, QuerySigningInfoResponseAmino, QuerySigningInfoResponseSDKType, QuerySigningInfosRequest, QuerySigningInfosRequestAmino, QuerySigningInfosRequestSDKType, QuerySigningInfosResponse, QuerySigningInfosResponseAmino, QuerySigningInfosResponseSDKType } from "./query"; +import { QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QuerySigningInfoRequest, QuerySigningInfoRequestSDKType, QuerySigningInfoResponse, QuerySigningInfoResponseSDKType, QuerySigningInfosRequest, QuerySigningInfosRequestSDKType, QuerySigningInfosResponse, QuerySigningInfosResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/cosmos/slashing/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/cosmos/slashing/v1beta1/query.rpc.Query.ts index 2f1ceb166e..5d5e9ab9e2 100644 --- a/__fixtures__/outputv2/cosmos/slashing/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/cosmos/slashing/v1beta1/query.rpc.Query.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Params, ParamsAmino, ParamsSDKType, ValidatorSigningInfo, ValidatorSigningInfoAmino, ValidatorSigningInfoSDKType } from "./slashing"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { Params, ParamsSDKType, ValidatorSigningInfo, ValidatorSigningInfoSDKType } from "./slashing"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QuerySigningInfoRequest, QuerySigningInfoRequestAmino, QuerySigningInfoRequestSDKType, QuerySigningInfoResponse, QuerySigningInfoResponseAmino, QuerySigningInfoResponseSDKType, QuerySigningInfosRequest, QuerySigningInfosRequestAmino, QuerySigningInfosRequestSDKType, QuerySigningInfosResponse, QuerySigningInfosResponseAmino, QuerySigningInfosResponseSDKType } from "./query"; +import { QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QuerySigningInfoRequest, QuerySigningInfoRequestSDKType, QuerySigningInfoResponse, QuerySigningInfoResponseSDKType, QuerySigningInfosRequest, QuerySigningInfosRequestSDKType, QuerySigningInfosResponse, QuerySigningInfosResponseSDKType } from "./query"; /** Query provides defines the gRPC querier service */ export interface Query { diff --git a/__fixtures__/outputv2/cosmos/slashing/v1beta1/tx.amino.ts b/__fixtures__/outputv2/cosmos/slashing/v1beta1/tx.amino.ts index 200a6ac103..00acf595f9 100644 --- a/__fixtures__/outputv2/cosmos/slashing/v1beta1/tx.amino.ts +++ b/__fixtures__/outputv2/cosmos/slashing/v1beta1/tx.amino.ts @@ -1,4 +1,4 @@ -import { MsgUnjail, MsgUnjailAmino, MsgUnjailSDKType } from "./tx"; +import { MsgUnjail, MsgUnjailSDKType } from "./tx"; export const AminoConverter = { "/cosmos.slashing.v1beta1.MsgUnjail": { aminoType: "cosmos-sdk/MsgUnjail", diff --git a/__fixtures__/outputv2/cosmos/slashing/v1beta1/tx.registry.ts b/__fixtures__/outputv2/cosmos/slashing/v1beta1/tx.registry.ts index 243cf4974a..8fb9783434 100644 --- a/__fixtures__/outputv2/cosmos/slashing/v1beta1/tx.registry.ts +++ b/__fixtures__/outputv2/cosmos/slashing/v1beta1/tx.registry.ts @@ -1,5 +1,5 @@ import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgUnjail, MsgUnjailAmino, MsgUnjailSDKType } from "./tx"; +import { MsgUnjail, MsgUnjailSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/cosmos.slashing.v1beta1.MsgUnjail", MsgUnjail]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/cosmos/slashing/v1beta1/tx.rpc.msg.ts b/__fixtures__/outputv2/cosmos/slashing/v1beta1/tx.rpc.msg.ts index 5fad158bd4..d10d0bb9cf 100644 --- a/__fixtures__/outputv2/cosmos/slashing/v1beta1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/cosmos/slashing/v1beta1/tx.rpc.msg.ts @@ -1,6 +1,6 @@ import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgUnjail, MsgUnjailAmino, MsgUnjailSDKType, MsgUnjailResponse, MsgUnjailResponseAmino, MsgUnjailResponseSDKType } from "./tx"; +import { MsgUnjail, MsgUnjailSDKType, MsgUnjailResponse, MsgUnjailResponseSDKType } from "./tx"; /** Msg defines the slashing Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/cosmos/staking/v1beta1/query.lcd.ts b/__fixtures__/outputv2/cosmos/staking/v1beta1/query.lcd.ts index 87a977094d..5ae6fd4bff 100644 --- a/__fixtures__/outputv2/cosmos/staking/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/cosmos/staking/v1beta1/query.lcd.ts @@ -1,8 +1,8 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Validator, ValidatorAmino, ValidatorSDKType, DelegationResponse, DelegationResponseAmino, DelegationResponseSDKType, UnbondingDelegation, UnbondingDelegationAmino, UnbondingDelegationSDKType, RedelegationResponse, RedelegationResponseAmino, RedelegationResponseSDKType, HistoricalInfo, HistoricalInfoAmino, HistoricalInfoSDKType, Pool, PoolAmino, PoolSDKType, Params, ParamsAmino, ParamsSDKType } from "./staking"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { Validator, ValidatorSDKType, DelegationResponse, DelegationResponseSDKType, UnbondingDelegation, UnbondingDelegationSDKType, RedelegationResponse, RedelegationResponseSDKType, HistoricalInfo, HistoricalInfoSDKType, Pool, PoolSDKType, Params, ParamsSDKType } from "./staking"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryValidatorsRequest, QueryValidatorsRequestAmino, QueryValidatorsRequestSDKType, QueryValidatorsResponse, QueryValidatorsResponseAmino, QueryValidatorsResponseSDKType, QueryValidatorRequest, QueryValidatorRequestAmino, QueryValidatorRequestSDKType, QueryValidatorResponse, QueryValidatorResponseAmino, QueryValidatorResponseSDKType, QueryValidatorDelegationsRequest, QueryValidatorDelegationsRequestAmino, QueryValidatorDelegationsRequestSDKType, QueryValidatorDelegationsResponse, QueryValidatorDelegationsResponseAmino, QueryValidatorDelegationsResponseSDKType, QueryValidatorUnbondingDelegationsRequest, QueryValidatorUnbondingDelegationsRequestAmino, QueryValidatorUnbondingDelegationsRequestSDKType, QueryValidatorUnbondingDelegationsResponse, QueryValidatorUnbondingDelegationsResponseAmino, QueryValidatorUnbondingDelegationsResponseSDKType, QueryDelegationRequest, QueryDelegationRequestAmino, QueryDelegationRequestSDKType, QueryDelegationResponse, QueryDelegationResponseAmino, QueryDelegationResponseSDKType, QueryUnbondingDelegationRequest, QueryUnbondingDelegationRequestAmino, QueryUnbondingDelegationRequestSDKType, QueryUnbondingDelegationResponse, QueryUnbondingDelegationResponseAmino, QueryUnbondingDelegationResponseSDKType, QueryDelegatorDelegationsRequest, QueryDelegatorDelegationsRequestAmino, QueryDelegatorDelegationsRequestSDKType, QueryDelegatorDelegationsResponse, QueryDelegatorDelegationsResponseAmino, QueryDelegatorDelegationsResponseSDKType, QueryDelegatorUnbondingDelegationsRequest, QueryDelegatorUnbondingDelegationsRequestAmino, QueryDelegatorUnbondingDelegationsRequestSDKType, QueryDelegatorUnbondingDelegationsResponse, QueryDelegatorUnbondingDelegationsResponseAmino, QueryDelegatorUnbondingDelegationsResponseSDKType, QueryRedelegationsRequest, QueryRedelegationsRequestAmino, QueryRedelegationsRequestSDKType, QueryRedelegationsResponse, QueryRedelegationsResponseAmino, QueryRedelegationsResponseSDKType, QueryDelegatorValidatorsRequest, QueryDelegatorValidatorsRequestAmino, QueryDelegatorValidatorsRequestSDKType, QueryDelegatorValidatorsResponse, QueryDelegatorValidatorsResponseAmino, QueryDelegatorValidatorsResponseSDKType, QueryDelegatorValidatorRequest, QueryDelegatorValidatorRequestAmino, QueryDelegatorValidatorRequestSDKType, QueryDelegatorValidatorResponse, QueryDelegatorValidatorResponseAmino, QueryDelegatorValidatorResponseSDKType, QueryHistoricalInfoRequest, QueryHistoricalInfoRequestAmino, QueryHistoricalInfoRequestSDKType, QueryHistoricalInfoResponse, QueryHistoricalInfoResponseAmino, QueryHistoricalInfoResponseSDKType, QueryPoolRequest, QueryPoolRequestAmino, QueryPoolRequestSDKType, QueryPoolResponse, QueryPoolResponseAmino, QueryPoolResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType } from "./query"; +import { QueryValidatorsRequest, QueryValidatorsRequestSDKType, QueryValidatorsResponse, QueryValidatorsResponseSDKType, QueryValidatorRequest, QueryValidatorRequestSDKType, QueryValidatorResponse, QueryValidatorResponseSDKType, QueryValidatorDelegationsRequest, QueryValidatorDelegationsRequestSDKType, QueryValidatorDelegationsResponse, QueryValidatorDelegationsResponseSDKType, QueryValidatorUnbondingDelegationsRequest, QueryValidatorUnbondingDelegationsRequestSDKType, QueryValidatorUnbondingDelegationsResponse, QueryValidatorUnbondingDelegationsResponseSDKType, QueryDelegationRequest, QueryDelegationRequestSDKType, QueryDelegationResponse, QueryDelegationResponseSDKType, QueryUnbondingDelegationRequest, QueryUnbondingDelegationRequestSDKType, QueryUnbondingDelegationResponse, QueryUnbondingDelegationResponseSDKType, QueryDelegatorDelegationsRequest, QueryDelegatorDelegationsRequestSDKType, QueryDelegatorDelegationsResponse, QueryDelegatorDelegationsResponseSDKType, QueryDelegatorUnbondingDelegationsRequest, QueryDelegatorUnbondingDelegationsRequestSDKType, QueryDelegatorUnbondingDelegationsResponse, QueryDelegatorUnbondingDelegationsResponseSDKType, QueryRedelegationsRequest, QueryRedelegationsRequestSDKType, QueryRedelegationsResponse, QueryRedelegationsResponseSDKType, QueryDelegatorValidatorsRequest, QueryDelegatorValidatorsRequestSDKType, QueryDelegatorValidatorsResponse, QueryDelegatorValidatorsResponseSDKType, QueryDelegatorValidatorRequest, QueryDelegatorValidatorRequestSDKType, QueryDelegatorValidatorResponse, QueryDelegatorValidatorResponseSDKType, QueryHistoricalInfoRequest, QueryHistoricalInfoRequestSDKType, QueryHistoricalInfoResponse, QueryHistoricalInfoResponseSDKType, QueryPoolRequest, QueryPoolRequestSDKType, QueryPoolResponse, QueryPoolResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/cosmos/staking/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/cosmos/staking/v1beta1/query.rpc.Query.ts index 51c1e54d9e..f6f77d5f97 100644 --- a/__fixtures__/outputv2/cosmos/staking/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/cosmos/staking/v1beta1/query.rpc.Query.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Validator, ValidatorAmino, ValidatorSDKType, DelegationResponse, DelegationResponseAmino, DelegationResponseSDKType, UnbondingDelegation, UnbondingDelegationAmino, UnbondingDelegationSDKType, RedelegationResponse, RedelegationResponseAmino, RedelegationResponseSDKType, HistoricalInfo, HistoricalInfoAmino, HistoricalInfoSDKType, Pool, PoolAmino, PoolSDKType, Params, ParamsAmino, ParamsSDKType } from "./staking"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { Validator, ValidatorSDKType, DelegationResponse, DelegationResponseSDKType, UnbondingDelegation, UnbondingDelegationSDKType, RedelegationResponse, RedelegationResponseSDKType, HistoricalInfo, HistoricalInfoSDKType, Pool, PoolSDKType, Params, ParamsSDKType } from "./staking"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryValidatorsRequest, QueryValidatorsRequestAmino, QueryValidatorsRequestSDKType, QueryValidatorsResponse, QueryValidatorsResponseAmino, QueryValidatorsResponseSDKType, QueryValidatorRequest, QueryValidatorRequestAmino, QueryValidatorRequestSDKType, QueryValidatorResponse, QueryValidatorResponseAmino, QueryValidatorResponseSDKType, QueryValidatorDelegationsRequest, QueryValidatorDelegationsRequestAmino, QueryValidatorDelegationsRequestSDKType, QueryValidatorDelegationsResponse, QueryValidatorDelegationsResponseAmino, QueryValidatorDelegationsResponseSDKType, QueryValidatorUnbondingDelegationsRequest, QueryValidatorUnbondingDelegationsRequestAmino, QueryValidatorUnbondingDelegationsRequestSDKType, QueryValidatorUnbondingDelegationsResponse, QueryValidatorUnbondingDelegationsResponseAmino, QueryValidatorUnbondingDelegationsResponseSDKType, QueryDelegationRequest, QueryDelegationRequestAmino, QueryDelegationRequestSDKType, QueryDelegationResponse, QueryDelegationResponseAmino, QueryDelegationResponseSDKType, QueryUnbondingDelegationRequest, QueryUnbondingDelegationRequestAmino, QueryUnbondingDelegationRequestSDKType, QueryUnbondingDelegationResponse, QueryUnbondingDelegationResponseAmino, QueryUnbondingDelegationResponseSDKType, QueryDelegatorDelegationsRequest, QueryDelegatorDelegationsRequestAmino, QueryDelegatorDelegationsRequestSDKType, QueryDelegatorDelegationsResponse, QueryDelegatorDelegationsResponseAmino, QueryDelegatorDelegationsResponseSDKType, QueryDelegatorUnbondingDelegationsRequest, QueryDelegatorUnbondingDelegationsRequestAmino, QueryDelegatorUnbondingDelegationsRequestSDKType, QueryDelegatorUnbondingDelegationsResponse, QueryDelegatorUnbondingDelegationsResponseAmino, QueryDelegatorUnbondingDelegationsResponseSDKType, QueryRedelegationsRequest, QueryRedelegationsRequestAmino, QueryRedelegationsRequestSDKType, QueryRedelegationsResponse, QueryRedelegationsResponseAmino, QueryRedelegationsResponseSDKType, QueryDelegatorValidatorsRequest, QueryDelegatorValidatorsRequestAmino, QueryDelegatorValidatorsRequestSDKType, QueryDelegatorValidatorsResponse, QueryDelegatorValidatorsResponseAmino, QueryDelegatorValidatorsResponseSDKType, QueryDelegatorValidatorRequest, QueryDelegatorValidatorRequestAmino, QueryDelegatorValidatorRequestSDKType, QueryDelegatorValidatorResponse, QueryDelegatorValidatorResponseAmino, QueryDelegatorValidatorResponseSDKType, QueryHistoricalInfoRequest, QueryHistoricalInfoRequestAmino, QueryHistoricalInfoRequestSDKType, QueryHistoricalInfoResponse, QueryHistoricalInfoResponseAmino, QueryHistoricalInfoResponseSDKType, QueryPoolRequest, QueryPoolRequestAmino, QueryPoolRequestSDKType, QueryPoolResponse, QueryPoolResponseAmino, QueryPoolResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType } from "./query"; +import { QueryValidatorsRequest, QueryValidatorsRequestSDKType, QueryValidatorsResponse, QueryValidatorsResponseSDKType, QueryValidatorRequest, QueryValidatorRequestSDKType, QueryValidatorResponse, QueryValidatorResponseSDKType, QueryValidatorDelegationsRequest, QueryValidatorDelegationsRequestSDKType, QueryValidatorDelegationsResponse, QueryValidatorDelegationsResponseSDKType, QueryValidatorUnbondingDelegationsRequest, QueryValidatorUnbondingDelegationsRequestSDKType, QueryValidatorUnbondingDelegationsResponse, QueryValidatorUnbondingDelegationsResponseSDKType, QueryDelegationRequest, QueryDelegationRequestSDKType, QueryDelegationResponse, QueryDelegationResponseSDKType, QueryUnbondingDelegationRequest, QueryUnbondingDelegationRequestSDKType, QueryUnbondingDelegationResponse, QueryUnbondingDelegationResponseSDKType, QueryDelegatorDelegationsRequest, QueryDelegatorDelegationsRequestSDKType, QueryDelegatorDelegationsResponse, QueryDelegatorDelegationsResponseSDKType, QueryDelegatorUnbondingDelegationsRequest, QueryDelegatorUnbondingDelegationsRequestSDKType, QueryDelegatorUnbondingDelegationsResponse, QueryDelegatorUnbondingDelegationsResponseSDKType, QueryRedelegationsRequest, QueryRedelegationsRequestSDKType, QueryRedelegationsResponse, QueryRedelegationsResponseSDKType, QueryDelegatorValidatorsRequest, QueryDelegatorValidatorsRequestSDKType, QueryDelegatorValidatorsResponse, QueryDelegatorValidatorsResponseSDKType, QueryDelegatorValidatorRequest, QueryDelegatorValidatorRequestSDKType, QueryDelegatorValidatorResponse, QueryDelegatorValidatorResponseSDKType, QueryHistoricalInfoRequest, QueryHistoricalInfoRequestSDKType, QueryHistoricalInfoResponse, QueryHistoricalInfoResponseSDKType, QueryPoolRequest, QueryPoolRequestSDKType, QueryPoolResponse, QueryPoolResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/cosmos/staking/v1beta1/staking.ts b/__fixtures__/outputv2/cosmos/staking/v1beta1/staking.ts index 0546aff488..f116c96dda 100644 --- a/__fixtures__/outputv2/cosmos/staking/v1beta1/staking.ts +++ b/__fixtures__/outputv2/cosmos/staking/v1beta1/staking.ts @@ -1,6 +1,6 @@ import { Header, HeaderAmino, HeaderSDKType } from "../../../tendermint/types/types"; import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../google/protobuf/timestamp"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Duration, DurationAmino, DurationSDKType } from "../../../google/protobuf/duration"; import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; import * as _m0 from "protobufjs/minimal"; @@ -292,6 +292,10 @@ export interface ValidatorProtoMsg { typeUrl: "/cosmos.staking.v1beta1.Validator"; value: Uint8Array; } +export type ValidatorEncoded = Omit & { + /** consensus_pubkey is the consensus public key of the validator, as a Protobuf Any. */ + consensusPubkey?: AnyProtoMsg | undefined; +}; /** * Validator defines a validator, together with the total amount of the @@ -354,7 +358,7 @@ export interface ValidatorAminoMsg { */ export interface ValidatorSDKType { operator_address: string; - consensus_pubkey?: AnySDKType; + consensus_pubkey?: AnySDKType | undefined; jailed: boolean; status: BondStatus; tokens: string; diff --git a/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.amino.ts b/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.amino.ts index d42199bb74..dd41f9ffa5 100644 --- a/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.amino.ts +++ b/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.amino.ts @@ -1,8 +1,8 @@ -import { Description, DescriptionAmino, DescriptionSDKType, CommissionRates, CommissionRatesAmino, CommissionRatesSDKType } from "./staking"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../google/protobuf/timestamp"; -import { MsgCreateValidator, MsgCreateValidatorAmino, MsgCreateValidatorSDKType, MsgEditValidator, MsgEditValidatorAmino, MsgEditValidatorSDKType, MsgDelegate, MsgDelegateAmino, MsgDelegateSDKType, MsgBeginRedelegate, MsgBeginRedelegateAmino, MsgBeginRedelegateSDKType, MsgUndelegate, MsgUndelegateAmino, MsgUndelegateSDKType } from "./tx"; +import { Description, DescriptionSDKType, CommissionRates, CommissionRatesSDKType } from "./staking"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; +import { Timestamp, TimestampSDKType } from "../../../google/protobuf/timestamp"; +import { MsgCreateValidator, MsgCreateValidatorSDKType, MsgEditValidator, MsgEditValidatorSDKType, MsgDelegate, MsgDelegateSDKType, MsgBeginRedelegate, MsgBeginRedelegateSDKType, MsgUndelegate, MsgUndelegateSDKType } from "./tx"; export const AminoConverter = { "/cosmos.staking.v1beta1.MsgCreateValidator": { aminoType: "cosmos-sdk/MsgCreateValidator", diff --git a/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.registry.ts b/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.registry.ts index 1384187a94..fc2cf11ef8 100644 --- a/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.registry.ts +++ b/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.registry.ts @@ -1,9 +1,9 @@ -import { Description, DescriptionAmino, DescriptionSDKType, CommissionRates, CommissionRatesAmino, CommissionRatesSDKType } from "./staking"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../google/protobuf/timestamp"; +import { Description, DescriptionSDKType, CommissionRates, CommissionRatesSDKType } from "./staking"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; +import { Timestamp, TimestampSDKType } from "../../../google/protobuf/timestamp"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgCreateValidator, MsgCreateValidatorAmino, MsgCreateValidatorSDKType, MsgEditValidator, MsgEditValidatorAmino, MsgEditValidatorSDKType, MsgDelegate, MsgDelegateAmino, MsgDelegateSDKType, MsgBeginRedelegate, MsgBeginRedelegateAmino, MsgBeginRedelegateSDKType, MsgUndelegate, MsgUndelegateAmino, MsgUndelegateSDKType } from "./tx"; +import { MsgCreateValidator, MsgCreateValidatorSDKType, MsgEditValidator, MsgEditValidatorSDKType, MsgDelegate, MsgDelegateSDKType, MsgBeginRedelegate, MsgBeginRedelegateSDKType, MsgUndelegate, MsgUndelegateSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/cosmos.staking.v1beta1.MsgCreateValidator", MsgCreateValidator], ["/cosmos.staking.v1beta1.MsgEditValidator", MsgEditValidator], ["/cosmos.staking.v1beta1.MsgDelegate", MsgDelegate], ["/cosmos.staking.v1beta1.MsgBeginRedelegate", MsgBeginRedelegate], ["/cosmos.staking.v1beta1.MsgUndelegate", MsgUndelegate]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.rpc.msg.ts b/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.rpc.msg.ts index 24e3d80b53..4fcec84909 100644 --- a/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.rpc.msg.ts @@ -1,10 +1,10 @@ -import { Description, DescriptionAmino, DescriptionSDKType, CommissionRates, CommissionRatesAmino, CommissionRatesSDKType } from "./staking"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../google/protobuf/timestamp"; +import { Description, DescriptionSDKType, CommissionRates, CommissionRatesSDKType } from "./staking"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; +import { Timestamp, TimestampSDKType } from "../../../google/protobuf/timestamp"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgCreateValidator, MsgCreateValidatorAmino, MsgCreateValidatorSDKType, MsgCreateValidatorResponse, MsgCreateValidatorResponseAmino, MsgCreateValidatorResponseSDKType, MsgEditValidator, MsgEditValidatorAmino, MsgEditValidatorSDKType, MsgEditValidatorResponse, MsgEditValidatorResponseAmino, MsgEditValidatorResponseSDKType, MsgDelegate, MsgDelegateAmino, MsgDelegateSDKType, MsgDelegateResponse, MsgDelegateResponseAmino, MsgDelegateResponseSDKType, MsgBeginRedelegate, MsgBeginRedelegateAmino, MsgBeginRedelegateSDKType, MsgBeginRedelegateResponse, MsgBeginRedelegateResponseAmino, MsgBeginRedelegateResponseSDKType, MsgUndelegate, MsgUndelegateAmino, MsgUndelegateSDKType, MsgUndelegateResponse, MsgUndelegateResponseAmino, MsgUndelegateResponseSDKType } from "./tx"; +import { MsgCreateValidator, MsgCreateValidatorSDKType, MsgCreateValidatorResponse, MsgCreateValidatorResponseSDKType, MsgEditValidator, MsgEditValidatorSDKType, MsgEditValidatorResponse, MsgEditValidatorResponseSDKType, MsgDelegate, MsgDelegateSDKType, MsgDelegateResponse, MsgDelegateResponseSDKType, MsgBeginRedelegate, MsgBeginRedelegateSDKType, MsgBeginRedelegateResponse, MsgBeginRedelegateResponseSDKType, MsgUndelegate, MsgUndelegateSDKType, MsgUndelegateResponse, MsgUndelegateResponseSDKType } from "./tx"; /** Msg defines the staking Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.ts b/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.ts index 3ccd89c155..4bc2ef3362 100644 --- a/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.ts +++ b/__fixtures__/outputv2/cosmos/staking/v1beta1/tx.ts @@ -1,5 +1,5 @@ import { Description, DescriptionAmino, DescriptionSDKType, CommissionRates, CommissionRatesAmino, CommissionRatesSDKType } from "./staking"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../google/protobuf/timestamp"; import * as _m0 from "protobufjs/minimal"; @@ -22,6 +22,9 @@ export interface MsgCreateValidatorProtoMsg { typeUrl: "/cosmos.staking.v1beta1.MsgCreateValidator"; value: Uint8Array; } +export type MsgCreateValidatorEncoded = Omit & { + pubkey?: AnyProtoMsg | undefined; +}; /** MsgCreateValidator defines a SDK message for creating a new validator. */ export interface MsgCreateValidatorAmino { @@ -45,7 +48,7 @@ export interface MsgCreateValidatorSDKType { min_self_delegation: string; delegator_address: string; validator_address: string; - pubkey?: AnySDKType; + pubkey?: AnySDKType | undefined; value?: CoinSDKType; } diff --git a/__fixtures__/outputv2/cosmos/tx/signing/v1beta1/signing.ts b/__fixtures__/outputv2/cosmos/tx/signing/v1beta1/signing.ts index 8836aaf546..4b1636c743 100644 --- a/__fixtures__/outputv2/cosmos/tx/signing/v1beta1/signing.ts +++ b/__fixtures__/outputv2/cosmos/tx/signing/v1beta1/signing.ts @@ -1,5 +1,5 @@ import { CompactBitArray, CompactBitArrayAmino, CompactBitArraySDKType } from "../../../crypto/multisig/v1beta1/multisig"; -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { DeepPartial, Long, isSet, bytesFromBase64, base64FromBytes } from "../../../../helpers"; export const protobufPackage = "cosmos.tx.signing.v1beta1"; diff --git a/__fixtures__/outputv2/cosmos/tx/v1beta1/service.lcd.ts b/__fixtures__/outputv2/cosmos/tx/v1beta1/service.lcd.ts index 83d70245ff..251a52a99b 100644 --- a/__fixtures__/outputv2/cosmos/tx/v1beta1/service.lcd.ts +++ b/__fixtures__/outputv2/cosmos/tx/v1beta1/service.lcd.ts @@ -1,11 +1,11 @@ -import { Tx, TxAmino, TxSDKType } from "./tx"; -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { TxResponse, TxResponseAmino, TxResponseSDKType, GasInfo, GasInfoAmino, GasInfoSDKType, Result, ResultAmino, ResultSDKType } from "../../base/abci/v1beta1/abci"; -import { BlockID, BlockIDAmino, BlockIDSDKType } from "../../../tendermint/types/types"; -import { Block, BlockAmino, BlockSDKType } from "../../../tendermint/types/block"; +import { Tx, TxSDKType } from "./tx"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { TxResponse, TxResponseSDKType, GasInfo, GasInfoSDKType, Result, ResultSDKType } from "../../base/abci/v1beta1/abci"; +import { BlockID, BlockIDSDKType } from "../../../tendermint/types/types"; +import { Block, BlockSDKType } from "../../../tendermint/types/block"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { SimulateRequest, SimulateRequestAmino, SimulateRequestSDKType, SimulateResponse, SimulateResponseAmino, SimulateResponseSDKType, GetTxRequest, GetTxRequestAmino, GetTxRequestSDKType, GetTxResponse, GetTxResponseAmino, GetTxResponseSDKType, BroadcastTxRequest, BroadcastTxRequestAmino, BroadcastTxRequestSDKType, BroadcastTxResponse, BroadcastTxResponseAmino, BroadcastTxResponseSDKType, GetTxsEventRequest, GetTxsEventRequestAmino, GetTxsEventRequestSDKType, GetTxsEventResponse, GetTxsEventResponseAmino, GetTxsEventResponseSDKType, GetBlockWithTxsRequest, GetBlockWithTxsRequestAmino, GetBlockWithTxsRequestSDKType, GetBlockWithTxsResponse, GetBlockWithTxsResponseAmino, GetBlockWithTxsResponseSDKType } from "./service"; +import { SimulateRequest, SimulateRequestSDKType, SimulateResponse, SimulateResponseSDKType, GetTxRequest, GetTxRequestSDKType, GetTxResponse, GetTxResponseSDKType, BroadcastTxRequest, BroadcastTxRequestSDKType, BroadcastTxResponse, BroadcastTxResponseSDKType, GetTxsEventRequest, GetTxsEventRequestSDKType, GetTxsEventResponse, GetTxsEventResponseSDKType, GetBlockWithTxsRequest, GetBlockWithTxsRequestSDKType, GetBlockWithTxsResponse, GetBlockWithTxsResponseSDKType } from "./service"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/cosmos/tx/v1beta1/service.rpc.Service.ts b/__fixtures__/outputv2/cosmos/tx/v1beta1/service.rpc.Service.ts index 5048b07fcf..2f2cedc30a 100644 --- a/__fixtures__/outputv2/cosmos/tx/v1beta1/service.rpc.Service.ts +++ b/__fixtures__/outputv2/cosmos/tx/v1beta1/service.rpc.Service.ts @@ -1,12 +1,12 @@ -import { Tx, TxAmino, TxSDKType } from "./tx"; -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { TxResponse, TxResponseAmino, TxResponseSDKType, GasInfo, GasInfoAmino, GasInfoSDKType, Result, ResultAmino, ResultSDKType } from "../../base/abci/v1beta1/abci"; -import { BlockID, BlockIDAmino, BlockIDSDKType } from "../../../tendermint/types/types"; -import { Block, BlockAmino, BlockSDKType } from "../../../tendermint/types/block"; +import { Tx, TxSDKType } from "./tx"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; +import { TxResponse, TxResponseSDKType, GasInfo, GasInfoSDKType, Result, ResultSDKType } from "../../base/abci/v1beta1/abci"; +import { BlockID, BlockIDSDKType } from "../../../tendermint/types/types"; +import { Block, BlockSDKType } from "../../../tendermint/types/block"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { SimulateRequest, SimulateRequestAmino, SimulateRequestSDKType, SimulateResponse, SimulateResponseAmino, SimulateResponseSDKType, GetTxRequest, GetTxRequestAmino, GetTxRequestSDKType, GetTxResponse, GetTxResponseAmino, GetTxResponseSDKType, BroadcastTxRequest, BroadcastTxRequestAmino, BroadcastTxRequestSDKType, BroadcastTxResponse, BroadcastTxResponseAmino, BroadcastTxResponseSDKType, GetTxsEventRequest, GetTxsEventRequestAmino, GetTxsEventRequestSDKType, GetTxsEventResponse, GetTxsEventResponseAmino, GetTxsEventResponseSDKType, GetBlockWithTxsRequest, GetBlockWithTxsRequestAmino, GetBlockWithTxsRequestSDKType, GetBlockWithTxsResponse, GetBlockWithTxsResponseAmino, GetBlockWithTxsResponseSDKType } from "./service"; +import { SimulateRequest, SimulateRequestSDKType, SimulateResponse, SimulateResponseSDKType, GetTxRequest, GetTxRequestSDKType, GetTxResponse, GetTxResponseSDKType, BroadcastTxRequest, BroadcastTxRequestSDKType, BroadcastTxResponse, BroadcastTxResponseSDKType, GetTxsEventRequest, GetTxsEventRequestSDKType, GetTxsEventResponse, GetTxsEventResponseSDKType, GetBlockWithTxsRequest, GetBlockWithTxsRequestSDKType, GetBlockWithTxsResponse, GetBlockWithTxsResponseSDKType } from "./service"; /** Service defines a gRPC service for interacting with transactions. */ export interface Service { diff --git a/__fixtures__/outputv2/cosmos/tx/v1beta1/tx.ts b/__fixtures__/outputv2/cosmos/tx/v1beta1/tx.ts index 16f1984c05..4f09e0fa8c 100644 --- a/__fixtures__/outputv2/cosmos/tx/v1beta1/tx.ts +++ b/__fixtures__/outputv2/cosmos/tx/v1beta1/tx.ts @@ -1,5 +1,5 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { SignMode, SignModeAmino, SignModeSDKType, signModeFromJSON, signModeToJSON } from "../signing/v1beta1/signing"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { SignMode, SignModeSDKType, signModeFromJSON, signModeToJSON } from "../signing/v1beta1/signing"; import { CompactBitArray, CompactBitArrayAmino, CompactBitArraySDKType } from "../../crypto/multisig/v1beta1/multisig"; import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; import * as _m0 from "protobufjs/minimal"; diff --git a/__fixtures__/outputv2/cosmos/upgrade/v1beta1/query.lcd.ts b/__fixtures__/outputv2/cosmos/upgrade/v1beta1/query.lcd.ts index 5892046759..ab3691b1c0 100644 --- a/__fixtures__/outputv2/cosmos/upgrade/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/cosmos/upgrade/v1beta1/query.lcd.ts @@ -1,6 +1,6 @@ -import { Plan, PlanAmino, PlanSDKType, ModuleVersion, ModuleVersionAmino, ModuleVersionSDKType } from "./upgrade"; +import { Plan, PlanSDKType, ModuleVersion, ModuleVersionSDKType } from "./upgrade"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryCurrentPlanRequest, QueryCurrentPlanRequestAmino, QueryCurrentPlanRequestSDKType, QueryCurrentPlanResponse, QueryCurrentPlanResponseAmino, QueryCurrentPlanResponseSDKType, QueryAppliedPlanRequest, QueryAppliedPlanRequestAmino, QueryAppliedPlanRequestSDKType, QueryAppliedPlanResponse, QueryAppliedPlanResponseAmino, QueryAppliedPlanResponseSDKType, QueryUpgradedConsensusStateRequest, QueryUpgradedConsensusStateRequestAmino, QueryUpgradedConsensusStateRequestSDKType, QueryUpgradedConsensusStateResponse, QueryUpgradedConsensusStateResponseAmino, QueryUpgradedConsensusStateResponseSDKType, QueryModuleVersionsRequest, QueryModuleVersionsRequestAmino, QueryModuleVersionsRequestSDKType, QueryModuleVersionsResponse, QueryModuleVersionsResponseAmino, QueryModuleVersionsResponseSDKType, QueryAuthorityRequest, QueryAuthorityRequestAmino, QueryAuthorityRequestSDKType, QueryAuthorityResponse, QueryAuthorityResponseAmino, QueryAuthorityResponseSDKType } from "./query"; +import { QueryCurrentPlanRequest, QueryCurrentPlanRequestSDKType, QueryCurrentPlanResponse, QueryCurrentPlanResponseSDKType, QueryAppliedPlanRequest, QueryAppliedPlanRequestSDKType, QueryAppliedPlanResponse, QueryAppliedPlanResponseSDKType, QueryUpgradedConsensusStateRequest, QueryUpgradedConsensusStateRequestSDKType, QueryUpgradedConsensusStateResponse, QueryUpgradedConsensusStateResponseSDKType, QueryModuleVersionsRequest, QueryModuleVersionsRequestSDKType, QueryModuleVersionsResponse, QueryModuleVersionsResponseSDKType, QueryAuthorityRequest, QueryAuthorityRequestSDKType, QueryAuthorityResponse, QueryAuthorityResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/cosmos/upgrade/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/cosmos/upgrade/v1beta1/query.rpc.Query.ts index b5e9f984cc..e11f335a40 100644 --- a/__fixtures__/outputv2/cosmos/upgrade/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/cosmos/upgrade/v1beta1/query.rpc.Query.ts @@ -1,8 +1,8 @@ -import { Plan, PlanAmino, PlanSDKType, ModuleVersion, ModuleVersionAmino, ModuleVersionSDKType } from "./upgrade"; +import { Plan, PlanSDKType, ModuleVersion, ModuleVersionSDKType } from "./upgrade"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryCurrentPlanRequest, QueryCurrentPlanRequestAmino, QueryCurrentPlanRequestSDKType, QueryCurrentPlanResponse, QueryCurrentPlanResponseAmino, QueryCurrentPlanResponseSDKType, QueryAppliedPlanRequest, QueryAppliedPlanRequestAmino, QueryAppliedPlanRequestSDKType, QueryAppliedPlanResponse, QueryAppliedPlanResponseAmino, QueryAppliedPlanResponseSDKType, QueryUpgradedConsensusStateRequest, QueryUpgradedConsensusStateRequestAmino, QueryUpgradedConsensusStateRequestSDKType, QueryUpgradedConsensusStateResponse, QueryUpgradedConsensusStateResponseAmino, QueryUpgradedConsensusStateResponseSDKType, QueryModuleVersionsRequest, QueryModuleVersionsRequestAmino, QueryModuleVersionsRequestSDKType, QueryModuleVersionsResponse, QueryModuleVersionsResponseAmino, QueryModuleVersionsResponseSDKType, QueryAuthorityRequest, QueryAuthorityRequestAmino, QueryAuthorityRequestSDKType, QueryAuthorityResponse, QueryAuthorityResponseAmino, QueryAuthorityResponseSDKType } from "./query"; +import { QueryCurrentPlanRequest, QueryCurrentPlanRequestSDKType, QueryCurrentPlanResponse, QueryCurrentPlanResponseSDKType, QueryAppliedPlanRequest, QueryAppliedPlanRequestSDKType, QueryAppliedPlanResponse, QueryAppliedPlanResponseSDKType, QueryUpgradedConsensusStateRequest, QueryUpgradedConsensusStateRequestSDKType, QueryUpgradedConsensusStateResponse, QueryUpgradedConsensusStateResponseSDKType, QueryModuleVersionsRequest, QueryModuleVersionsRequestSDKType, QueryModuleVersionsResponse, QueryModuleVersionsResponseSDKType, QueryAuthorityRequest, QueryAuthorityRequestSDKType, QueryAuthorityResponse, QueryAuthorityResponseSDKType } from "./query"; /** Query defines the gRPC upgrade querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/cosmos/upgrade/v1beta1/tx.amino.ts b/__fixtures__/outputv2/cosmos/upgrade/v1beta1/tx.amino.ts index 7861f7aaea..8bcc698862 100644 --- a/__fixtures__/outputv2/cosmos/upgrade/v1beta1/tx.amino.ts +++ b/__fixtures__/outputv2/cosmos/upgrade/v1beta1/tx.amino.ts @@ -1,5 +1,5 @@ -import { Plan, PlanAmino, PlanSDKType } from "./upgrade"; -import { MsgSoftwareUpgrade, MsgSoftwareUpgradeAmino, MsgSoftwareUpgradeSDKType, MsgCancelUpgrade, MsgCancelUpgradeAmino, MsgCancelUpgradeSDKType } from "./tx"; +import { Plan, PlanSDKType } from "./upgrade"; +import { MsgSoftwareUpgrade, MsgSoftwareUpgradeSDKType, MsgCancelUpgrade, MsgCancelUpgradeSDKType } from "./tx"; export const AminoConverter = { "/cosmos.upgrade.v1beta1.MsgSoftwareUpgrade": { aminoType: "cosmos-sdk/MsgSoftwareUpgrade", diff --git a/__fixtures__/outputv2/cosmos/upgrade/v1beta1/tx.registry.ts b/__fixtures__/outputv2/cosmos/upgrade/v1beta1/tx.registry.ts index 1b64ca2d21..e43dbe0e1a 100644 --- a/__fixtures__/outputv2/cosmos/upgrade/v1beta1/tx.registry.ts +++ b/__fixtures__/outputv2/cosmos/upgrade/v1beta1/tx.registry.ts @@ -1,6 +1,6 @@ -import { Plan, PlanAmino, PlanSDKType } from "./upgrade"; +import { Plan, PlanSDKType } from "./upgrade"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgSoftwareUpgrade, MsgSoftwareUpgradeAmino, MsgSoftwareUpgradeSDKType, MsgCancelUpgrade, MsgCancelUpgradeAmino, MsgCancelUpgradeSDKType } from "./tx"; +import { MsgSoftwareUpgrade, MsgSoftwareUpgradeSDKType, MsgCancelUpgrade, MsgCancelUpgradeSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/cosmos.upgrade.v1beta1.MsgSoftwareUpgrade", MsgSoftwareUpgrade], ["/cosmos.upgrade.v1beta1.MsgCancelUpgrade", MsgCancelUpgrade]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/cosmos/upgrade/v1beta1/tx.rpc.msg.ts b/__fixtures__/outputv2/cosmos/upgrade/v1beta1/tx.rpc.msg.ts index 1b18be802f..d7d8bcf60e 100644 --- a/__fixtures__/outputv2/cosmos/upgrade/v1beta1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/cosmos/upgrade/v1beta1/tx.rpc.msg.ts @@ -1,7 +1,7 @@ -import { Plan, PlanAmino, PlanSDKType } from "./upgrade"; +import { Plan, PlanSDKType } from "./upgrade"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgSoftwareUpgrade, MsgSoftwareUpgradeAmino, MsgSoftwareUpgradeSDKType, MsgSoftwareUpgradeResponse, MsgSoftwareUpgradeResponseAmino, MsgSoftwareUpgradeResponseSDKType, MsgCancelUpgrade, MsgCancelUpgradeAmino, MsgCancelUpgradeSDKType, MsgCancelUpgradeResponse, MsgCancelUpgradeResponseAmino, MsgCancelUpgradeResponseSDKType } from "./tx"; +import { MsgSoftwareUpgrade, MsgSoftwareUpgradeSDKType, MsgSoftwareUpgradeResponse, MsgSoftwareUpgradeResponseSDKType, MsgCancelUpgrade, MsgCancelUpgradeSDKType, MsgCancelUpgradeResponse, MsgCancelUpgradeResponseSDKType } from "./tx"; /** Msg defines the upgrade Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/cosmos/upgrade/v1beta1/upgrade.ts b/__fixtures__/outputv2/cosmos/upgrade/v1beta1/upgrade.ts index 737c0b3179..3e2eaa695e 100644 --- a/__fixtures__/outputv2/cosmos/upgrade/v1beta1/upgrade.ts +++ b/__fixtures__/outputv2/cosmos/upgrade/v1beta1/upgrade.ts @@ -1,5 +1,5 @@ import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../google/protobuf/timestamp"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Long, toTimestamp, fromTimestamp, isSet, fromJsonTimestamp, DeepPartial } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; export const protobufPackage = "cosmos.upgrade.v1beta1"; diff --git a/__fixtures__/outputv2/cosmos/vesting/v1beta1/tx.amino.ts b/__fixtures__/outputv2/cosmos/vesting/v1beta1/tx.amino.ts index 6d74d3bea3..b64efdb05e 100644 --- a/__fixtures__/outputv2/cosmos/vesting/v1beta1/tx.amino.ts +++ b/__fixtures__/outputv2/cosmos/vesting/v1beta1/tx.amino.ts @@ -1,6 +1,6 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { Period, PeriodAmino, PeriodSDKType } from "./vesting"; -import { MsgCreateVestingAccount, MsgCreateVestingAccountAmino, MsgCreateVestingAccountSDKType, MsgCreatePermanentLockedAccount, MsgCreatePermanentLockedAccountAmino, MsgCreatePermanentLockedAccountSDKType, MsgCreatePeriodicVestingAccount, MsgCreatePeriodicVestingAccountAmino, MsgCreatePeriodicVestingAccountSDKType } from "./tx"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; +import { Period, PeriodSDKType } from "./vesting"; +import { MsgCreateVestingAccount, MsgCreateVestingAccountSDKType, MsgCreatePermanentLockedAccount, MsgCreatePermanentLockedAccountSDKType, MsgCreatePeriodicVestingAccount, MsgCreatePeriodicVestingAccountSDKType } from "./tx"; export const AminoConverter = { "/cosmos.vesting.v1beta1.MsgCreateVestingAccount": { aminoType: "cosmos-sdk/MsgCreateVestingAccount", diff --git a/__fixtures__/outputv2/cosmos/vesting/v1beta1/tx.registry.ts b/__fixtures__/outputv2/cosmos/vesting/v1beta1/tx.registry.ts index ebb6be7152..d34cb9c840 100644 --- a/__fixtures__/outputv2/cosmos/vesting/v1beta1/tx.registry.ts +++ b/__fixtures__/outputv2/cosmos/vesting/v1beta1/tx.registry.ts @@ -1,7 +1,7 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { Period, PeriodAmino, PeriodSDKType } from "./vesting"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; +import { Period, PeriodSDKType } from "./vesting"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgCreateVestingAccount, MsgCreateVestingAccountAmino, MsgCreateVestingAccountSDKType, MsgCreatePermanentLockedAccount, MsgCreatePermanentLockedAccountAmino, MsgCreatePermanentLockedAccountSDKType, MsgCreatePeriodicVestingAccount, MsgCreatePeriodicVestingAccountAmino, MsgCreatePeriodicVestingAccountSDKType } from "./tx"; +import { MsgCreateVestingAccount, MsgCreateVestingAccountSDKType, MsgCreatePermanentLockedAccount, MsgCreatePermanentLockedAccountSDKType, MsgCreatePeriodicVestingAccount, MsgCreatePeriodicVestingAccountSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/cosmos.vesting.v1beta1.MsgCreateVestingAccount", MsgCreateVestingAccount], ["/cosmos.vesting.v1beta1.MsgCreatePermanentLockedAccount", MsgCreatePermanentLockedAccount], ["/cosmos.vesting.v1beta1.MsgCreatePeriodicVestingAccount", MsgCreatePeriodicVestingAccount]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/cosmos/vesting/v1beta1/tx.rpc.msg.ts b/__fixtures__/outputv2/cosmos/vesting/v1beta1/tx.rpc.msg.ts index 6dc604f974..51334ba075 100644 --- a/__fixtures__/outputv2/cosmos/vesting/v1beta1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/cosmos/vesting/v1beta1/tx.rpc.msg.ts @@ -1,8 +1,8 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { Period, PeriodAmino, PeriodSDKType } from "./vesting"; +import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; +import { Period, PeriodSDKType } from "./vesting"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgCreateVestingAccount, MsgCreateVestingAccountAmino, MsgCreateVestingAccountSDKType, MsgCreateVestingAccountResponse, MsgCreateVestingAccountResponseAmino, MsgCreateVestingAccountResponseSDKType, MsgCreatePermanentLockedAccount, MsgCreatePermanentLockedAccountAmino, MsgCreatePermanentLockedAccountSDKType, MsgCreatePermanentLockedAccountResponse, MsgCreatePermanentLockedAccountResponseAmino, MsgCreatePermanentLockedAccountResponseSDKType, MsgCreatePeriodicVestingAccount, MsgCreatePeriodicVestingAccountAmino, MsgCreatePeriodicVestingAccountSDKType, MsgCreatePeriodicVestingAccountResponse, MsgCreatePeriodicVestingAccountResponseAmino, MsgCreatePeriodicVestingAccountResponseSDKType } from "./tx"; +import { MsgCreateVestingAccount, MsgCreateVestingAccountSDKType, MsgCreateVestingAccountResponse, MsgCreateVestingAccountResponseSDKType, MsgCreatePermanentLockedAccount, MsgCreatePermanentLockedAccountSDKType, MsgCreatePermanentLockedAccountResponse, MsgCreatePermanentLockedAccountResponseSDKType, MsgCreatePeriodicVestingAccount, MsgCreatePeriodicVestingAccountSDKType, MsgCreatePeriodicVestingAccountResponse, MsgCreatePeriodicVestingAccountResponseSDKType } from "./tx"; /** Msg defines the bank Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/cosmwasm/wasm/v1/query.lcd.ts b/__fixtures__/outputv2/cosmwasm/wasm/v1/query.lcd.ts index 524a2d043e..437be2583f 100644 --- a/__fixtures__/outputv2/cosmwasm/wasm/v1/query.lcd.ts +++ b/__fixtures__/outputv2/cosmwasm/wasm/v1/query.lcd.ts @@ -1,8 +1,8 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { ContractInfo, ContractInfoAmino, ContractInfoSDKType, ContractCodeHistoryEntry, ContractCodeHistoryEntryAmino, ContractCodeHistoryEntrySDKType, Model, ModelAmino, ModelSDKType } from "./types"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { ContractInfo, ContractInfoSDKType, ContractCodeHistoryEntry, ContractCodeHistoryEntrySDKType, Model, ModelSDKType } from "./types"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryContractInfoRequest, QueryContractInfoRequestAmino, QueryContractInfoRequestSDKType, QueryContractInfoResponse, QueryContractInfoResponseAmino, QueryContractInfoResponseSDKType, QueryContractHistoryRequest, QueryContractHistoryRequestAmino, QueryContractHistoryRequestSDKType, QueryContractHistoryResponse, QueryContractHistoryResponseAmino, QueryContractHistoryResponseSDKType, QueryContractsByCodeRequest, QueryContractsByCodeRequestAmino, QueryContractsByCodeRequestSDKType, QueryContractsByCodeResponse, QueryContractsByCodeResponseAmino, QueryContractsByCodeResponseSDKType, QueryAllContractStateRequest, QueryAllContractStateRequestAmino, QueryAllContractStateRequestSDKType, QueryAllContractStateResponse, QueryAllContractStateResponseAmino, QueryAllContractStateResponseSDKType, QueryRawContractStateRequest, QueryRawContractStateRequestAmino, QueryRawContractStateRequestSDKType, QueryRawContractStateResponse, QueryRawContractStateResponseAmino, QueryRawContractStateResponseSDKType, QuerySmartContractStateRequest, QuerySmartContractStateRequestAmino, QuerySmartContractStateRequestSDKType, QuerySmartContractStateResponse, QuerySmartContractStateResponseAmino, QuerySmartContractStateResponseSDKType, QueryCodeRequest, QueryCodeRequestAmino, QueryCodeRequestSDKType, QueryCodeResponse, QueryCodeResponseAmino, QueryCodeResponseSDKType, QueryCodesRequest, QueryCodesRequestAmino, QueryCodesRequestSDKType, QueryCodesResponse, QueryCodesResponseAmino, QueryCodesResponseSDKType, QueryPinnedCodesRequest, QueryPinnedCodesRequestAmino, QueryPinnedCodesRequestSDKType, QueryPinnedCodesResponse, QueryPinnedCodesResponseAmino, QueryPinnedCodesResponseSDKType } from "./query"; +import { QueryContractInfoRequest, QueryContractInfoRequestSDKType, QueryContractInfoResponse, QueryContractInfoResponseSDKType, QueryContractHistoryRequest, QueryContractHistoryRequestSDKType, QueryContractHistoryResponse, QueryContractHistoryResponseSDKType, QueryContractsByCodeRequest, QueryContractsByCodeRequestSDKType, QueryContractsByCodeResponse, QueryContractsByCodeResponseSDKType, QueryAllContractStateRequest, QueryAllContractStateRequestSDKType, QueryAllContractStateResponse, QueryAllContractStateResponseSDKType, QueryRawContractStateRequest, QueryRawContractStateRequestSDKType, QueryRawContractStateResponse, QueryRawContractStateResponseSDKType, QuerySmartContractStateRequest, QuerySmartContractStateRequestSDKType, QuerySmartContractStateResponse, QuerySmartContractStateResponseSDKType, QueryCodeRequest, QueryCodeRequestSDKType, QueryCodeResponse, QueryCodeResponseSDKType, QueryCodesRequest, QueryCodesRequestSDKType, QueryCodesResponse, QueryCodesResponseSDKType, QueryPinnedCodesRequest, QueryPinnedCodesRequestSDKType, QueryPinnedCodesResponse, QueryPinnedCodesResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/cosmwasm/wasm/v1/query.rpc.Query.ts b/__fixtures__/outputv2/cosmwasm/wasm/v1/query.rpc.Query.ts index ff2807d1bd..d8625e547e 100644 --- a/__fixtures__/outputv2/cosmwasm/wasm/v1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/cosmwasm/wasm/v1/query.rpc.Query.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { ContractInfo, ContractInfoAmino, ContractInfoSDKType, ContractCodeHistoryEntry, ContractCodeHistoryEntryAmino, ContractCodeHistoryEntrySDKType, Model, ModelAmino, ModelSDKType } from "./types"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { ContractInfo, ContractInfoSDKType, ContractCodeHistoryEntry, ContractCodeHistoryEntrySDKType, Model, ModelSDKType } from "./types"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryContractInfoRequest, QueryContractInfoRequestAmino, QueryContractInfoRequestSDKType, QueryContractInfoResponse, QueryContractInfoResponseAmino, QueryContractInfoResponseSDKType, QueryContractHistoryRequest, QueryContractHistoryRequestAmino, QueryContractHistoryRequestSDKType, QueryContractHistoryResponse, QueryContractHistoryResponseAmino, QueryContractHistoryResponseSDKType, QueryContractsByCodeRequest, QueryContractsByCodeRequestAmino, QueryContractsByCodeRequestSDKType, QueryContractsByCodeResponse, QueryContractsByCodeResponseAmino, QueryContractsByCodeResponseSDKType, QueryAllContractStateRequest, QueryAllContractStateRequestAmino, QueryAllContractStateRequestSDKType, QueryAllContractStateResponse, QueryAllContractStateResponseAmino, QueryAllContractStateResponseSDKType, QueryRawContractStateRequest, QueryRawContractStateRequestAmino, QueryRawContractStateRequestSDKType, QueryRawContractStateResponse, QueryRawContractStateResponseAmino, QueryRawContractStateResponseSDKType, QuerySmartContractStateRequest, QuerySmartContractStateRequestAmino, QuerySmartContractStateRequestSDKType, QuerySmartContractStateResponse, QuerySmartContractStateResponseAmino, QuerySmartContractStateResponseSDKType, QueryCodeRequest, QueryCodeRequestAmino, QueryCodeRequestSDKType, QueryCodeResponse, QueryCodeResponseAmino, QueryCodeResponseSDKType, QueryCodesRequest, QueryCodesRequestAmino, QueryCodesRequestSDKType, QueryCodesResponse, QueryCodesResponseAmino, QueryCodesResponseSDKType, QueryPinnedCodesRequest, QueryPinnedCodesRequestAmino, QueryPinnedCodesRequestSDKType, QueryPinnedCodesResponse, QueryPinnedCodesResponseAmino, QueryPinnedCodesResponseSDKType } from "./query"; +import { QueryContractInfoRequest, QueryContractInfoRequestSDKType, QueryContractInfoResponse, QueryContractInfoResponseSDKType, QueryContractHistoryRequest, QueryContractHistoryRequestSDKType, QueryContractHistoryResponse, QueryContractHistoryResponseSDKType, QueryContractsByCodeRequest, QueryContractsByCodeRequestSDKType, QueryContractsByCodeResponse, QueryContractsByCodeResponseSDKType, QueryAllContractStateRequest, QueryAllContractStateRequestSDKType, QueryAllContractStateResponse, QueryAllContractStateResponseSDKType, QueryRawContractStateRequest, QueryRawContractStateRequestSDKType, QueryRawContractStateResponse, QueryRawContractStateResponseSDKType, QuerySmartContractStateRequest, QuerySmartContractStateRequestSDKType, QuerySmartContractStateResponse, QuerySmartContractStateResponseSDKType, QueryCodeRequest, QueryCodeRequestSDKType, QueryCodeResponse, QueryCodeResponseSDKType, QueryCodesRequest, QueryCodesRequestSDKType, QueryCodesResponse, QueryCodesResponseSDKType, QueryPinnedCodesRequest, QueryPinnedCodesRequestSDKType, QueryPinnedCodesResponse, QueryPinnedCodesResponseSDKType } from "./query"; /** Query provides defines the gRPC querier service */ export interface Query { diff --git a/__fixtures__/outputv2/cosmwasm/wasm/v1/tx.amino.ts b/__fixtures__/outputv2/cosmwasm/wasm/v1/tx.amino.ts index 392e01d783..800a92e7a3 100644 --- a/__fixtures__/outputv2/cosmwasm/wasm/v1/tx.amino.ts +++ b/__fixtures__/outputv2/cosmwasm/wasm/v1/tx.amino.ts @@ -1,6 +1,6 @@ -import { AccessConfig, AccessConfigAmino, AccessConfigSDKType } from "./types"; -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { MsgStoreCode, MsgStoreCodeAmino, MsgStoreCodeSDKType, MsgInstantiateContract, MsgInstantiateContractAmino, MsgInstantiateContractSDKType, MsgExecuteContract, MsgExecuteContractAmino, MsgExecuteContractSDKType, MsgMigrateContract, MsgMigrateContractAmino, MsgMigrateContractSDKType, MsgUpdateAdmin, MsgUpdateAdminAmino, MsgUpdateAdminSDKType, MsgClearAdmin, MsgClearAdminAmino, MsgClearAdminSDKType } from "./tx"; +import { AccessConfig, AccessConfigSDKType } from "./types"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { MsgStoreCode, MsgStoreCodeSDKType, MsgInstantiateContract, MsgInstantiateContractSDKType, MsgExecuteContract, MsgExecuteContractSDKType, MsgMigrateContract, MsgMigrateContractSDKType, MsgUpdateAdmin, MsgUpdateAdminSDKType, MsgClearAdmin, MsgClearAdminSDKType } from "./tx"; export const AminoConverter = { "/cosmwasm.wasm.v1.MsgStoreCode": { aminoType: "wasm/MsgStoreCode", diff --git a/__fixtures__/outputv2/cosmwasm/wasm/v1/tx.registry.ts b/__fixtures__/outputv2/cosmwasm/wasm/v1/tx.registry.ts index 80ca0819af..805b276e5c 100644 --- a/__fixtures__/outputv2/cosmwasm/wasm/v1/tx.registry.ts +++ b/__fixtures__/outputv2/cosmwasm/wasm/v1/tx.registry.ts @@ -1,7 +1,7 @@ -import { AccessConfig, AccessConfigAmino, AccessConfigSDKType } from "./types"; -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { AccessConfig, AccessConfigSDKType } from "./types"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgStoreCode, MsgStoreCodeAmino, MsgStoreCodeSDKType, MsgInstantiateContract, MsgInstantiateContractAmino, MsgInstantiateContractSDKType, MsgExecuteContract, MsgExecuteContractAmino, MsgExecuteContractSDKType, MsgMigrateContract, MsgMigrateContractAmino, MsgMigrateContractSDKType, MsgUpdateAdmin, MsgUpdateAdminAmino, MsgUpdateAdminSDKType, MsgClearAdmin, MsgClearAdminAmino, MsgClearAdminSDKType } from "./tx"; +import { MsgStoreCode, MsgStoreCodeSDKType, MsgInstantiateContract, MsgInstantiateContractSDKType, MsgExecuteContract, MsgExecuteContractSDKType, MsgMigrateContract, MsgMigrateContractSDKType, MsgUpdateAdmin, MsgUpdateAdminSDKType, MsgClearAdmin, MsgClearAdminSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/cosmwasm.wasm.v1.MsgStoreCode", MsgStoreCode], ["/cosmwasm.wasm.v1.MsgInstantiateContract", MsgInstantiateContract], ["/cosmwasm.wasm.v1.MsgExecuteContract", MsgExecuteContract], ["/cosmwasm.wasm.v1.MsgMigrateContract", MsgMigrateContract], ["/cosmwasm.wasm.v1.MsgUpdateAdmin", MsgUpdateAdmin], ["/cosmwasm.wasm.v1.MsgClearAdmin", MsgClearAdmin]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/cosmwasm/wasm/v1/tx.rpc.msg.ts b/__fixtures__/outputv2/cosmwasm/wasm/v1/tx.rpc.msg.ts index a2fe96e860..cb8e46a8e3 100644 --- a/__fixtures__/outputv2/cosmwasm/wasm/v1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/cosmwasm/wasm/v1/tx.rpc.msg.ts @@ -1,8 +1,8 @@ -import { AccessConfig, AccessConfigAmino, AccessConfigSDKType } from "./types"; -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { AccessConfig, AccessConfigSDKType } from "./types"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgStoreCode, MsgStoreCodeAmino, MsgStoreCodeSDKType, MsgStoreCodeResponse, MsgStoreCodeResponseAmino, MsgStoreCodeResponseSDKType, MsgInstantiateContract, MsgInstantiateContractAmino, MsgInstantiateContractSDKType, MsgInstantiateContractResponse, MsgInstantiateContractResponseAmino, MsgInstantiateContractResponseSDKType, MsgExecuteContract, MsgExecuteContractAmino, MsgExecuteContractSDKType, MsgExecuteContractResponse, MsgExecuteContractResponseAmino, MsgExecuteContractResponseSDKType, MsgMigrateContract, MsgMigrateContractAmino, MsgMigrateContractSDKType, MsgMigrateContractResponse, MsgMigrateContractResponseAmino, MsgMigrateContractResponseSDKType, MsgUpdateAdmin, MsgUpdateAdminAmino, MsgUpdateAdminSDKType, MsgUpdateAdminResponse, MsgUpdateAdminResponseAmino, MsgUpdateAdminResponseSDKType, MsgClearAdmin, MsgClearAdminAmino, MsgClearAdminSDKType, MsgClearAdminResponse, MsgClearAdminResponseAmino, MsgClearAdminResponseSDKType } from "./tx"; +import { MsgStoreCode, MsgStoreCodeSDKType, MsgStoreCodeResponse, MsgStoreCodeResponseSDKType, MsgInstantiateContract, MsgInstantiateContractSDKType, MsgInstantiateContractResponse, MsgInstantiateContractResponseSDKType, MsgExecuteContract, MsgExecuteContractSDKType, MsgExecuteContractResponse, MsgExecuteContractResponseSDKType, MsgMigrateContract, MsgMigrateContractSDKType, MsgMigrateContractResponse, MsgMigrateContractResponseSDKType, MsgUpdateAdmin, MsgUpdateAdminSDKType, MsgUpdateAdminResponse, MsgUpdateAdminResponseSDKType, MsgClearAdmin, MsgClearAdminSDKType, MsgClearAdminResponse, MsgClearAdminResponseSDKType } from "./tx"; /** Msg defines the wasm Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/cosmwasm/wasm/v1/types.ts b/__fixtures__/outputv2/cosmwasm/wasm/v1/types.ts index 6a0e798f04..8e910bfaaf 100644 --- a/__fixtures__/outputv2/cosmwasm/wasm/v1/types.ts +++ b/__fixtures__/outputv2/cosmwasm/wasm/v1/types.ts @@ -1,4 +1,4 @@ -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, Long, bytesFromBase64, base64FromBytes } from "../../../helpers"; import { toUtf8, fromUtf8 } from "@cosmjs/encoding"; @@ -275,6 +275,13 @@ export interface ContractInfoProtoMsg { typeUrl: "/cosmwasm.wasm.v1.ContractInfo"; value: Uint8Array; } +export type ContractInfoEncoded = Omit & { + /** + * Extension is an extension point to store custom metadata within the + * persistence model. + */ + extension?: AnyProtoMsg | undefined; +}; /** ContractInfo stores a WASM contract instance */ export interface ContractInfoAmino { @@ -317,7 +324,7 @@ export interface ContractInfoSDKType { label: string; created?: AbsoluteTxPositionSDKType; ibc_port_id: string; - extension?: AnySDKType; + extension?: AnySDKType | undefined; } /** ContractCodeHistoryEntry metadata to a contract. */ diff --git a/__fixtures__/outputv2/evmos/claims/v1/query.lcd.ts b/__fixtures__/outputv2/evmos/claims/v1/query.lcd.ts index 97fc5d5313..96f0eb90a8 100644 --- a/__fixtures__/outputv2/evmos/claims/v1/query.lcd.ts +++ b/__fixtures__/outputv2/evmos/claims/v1/query.lcd.ts @@ -1,10 +1,10 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; -import { ClaimsRecordAddress, ClaimsRecordAddressAmino, ClaimsRecordAddressSDKType, Claim, ClaimAmino, ClaimSDKType } from "./claims"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { Params, ParamsSDKType } from "./genesis"; +import { ClaimsRecordAddress, ClaimsRecordAddressSDKType, Claim, ClaimSDKType } from "./claims"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryTotalUnclaimedRequest, QueryTotalUnclaimedRequestAmino, QueryTotalUnclaimedRequestSDKType, QueryTotalUnclaimedResponse, QueryTotalUnclaimedResponseAmino, QueryTotalUnclaimedResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryClaimsRecordsRequest, QueryClaimsRecordsRequestAmino, QueryClaimsRecordsRequestSDKType, QueryClaimsRecordsResponse, QueryClaimsRecordsResponseAmino, QueryClaimsRecordsResponseSDKType, QueryClaimsRecordRequest, QueryClaimsRecordRequestAmino, QueryClaimsRecordRequestSDKType, QueryClaimsRecordResponse, QueryClaimsRecordResponseAmino, QueryClaimsRecordResponseSDKType } from "./query"; +import { QueryTotalUnclaimedRequest, QueryTotalUnclaimedRequestSDKType, QueryTotalUnclaimedResponse, QueryTotalUnclaimedResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryClaimsRecordsRequest, QueryClaimsRecordsRequestSDKType, QueryClaimsRecordsResponse, QueryClaimsRecordsResponseSDKType, QueryClaimsRecordRequest, QueryClaimsRecordRequestSDKType, QueryClaimsRecordResponse, QueryClaimsRecordResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/evmos/claims/v1/query.rpc.Query.ts b/__fixtures__/outputv2/evmos/claims/v1/query.rpc.Query.ts index 83dae7873d..5d4573a6d5 100644 --- a/__fixtures__/outputv2/evmos/claims/v1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/evmos/claims/v1/query.rpc.Query.ts @@ -1,11 +1,11 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; -import { ClaimsRecordAddress, ClaimsRecordAddressAmino, ClaimsRecordAddressSDKType, Claim, ClaimAmino, ClaimSDKType } from "./claims"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { Params, ParamsSDKType } from "./genesis"; +import { ClaimsRecordAddress, ClaimsRecordAddressSDKType, Claim, ClaimSDKType } from "./claims"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryTotalUnclaimedRequest, QueryTotalUnclaimedRequestAmino, QueryTotalUnclaimedRequestSDKType, QueryTotalUnclaimedResponse, QueryTotalUnclaimedResponseAmino, QueryTotalUnclaimedResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryClaimsRecordsRequest, QueryClaimsRecordsRequestAmino, QueryClaimsRecordsRequestSDKType, QueryClaimsRecordsResponse, QueryClaimsRecordsResponseAmino, QueryClaimsRecordsResponseSDKType, QueryClaimsRecordRequest, QueryClaimsRecordRequestAmino, QueryClaimsRecordRequestSDKType, QueryClaimsRecordResponse, QueryClaimsRecordResponseAmino, QueryClaimsRecordResponseSDKType } from "./query"; +import { QueryTotalUnclaimedRequest, QueryTotalUnclaimedRequestSDKType, QueryTotalUnclaimedResponse, QueryTotalUnclaimedResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryClaimsRecordsRequest, QueryClaimsRecordsRequestSDKType, QueryClaimsRecordsResponse, QueryClaimsRecordsResponseSDKType, QueryClaimsRecordRequest, QueryClaimsRecordRequestSDKType, QueryClaimsRecordResponse, QueryClaimsRecordResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/evmos/epochs/v1/query.lcd.ts b/__fixtures__/outputv2/evmos/epochs/v1/query.lcd.ts index 410963d175..2afdaf4a48 100644 --- a/__fixtures__/outputv2/evmos/epochs/v1/query.lcd.ts +++ b/__fixtures__/outputv2/evmos/epochs/v1/query.lcd.ts @@ -1,8 +1,8 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { EpochInfo, EpochInfoAmino, EpochInfoSDKType } from "./genesis"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { EpochInfo, EpochInfoSDKType } from "./genesis"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryEpochsInfoRequest, QueryEpochsInfoRequestAmino, QueryEpochsInfoRequestSDKType, QueryEpochsInfoResponse, QueryEpochsInfoResponseAmino, QueryEpochsInfoResponseSDKType, QueryCurrentEpochRequest, QueryCurrentEpochRequestAmino, QueryCurrentEpochRequestSDKType, QueryCurrentEpochResponse, QueryCurrentEpochResponseAmino, QueryCurrentEpochResponseSDKType } from "./query"; +import { QueryEpochsInfoRequest, QueryEpochsInfoRequestSDKType, QueryEpochsInfoResponse, QueryEpochsInfoResponseSDKType, QueryCurrentEpochRequest, QueryCurrentEpochRequestSDKType, QueryCurrentEpochResponse, QueryCurrentEpochResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/evmos/epochs/v1/query.rpc.Query.ts b/__fixtures__/outputv2/evmos/epochs/v1/query.rpc.Query.ts index 6bff8e146b..aa0ebc275a 100644 --- a/__fixtures__/outputv2/evmos/epochs/v1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/evmos/epochs/v1/query.rpc.Query.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { EpochInfo, EpochInfoAmino, EpochInfoSDKType } from "./genesis"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { EpochInfo, EpochInfoSDKType } from "./genesis"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryEpochsInfoRequest, QueryEpochsInfoRequestAmino, QueryEpochsInfoRequestSDKType, QueryEpochsInfoResponse, QueryEpochsInfoResponseAmino, QueryEpochsInfoResponseSDKType, QueryCurrentEpochRequest, QueryCurrentEpochRequestAmino, QueryCurrentEpochRequestSDKType, QueryCurrentEpochResponse, QueryCurrentEpochResponseAmino, QueryCurrentEpochResponseSDKType } from "./query"; +import { QueryEpochsInfoRequest, QueryEpochsInfoRequestSDKType, QueryEpochsInfoResponse, QueryEpochsInfoResponseSDKType, QueryCurrentEpochRequest, QueryCurrentEpochRequestSDKType, QueryCurrentEpochResponse, QueryCurrentEpochResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/evmos/erc20/v1/query.lcd.ts b/__fixtures__/outputv2/evmos/erc20/v1/query.lcd.ts index 5e4f05f960..4bee616b54 100644 --- a/__fixtures__/outputv2/evmos/erc20/v1/query.lcd.ts +++ b/__fixtures__/outputv2/evmos/erc20/v1/query.lcd.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { TokenPair, TokenPairAmino, TokenPairSDKType } from "./erc20"; -import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { TokenPair, TokenPairSDKType } from "./erc20"; +import { Params, ParamsSDKType } from "./genesis"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryTokenPairsRequest, QueryTokenPairsRequestAmino, QueryTokenPairsRequestSDKType, QueryTokenPairsResponse, QueryTokenPairsResponseAmino, QueryTokenPairsResponseSDKType, QueryTokenPairRequest, QueryTokenPairRequestAmino, QueryTokenPairRequestSDKType, QueryTokenPairResponse, QueryTokenPairResponseAmino, QueryTokenPairResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType } from "./query"; +import { QueryTokenPairsRequest, QueryTokenPairsRequestSDKType, QueryTokenPairsResponse, QueryTokenPairsResponseSDKType, QueryTokenPairRequest, QueryTokenPairRequestSDKType, QueryTokenPairResponse, QueryTokenPairResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/evmos/erc20/v1/query.rpc.Query.ts b/__fixtures__/outputv2/evmos/erc20/v1/query.rpc.Query.ts index 3e4cb4b7ff..3002a8f38e 100644 --- a/__fixtures__/outputv2/evmos/erc20/v1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/evmos/erc20/v1/query.rpc.Query.ts @@ -1,12 +1,12 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { TokenPair, TokenPairAmino, TokenPairSDKType } from "./erc20"; -import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { TokenPair, TokenPairSDKType } from "./erc20"; +import { Params, ParamsSDKType } from "./genesis"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient, ProtobufRpcClient } from "@cosmjs/stargate"; import { ReactQueryParams } from "../../../react-query"; import { useQuery } from "@tanstack/react-query"; -import { QueryTokenPairsRequest, QueryTokenPairsRequestAmino, QueryTokenPairsRequestSDKType, QueryTokenPairsResponse, QueryTokenPairsResponseAmino, QueryTokenPairsResponseSDKType, QueryTokenPairRequest, QueryTokenPairRequestAmino, QueryTokenPairRequestSDKType, QueryTokenPairResponse, QueryTokenPairResponseAmino, QueryTokenPairResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType } from "./query"; +import { QueryTokenPairsRequest, QueryTokenPairsRequestSDKType, QueryTokenPairsResponse, QueryTokenPairsResponseSDKType, QueryTokenPairRequest, QueryTokenPairRequestSDKType, QueryTokenPairResponse, QueryTokenPairResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/evmos/erc20/v1/tx.amino.ts b/__fixtures__/outputv2/evmos/erc20/v1/tx.amino.ts index 4759c2b899..39d6af3d3c 100644 --- a/__fixtures__/outputv2/evmos/erc20/v1/tx.amino.ts +++ b/__fixtures__/outputv2/evmos/erc20/v1/tx.amino.ts @@ -1,5 +1,5 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { MsgConvertCoin, MsgConvertCoinAmino, MsgConvertCoinSDKType, MsgConvertERC20, MsgConvertERC20Amino, MsgConvertERC20SDKType } from "./tx"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { MsgConvertCoin, MsgConvertCoinSDKType, MsgConvertERC20, MsgConvertERC20SDKType } from "./tx"; export const AminoConverter = { "/evmos.erc20.v1.MsgConvertCoin": { aminoType: "/evmos.erc20.v1.MsgConvertCoin", diff --git a/__fixtures__/outputv2/evmos/erc20/v1/tx.registry.ts b/__fixtures__/outputv2/evmos/erc20/v1/tx.registry.ts index c94e5b1b61..f57dc322f6 100644 --- a/__fixtures__/outputv2/evmos/erc20/v1/tx.registry.ts +++ b/__fixtures__/outputv2/evmos/erc20/v1/tx.registry.ts @@ -1,6 +1,6 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgConvertCoin, MsgConvertCoinAmino, MsgConvertCoinSDKType, MsgConvertERC20, MsgConvertERC20Amino, MsgConvertERC20SDKType } from "./tx"; +import { MsgConvertCoin, MsgConvertCoinSDKType, MsgConvertERC20, MsgConvertERC20SDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/evmos.erc20.v1.MsgConvertCoin", MsgConvertCoin], ["/evmos.erc20.v1.MsgConvertERC20", MsgConvertERC20]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/evmos/erc20/v1/tx.rpc.msg.ts b/__fixtures__/outputv2/evmos/erc20/v1/tx.rpc.msg.ts index 4714073820..5a64fd9a40 100644 --- a/__fixtures__/outputv2/evmos/erc20/v1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/evmos/erc20/v1/tx.rpc.msg.ts @@ -1,7 +1,7 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgConvertCoin, MsgConvertCoinAmino, MsgConvertCoinSDKType, MsgConvertCoinResponse, MsgConvertCoinResponseAmino, MsgConvertCoinResponseSDKType, MsgConvertERC20, MsgConvertERC20Amino, MsgConvertERC20SDKType, MsgConvertERC20Response, MsgConvertERC20ResponseAmino, MsgConvertERC20ResponseSDKType } from "./tx"; +import { MsgConvertCoin, MsgConvertCoinSDKType, MsgConvertCoinResponse, MsgConvertCoinResponseSDKType, MsgConvertERC20, MsgConvertERC20SDKType, MsgConvertERC20Response, MsgConvertERC20ResponseSDKType } from "./tx"; /** Msg defines the erc20 Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/evmos/fees/v1/query.lcd.ts b/__fixtures__/outputv2/evmos/fees/v1/query.lcd.ts index b1c600ec49..d2adfc0d41 100644 --- a/__fixtures__/outputv2/evmos/fees/v1/query.lcd.ts +++ b/__fixtures__/outputv2/evmos/fees/v1/query.lcd.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { DevFeeInfo, DevFeeInfoAmino, DevFeeInfoSDKType } from "./fees"; -import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { DevFeeInfo, DevFeeInfoSDKType } from "./fees"; +import { Params, ParamsSDKType } from "./genesis"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryDevFeeInfosRequest, QueryDevFeeInfosRequestAmino, QueryDevFeeInfosRequestSDKType, QueryDevFeeInfosResponse, QueryDevFeeInfosResponseAmino, QueryDevFeeInfosResponseSDKType, QueryDevFeeInfoRequest, QueryDevFeeInfoRequestAmino, QueryDevFeeInfoRequestSDKType, QueryDevFeeInfoResponse, QueryDevFeeInfoResponseAmino, QueryDevFeeInfoResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryDevFeeInfosPerDeployerRequest, QueryDevFeeInfosPerDeployerRequestAmino, QueryDevFeeInfosPerDeployerRequestSDKType, QueryDevFeeInfosPerDeployerResponse, QueryDevFeeInfosPerDeployerResponseAmino, QueryDevFeeInfosPerDeployerResponseSDKType } from "./query"; +import { QueryDevFeeInfosRequest, QueryDevFeeInfosRequestSDKType, QueryDevFeeInfosResponse, QueryDevFeeInfosResponseSDKType, QueryDevFeeInfoRequest, QueryDevFeeInfoRequestSDKType, QueryDevFeeInfoResponse, QueryDevFeeInfoResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryDevFeeInfosPerDeployerRequest, QueryDevFeeInfosPerDeployerRequestSDKType, QueryDevFeeInfosPerDeployerResponse, QueryDevFeeInfosPerDeployerResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/evmos/fees/v1/query.rpc.Query.ts b/__fixtures__/outputv2/evmos/fees/v1/query.rpc.Query.ts index a00592ff6a..32efbef2e5 100644 --- a/__fixtures__/outputv2/evmos/fees/v1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/evmos/fees/v1/query.rpc.Query.ts @@ -1,10 +1,10 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { DevFeeInfo, DevFeeInfoAmino, DevFeeInfoSDKType } from "./fees"; -import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { DevFeeInfo, DevFeeInfoSDKType } from "./fees"; +import { Params, ParamsSDKType } from "./genesis"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryDevFeeInfosRequest, QueryDevFeeInfosRequestAmino, QueryDevFeeInfosRequestSDKType, QueryDevFeeInfosResponse, QueryDevFeeInfosResponseAmino, QueryDevFeeInfosResponseSDKType, QueryDevFeeInfoRequest, QueryDevFeeInfoRequestAmino, QueryDevFeeInfoRequestSDKType, QueryDevFeeInfoResponse, QueryDevFeeInfoResponseAmino, QueryDevFeeInfoResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryDevFeeInfosPerDeployerRequest, QueryDevFeeInfosPerDeployerRequestAmino, QueryDevFeeInfosPerDeployerRequestSDKType, QueryDevFeeInfosPerDeployerResponse, QueryDevFeeInfosPerDeployerResponseAmino, QueryDevFeeInfosPerDeployerResponseSDKType } from "./query"; +import { QueryDevFeeInfosRequest, QueryDevFeeInfosRequestSDKType, QueryDevFeeInfosResponse, QueryDevFeeInfosResponseSDKType, QueryDevFeeInfoRequest, QueryDevFeeInfoRequestSDKType, QueryDevFeeInfoResponse, QueryDevFeeInfoResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryDevFeeInfosPerDeployerRequest, QueryDevFeeInfosPerDeployerRequestSDKType, QueryDevFeeInfosPerDeployerResponse, QueryDevFeeInfosPerDeployerResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/evmos/fees/v1/tx.amino.ts b/__fixtures__/outputv2/evmos/fees/v1/tx.amino.ts index 7e63e214aa..19d5a08b09 100644 --- a/__fixtures__/outputv2/evmos/fees/v1/tx.amino.ts +++ b/__fixtures__/outputv2/evmos/fees/v1/tx.amino.ts @@ -1,4 +1,4 @@ -import { MsgRegisterDevFeeInfo, MsgRegisterDevFeeInfoAmino, MsgRegisterDevFeeInfoSDKType, MsgCancelDevFeeInfo, MsgCancelDevFeeInfoAmino, MsgCancelDevFeeInfoSDKType, MsgUpdateDevFeeInfo, MsgUpdateDevFeeInfoAmino, MsgUpdateDevFeeInfoSDKType } from "./tx"; +import { MsgRegisterDevFeeInfo, MsgRegisterDevFeeInfoSDKType, MsgCancelDevFeeInfo, MsgCancelDevFeeInfoSDKType, MsgUpdateDevFeeInfo, MsgUpdateDevFeeInfoSDKType } from "./tx"; export const AminoConverter = { "/evmos.fees.v1.MsgRegisterDevFeeInfo": { aminoType: "/evmos.fees.v1.MsgRegisterDevFeeInfo", diff --git a/__fixtures__/outputv2/evmos/fees/v1/tx.registry.ts b/__fixtures__/outputv2/evmos/fees/v1/tx.registry.ts index a53281fc0d..f28b0b902a 100644 --- a/__fixtures__/outputv2/evmos/fees/v1/tx.registry.ts +++ b/__fixtures__/outputv2/evmos/fees/v1/tx.registry.ts @@ -1,5 +1,5 @@ import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgRegisterDevFeeInfo, MsgRegisterDevFeeInfoAmino, MsgRegisterDevFeeInfoSDKType, MsgCancelDevFeeInfo, MsgCancelDevFeeInfoAmino, MsgCancelDevFeeInfoSDKType, MsgUpdateDevFeeInfo, MsgUpdateDevFeeInfoAmino, MsgUpdateDevFeeInfoSDKType } from "./tx"; +import { MsgRegisterDevFeeInfo, MsgRegisterDevFeeInfoSDKType, MsgCancelDevFeeInfo, MsgCancelDevFeeInfoSDKType, MsgUpdateDevFeeInfo, MsgUpdateDevFeeInfoSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/evmos.fees.v1.MsgRegisterDevFeeInfo", MsgRegisterDevFeeInfo], ["/evmos.fees.v1.MsgCancelDevFeeInfo", MsgCancelDevFeeInfo], ["/evmos.fees.v1.MsgUpdateDevFeeInfo", MsgUpdateDevFeeInfo]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/evmos/fees/v1/tx.rpc.msg.ts b/__fixtures__/outputv2/evmos/fees/v1/tx.rpc.msg.ts index f2689f28a3..bf9fe574b5 100644 --- a/__fixtures__/outputv2/evmos/fees/v1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/evmos/fees/v1/tx.rpc.msg.ts @@ -1,6 +1,6 @@ import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgRegisterDevFeeInfo, MsgRegisterDevFeeInfoAmino, MsgRegisterDevFeeInfoSDKType, MsgRegisterDevFeeInfoResponse, MsgRegisterDevFeeInfoResponseAmino, MsgRegisterDevFeeInfoResponseSDKType, MsgCancelDevFeeInfo, MsgCancelDevFeeInfoAmino, MsgCancelDevFeeInfoSDKType, MsgCancelDevFeeInfoResponse, MsgCancelDevFeeInfoResponseAmino, MsgCancelDevFeeInfoResponseSDKType, MsgUpdateDevFeeInfo, MsgUpdateDevFeeInfoAmino, MsgUpdateDevFeeInfoSDKType, MsgUpdateDevFeeInfoResponse, MsgUpdateDevFeeInfoResponseAmino, MsgUpdateDevFeeInfoResponseSDKType } from "./tx"; +import { MsgRegisterDevFeeInfo, MsgRegisterDevFeeInfoSDKType, MsgRegisterDevFeeInfoResponse, MsgRegisterDevFeeInfoResponseSDKType, MsgCancelDevFeeInfo, MsgCancelDevFeeInfoSDKType, MsgCancelDevFeeInfoResponse, MsgCancelDevFeeInfoResponseSDKType, MsgUpdateDevFeeInfo, MsgUpdateDevFeeInfoSDKType, MsgUpdateDevFeeInfoResponse, MsgUpdateDevFeeInfoResponseSDKType } from "./tx"; /** Msg defines the fees Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/evmos/incentives/v1/query.lcd.ts b/__fixtures__/outputv2/evmos/incentives/v1/query.lcd.ts index f33062913c..cf1d63a4f5 100644 --- a/__fixtures__/outputv2/evmos/incentives/v1/query.lcd.ts +++ b/__fixtures__/outputv2/evmos/incentives/v1/query.lcd.ts @@ -1,10 +1,10 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { Incentive, IncentiveAmino, IncentiveSDKType, GasMeter, GasMeterAmino, GasMeterSDKType } from "./incentives"; -import { DecCoin, DecCoinAmino, DecCoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { Incentive, IncentiveSDKType, GasMeter, GasMeterSDKType } from "./incentives"; +import { DecCoin, DecCoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { Params, ParamsSDKType } from "./genesis"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryIncentivesRequest, QueryIncentivesRequestAmino, QueryIncentivesRequestSDKType, QueryIncentivesResponse, QueryIncentivesResponseAmino, QueryIncentivesResponseSDKType, QueryIncentiveRequest, QueryIncentiveRequestAmino, QueryIncentiveRequestSDKType, QueryIncentiveResponse, QueryIncentiveResponseAmino, QueryIncentiveResponseSDKType, QueryGasMetersRequest, QueryGasMetersRequestAmino, QueryGasMetersRequestSDKType, QueryGasMetersResponse, QueryGasMetersResponseAmino, QueryGasMetersResponseSDKType, QueryGasMeterRequest, QueryGasMeterRequestAmino, QueryGasMeterRequestSDKType, QueryGasMeterResponse, QueryGasMeterResponseAmino, QueryGasMeterResponseSDKType, QueryAllocationMetersRequest, QueryAllocationMetersRequestAmino, QueryAllocationMetersRequestSDKType, QueryAllocationMetersResponse, QueryAllocationMetersResponseAmino, QueryAllocationMetersResponseSDKType, QueryAllocationMeterRequest, QueryAllocationMeterRequestAmino, QueryAllocationMeterRequestSDKType, QueryAllocationMeterResponse, QueryAllocationMeterResponseAmino, QueryAllocationMeterResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType } from "./query"; +import { QueryIncentivesRequest, QueryIncentivesRequestSDKType, QueryIncentivesResponse, QueryIncentivesResponseSDKType, QueryIncentiveRequest, QueryIncentiveRequestSDKType, QueryIncentiveResponse, QueryIncentiveResponseSDKType, QueryGasMetersRequest, QueryGasMetersRequestSDKType, QueryGasMetersResponse, QueryGasMetersResponseSDKType, QueryGasMeterRequest, QueryGasMeterRequestSDKType, QueryGasMeterResponse, QueryGasMeterResponseSDKType, QueryAllocationMetersRequest, QueryAllocationMetersRequestSDKType, QueryAllocationMetersResponse, QueryAllocationMetersResponseSDKType, QueryAllocationMeterRequest, QueryAllocationMeterRequestSDKType, QueryAllocationMeterResponse, QueryAllocationMeterResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/evmos/incentives/v1/query.rpc.Query.ts b/__fixtures__/outputv2/evmos/incentives/v1/query.rpc.Query.ts index 53305b9327..533db02d46 100644 --- a/__fixtures__/outputv2/evmos/incentives/v1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/evmos/incentives/v1/query.rpc.Query.ts @@ -1,11 +1,11 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { Incentive, IncentiveAmino, IncentiveSDKType, GasMeter, GasMeterAmino, GasMeterSDKType } from "./incentives"; -import { DecCoin, DecCoinAmino, DecCoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { Incentive, IncentiveSDKType, GasMeter, GasMeterSDKType } from "./incentives"; +import { DecCoin, DecCoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { Params, ParamsSDKType } from "./genesis"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryIncentivesRequest, QueryIncentivesRequestAmino, QueryIncentivesRequestSDKType, QueryIncentivesResponse, QueryIncentivesResponseAmino, QueryIncentivesResponseSDKType, QueryIncentiveRequest, QueryIncentiveRequestAmino, QueryIncentiveRequestSDKType, QueryIncentiveResponse, QueryIncentiveResponseAmino, QueryIncentiveResponseSDKType, QueryGasMetersRequest, QueryGasMetersRequestAmino, QueryGasMetersRequestSDKType, QueryGasMetersResponse, QueryGasMetersResponseAmino, QueryGasMetersResponseSDKType, QueryGasMeterRequest, QueryGasMeterRequestAmino, QueryGasMeterRequestSDKType, QueryGasMeterResponse, QueryGasMeterResponseAmino, QueryGasMeterResponseSDKType, QueryAllocationMetersRequest, QueryAllocationMetersRequestAmino, QueryAllocationMetersRequestSDKType, QueryAllocationMetersResponse, QueryAllocationMetersResponseAmino, QueryAllocationMetersResponseSDKType, QueryAllocationMeterRequest, QueryAllocationMeterRequestAmino, QueryAllocationMeterRequestSDKType, QueryAllocationMeterResponse, QueryAllocationMeterResponseAmino, QueryAllocationMeterResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType } from "./query"; +import { QueryIncentivesRequest, QueryIncentivesRequestSDKType, QueryIncentivesResponse, QueryIncentivesResponseSDKType, QueryIncentiveRequest, QueryIncentiveRequestSDKType, QueryIncentiveResponse, QueryIncentiveResponseSDKType, QueryGasMetersRequest, QueryGasMetersRequestSDKType, QueryGasMetersResponse, QueryGasMetersResponseSDKType, QueryGasMeterRequest, QueryGasMeterRequestSDKType, QueryGasMeterResponse, QueryGasMeterResponseSDKType, QueryAllocationMetersRequest, QueryAllocationMetersRequestSDKType, QueryAllocationMetersResponse, QueryAllocationMetersResponseSDKType, QueryAllocationMeterRequest, QueryAllocationMeterRequestSDKType, QueryAllocationMeterResponse, QueryAllocationMeterResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/evmos/inflation/v1/query.lcd.ts b/__fixtures__/outputv2/evmos/inflation/v1/query.lcd.ts index eddb3dc248..f5f32a3aa8 100644 --- a/__fixtures__/outputv2/evmos/inflation/v1/query.lcd.ts +++ b/__fixtures__/outputv2/evmos/inflation/v1/query.lcd.ts @@ -1,7 +1,7 @@ -import { DecCoin, DecCoinAmino, DecCoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; +import { DecCoin, DecCoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { Params, ParamsSDKType } from "./genesis"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryPeriodRequest, QueryPeriodRequestAmino, QueryPeriodRequestSDKType, QueryPeriodResponse, QueryPeriodResponseAmino, QueryPeriodResponseSDKType, QueryEpochMintProvisionRequest, QueryEpochMintProvisionRequestAmino, QueryEpochMintProvisionRequestSDKType, QueryEpochMintProvisionResponse, QueryEpochMintProvisionResponseAmino, QueryEpochMintProvisionResponseSDKType, QuerySkippedEpochsRequest, QuerySkippedEpochsRequestAmino, QuerySkippedEpochsRequestSDKType, QuerySkippedEpochsResponse, QuerySkippedEpochsResponseAmino, QuerySkippedEpochsResponseSDKType, QueryCirculatingSupplyRequest, QueryCirculatingSupplyRequestAmino, QueryCirculatingSupplyRequestSDKType, QueryCirculatingSupplyResponse, QueryCirculatingSupplyResponseAmino, QueryCirculatingSupplyResponseSDKType, QueryInflationRateRequest, QueryInflationRateRequestAmino, QueryInflationRateRequestSDKType, QueryInflationRateResponse, QueryInflationRateResponseAmino, QueryInflationRateResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType } from "./query"; +import { QueryPeriodRequest, QueryPeriodRequestSDKType, QueryPeriodResponse, QueryPeriodResponseSDKType, QueryEpochMintProvisionRequest, QueryEpochMintProvisionRequestSDKType, QueryEpochMintProvisionResponse, QueryEpochMintProvisionResponseSDKType, QuerySkippedEpochsRequest, QuerySkippedEpochsRequestSDKType, QuerySkippedEpochsResponse, QuerySkippedEpochsResponseSDKType, QueryCirculatingSupplyRequest, QueryCirculatingSupplyRequestSDKType, QueryCirculatingSupplyResponse, QueryCirculatingSupplyResponseSDKType, QueryInflationRateRequest, QueryInflationRateRequestSDKType, QueryInflationRateResponse, QueryInflationRateResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/evmos/inflation/v1/query.rpc.Query.ts b/__fixtures__/outputv2/evmos/inflation/v1/query.rpc.Query.ts index 175cf89570..2e7ef07a3d 100644 --- a/__fixtures__/outputv2/evmos/inflation/v1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/evmos/inflation/v1/query.rpc.Query.ts @@ -1,9 +1,9 @@ -import { DecCoin, DecCoinAmino, DecCoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; +import { DecCoin, DecCoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { Params, ParamsSDKType } from "./genesis"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryPeriodRequest, QueryPeriodRequestAmino, QueryPeriodRequestSDKType, QueryPeriodResponse, QueryPeriodResponseAmino, QueryPeriodResponseSDKType, QueryEpochMintProvisionRequest, QueryEpochMintProvisionRequestAmino, QueryEpochMintProvisionRequestSDKType, QueryEpochMintProvisionResponse, QueryEpochMintProvisionResponseAmino, QueryEpochMintProvisionResponseSDKType, QuerySkippedEpochsRequest, QuerySkippedEpochsRequestAmino, QuerySkippedEpochsRequestSDKType, QuerySkippedEpochsResponse, QuerySkippedEpochsResponseAmino, QuerySkippedEpochsResponseSDKType, QueryCirculatingSupplyRequest, QueryCirculatingSupplyRequestAmino, QueryCirculatingSupplyRequestSDKType, QueryCirculatingSupplyResponse, QueryCirculatingSupplyResponseAmino, QueryCirculatingSupplyResponseSDKType, QueryInflationRateRequest, QueryInflationRateRequestAmino, QueryInflationRateRequestSDKType, QueryInflationRateResponse, QueryInflationRateResponseAmino, QueryInflationRateResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType } from "./query"; +import { QueryPeriodRequest, QueryPeriodRequestSDKType, QueryPeriodResponse, QueryPeriodResponseSDKType, QueryEpochMintProvisionRequest, QueryEpochMintProvisionRequestSDKType, QueryEpochMintProvisionResponse, QueryEpochMintProvisionResponseSDKType, QuerySkippedEpochsRequest, QuerySkippedEpochsRequestSDKType, QuerySkippedEpochsResponse, QuerySkippedEpochsResponseSDKType, QueryCirculatingSupplyRequest, QueryCirculatingSupplyRequestSDKType, QueryCirculatingSupplyResponse, QueryCirculatingSupplyResponseSDKType, QueryInflationRateRequest, QueryInflationRateRequestSDKType, QueryInflationRateResponse, QueryInflationRateResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType } from "./query"; /** Query provides defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/evmos/recovery/v1/query.lcd.ts b/__fixtures__/outputv2/evmos/recovery/v1/query.lcd.ts index f78389956b..c0e0598798 100644 --- a/__fixtures__/outputv2/evmos/recovery/v1/query.lcd.ts +++ b/__fixtures__/outputv2/evmos/recovery/v1/query.lcd.ts @@ -1,6 +1,6 @@ -import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; +import { Params, ParamsSDKType } from "./genesis"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType } from "./query"; +import { QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/evmos/recovery/v1/query.rpc.Query.ts b/__fixtures__/outputv2/evmos/recovery/v1/query.rpc.Query.ts index 71841df192..84ab102f83 100644 --- a/__fixtures__/outputv2/evmos/recovery/v1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/evmos/recovery/v1/query.rpc.Query.ts @@ -1,8 +1,8 @@ -import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; +import { Params, ParamsSDKType } from "./genesis"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType } from "./query"; +import { QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/evmos/vesting/v1/query.lcd.ts b/__fixtures__/outputv2/evmos/vesting/v1/query.lcd.ts index 3c572c0156..291c51037b 100644 --- a/__fixtures__/outputv2/evmos/vesting/v1/query.lcd.ts +++ b/__fixtures__/outputv2/evmos/vesting/v1/query.lcd.ts @@ -1,6 +1,6 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryBalancesRequest, QueryBalancesRequestAmino, QueryBalancesRequestSDKType, QueryBalancesResponse, QueryBalancesResponseAmino, QueryBalancesResponseSDKType } from "./query"; +import { QueryBalancesRequest, QueryBalancesRequestSDKType, QueryBalancesResponse, QueryBalancesResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/evmos/vesting/v1/query.rpc.Query.ts b/__fixtures__/outputv2/evmos/vesting/v1/query.rpc.Query.ts index 63852e1770..feb54ff72b 100644 --- a/__fixtures__/outputv2/evmos/vesting/v1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/evmos/vesting/v1/query.rpc.Query.ts @@ -1,8 +1,8 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryBalancesRequest, QueryBalancesRequestAmino, QueryBalancesRequestSDKType, QueryBalancesResponse, QueryBalancesResponseAmino, QueryBalancesResponseSDKType } from "./query"; +import { QueryBalancesRequest, QueryBalancesRequestSDKType, QueryBalancesResponse, QueryBalancesResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/evmos/vesting/v1/tx.amino.ts b/__fixtures__/outputv2/evmos/vesting/v1/tx.amino.ts index 962baf6ef1..919eb896db 100644 --- a/__fixtures__/outputv2/evmos/vesting/v1/tx.amino.ts +++ b/__fixtures__/outputv2/evmos/vesting/v1/tx.amino.ts @@ -1,6 +1,6 @@ -import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../google/protobuf/timestamp"; -import { Period, PeriodAmino, PeriodSDKType } from "../../../cosmos/vesting/v1beta1/vesting"; -import { MsgCreateClawbackVestingAccount, MsgCreateClawbackVestingAccountAmino, MsgCreateClawbackVestingAccountSDKType, MsgClawback, MsgClawbackAmino, MsgClawbackSDKType } from "./tx"; +import { Timestamp, TimestampSDKType } from "../../../google/protobuf/timestamp"; +import { Period, PeriodSDKType } from "../../../cosmos/vesting/v1beta1/vesting"; +import { MsgCreateClawbackVestingAccount, MsgCreateClawbackVestingAccountSDKType, MsgClawback, MsgClawbackSDKType } from "./tx"; export const AminoConverter = { "/evmos.vesting.v1.MsgCreateClawbackVestingAccount": { aminoType: "/evmos.vesting.v1.MsgCreateClawbackVestingAccount", diff --git a/__fixtures__/outputv2/evmos/vesting/v1/tx.registry.ts b/__fixtures__/outputv2/evmos/vesting/v1/tx.registry.ts index e2ed7dbafc..17e9241feb 100644 --- a/__fixtures__/outputv2/evmos/vesting/v1/tx.registry.ts +++ b/__fixtures__/outputv2/evmos/vesting/v1/tx.registry.ts @@ -1,7 +1,7 @@ -import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../google/protobuf/timestamp"; -import { Period, PeriodAmino, PeriodSDKType } from "../../../cosmos/vesting/v1beta1/vesting"; +import { Timestamp, TimestampSDKType } from "../../../google/protobuf/timestamp"; +import { Period, PeriodSDKType } from "../../../cosmos/vesting/v1beta1/vesting"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgCreateClawbackVestingAccount, MsgCreateClawbackVestingAccountAmino, MsgCreateClawbackVestingAccountSDKType, MsgClawback, MsgClawbackAmino, MsgClawbackSDKType } from "./tx"; +import { MsgCreateClawbackVestingAccount, MsgCreateClawbackVestingAccountSDKType, MsgClawback, MsgClawbackSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/evmos.vesting.v1.MsgCreateClawbackVestingAccount", MsgCreateClawbackVestingAccount], ["/evmos.vesting.v1.MsgClawback", MsgClawback]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/evmos/vesting/v1/tx.rpc.msg.ts b/__fixtures__/outputv2/evmos/vesting/v1/tx.rpc.msg.ts index c17320a4cb..b86da24b52 100644 --- a/__fixtures__/outputv2/evmos/vesting/v1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/evmos/vesting/v1/tx.rpc.msg.ts @@ -1,8 +1,8 @@ -import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../google/protobuf/timestamp"; -import { Period, PeriodAmino, PeriodSDKType } from "../../../cosmos/vesting/v1beta1/vesting"; +import { Timestamp, TimestampSDKType } from "../../../google/protobuf/timestamp"; +import { Period, PeriodSDKType } from "../../../cosmos/vesting/v1beta1/vesting"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgCreateClawbackVestingAccount, MsgCreateClawbackVestingAccountAmino, MsgCreateClawbackVestingAccountSDKType, MsgCreateClawbackVestingAccountResponse, MsgCreateClawbackVestingAccountResponseAmino, MsgCreateClawbackVestingAccountResponseSDKType, MsgClawback, MsgClawbackAmino, MsgClawbackSDKType, MsgClawbackResponse, MsgClawbackResponseAmino, MsgClawbackResponseSDKType } from "./tx"; +import { MsgCreateClawbackVestingAccount, MsgCreateClawbackVestingAccountSDKType, MsgCreateClawbackVestingAccountResponse, MsgCreateClawbackVestingAccountResponseSDKType, MsgClawback, MsgClawbackSDKType, MsgClawbackResponse, MsgClawbackResponseSDKType } from "./tx"; /** Msg defines the vesting Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/google/api/distribution.ts b/__fixtures__/outputv2/google/api/distribution.ts index 2e51da1e9d..0205633ac6 100644 --- a/__fixtures__/outputv2/google/api/distribution.ts +++ b/__fixtures__/outputv2/google/api/distribution.ts @@ -1,5 +1,5 @@ import { Timestamp, TimestampAmino, TimestampSDKType } from "../protobuf/timestamp"; -import { Any, AnyAmino, AnySDKType } from "../protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../protobuf/any"; import { Long, isSet, DeepPartial, toTimestamp, fromTimestamp, fromJsonTimestamp } from "../../helpers"; import * as _m0 from "protobufjs/minimal"; export const protobufPackage = "google.api"; diff --git a/__fixtures__/outputv2/google/api/expr/v1alpha1/checked.ts b/__fixtures__/outputv2/google/api/expr/v1alpha1/checked.ts index 98b4d3d402..54daf41e45 100644 --- a/__fixtures__/outputv2/google/api/expr/v1alpha1/checked.ts +++ b/__fixtures__/outputv2/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, NullValueAmino, NullValueSDKType, nullValueFromJSON, nullValueToJSON } from "../../../protobuf/struct"; +import { NullValue, NullValueSDKType, nullValueFromJSON, nullValueToJSON } from "../../../protobuf/struct"; import { Long, isSet, DeepPartial, isObject } from "../../../../helpers"; import * as _m0 from "protobufjs/minimal"; export const protobufPackage = "google.api.expr.v1alpha1"; diff --git a/__fixtures__/outputv2/google/api/expr/v1alpha1/syntax.ts b/__fixtures__/outputv2/google/api/expr/v1alpha1/syntax.ts index f120b621a1..2a23b8cdfc 100644 --- a/__fixtures__/outputv2/google/api/expr/v1alpha1/syntax.ts +++ b/__fixtures__/outputv2/google/api/expr/v1alpha1/syntax.ts @@ -1,4 +1,4 @@ -import { NullValue, NullValueAmino, NullValueSDKType, nullValueFromJSON, nullValueToJSON } from "../../../protobuf/struct"; +import { NullValue, NullValueSDKType, nullValueFromJSON, nullValueToJSON } from "../../../protobuf/struct"; import { Duration, DurationAmino, DurationSDKType } from "../../../protobuf/duration"; import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../protobuf/timestamp"; import * as _m0 from "protobufjs/minimal"; diff --git a/__fixtures__/outputv2/google/api/expr/v1alpha1/value.ts b/__fixtures__/outputv2/google/api/expr/v1alpha1/value.ts index 4b20abcd0c..dcde080f33 100644 --- a/__fixtures__/outputv2/google/api/expr/v1alpha1/value.ts +++ b/__fixtures__/outputv2/google/api/expr/v1alpha1/value.ts @@ -1,5 +1,5 @@ -import { NullValue, NullValueAmino, NullValueSDKType, nullValueFromJSON, nullValueToJSON } from "../../../protobuf/struct"; -import { Any, AnyAmino, AnySDKType } from "../../../protobuf/any"; +import { NullValue, NullValueSDKType, nullValueFromJSON, nullValueToJSON } from "../../../protobuf/struct"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { Long, isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../../helpers"; export const protobufPackage = "google.api.expr.v1alpha1"; diff --git a/__fixtures__/outputv2/google/api/expr/v1beta1/expr.ts b/__fixtures__/outputv2/google/api/expr/v1beta1/expr.ts index b1c7fb4e04..670edebc68 100644 --- a/__fixtures__/outputv2/google/api/expr/v1beta1/expr.ts +++ b/__fixtures__/outputv2/google/api/expr/v1beta1/expr.ts @@ -1,5 +1,5 @@ import { SourceInfo, SourceInfoAmino, SourceInfoSDKType } from "./source"; -import { NullValue, NullValueAmino, NullValueSDKType, nullValueFromJSON, nullValueToJSON } from "../../../protobuf/struct"; +import { NullValue, NullValueSDKType, nullValueFromJSON, nullValueToJSON } from "../../../protobuf/struct"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, Long, bytesFromBase64, base64FromBytes } from "../../../../helpers"; export const protobufPackage = "google.api.expr.v1beta1"; diff --git a/__fixtures__/outputv2/google/api/expr/v1beta1/value.ts b/__fixtures__/outputv2/google/api/expr/v1beta1/value.ts index c36893c767..f1b9bc7a26 100644 --- a/__fixtures__/outputv2/google/api/expr/v1beta1/value.ts +++ b/__fixtures__/outputv2/google/api/expr/v1beta1/value.ts @@ -1,5 +1,5 @@ -import { NullValue, NullValueAmino, NullValueSDKType, nullValueFromJSON, nullValueToJSON } from "../../../protobuf/struct"; -import { Any, AnyAmino, AnySDKType } from "../../../protobuf/any"; +import { NullValue, NullValueSDKType, nullValueFromJSON, nullValueToJSON } from "../../../protobuf/struct"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { Long, isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../../helpers"; export const protobufPackage = "google.api.expr.v1beta1"; diff --git a/__fixtures__/outputv2/google/api/httpbody.ts b/__fixtures__/outputv2/google/api/httpbody.ts index aef25ccb9c..8b37811cc8 100644 --- a/__fixtures__/outputv2/google/api/httpbody.ts +++ b/__fixtures__/outputv2/google/api/httpbody.ts @@ -1,4 +1,4 @@ -import { Any, AnyAmino, AnySDKType } from "../protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../helpers"; export const protobufPackage = "google.api"; diff --git a/__fixtures__/outputv2/google/api/metric.ts b/__fixtures__/outputv2/google/api/metric.ts index d5a21dd466..d90d7458b2 100644 --- a/__fixtures__/outputv2/google/api/metric.ts +++ b/__fixtures__/outputv2/google/api/metric.ts @@ -1,4 +1,4 @@ -import { LaunchStage, LaunchStageAmino, LaunchStageSDKType, launchStageFromJSON, launchStageToJSON } from "./launch_stage"; +import { LaunchStage, LaunchStageSDKType, launchStageFromJSON, launchStageToJSON } from "./launch_stage"; import { Duration, DurationAmino, DurationSDKType } from "../protobuf/duration"; import { LabelDescriptor, LabelDescriptorAmino, LabelDescriptorSDKType } from "./label"; import * as _m0 from "protobufjs/minimal"; diff --git a/__fixtures__/outputv2/google/api/monitored_resource.ts b/__fixtures__/outputv2/google/api/monitored_resource.ts index 7510524167..9243652b93 100644 --- a/__fixtures__/outputv2/google/api/monitored_resource.ts +++ b/__fixtures__/outputv2/google/api/monitored_resource.ts @@ -1,5 +1,5 @@ import { LabelDescriptor, LabelDescriptorAmino, LabelDescriptorSDKType } from "./label"; -import { LaunchStage, LaunchStageAmino, LaunchStageSDKType, launchStageFromJSON, launchStageToJSON } from "./launch_stage"; +import { LaunchStage, LaunchStageSDKType, launchStageFromJSON, launchStageToJSON } from "./launch_stage"; import { Struct, StructAmino, StructSDKType } from "../protobuf/struct"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, isObject } from "../../helpers"; diff --git a/__fixtures__/outputv2/google/api/servicecontrol/v1/log_entry.ts b/__fixtures__/outputv2/google/api/servicecontrol/v1/log_entry.ts index b7d6384fe0..70926a495e 100644 --- a/__fixtures__/outputv2/google/api/servicecontrol/v1/log_entry.ts +++ b/__fixtures__/outputv2/google/api/servicecontrol/v1/log_entry.ts @@ -1,7 +1,7 @@ import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../protobuf/timestamp"; -import { LogSeverity, LogSeverityAmino, LogSeveritySDKType, logSeverityFromJSON, logSeverityToJSON } from "../../../logging/type/log_severity"; +import { LogSeverity, LogSeveritySDKType, logSeverityFromJSON, logSeverityToJSON } from "../../../logging/type/log_severity"; import { HttpRequest, HttpRequestAmino, HttpRequestSDKType } from "./http_request"; -import { Any, AnyAmino, AnySDKType } from "../../../protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../protobuf/any"; import { Struct, StructAmino, StructSDKType } from "../../../protobuf/struct"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, toTimestamp, fromTimestamp, fromJsonTimestamp, isObject, Long } from "../../../../helpers"; diff --git a/__fixtures__/outputv2/google/api/servicecontrol/v1/operation.ts b/__fixtures__/outputv2/google/api/servicecontrol/v1/operation.ts index ccc6893490..a9ade2bc3f 100644 --- a/__fixtures__/outputv2/google/api/servicecontrol/v1/operation.ts +++ b/__fixtures__/outputv2/google/api/servicecontrol/v1/operation.ts @@ -1,7 +1,7 @@ import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../protobuf/timestamp"; import { MetricValueSet, MetricValueSetAmino, MetricValueSetSDKType } from "./metric_value"; import { LogEntry, LogEntryAmino, LogEntrySDKType } from "./log_entry"; -import { Any, AnyAmino, AnySDKType } from "../../../protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, toTimestamp, fromTimestamp, fromJsonTimestamp, isObject } from "../../../../helpers"; export const protobufPackage = "google.api.servicecontrol.v1"; diff --git a/__fixtures__/outputv2/google/api/servicemanagement/v1/servicemanager.ts b/__fixtures__/outputv2/google/api/servicemanagement/v1/servicemanager.ts index b7aa0d8083..5d10f9b9d9 100644 --- a/__fixtures__/outputv2/google/api/servicemanagement/v1/servicemanager.ts +++ b/__fixtures__/outputv2/google/api/servicemanagement/v1/servicemanager.ts @@ -1,6 +1,6 @@ import { ManagedService, ManagedServiceAmino, ManagedServiceSDKType, ConfigSource, ConfigSourceAmino, ConfigSourceSDKType, Rollout, RolloutAmino, RolloutSDKType, ChangeReport, ChangeReportAmino, ChangeReportSDKType, Diagnostic, DiagnosticAmino, DiagnosticSDKType } from "./resources"; import { Service, ServiceAmino, ServiceSDKType } from "../../service"; -import { Any, AnyAmino, AnySDKType } from "../../../protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial } from "../../../../helpers"; export const protobufPackage = "google.api.servicemanagement.v1"; diff --git a/__fixtures__/outputv2/google/api/serviceusage/v1beta1/serviceusage.ts b/__fixtures__/outputv2/google/api/serviceusage/v1beta1/serviceusage.ts index 125e5c342a..661465cd9c 100644 --- a/__fixtures__/outputv2/google/api/serviceusage/v1beta1/serviceusage.ts +++ b/__fixtures__/outputv2/google/api/serviceusage/v1beta1/serviceusage.ts @@ -1,4 +1,4 @@ -import { QuotaView, QuotaViewAmino, QuotaViewSDKType, QuotaOverride, QuotaOverrideAmino, QuotaOverrideSDKType, QuotaSafetyCheck, QuotaSafetyCheckAmino, QuotaSafetyCheckSDKType, OverrideInlineSource, OverrideInlineSourceAmino, OverrideInlineSourceSDKType, Service, ServiceAmino, ServiceSDKType, ConsumerQuotaMetric, ConsumerQuotaMetricAmino, ConsumerQuotaMetricSDKType, AdminQuotaPolicy, AdminQuotaPolicyAmino, AdminQuotaPolicySDKType, ServiceIdentity, ServiceIdentityAmino, ServiceIdentitySDKType, quotaViewFromJSON, quotaViewToJSON, quotaSafetyCheckFromJSON, quotaSafetyCheckToJSON } 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, quotaViewFromJSON, quotaViewToJSON, quotaSafetyCheckFromJSON, quotaSafetyCheckToJSON } from "./resources"; import { FieldMask, FieldMaskAmino, FieldMaskSDKType } from "../../../protobuf/field_mask"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial } from "../../../../helpers"; diff --git a/__fixtures__/outputv2/google/api/source_info.ts b/__fixtures__/outputv2/google/api/source_info.ts index bdfc1f64be..9292e9627a 100644 --- a/__fixtures__/outputv2/google/api/source_info.ts +++ b/__fixtures__/outputv2/google/api/source_info.ts @@ -1,4 +1,4 @@ -import { Any, AnyAmino, AnySDKType } from "../protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { DeepPartial } from "../../helpers"; export const protobufPackage = "google.api"; diff --git a/__fixtures__/outputv2/google/logging/v2/log_entry.ts b/__fixtures__/outputv2/google/logging/v2/log_entry.ts index ccc7e0593c..a4843562a9 100644 --- a/__fixtures__/outputv2/google/logging/v2/log_entry.ts +++ b/__fixtures__/outputv2/google/logging/v2/log_entry.ts @@ -1,8 +1,8 @@ import { MonitoredResource, MonitoredResourceAmino, MonitoredResourceSDKType } from "../../api/monitored_resource"; -import { Any, AnyAmino, AnySDKType } from "../../protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../protobuf/any"; import { Struct, StructAmino, StructSDKType } from "../../protobuf/struct"; import { Timestamp, TimestampAmino, TimestampSDKType } from "../../protobuf/timestamp"; -import { LogSeverity, LogSeverityAmino, LogSeveritySDKType, logSeverityFromJSON, logSeverityToJSON } from "../type/log_severity"; +import { LogSeverity, LogSeveritySDKType, logSeverityFromJSON, logSeverityToJSON } from "../type/log_severity"; import { HttpRequest, HttpRequestAmino, HttpRequestSDKType } from "../type/http_request"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, toTimestamp, fromTimestamp, fromJsonTimestamp, isObject, Long } from "../../../helpers"; diff --git a/__fixtures__/outputv2/google/longrunning/operations.ts b/__fixtures__/outputv2/google/longrunning/operations.ts index 1a7d9c9b7b..c06d6c332b 100644 --- a/__fixtures__/outputv2/google/longrunning/operations.ts +++ b/__fixtures__/outputv2/google/longrunning/operations.ts @@ -1,5 +1,5 @@ import { Duration, DurationAmino, DurationSDKType } from "../protobuf/duration"; -import { Any, AnyAmino, AnySDKType } from "../protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../protobuf/any"; import { Status, StatusAmino, StatusSDKType } from "../rpc/status"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial } from "../../helpers"; diff --git a/__fixtures__/outputv2/google/protobuf/api.ts b/__fixtures__/outputv2/google/protobuf/api.ts index 01205f9061..a536e859f2 100644 --- a/__fixtures__/outputv2/google/protobuf/api.ts +++ b/__fixtures__/outputv2/google/protobuf/api.ts @@ -1,4 +1,4 @@ -import { Option, OptionAmino, OptionSDKType, Syntax, SyntaxAmino, SyntaxSDKType, syntaxFromJSON, syntaxToJSON } from "./type"; +import { Option, OptionAmino, OptionSDKType, Syntax, SyntaxSDKType, syntaxFromJSON, syntaxToJSON } from "./type"; import { SourceContext, SourceContextAmino, SourceContextSDKType } from "./source_context"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial } from "../../helpers"; diff --git a/__fixtures__/outputv2/google/protobuf/type.ts b/__fixtures__/outputv2/google/protobuf/type.ts index d4102cae19..8fef756820 100644 --- a/__fixtures__/outputv2/google/protobuf/type.ts +++ b/__fixtures__/outputv2/google/protobuf/type.ts @@ -1,5 +1,5 @@ import { SourceContext, SourceContextAmino, SourceContextSDKType } from "./source_context"; -import { Any, AnyAmino, AnySDKType } from "./any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "./any"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial } from "../../helpers"; export const protobufPackage = "google.protobuf"; diff --git a/__fixtures__/outputv2/google/rpc/context/attribute_context.ts b/__fixtures__/outputv2/google/rpc/context/attribute_context.ts index e0e1494ded..4f0a8f2530 100644 --- a/__fixtures__/outputv2/google/rpc/context/attribute_context.ts +++ b/__fixtures__/outputv2/google/rpc/context/attribute_context.ts @@ -1,7 +1,7 @@ import { Struct, StructAmino, StructSDKType } from "../../protobuf/struct"; import { Timestamp, TimestampAmino, TimestampSDKType } from "../../protobuf/timestamp"; import { Duration, DurationAmino, DurationSDKType } from "../../protobuf/duration"; -import { Any, AnyAmino, AnySDKType } from "../../protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, Long, isObject, toTimestamp, fromTimestamp, fromJsonTimestamp } from "../../../helpers"; export const protobufPackage = "google.rpc.context"; diff --git a/__fixtures__/outputv2/google/rpc/status.ts b/__fixtures__/outputv2/google/rpc/status.ts index cdf1d5f00b..6add1a9361 100644 --- a/__fixtures__/outputv2/google/rpc/status.ts +++ b/__fixtures__/outputv2/google/rpc/status.ts @@ -1,4 +1,4 @@ -import { Any, AnyAmino, AnySDKType } from "../protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial } from "../../helpers"; export const protobufPackage = "google.rpc"; diff --git a/__fixtures__/outputv2/ibc/applications/transfer/v1/query.lcd.ts b/__fixtures__/outputv2/ibc/applications/transfer/v1/query.lcd.ts index 7701937a43..557aaeff40 100644 --- a/__fixtures__/outputv2/ibc/applications/transfer/v1/query.lcd.ts +++ b/__fixtures__/outputv2/ibc/applications/transfer/v1/query.lcd.ts @@ -1,8 +1,8 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../../cosmos/base/query/v1beta1/pagination"; -import { DenomTrace, DenomTraceAmino, DenomTraceSDKType, Params, ParamsAmino, ParamsSDKType } from "./transfer"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../../cosmos/base/query/v1beta1/pagination"; +import { DenomTrace, DenomTraceSDKType, Params, ParamsSDKType } from "./transfer"; import { setPaginationParams } from "../../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryDenomTraceRequest, QueryDenomTraceRequestAmino, QueryDenomTraceRequestSDKType, QueryDenomTraceResponse, QueryDenomTraceResponseAmino, QueryDenomTraceResponseSDKType, QueryDenomTracesRequest, QueryDenomTracesRequestAmino, QueryDenomTracesRequestSDKType, QueryDenomTracesResponse, QueryDenomTracesResponseAmino, QueryDenomTracesResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType } from "./query"; +import { QueryDenomTraceRequest, QueryDenomTraceRequestSDKType, QueryDenomTraceResponse, QueryDenomTraceResponseSDKType, QueryDenomTracesRequest, QueryDenomTracesRequestSDKType, QueryDenomTracesResponse, QueryDenomTracesResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/ibc/applications/transfer/v1/query.rpc.Query.ts b/__fixtures__/outputv2/ibc/applications/transfer/v1/query.rpc.Query.ts index c7608b82bf..93ab7ec57b 100644 --- a/__fixtures__/outputv2/ibc/applications/transfer/v1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/ibc/applications/transfer/v1/query.rpc.Query.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../../cosmos/base/query/v1beta1/pagination"; -import { DenomTrace, DenomTraceAmino, DenomTraceSDKType, Params, ParamsAmino, ParamsSDKType } from "./transfer"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../../cosmos/base/query/v1beta1/pagination"; +import { DenomTrace, DenomTraceSDKType, Params, ParamsSDKType } from "./transfer"; import { Rpc } from "../../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryDenomTraceRequest, QueryDenomTraceRequestAmino, QueryDenomTraceRequestSDKType, QueryDenomTraceResponse, QueryDenomTraceResponseAmino, QueryDenomTraceResponseSDKType, QueryDenomTracesRequest, QueryDenomTracesRequestAmino, QueryDenomTracesRequestSDKType, QueryDenomTracesResponse, QueryDenomTracesResponseAmino, QueryDenomTracesResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType } from "./query"; +import { QueryDenomTraceRequest, QueryDenomTraceRequestSDKType, QueryDenomTraceResponse, QueryDenomTraceResponseSDKType, QueryDenomTracesRequest, QueryDenomTracesRequestSDKType, QueryDenomTracesResponse, QueryDenomTracesResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType } from "./query"; /** Query provides defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/ibc/applications/transfer/v1/tx.amino.ts b/__fixtures__/outputv2/ibc/applications/transfer/v1/tx.amino.ts index 4ebf9a0705..86f351f5f5 100644 --- a/__fixtures__/outputv2/ibc/applications/transfer/v1/tx.amino.ts +++ b/__fixtures__/outputv2/ibc/applications/transfer/v1/tx.amino.ts @@ -1,6 +1,6 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../../../cosmos/base/v1beta1/coin"; -import { Height, HeightAmino, HeightSDKType } from "../../../core/client/v1/client"; -import { MsgTransfer, MsgTransferAmino, MsgTransferSDKType } from "./tx"; +import { Coin, CoinSDKType } from "../../../../cosmos/base/v1beta1/coin"; +import { Height, HeightSDKType } from "../../../core/client/v1/client"; +import { MsgTransfer, MsgTransferSDKType } from "./tx"; export const AminoConverter = { "/ibc.applications.transfer.v1.MsgTransfer": { aminoType: "cosmos-sdk/MsgTransfer", diff --git a/__fixtures__/outputv2/ibc/applications/transfer/v1/tx.registry.ts b/__fixtures__/outputv2/ibc/applications/transfer/v1/tx.registry.ts index 416a75de81..b0881df270 100644 --- a/__fixtures__/outputv2/ibc/applications/transfer/v1/tx.registry.ts +++ b/__fixtures__/outputv2/ibc/applications/transfer/v1/tx.registry.ts @@ -1,7 +1,7 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../../../cosmos/base/v1beta1/coin"; -import { Height, HeightAmino, HeightSDKType } from "../../../core/client/v1/client"; +import { Coin, CoinSDKType } from "../../../../cosmos/base/v1beta1/coin"; +import { Height, HeightSDKType } from "../../../core/client/v1/client"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgTransfer, MsgTransferAmino, MsgTransferSDKType } from "./tx"; +import { MsgTransfer, MsgTransferSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/ibc.applications.transfer.v1.MsgTransfer", MsgTransfer]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/ibc/applications/transfer/v1/tx.rpc.msg.ts b/__fixtures__/outputv2/ibc/applications/transfer/v1/tx.rpc.msg.ts index dbd6d9aee1..4e9f7e9e5c 100644 --- a/__fixtures__/outputv2/ibc/applications/transfer/v1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/ibc/applications/transfer/v1/tx.rpc.msg.ts @@ -1,8 +1,8 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../../../cosmos/base/v1beta1/coin"; -import { Height, HeightAmino, HeightSDKType } from "../../../core/client/v1/client"; +import { Coin, CoinSDKType } from "../../../../cosmos/base/v1beta1/coin"; +import { Height, HeightSDKType } from "../../../core/client/v1/client"; import { Rpc } from "../../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgTransfer, MsgTransferAmino, MsgTransferSDKType, MsgTransferResponse, MsgTransferResponseAmino, MsgTransferResponseSDKType } from "./tx"; +import { MsgTransfer, MsgTransferSDKType, MsgTransferResponse, MsgTransferResponseSDKType } from "./tx"; /** Msg defines the ibc/transfer Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/ibc/core/channel/v1/query.lcd.ts b/__fixtures__/outputv2/ibc/core/channel/v1/query.lcd.ts index faba432824..7689b5610f 100644 --- a/__fixtures__/outputv2/ibc/core/channel/v1/query.lcd.ts +++ b/__fixtures__/outputv2/ibc/core/channel/v1/query.lcd.ts @@ -1,10 +1,10 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../../cosmos/base/query/v1beta1/pagination"; -import { Channel, ChannelAmino, ChannelSDKType, IdentifiedChannel, IdentifiedChannelAmino, IdentifiedChannelSDKType, PacketState, PacketStateAmino, PacketStateSDKType } from "./channel"; -import { Height, HeightAmino, HeightSDKType, IdentifiedClientState, IdentifiedClientStateAmino, IdentifiedClientStateSDKType } from "../../client/v1/client"; -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../../cosmos/base/query/v1beta1/pagination"; +import { Channel, ChannelSDKType, IdentifiedChannel, IdentifiedChannelSDKType, PacketState, PacketStateSDKType } from "./channel"; +import { Height, HeightSDKType, IdentifiedClientState, IdentifiedClientStateSDKType } from "../../client/v1/client"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import { setPaginationParams } from "../../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryChannelRequest, QueryChannelRequestAmino, QueryChannelRequestSDKType, QueryChannelResponse, QueryChannelResponseAmino, QueryChannelResponseSDKType, QueryChannelsRequest, QueryChannelsRequestAmino, QueryChannelsRequestSDKType, QueryChannelsResponse, QueryChannelsResponseAmino, QueryChannelsResponseSDKType, QueryConnectionChannelsRequest, QueryConnectionChannelsRequestAmino, QueryConnectionChannelsRequestSDKType, QueryConnectionChannelsResponse, QueryConnectionChannelsResponseAmino, QueryConnectionChannelsResponseSDKType, QueryChannelClientStateRequest, QueryChannelClientStateRequestAmino, QueryChannelClientStateRequestSDKType, QueryChannelClientStateResponse, QueryChannelClientStateResponseAmino, QueryChannelClientStateResponseSDKType, QueryChannelConsensusStateRequest, QueryChannelConsensusStateRequestAmino, QueryChannelConsensusStateRequestSDKType, QueryChannelConsensusStateResponse, QueryChannelConsensusStateResponseAmino, QueryChannelConsensusStateResponseSDKType, QueryPacketCommitmentRequest, QueryPacketCommitmentRequestAmino, QueryPacketCommitmentRequestSDKType, QueryPacketCommitmentResponse, QueryPacketCommitmentResponseAmino, QueryPacketCommitmentResponseSDKType, QueryPacketCommitmentsRequest, QueryPacketCommitmentsRequestAmino, QueryPacketCommitmentsRequestSDKType, QueryPacketCommitmentsResponse, QueryPacketCommitmentsResponseAmino, QueryPacketCommitmentsResponseSDKType, QueryPacketReceiptRequest, QueryPacketReceiptRequestAmino, QueryPacketReceiptRequestSDKType, QueryPacketReceiptResponse, QueryPacketReceiptResponseAmino, QueryPacketReceiptResponseSDKType, QueryPacketAcknowledgementRequest, QueryPacketAcknowledgementRequestAmino, QueryPacketAcknowledgementRequestSDKType, QueryPacketAcknowledgementResponse, QueryPacketAcknowledgementResponseAmino, QueryPacketAcknowledgementResponseSDKType, QueryPacketAcknowledgementsRequest, QueryPacketAcknowledgementsRequestAmino, QueryPacketAcknowledgementsRequestSDKType, QueryPacketAcknowledgementsResponse, QueryPacketAcknowledgementsResponseAmino, QueryPacketAcknowledgementsResponseSDKType, QueryUnreceivedPacketsRequest, QueryUnreceivedPacketsRequestAmino, QueryUnreceivedPacketsRequestSDKType, QueryUnreceivedPacketsResponse, QueryUnreceivedPacketsResponseAmino, QueryUnreceivedPacketsResponseSDKType, QueryUnreceivedAcksRequest, QueryUnreceivedAcksRequestAmino, QueryUnreceivedAcksRequestSDKType, QueryUnreceivedAcksResponse, QueryUnreceivedAcksResponseAmino, QueryUnreceivedAcksResponseSDKType, QueryNextSequenceReceiveRequest, QueryNextSequenceReceiveRequestAmino, QueryNextSequenceReceiveRequestSDKType, QueryNextSequenceReceiveResponse, QueryNextSequenceReceiveResponseAmino, QueryNextSequenceReceiveResponseSDKType } from "./query"; +import { QueryChannelRequest, QueryChannelRequestSDKType, QueryChannelResponse, QueryChannelResponseSDKType, QueryChannelsRequest, QueryChannelsRequestSDKType, QueryChannelsResponse, QueryChannelsResponseSDKType, QueryConnectionChannelsRequest, QueryConnectionChannelsRequestSDKType, QueryConnectionChannelsResponse, QueryConnectionChannelsResponseSDKType, QueryChannelClientStateRequest, QueryChannelClientStateRequestSDKType, QueryChannelClientStateResponse, QueryChannelClientStateResponseSDKType, QueryChannelConsensusStateRequest, QueryChannelConsensusStateRequestSDKType, QueryChannelConsensusStateResponse, QueryChannelConsensusStateResponseSDKType, QueryPacketCommitmentRequest, QueryPacketCommitmentRequestSDKType, QueryPacketCommitmentResponse, QueryPacketCommitmentResponseSDKType, QueryPacketCommitmentsRequest, QueryPacketCommitmentsRequestSDKType, QueryPacketCommitmentsResponse, QueryPacketCommitmentsResponseSDKType, QueryPacketReceiptRequest, QueryPacketReceiptRequestSDKType, QueryPacketReceiptResponse, QueryPacketReceiptResponseSDKType, QueryPacketAcknowledgementRequest, QueryPacketAcknowledgementRequestSDKType, QueryPacketAcknowledgementResponse, QueryPacketAcknowledgementResponseSDKType, QueryPacketAcknowledgementsRequest, QueryPacketAcknowledgementsRequestSDKType, QueryPacketAcknowledgementsResponse, QueryPacketAcknowledgementsResponseSDKType, QueryUnreceivedPacketsRequest, QueryUnreceivedPacketsRequestSDKType, QueryUnreceivedPacketsResponse, QueryUnreceivedPacketsResponseSDKType, QueryUnreceivedAcksRequest, QueryUnreceivedAcksRequestSDKType, QueryUnreceivedAcksResponse, QueryUnreceivedAcksResponseSDKType, QueryNextSequenceReceiveRequest, QueryNextSequenceReceiveRequestSDKType, QueryNextSequenceReceiveResponse, QueryNextSequenceReceiveResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/ibc/core/channel/v1/query.rpc.Query.ts b/__fixtures__/outputv2/ibc/core/channel/v1/query.rpc.Query.ts index 1e85634ba4..a6117c745c 100644 --- a/__fixtures__/outputv2/ibc/core/channel/v1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/ibc/core/channel/v1/query.rpc.Query.ts @@ -1,11 +1,11 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../../cosmos/base/query/v1beta1/pagination"; -import { Channel, ChannelAmino, ChannelSDKType, IdentifiedChannel, IdentifiedChannelAmino, IdentifiedChannelSDKType, PacketState, PacketStateAmino, PacketStateSDKType } from "./channel"; -import { Height, HeightAmino, HeightSDKType, IdentifiedClientState, IdentifiedClientStateAmino, IdentifiedClientStateSDKType } from "../../client/v1/client"; -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../../cosmos/base/query/v1beta1/pagination"; +import { Channel, ChannelSDKType, IdentifiedChannel, IdentifiedChannelSDKType, PacketState, PacketStateSDKType } from "./channel"; +import { Height, HeightSDKType, IdentifiedClientState, IdentifiedClientStateSDKType } from "../../client/v1/client"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import { Rpc } from "../../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryChannelRequest, QueryChannelRequestAmino, QueryChannelRequestSDKType, QueryChannelResponse, QueryChannelResponseAmino, QueryChannelResponseSDKType, QueryChannelsRequest, QueryChannelsRequestAmino, QueryChannelsRequestSDKType, QueryChannelsResponse, QueryChannelsResponseAmino, QueryChannelsResponseSDKType, QueryConnectionChannelsRequest, QueryConnectionChannelsRequestAmino, QueryConnectionChannelsRequestSDKType, QueryConnectionChannelsResponse, QueryConnectionChannelsResponseAmino, QueryConnectionChannelsResponseSDKType, QueryChannelClientStateRequest, QueryChannelClientStateRequestAmino, QueryChannelClientStateRequestSDKType, QueryChannelClientStateResponse, QueryChannelClientStateResponseAmino, QueryChannelClientStateResponseSDKType, QueryChannelConsensusStateRequest, QueryChannelConsensusStateRequestAmino, QueryChannelConsensusStateRequestSDKType, QueryChannelConsensusStateResponse, QueryChannelConsensusStateResponseAmino, QueryChannelConsensusStateResponseSDKType, QueryPacketCommitmentRequest, QueryPacketCommitmentRequestAmino, QueryPacketCommitmentRequestSDKType, QueryPacketCommitmentResponse, QueryPacketCommitmentResponseAmino, QueryPacketCommitmentResponseSDKType, QueryPacketCommitmentsRequest, QueryPacketCommitmentsRequestAmino, QueryPacketCommitmentsRequestSDKType, QueryPacketCommitmentsResponse, QueryPacketCommitmentsResponseAmino, QueryPacketCommitmentsResponseSDKType, QueryPacketReceiptRequest, QueryPacketReceiptRequestAmino, QueryPacketReceiptRequestSDKType, QueryPacketReceiptResponse, QueryPacketReceiptResponseAmino, QueryPacketReceiptResponseSDKType, QueryPacketAcknowledgementRequest, QueryPacketAcknowledgementRequestAmino, QueryPacketAcknowledgementRequestSDKType, QueryPacketAcknowledgementResponse, QueryPacketAcknowledgementResponseAmino, QueryPacketAcknowledgementResponseSDKType, QueryPacketAcknowledgementsRequest, QueryPacketAcknowledgementsRequestAmino, QueryPacketAcknowledgementsRequestSDKType, QueryPacketAcknowledgementsResponse, QueryPacketAcknowledgementsResponseAmino, QueryPacketAcknowledgementsResponseSDKType, QueryUnreceivedPacketsRequest, QueryUnreceivedPacketsRequestAmino, QueryUnreceivedPacketsRequestSDKType, QueryUnreceivedPacketsResponse, QueryUnreceivedPacketsResponseAmino, QueryUnreceivedPacketsResponseSDKType, QueryUnreceivedAcksRequest, QueryUnreceivedAcksRequestAmino, QueryUnreceivedAcksRequestSDKType, QueryUnreceivedAcksResponse, QueryUnreceivedAcksResponseAmino, QueryUnreceivedAcksResponseSDKType, QueryNextSequenceReceiveRequest, QueryNextSequenceReceiveRequestAmino, QueryNextSequenceReceiveRequestSDKType, QueryNextSequenceReceiveResponse, QueryNextSequenceReceiveResponseAmino, QueryNextSequenceReceiveResponseSDKType } from "./query"; +import { QueryChannelRequest, QueryChannelRequestSDKType, QueryChannelResponse, QueryChannelResponseSDKType, QueryChannelsRequest, QueryChannelsRequestSDKType, QueryChannelsResponse, QueryChannelsResponseSDKType, QueryConnectionChannelsRequest, QueryConnectionChannelsRequestSDKType, QueryConnectionChannelsResponse, QueryConnectionChannelsResponseSDKType, QueryChannelClientStateRequest, QueryChannelClientStateRequestSDKType, QueryChannelClientStateResponse, QueryChannelClientStateResponseSDKType, QueryChannelConsensusStateRequest, QueryChannelConsensusStateRequestSDKType, QueryChannelConsensusStateResponse, QueryChannelConsensusStateResponseSDKType, QueryPacketCommitmentRequest, QueryPacketCommitmentRequestSDKType, QueryPacketCommitmentResponse, QueryPacketCommitmentResponseSDKType, QueryPacketCommitmentsRequest, QueryPacketCommitmentsRequestSDKType, QueryPacketCommitmentsResponse, QueryPacketCommitmentsResponseSDKType, QueryPacketReceiptRequest, QueryPacketReceiptRequestSDKType, QueryPacketReceiptResponse, QueryPacketReceiptResponseSDKType, QueryPacketAcknowledgementRequest, QueryPacketAcknowledgementRequestSDKType, QueryPacketAcknowledgementResponse, QueryPacketAcknowledgementResponseSDKType, QueryPacketAcknowledgementsRequest, QueryPacketAcknowledgementsRequestSDKType, QueryPacketAcknowledgementsResponse, QueryPacketAcknowledgementsResponseSDKType, QueryUnreceivedPacketsRequest, QueryUnreceivedPacketsRequestSDKType, QueryUnreceivedPacketsResponse, QueryUnreceivedPacketsResponseSDKType, QueryUnreceivedAcksRequest, QueryUnreceivedAcksRequestSDKType, QueryUnreceivedAcksResponse, QueryUnreceivedAcksResponseSDKType, QueryNextSequenceReceiveRequest, QueryNextSequenceReceiveRequestSDKType, QueryNextSequenceReceiveResponse, QueryNextSequenceReceiveResponseSDKType } from "./query"; /** Query provides defines the gRPC querier service */ export interface Query { diff --git a/__fixtures__/outputv2/ibc/core/channel/v1/query.ts b/__fixtures__/outputv2/ibc/core/channel/v1/query.ts index 1007b890df..af70ef8770 100644 --- a/__fixtures__/outputv2/ibc/core/channel/v1/query.ts +++ b/__fixtures__/outputv2/ibc/core/channel/v1/query.ts @@ -1,7 +1,7 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../../cosmos/base/query/v1beta1/pagination"; import { Channel, ChannelAmino, ChannelSDKType, IdentifiedChannel, IdentifiedChannelAmino, IdentifiedChannelSDKType, PacketState, PacketStateAmino, PacketStateSDKType } from "./channel"; import { Height, HeightAmino, HeightSDKType, IdentifiedClientState, IdentifiedClientStateAmino, IdentifiedClientStateSDKType } from "../../client/v1/client"; -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, bytesFromBase64, base64FromBytes, Long } from "../../../../helpers"; export const protobufPackage = "ibc.core.channel.v1"; diff --git a/__fixtures__/outputv2/ibc/core/channel/v1/tx.amino.ts b/__fixtures__/outputv2/ibc/core/channel/v1/tx.amino.ts index afa36ad289..2bef8a2399 100644 --- a/__fixtures__/outputv2/ibc/core/channel/v1/tx.amino.ts +++ b/__fixtures__/outputv2/ibc/core/channel/v1/tx.amino.ts @@ -1,6 +1,6 @@ -import { Channel, ChannelAmino, ChannelSDKType, Packet, PacketAmino, PacketSDKType } from "./channel"; -import { Height, HeightAmino, HeightSDKType } from "../../client/v1/client"; -import { MsgChannelOpenInit, MsgChannelOpenInitAmino, MsgChannelOpenInitSDKType, MsgChannelOpenTry, MsgChannelOpenTryAmino, MsgChannelOpenTrySDKType, MsgChannelOpenAck, MsgChannelOpenAckAmino, MsgChannelOpenAckSDKType, MsgChannelOpenConfirm, MsgChannelOpenConfirmAmino, MsgChannelOpenConfirmSDKType, MsgChannelCloseInit, MsgChannelCloseInitAmino, MsgChannelCloseInitSDKType, MsgChannelCloseConfirm, MsgChannelCloseConfirmAmino, MsgChannelCloseConfirmSDKType, MsgRecvPacket, MsgRecvPacketAmino, MsgRecvPacketSDKType, MsgTimeout, MsgTimeoutAmino, MsgTimeoutSDKType, MsgTimeoutOnClose, MsgTimeoutOnCloseAmino, MsgTimeoutOnCloseSDKType, MsgAcknowledgement, MsgAcknowledgementAmino, MsgAcknowledgementSDKType } from "./tx"; +import { Channel, ChannelSDKType, Packet, PacketSDKType } from "./channel"; +import { Height, HeightSDKType } from "../../client/v1/client"; +import { MsgChannelOpenInit, MsgChannelOpenInitSDKType, MsgChannelOpenTry, MsgChannelOpenTrySDKType, MsgChannelOpenAck, MsgChannelOpenAckSDKType, MsgChannelOpenConfirm, MsgChannelOpenConfirmSDKType, MsgChannelCloseInit, MsgChannelCloseInitSDKType, MsgChannelCloseConfirm, MsgChannelCloseConfirmSDKType, MsgRecvPacket, MsgRecvPacketSDKType, MsgTimeout, MsgTimeoutSDKType, MsgTimeoutOnClose, MsgTimeoutOnCloseSDKType, MsgAcknowledgement, MsgAcknowledgementSDKType } from "./tx"; export const AminoConverter = { "/ibc.core.channel.v1.MsgChannelOpenInit": { aminoType: "cosmos-sdk/MsgChannelOpenInit", diff --git a/__fixtures__/outputv2/ibc/core/channel/v1/tx.registry.ts b/__fixtures__/outputv2/ibc/core/channel/v1/tx.registry.ts index ea3de9ab64..37eba338cc 100644 --- a/__fixtures__/outputv2/ibc/core/channel/v1/tx.registry.ts +++ b/__fixtures__/outputv2/ibc/core/channel/v1/tx.registry.ts @@ -1,7 +1,7 @@ -import { Channel, ChannelAmino, ChannelSDKType, Packet, PacketAmino, PacketSDKType } from "./channel"; -import { Height, HeightAmino, HeightSDKType } from "../../client/v1/client"; +import { Channel, ChannelSDKType, Packet, PacketSDKType } from "./channel"; +import { Height, HeightSDKType } from "../../client/v1/client"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgChannelOpenInit, MsgChannelOpenInitAmino, MsgChannelOpenInitSDKType, MsgChannelOpenTry, MsgChannelOpenTryAmino, MsgChannelOpenTrySDKType, MsgChannelOpenAck, MsgChannelOpenAckAmino, MsgChannelOpenAckSDKType, MsgChannelOpenConfirm, MsgChannelOpenConfirmAmino, MsgChannelOpenConfirmSDKType, MsgChannelCloseInit, MsgChannelCloseInitAmino, MsgChannelCloseInitSDKType, MsgChannelCloseConfirm, MsgChannelCloseConfirmAmino, MsgChannelCloseConfirmSDKType, MsgRecvPacket, MsgRecvPacketAmino, MsgRecvPacketSDKType, MsgTimeout, MsgTimeoutAmino, MsgTimeoutSDKType, MsgTimeoutOnClose, MsgTimeoutOnCloseAmino, MsgTimeoutOnCloseSDKType, MsgAcknowledgement, MsgAcknowledgementAmino, MsgAcknowledgementSDKType } from "./tx"; +import { MsgChannelOpenInit, MsgChannelOpenInitSDKType, MsgChannelOpenTry, MsgChannelOpenTrySDKType, MsgChannelOpenAck, MsgChannelOpenAckSDKType, MsgChannelOpenConfirm, MsgChannelOpenConfirmSDKType, MsgChannelCloseInit, MsgChannelCloseInitSDKType, MsgChannelCloseConfirm, MsgChannelCloseConfirmSDKType, MsgRecvPacket, MsgRecvPacketSDKType, MsgTimeout, MsgTimeoutSDKType, MsgTimeoutOnClose, MsgTimeoutOnCloseSDKType, MsgAcknowledgement, MsgAcknowledgementSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/ibc.core.channel.v1.MsgChannelOpenInit", MsgChannelOpenInit], ["/ibc.core.channel.v1.MsgChannelOpenTry", MsgChannelOpenTry], ["/ibc.core.channel.v1.MsgChannelOpenAck", MsgChannelOpenAck], ["/ibc.core.channel.v1.MsgChannelOpenConfirm", MsgChannelOpenConfirm], ["/ibc.core.channel.v1.MsgChannelCloseInit", MsgChannelCloseInit], ["/ibc.core.channel.v1.MsgChannelCloseConfirm", MsgChannelCloseConfirm], ["/ibc.core.channel.v1.MsgRecvPacket", MsgRecvPacket], ["/ibc.core.channel.v1.MsgTimeout", MsgTimeout], ["/ibc.core.channel.v1.MsgTimeoutOnClose", MsgTimeoutOnClose], ["/ibc.core.channel.v1.MsgAcknowledgement", MsgAcknowledgement]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/ibc/core/channel/v1/tx.rpc.msg.ts b/__fixtures__/outputv2/ibc/core/channel/v1/tx.rpc.msg.ts index cb8b1c6705..187eedf364 100644 --- a/__fixtures__/outputv2/ibc/core/channel/v1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/ibc/core/channel/v1/tx.rpc.msg.ts @@ -1,8 +1,8 @@ -import { Channel, ChannelAmino, ChannelSDKType, Packet, PacketAmino, PacketSDKType } from "./channel"; -import { Height, HeightAmino, HeightSDKType } from "../../client/v1/client"; +import { Channel, ChannelSDKType, Packet, PacketSDKType } from "./channel"; +import { Height, HeightSDKType } from "../../client/v1/client"; import { Rpc } from "../../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgChannelOpenInit, MsgChannelOpenInitAmino, MsgChannelOpenInitSDKType, MsgChannelOpenInitResponse, MsgChannelOpenInitResponseAmino, MsgChannelOpenInitResponseSDKType, MsgChannelOpenTry, MsgChannelOpenTryAmino, MsgChannelOpenTrySDKType, MsgChannelOpenTryResponse, MsgChannelOpenTryResponseAmino, MsgChannelOpenTryResponseSDKType, MsgChannelOpenAck, MsgChannelOpenAckAmino, MsgChannelOpenAckSDKType, MsgChannelOpenAckResponse, MsgChannelOpenAckResponseAmino, MsgChannelOpenAckResponseSDKType, MsgChannelOpenConfirm, MsgChannelOpenConfirmAmino, MsgChannelOpenConfirmSDKType, MsgChannelOpenConfirmResponse, MsgChannelOpenConfirmResponseAmino, MsgChannelOpenConfirmResponseSDKType, MsgChannelCloseInit, MsgChannelCloseInitAmino, MsgChannelCloseInitSDKType, MsgChannelCloseInitResponse, MsgChannelCloseInitResponseAmino, MsgChannelCloseInitResponseSDKType, MsgChannelCloseConfirm, MsgChannelCloseConfirmAmino, MsgChannelCloseConfirmSDKType, MsgChannelCloseConfirmResponse, MsgChannelCloseConfirmResponseAmino, MsgChannelCloseConfirmResponseSDKType, MsgRecvPacket, MsgRecvPacketAmino, MsgRecvPacketSDKType, MsgRecvPacketResponse, MsgRecvPacketResponseAmino, MsgRecvPacketResponseSDKType, MsgTimeout, MsgTimeoutAmino, MsgTimeoutSDKType, MsgTimeoutResponse, MsgTimeoutResponseAmino, MsgTimeoutResponseSDKType, MsgTimeoutOnClose, MsgTimeoutOnCloseAmino, MsgTimeoutOnCloseSDKType, MsgTimeoutOnCloseResponse, MsgTimeoutOnCloseResponseAmino, MsgTimeoutOnCloseResponseSDKType, MsgAcknowledgement, MsgAcknowledgementAmino, MsgAcknowledgementSDKType, MsgAcknowledgementResponse, MsgAcknowledgementResponseAmino, MsgAcknowledgementResponseSDKType } from "./tx"; +import { MsgChannelOpenInit, MsgChannelOpenInitSDKType, MsgChannelOpenInitResponse, MsgChannelOpenInitResponseSDKType, MsgChannelOpenTry, MsgChannelOpenTrySDKType, MsgChannelOpenTryResponse, MsgChannelOpenTryResponseSDKType, MsgChannelOpenAck, MsgChannelOpenAckSDKType, MsgChannelOpenAckResponse, MsgChannelOpenAckResponseSDKType, MsgChannelOpenConfirm, MsgChannelOpenConfirmSDKType, MsgChannelOpenConfirmResponse, MsgChannelOpenConfirmResponseSDKType, MsgChannelCloseInit, MsgChannelCloseInitSDKType, MsgChannelCloseInitResponse, MsgChannelCloseInitResponseSDKType, MsgChannelCloseConfirm, MsgChannelCloseConfirmSDKType, MsgChannelCloseConfirmResponse, MsgChannelCloseConfirmResponseSDKType, MsgRecvPacket, MsgRecvPacketSDKType, MsgRecvPacketResponse, MsgRecvPacketResponseSDKType, MsgTimeout, MsgTimeoutSDKType, MsgTimeoutResponse, MsgTimeoutResponseSDKType, MsgTimeoutOnClose, MsgTimeoutOnCloseSDKType, MsgTimeoutOnCloseResponse, MsgTimeoutOnCloseResponseSDKType, MsgAcknowledgement, MsgAcknowledgementSDKType, MsgAcknowledgementResponse, MsgAcknowledgementResponseSDKType } from "./tx"; /** Msg defines the ibc/channel Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/ibc/core/client/v1/client.ts b/__fixtures__/outputv2/ibc/core/client/v1/client.ts index 1731f50d4e..3683f6b83b 100644 --- a/__fixtures__/outputv2/ibc/core/client/v1/client.ts +++ b/__fixtures__/outputv2/ibc/core/client/v1/client.ts @@ -1,4 +1,4 @@ -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import { Plan, PlanAmino, PlanSDKType } from "../../../../cosmos/upgrade/v1beta1/upgrade"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, Long } from "../../../../helpers"; diff --git a/__fixtures__/outputv2/ibc/core/client/v1/query.lcd.ts b/__fixtures__/outputv2/ibc/core/client/v1/query.lcd.ts index 127449598f..754596853f 100644 --- a/__fixtures__/outputv2/ibc/core/client/v1/query.lcd.ts +++ b/__fixtures__/outputv2/ibc/core/client/v1/query.lcd.ts @@ -1,9 +1,9 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../../cosmos/base/query/v1beta1/pagination"; -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; -import { Height, HeightAmino, HeightSDKType, IdentifiedClientState, IdentifiedClientStateAmino, IdentifiedClientStateSDKType, ConsensusStateWithHeight, ConsensusStateWithHeightAmino, ConsensusStateWithHeightSDKType, Params, ParamsAmino, ParamsSDKType } from "./client"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../../cosmos/base/query/v1beta1/pagination"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { Height, HeightSDKType, IdentifiedClientState, IdentifiedClientStateSDKType, ConsensusStateWithHeight, ConsensusStateWithHeightSDKType, Params, ParamsSDKType } from "./client"; import { setPaginationParams } from "../../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryClientStateRequest, QueryClientStateRequestAmino, QueryClientStateRequestSDKType, QueryClientStateResponse, QueryClientStateResponseAmino, QueryClientStateResponseSDKType, QueryClientStatesRequest, QueryClientStatesRequestAmino, QueryClientStatesRequestSDKType, QueryClientStatesResponse, QueryClientStatesResponseAmino, QueryClientStatesResponseSDKType, QueryConsensusStateRequest, QueryConsensusStateRequestAmino, QueryConsensusStateRequestSDKType, QueryConsensusStateResponse, QueryConsensusStateResponseAmino, QueryConsensusStateResponseSDKType, QueryConsensusStatesRequest, QueryConsensusStatesRequestAmino, QueryConsensusStatesRequestSDKType, QueryConsensusStatesResponse, QueryConsensusStatesResponseAmino, QueryConsensusStatesResponseSDKType, QueryClientStatusRequest, QueryClientStatusRequestAmino, QueryClientStatusRequestSDKType, QueryClientStatusResponse, QueryClientStatusResponseAmino, QueryClientStatusResponseSDKType, QueryClientParamsRequest, QueryClientParamsRequestAmino, QueryClientParamsRequestSDKType, QueryClientParamsResponse, QueryClientParamsResponseAmino, QueryClientParamsResponseSDKType, QueryUpgradedClientStateRequest, QueryUpgradedClientStateRequestAmino, QueryUpgradedClientStateRequestSDKType, QueryUpgradedClientStateResponse, QueryUpgradedClientStateResponseAmino, QueryUpgradedClientStateResponseSDKType, QueryUpgradedConsensusStateRequest, QueryUpgradedConsensusStateRequestAmino, QueryUpgradedConsensusStateRequestSDKType, QueryUpgradedConsensusStateResponse, QueryUpgradedConsensusStateResponseAmino, QueryUpgradedConsensusStateResponseSDKType } from "./query"; +import { QueryClientStateRequest, QueryClientStateRequestSDKType, QueryClientStateResponse, QueryClientStateResponseSDKType, QueryClientStatesRequest, QueryClientStatesRequestSDKType, QueryClientStatesResponse, QueryClientStatesResponseSDKType, QueryConsensusStateRequest, QueryConsensusStateRequestSDKType, QueryConsensusStateResponse, QueryConsensusStateResponseSDKType, QueryConsensusStatesRequest, QueryConsensusStatesRequestSDKType, QueryConsensusStatesResponse, QueryConsensusStatesResponseSDKType, QueryClientStatusRequest, QueryClientStatusRequestSDKType, QueryClientStatusResponse, QueryClientStatusResponseSDKType, QueryClientParamsRequest, QueryClientParamsRequestSDKType, QueryClientParamsResponse, QueryClientParamsResponseSDKType, QueryUpgradedClientStateRequest, QueryUpgradedClientStateRequestSDKType, QueryUpgradedClientStateResponse, QueryUpgradedClientStateResponseSDKType, QueryUpgradedConsensusStateRequest, QueryUpgradedConsensusStateRequestSDKType, QueryUpgradedConsensusStateResponse, QueryUpgradedConsensusStateResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/ibc/core/client/v1/query.rpc.Query.ts b/__fixtures__/outputv2/ibc/core/client/v1/query.rpc.Query.ts index 15703ac050..3928063e08 100644 --- a/__fixtures__/outputv2/ibc/core/client/v1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/ibc/core/client/v1/query.rpc.Query.ts @@ -1,10 +1,10 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../../cosmos/base/query/v1beta1/pagination"; -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; -import { Height, HeightAmino, HeightSDKType, IdentifiedClientState, IdentifiedClientStateAmino, IdentifiedClientStateSDKType, ConsensusStateWithHeight, ConsensusStateWithHeightAmino, ConsensusStateWithHeightSDKType, Params, ParamsAmino, ParamsSDKType } from "./client"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../../cosmos/base/query/v1beta1/pagination"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { Height, HeightSDKType, IdentifiedClientState, IdentifiedClientStateSDKType, ConsensusStateWithHeight, ConsensusStateWithHeightSDKType, Params, ParamsSDKType } from "./client"; import { Rpc } from "../../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryClientStateRequest, QueryClientStateRequestAmino, QueryClientStateRequestSDKType, QueryClientStateResponse, QueryClientStateResponseAmino, QueryClientStateResponseSDKType, QueryClientStatesRequest, QueryClientStatesRequestAmino, QueryClientStatesRequestSDKType, QueryClientStatesResponse, QueryClientStatesResponseAmino, QueryClientStatesResponseSDKType, QueryConsensusStateRequest, QueryConsensusStateRequestAmino, QueryConsensusStateRequestSDKType, QueryConsensusStateResponse, QueryConsensusStateResponseAmino, QueryConsensusStateResponseSDKType, QueryConsensusStatesRequest, QueryConsensusStatesRequestAmino, QueryConsensusStatesRequestSDKType, QueryConsensusStatesResponse, QueryConsensusStatesResponseAmino, QueryConsensusStatesResponseSDKType, QueryClientStatusRequest, QueryClientStatusRequestAmino, QueryClientStatusRequestSDKType, QueryClientStatusResponse, QueryClientStatusResponseAmino, QueryClientStatusResponseSDKType, QueryClientParamsRequest, QueryClientParamsRequestAmino, QueryClientParamsRequestSDKType, QueryClientParamsResponse, QueryClientParamsResponseAmino, QueryClientParamsResponseSDKType, QueryUpgradedClientStateRequest, QueryUpgradedClientStateRequestAmino, QueryUpgradedClientStateRequestSDKType, QueryUpgradedClientStateResponse, QueryUpgradedClientStateResponseAmino, QueryUpgradedClientStateResponseSDKType, QueryUpgradedConsensusStateRequest, QueryUpgradedConsensusStateRequestAmino, QueryUpgradedConsensusStateRequestSDKType, QueryUpgradedConsensusStateResponse, QueryUpgradedConsensusStateResponseAmino, QueryUpgradedConsensusStateResponseSDKType } from "./query"; +import { QueryClientStateRequest, QueryClientStateRequestSDKType, QueryClientStateResponse, QueryClientStateResponseSDKType, QueryClientStatesRequest, QueryClientStatesRequestSDKType, QueryClientStatesResponse, QueryClientStatesResponseSDKType, QueryConsensusStateRequest, QueryConsensusStateRequestSDKType, QueryConsensusStateResponse, QueryConsensusStateResponseSDKType, QueryConsensusStatesRequest, QueryConsensusStatesRequestSDKType, QueryConsensusStatesResponse, QueryConsensusStatesResponseSDKType, QueryClientStatusRequest, QueryClientStatusRequestSDKType, QueryClientStatusResponse, QueryClientStatusResponseSDKType, QueryClientParamsRequest, QueryClientParamsRequestSDKType, QueryClientParamsResponse, QueryClientParamsResponseSDKType, QueryUpgradedClientStateRequest, QueryUpgradedClientStateRequestSDKType, QueryUpgradedClientStateResponse, QueryUpgradedClientStateResponseSDKType, QueryUpgradedConsensusStateRequest, QueryUpgradedConsensusStateRequestSDKType, QueryUpgradedConsensusStateResponse, QueryUpgradedConsensusStateResponseSDKType } from "./query"; /** Query provides defines the gRPC querier service */ export interface Query { diff --git a/__fixtures__/outputv2/ibc/core/client/v1/query.ts b/__fixtures__/outputv2/ibc/core/client/v1/query.ts index f240c4bff6..173142e4d0 100644 --- a/__fixtures__/outputv2/ibc/core/client/v1/query.ts +++ b/__fixtures__/outputv2/ibc/core/client/v1/query.ts @@ -1,5 +1,5 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../../cosmos/base/query/v1beta1/pagination"; -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import { Height, HeightAmino, HeightSDKType, IdentifiedClientState, IdentifiedClientStateAmino, IdentifiedClientStateSDKType, ConsensusStateWithHeight, ConsensusStateWithHeightAmino, ConsensusStateWithHeightSDKType, Params, ParamsAmino, ParamsSDKType } from "./client"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, bytesFromBase64, base64FromBytes, Long } from "../../../../helpers"; diff --git a/__fixtures__/outputv2/ibc/core/client/v1/tx.amino.ts b/__fixtures__/outputv2/ibc/core/client/v1/tx.amino.ts index 81c10bf265..85383966a5 100644 --- a/__fixtures__/outputv2/ibc/core/client/v1/tx.amino.ts +++ b/__fixtures__/outputv2/ibc/core/client/v1/tx.amino.ts @@ -1,5 +1,5 @@ -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; -import { MsgCreateClient, MsgCreateClientAmino, MsgCreateClientSDKType, MsgUpdateClient, MsgUpdateClientAmino, MsgUpdateClientSDKType, MsgUpgradeClient, MsgUpgradeClientAmino, MsgUpgradeClientSDKType, MsgSubmitMisbehaviour, MsgSubmitMisbehaviourAmino, MsgSubmitMisbehaviourSDKType } from "./tx"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { MsgCreateClient, MsgCreateClientSDKType, MsgUpdateClient, MsgUpdateClientSDKType, MsgUpgradeClient, MsgUpgradeClientSDKType, MsgSubmitMisbehaviour, MsgSubmitMisbehaviourSDKType } from "./tx"; export const AminoConverter = { "/ibc.core.client.v1.MsgCreateClient": { aminoType: "cosmos-sdk/MsgCreateClient", diff --git a/__fixtures__/outputv2/ibc/core/client/v1/tx.registry.ts b/__fixtures__/outputv2/ibc/core/client/v1/tx.registry.ts index 57608bf1dc..ed8c2fc816 100644 --- a/__fixtures__/outputv2/ibc/core/client/v1/tx.registry.ts +++ b/__fixtures__/outputv2/ibc/core/client/v1/tx.registry.ts @@ -1,6 +1,6 @@ -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgCreateClient, MsgCreateClientAmino, MsgCreateClientSDKType, MsgUpdateClient, MsgUpdateClientAmino, MsgUpdateClientSDKType, MsgUpgradeClient, MsgUpgradeClientAmino, MsgUpgradeClientSDKType, MsgSubmitMisbehaviour, MsgSubmitMisbehaviourAmino, MsgSubmitMisbehaviourSDKType } from "./tx"; +import { MsgCreateClient, MsgCreateClientSDKType, MsgUpdateClient, MsgUpdateClientSDKType, MsgUpgradeClient, MsgUpgradeClientSDKType, MsgSubmitMisbehaviour, MsgSubmitMisbehaviourSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/ibc.core.client.v1.MsgCreateClient", MsgCreateClient], ["/ibc.core.client.v1.MsgUpdateClient", MsgUpdateClient], ["/ibc.core.client.v1.MsgUpgradeClient", MsgUpgradeClient], ["/ibc.core.client.v1.MsgSubmitMisbehaviour", MsgSubmitMisbehaviour]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/ibc/core/client/v1/tx.rpc.msg.ts b/__fixtures__/outputv2/ibc/core/client/v1/tx.rpc.msg.ts index 2028ecad64..6a1b9e023f 100644 --- a/__fixtures__/outputv2/ibc/core/client/v1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/ibc/core/client/v1/tx.rpc.msg.ts @@ -1,7 +1,7 @@ -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import { Rpc } from "../../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgCreateClient, MsgCreateClientAmino, MsgCreateClientSDKType, MsgCreateClientResponse, MsgCreateClientResponseAmino, MsgCreateClientResponseSDKType, MsgUpdateClient, MsgUpdateClientAmino, MsgUpdateClientSDKType, MsgUpdateClientResponse, MsgUpdateClientResponseAmino, MsgUpdateClientResponseSDKType, MsgUpgradeClient, MsgUpgradeClientAmino, MsgUpgradeClientSDKType, MsgUpgradeClientResponse, MsgUpgradeClientResponseAmino, MsgUpgradeClientResponseSDKType, MsgSubmitMisbehaviour, MsgSubmitMisbehaviourAmino, MsgSubmitMisbehaviourSDKType, MsgSubmitMisbehaviourResponse, MsgSubmitMisbehaviourResponseAmino, MsgSubmitMisbehaviourResponseSDKType } from "./tx"; +import { MsgCreateClient, MsgCreateClientSDKType, MsgCreateClientResponse, MsgCreateClientResponseSDKType, MsgUpdateClient, MsgUpdateClientSDKType, MsgUpdateClientResponse, MsgUpdateClientResponseSDKType, MsgUpgradeClient, MsgUpgradeClientSDKType, MsgUpgradeClientResponse, MsgUpgradeClientResponseSDKType, MsgSubmitMisbehaviour, MsgSubmitMisbehaviourSDKType, MsgSubmitMisbehaviourResponse, MsgSubmitMisbehaviourResponseSDKType } from "./tx"; /** Msg defines the ibc/client Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/ibc/core/client/v1/tx.ts b/__fixtures__/outputv2/ibc/core/client/v1/tx.ts index e58fc7e9df..6c1c948c87 100644 --- a/__fixtures__/outputv2/ibc/core/client/v1/tx.ts +++ b/__fixtures__/outputv2/ibc/core/client/v1/tx.ts @@ -1,4 +1,4 @@ -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../../helpers"; export const protobufPackage = "ibc.core.client.v1"; diff --git a/__fixtures__/outputv2/ibc/core/connection/v1/query.lcd.ts b/__fixtures__/outputv2/ibc/core/connection/v1/query.lcd.ts index 05100b39c1..eb1d4ae44f 100644 --- a/__fixtures__/outputv2/ibc/core/connection/v1/query.lcd.ts +++ b/__fixtures__/outputv2/ibc/core/connection/v1/query.lcd.ts @@ -1,10 +1,10 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../../cosmos/base/query/v1beta1/pagination"; -import { ConnectionEnd, ConnectionEndAmino, ConnectionEndSDKType, IdentifiedConnection, IdentifiedConnectionAmino, IdentifiedConnectionSDKType } from "./connection"; -import { Height, HeightAmino, HeightSDKType, IdentifiedClientState, IdentifiedClientStateAmino, IdentifiedClientStateSDKType } from "../../client/v1/client"; -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../../cosmos/base/query/v1beta1/pagination"; +import { ConnectionEnd, ConnectionEndSDKType, IdentifiedConnection, IdentifiedConnectionSDKType } from "./connection"; +import { Height, HeightSDKType, IdentifiedClientState, IdentifiedClientStateSDKType } from "../../client/v1/client"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import { setPaginationParams } from "../../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryConnectionRequest, QueryConnectionRequestAmino, QueryConnectionRequestSDKType, QueryConnectionResponse, QueryConnectionResponseAmino, QueryConnectionResponseSDKType, QueryConnectionsRequest, QueryConnectionsRequestAmino, QueryConnectionsRequestSDKType, QueryConnectionsResponse, QueryConnectionsResponseAmino, QueryConnectionsResponseSDKType, QueryClientConnectionsRequest, QueryClientConnectionsRequestAmino, QueryClientConnectionsRequestSDKType, QueryClientConnectionsResponse, QueryClientConnectionsResponseAmino, QueryClientConnectionsResponseSDKType, QueryConnectionClientStateRequest, QueryConnectionClientStateRequestAmino, QueryConnectionClientStateRequestSDKType, QueryConnectionClientStateResponse, QueryConnectionClientStateResponseAmino, QueryConnectionClientStateResponseSDKType, QueryConnectionConsensusStateRequest, QueryConnectionConsensusStateRequestAmino, QueryConnectionConsensusStateRequestSDKType, QueryConnectionConsensusStateResponse, QueryConnectionConsensusStateResponseAmino, QueryConnectionConsensusStateResponseSDKType } from "./query"; +import { QueryConnectionRequest, QueryConnectionRequestSDKType, QueryConnectionResponse, QueryConnectionResponseSDKType, QueryConnectionsRequest, QueryConnectionsRequestSDKType, QueryConnectionsResponse, QueryConnectionsResponseSDKType, QueryClientConnectionsRequest, QueryClientConnectionsRequestSDKType, QueryClientConnectionsResponse, QueryClientConnectionsResponseSDKType, QueryConnectionClientStateRequest, QueryConnectionClientStateRequestSDKType, QueryConnectionClientStateResponse, QueryConnectionClientStateResponseSDKType, QueryConnectionConsensusStateRequest, QueryConnectionConsensusStateRequestSDKType, QueryConnectionConsensusStateResponse, QueryConnectionConsensusStateResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/ibc/core/connection/v1/query.rpc.Query.ts b/__fixtures__/outputv2/ibc/core/connection/v1/query.rpc.Query.ts index 1872d9cfc2..839280c62f 100644 --- a/__fixtures__/outputv2/ibc/core/connection/v1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/ibc/core/connection/v1/query.rpc.Query.ts @@ -1,11 +1,11 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../../cosmos/base/query/v1beta1/pagination"; -import { ConnectionEnd, ConnectionEndAmino, ConnectionEndSDKType, IdentifiedConnection, IdentifiedConnectionAmino, IdentifiedConnectionSDKType } from "./connection"; -import { Height, HeightAmino, HeightSDKType, IdentifiedClientState, IdentifiedClientStateAmino, IdentifiedClientStateSDKType } from "../../client/v1/client"; -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../../cosmos/base/query/v1beta1/pagination"; +import { ConnectionEnd, ConnectionEndSDKType, IdentifiedConnection, IdentifiedConnectionSDKType } from "./connection"; +import { Height, HeightSDKType, IdentifiedClientState, IdentifiedClientStateSDKType } from "../../client/v1/client"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import { Rpc } from "../../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryConnectionRequest, QueryConnectionRequestAmino, QueryConnectionRequestSDKType, QueryConnectionResponse, QueryConnectionResponseAmino, QueryConnectionResponseSDKType, QueryConnectionsRequest, QueryConnectionsRequestAmino, QueryConnectionsRequestSDKType, QueryConnectionsResponse, QueryConnectionsResponseAmino, QueryConnectionsResponseSDKType, QueryClientConnectionsRequest, QueryClientConnectionsRequestAmino, QueryClientConnectionsRequestSDKType, QueryClientConnectionsResponse, QueryClientConnectionsResponseAmino, QueryClientConnectionsResponseSDKType, QueryConnectionClientStateRequest, QueryConnectionClientStateRequestAmino, QueryConnectionClientStateRequestSDKType, QueryConnectionClientStateResponse, QueryConnectionClientStateResponseAmino, QueryConnectionClientStateResponseSDKType, QueryConnectionConsensusStateRequest, QueryConnectionConsensusStateRequestAmino, QueryConnectionConsensusStateRequestSDKType, QueryConnectionConsensusStateResponse, QueryConnectionConsensusStateResponseAmino, QueryConnectionConsensusStateResponseSDKType } from "./query"; +import { QueryConnectionRequest, QueryConnectionRequestSDKType, QueryConnectionResponse, QueryConnectionResponseSDKType, QueryConnectionsRequest, QueryConnectionsRequestSDKType, QueryConnectionsResponse, QueryConnectionsResponseSDKType, QueryClientConnectionsRequest, QueryClientConnectionsRequestSDKType, QueryClientConnectionsResponse, QueryClientConnectionsResponseSDKType, QueryConnectionClientStateRequest, QueryConnectionClientStateRequestSDKType, QueryConnectionClientStateResponse, QueryConnectionClientStateResponseSDKType, QueryConnectionConsensusStateRequest, QueryConnectionConsensusStateRequestSDKType, QueryConnectionConsensusStateResponse, QueryConnectionConsensusStateResponseSDKType } from "./query"; /** Query provides defines the gRPC querier service */ export interface Query { diff --git a/__fixtures__/outputv2/ibc/core/connection/v1/query.ts b/__fixtures__/outputv2/ibc/core/connection/v1/query.ts index 7be106aa14..5e7f701a25 100644 --- a/__fixtures__/outputv2/ibc/core/connection/v1/query.ts +++ b/__fixtures__/outputv2/ibc/core/connection/v1/query.ts @@ -1,7 +1,7 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../../cosmos/base/query/v1beta1/pagination"; import { ConnectionEnd, ConnectionEndAmino, ConnectionEndSDKType, IdentifiedConnection, IdentifiedConnectionAmino, IdentifiedConnectionSDKType } from "./connection"; import { Height, HeightAmino, HeightSDKType, IdentifiedClientState, IdentifiedClientStateAmino, IdentifiedClientStateSDKType } from "../../client/v1/client"; -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial, bytesFromBase64, base64FromBytes, Long } from "../../../../helpers"; export const protobufPackage = "ibc.core.connection.v1"; diff --git a/__fixtures__/outputv2/ibc/core/connection/v1/tx.amino.ts b/__fixtures__/outputv2/ibc/core/connection/v1/tx.amino.ts index 1ed4408ea2..ee14071445 100644 --- a/__fixtures__/outputv2/ibc/core/connection/v1/tx.amino.ts +++ b/__fixtures__/outputv2/ibc/core/connection/v1/tx.amino.ts @@ -1,7 +1,7 @@ -import { Counterparty, CounterpartyAmino, CounterpartySDKType, Version, VersionAmino, VersionSDKType } from "./connection"; -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; -import { Height, HeightAmino, HeightSDKType } from "../../client/v1/client"; -import { MsgConnectionOpenInit, MsgConnectionOpenInitAmino, MsgConnectionOpenInitSDKType, MsgConnectionOpenTry, MsgConnectionOpenTryAmino, MsgConnectionOpenTrySDKType, MsgConnectionOpenAck, MsgConnectionOpenAckAmino, MsgConnectionOpenAckSDKType, MsgConnectionOpenConfirm, MsgConnectionOpenConfirmAmino, MsgConnectionOpenConfirmSDKType } from "./tx"; +import { Counterparty, CounterpartySDKType, Version, VersionSDKType } from "./connection"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { Height, HeightSDKType } from "../../client/v1/client"; +import { MsgConnectionOpenInit, MsgConnectionOpenInitSDKType, MsgConnectionOpenTry, MsgConnectionOpenTrySDKType, MsgConnectionOpenAck, MsgConnectionOpenAckSDKType, MsgConnectionOpenConfirm, MsgConnectionOpenConfirmSDKType } from "./tx"; export const AminoConverter = { "/ibc.core.connection.v1.MsgConnectionOpenInit": { aminoType: "cosmos-sdk/MsgConnectionOpenInit", diff --git a/__fixtures__/outputv2/ibc/core/connection/v1/tx.registry.ts b/__fixtures__/outputv2/ibc/core/connection/v1/tx.registry.ts index ad3d83bb87..7c1d5ae8dc 100644 --- a/__fixtures__/outputv2/ibc/core/connection/v1/tx.registry.ts +++ b/__fixtures__/outputv2/ibc/core/connection/v1/tx.registry.ts @@ -1,8 +1,8 @@ -import { Counterparty, CounterpartyAmino, CounterpartySDKType, Version, VersionAmino, VersionSDKType } from "./connection"; -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; -import { Height, HeightAmino, HeightSDKType } from "../../client/v1/client"; +import { Counterparty, CounterpartySDKType, Version, VersionSDKType } from "./connection"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { Height, HeightSDKType } from "../../client/v1/client"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgConnectionOpenInit, MsgConnectionOpenInitAmino, MsgConnectionOpenInitSDKType, MsgConnectionOpenTry, MsgConnectionOpenTryAmino, MsgConnectionOpenTrySDKType, MsgConnectionOpenAck, MsgConnectionOpenAckAmino, MsgConnectionOpenAckSDKType, MsgConnectionOpenConfirm, MsgConnectionOpenConfirmAmino, MsgConnectionOpenConfirmSDKType } from "./tx"; +import { MsgConnectionOpenInit, MsgConnectionOpenInitSDKType, MsgConnectionOpenTry, MsgConnectionOpenTrySDKType, MsgConnectionOpenAck, MsgConnectionOpenAckSDKType, MsgConnectionOpenConfirm, MsgConnectionOpenConfirmSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/ibc.core.connection.v1.MsgConnectionOpenInit", MsgConnectionOpenInit], ["/ibc.core.connection.v1.MsgConnectionOpenTry", MsgConnectionOpenTry], ["/ibc.core.connection.v1.MsgConnectionOpenAck", MsgConnectionOpenAck], ["/ibc.core.connection.v1.MsgConnectionOpenConfirm", MsgConnectionOpenConfirm]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/ibc/core/connection/v1/tx.rpc.msg.ts b/__fixtures__/outputv2/ibc/core/connection/v1/tx.rpc.msg.ts index 730701504d..c6d736d813 100644 --- a/__fixtures__/outputv2/ibc/core/connection/v1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/ibc/core/connection/v1/tx.rpc.msg.ts @@ -1,9 +1,9 @@ -import { Counterparty, CounterpartyAmino, CounterpartySDKType, Version, VersionAmino, VersionSDKType } from "./connection"; -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; -import { Height, HeightAmino, HeightSDKType } from "../../client/v1/client"; +import { Counterparty, CounterpartySDKType, Version, VersionSDKType } from "./connection"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { Height, HeightSDKType } from "../../client/v1/client"; import { Rpc } from "../../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgConnectionOpenInit, MsgConnectionOpenInitAmino, MsgConnectionOpenInitSDKType, MsgConnectionOpenInitResponse, MsgConnectionOpenInitResponseAmino, MsgConnectionOpenInitResponseSDKType, MsgConnectionOpenTry, MsgConnectionOpenTryAmino, MsgConnectionOpenTrySDKType, MsgConnectionOpenTryResponse, MsgConnectionOpenTryResponseAmino, MsgConnectionOpenTryResponseSDKType, MsgConnectionOpenAck, MsgConnectionOpenAckAmino, MsgConnectionOpenAckSDKType, MsgConnectionOpenAckResponse, MsgConnectionOpenAckResponseAmino, MsgConnectionOpenAckResponseSDKType, MsgConnectionOpenConfirm, MsgConnectionOpenConfirmAmino, MsgConnectionOpenConfirmSDKType, MsgConnectionOpenConfirmResponse, MsgConnectionOpenConfirmResponseAmino, MsgConnectionOpenConfirmResponseSDKType } from "./tx"; +import { MsgConnectionOpenInit, MsgConnectionOpenInitSDKType, MsgConnectionOpenInitResponse, MsgConnectionOpenInitResponseSDKType, MsgConnectionOpenTry, MsgConnectionOpenTrySDKType, MsgConnectionOpenTryResponse, MsgConnectionOpenTryResponseSDKType, MsgConnectionOpenAck, MsgConnectionOpenAckSDKType, MsgConnectionOpenAckResponse, MsgConnectionOpenAckResponseSDKType, MsgConnectionOpenConfirm, MsgConnectionOpenConfirmSDKType, MsgConnectionOpenConfirmResponse, MsgConnectionOpenConfirmResponseSDKType } from "./tx"; /** Msg defines the ibc/connection Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/ibc/core/connection/v1/tx.ts b/__fixtures__/outputv2/ibc/core/connection/v1/tx.ts index 6dbc6ca286..cfafdd19b9 100644 --- a/__fixtures__/outputv2/ibc/core/connection/v1/tx.ts +++ b/__fixtures__/outputv2/ibc/core/connection/v1/tx.ts @@ -1,5 +1,5 @@ import { Counterparty, CounterpartyAmino, CounterpartySDKType, Version, VersionAmino, VersionSDKType } from "./connection"; -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import { Height, HeightAmino, HeightSDKType } from "../../client/v1/client"; import { Long, isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../../helpers"; import * as _m0 from "protobufjs/minimal"; diff --git a/__fixtures__/outputv2/ibc/core/port/v1/query.rpc.Query.ts b/__fixtures__/outputv2/ibc/core/port/v1/query.rpc.Query.ts index dedc73862d..4415828783 100644 --- a/__fixtures__/outputv2/ibc/core/port/v1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/ibc/core/port/v1/query.rpc.Query.ts @@ -1,8 +1,8 @@ -import { Order, OrderAmino, OrderSDKType, Counterparty, CounterpartyAmino, CounterpartySDKType } from "../../channel/v1/channel"; +import { Order, OrderSDKType, Counterparty, CounterpartySDKType } from "../../channel/v1/channel"; import { Rpc } from "../../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryAppVersionRequest, QueryAppVersionRequestAmino, QueryAppVersionRequestSDKType, QueryAppVersionResponse, QueryAppVersionResponseAmino, QueryAppVersionResponseSDKType } from "./query"; +import { QueryAppVersionRequest, QueryAppVersionRequestSDKType, QueryAppVersionResponse, QueryAppVersionResponseSDKType } from "./query"; /** Query defines the gRPC querier service */ export interface Query { diff --git a/__fixtures__/outputv2/ibc/core/port/v1/query.ts b/__fixtures__/outputv2/ibc/core/port/v1/query.ts index bdd238919d..3b3f899b80 100644 --- a/__fixtures__/outputv2/ibc/core/port/v1/query.ts +++ b/__fixtures__/outputv2/ibc/core/port/v1/query.ts @@ -1,4 +1,4 @@ -import { Order, OrderAmino, OrderSDKType, Counterparty, CounterpartyAmino, CounterpartySDKType, orderFromJSON, orderToJSON } from "../../channel/v1/channel"; +import { Order, OrderSDKType, Counterparty, CounterpartyAmino, CounterpartySDKType, orderFromJSON, orderToJSON } from "../../channel/v1/channel"; import * as _m0 from "protobufjs/minimal"; import { isSet, DeepPartial } from "../../../../helpers"; export const protobufPackage = "ibc.core.port.v1"; diff --git a/__fixtures__/outputv2/ibc/lightclients/solomachine/v1/solomachine.ts b/__fixtures__/outputv2/ibc/lightclients/solomachine/v1/solomachine.ts index 8a0821fc29..39f064dd91 100644 --- a/__fixtures__/outputv2/ibc/lightclients/solomachine/v1/solomachine.ts +++ b/__fixtures__/outputv2/ibc/lightclients/solomachine/v1/solomachine.ts @@ -1,4 +1,4 @@ -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import { ConnectionEnd, ConnectionEndAmino, ConnectionEndSDKType } from "../../../core/connection/v1/connection"; import { Channel, ChannelAmino, ChannelSDKType } from "../../../core/channel/v1/channel"; import { Long, isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../../helpers"; diff --git a/__fixtures__/outputv2/ibc/lightclients/solomachine/v2/solomachine.ts b/__fixtures__/outputv2/ibc/lightclients/solomachine/v2/solomachine.ts index 8bf529335e..79696f0391 100644 --- a/__fixtures__/outputv2/ibc/lightclients/solomachine/v2/solomachine.ts +++ b/__fixtures__/outputv2/ibc/lightclients/solomachine/v2/solomachine.ts @@ -1,4 +1,4 @@ -import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import { ConnectionEnd, ConnectionEndAmino, ConnectionEndSDKType } from "../../../core/connection/v1/connection"; import { Channel, ChannelAmino, ChannelSDKType } from "../../../core/channel/v1/channel"; import { Long, isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../../helpers"; diff --git a/__fixtures__/outputv2/osmosis/claim/v1beta1/query.lcd.ts b/__fixtures__/outputv2/osmosis/claim/v1beta1/query.lcd.ts index 9cca790917..dd1b3ef330 100644 --- a/__fixtures__/outputv2/osmosis/claim/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/osmosis/claim/v1beta1/query.lcd.ts @@ -1,8 +1,8 @@ -import { Action, ActionAmino, ActionSDKType, ClaimRecord, ClaimRecordAmino, ClaimRecordSDKType } from "./claim"; -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { Params, ParamsAmino, ParamsSDKType } from "./params"; +import { Action, ActionSDKType, ClaimRecord, ClaimRecordSDKType } from "./claim"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { Params, ParamsSDKType } from "./params"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryModuleAccountBalanceRequest, QueryModuleAccountBalanceRequestAmino, QueryModuleAccountBalanceRequestSDKType, QueryModuleAccountBalanceResponse, QueryModuleAccountBalanceResponseAmino, QueryModuleAccountBalanceResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryClaimRecordRequest, QueryClaimRecordRequestAmino, QueryClaimRecordRequestSDKType, QueryClaimRecordResponse, QueryClaimRecordResponseAmino, QueryClaimRecordResponseSDKType, QueryClaimableForActionRequest, QueryClaimableForActionRequestAmino, QueryClaimableForActionRequestSDKType, QueryClaimableForActionResponse, QueryClaimableForActionResponseAmino, QueryClaimableForActionResponseSDKType, QueryTotalClaimableRequest, QueryTotalClaimableRequestAmino, QueryTotalClaimableRequestSDKType, QueryTotalClaimableResponse, QueryTotalClaimableResponseAmino, QueryTotalClaimableResponseSDKType } from "./query"; +import { QueryModuleAccountBalanceRequest, QueryModuleAccountBalanceRequestSDKType, QueryModuleAccountBalanceResponse, QueryModuleAccountBalanceResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryClaimRecordRequest, QueryClaimRecordRequestSDKType, QueryClaimRecordResponse, QueryClaimRecordResponseSDKType, QueryClaimableForActionRequest, QueryClaimableForActionRequestSDKType, QueryClaimableForActionResponse, QueryClaimableForActionResponseSDKType, QueryTotalClaimableRequest, QueryTotalClaimableRequestSDKType, QueryTotalClaimableResponse, QueryTotalClaimableResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/osmosis/claim/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/osmosis/claim/v1beta1/query.rpc.Query.ts index cdebfa0bf8..22c0d55d43 100644 --- a/__fixtures__/outputv2/osmosis/claim/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/osmosis/claim/v1beta1/query.rpc.Query.ts @@ -1,10 +1,10 @@ -import { Action, ActionAmino, ActionSDKType, ClaimRecord, ClaimRecordAmino, ClaimRecordSDKType } from "./claim"; -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { Params, ParamsAmino, ParamsSDKType } from "./params"; +import { Action, ActionSDKType, ClaimRecord, ClaimRecordSDKType } from "./claim"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { Params, ParamsSDKType } from "./params"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryModuleAccountBalanceRequest, QueryModuleAccountBalanceRequestAmino, QueryModuleAccountBalanceRequestSDKType, QueryModuleAccountBalanceResponse, QueryModuleAccountBalanceResponseAmino, QueryModuleAccountBalanceResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryClaimRecordRequest, QueryClaimRecordRequestAmino, QueryClaimRecordRequestSDKType, QueryClaimRecordResponse, QueryClaimRecordResponseAmino, QueryClaimRecordResponseSDKType, QueryClaimableForActionRequest, QueryClaimableForActionRequestAmino, QueryClaimableForActionRequestSDKType, QueryClaimableForActionResponse, QueryClaimableForActionResponseAmino, QueryClaimableForActionResponseSDKType, QueryTotalClaimableRequest, QueryTotalClaimableRequestAmino, QueryTotalClaimableRequestSDKType, QueryTotalClaimableResponse, QueryTotalClaimableResponseAmino, QueryTotalClaimableResponseSDKType } from "./query"; +import { QueryModuleAccountBalanceRequest, QueryModuleAccountBalanceRequestSDKType, QueryModuleAccountBalanceResponse, QueryModuleAccountBalanceResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryClaimRecordRequest, QueryClaimRecordRequestSDKType, QueryClaimRecordResponse, QueryClaimRecordResponseSDKType, QueryClaimableForActionRequest, QueryClaimableForActionRequestSDKType, QueryClaimableForActionResponse, QueryClaimableForActionResponseSDKType, QueryTotalClaimableRequest, QueryTotalClaimableRequestSDKType, QueryTotalClaimableResponse, QueryTotalClaimableResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/osmosis/claim/v1beta1/query.ts b/__fixtures__/outputv2/osmosis/claim/v1beta1/query.ts index bbfb15b1b6..9f74bcb706 100644 --- a/__fixtures__/outputv2/osmosis/claim/v1beta1/query.ts +++ b/__fixtures__/outputv2/osmosis/claim/v1beta1/query.ts @@ -1,4 +1,4 @@ -import { Action, ActionAmino, ActionSDKType, ClaimRecord, ClaimRecordAmino, ClaimRecordSDKType, actionFromJSON, actionToJSON } from "./claim"; +import { Action, ActionSDKType, ClaimRecord, ClaimRecordAmino, ClaimRecordSDKType, actionFromJSON, actionToJSON } from "./claim"; import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { Params, ParamsAmino, ParamsSDKType } from "./params"; import * as _m0 from "protobufjs/minimal"; diff --git a/__fixtures__/outputv2/osmosis/epochs/query.lcd.ts b/__fixtures__/outputv2/osmosis/epochs/query.lcd.ts index 060af2a481..0bb68080b1 100644 --- a/__fixtures__/outputv2/osmosis/epochs/query.lcd.ts +++ b/__fixtures__/outputv2/osmosis/epochs/query.lcd.ts @@ -1,6 +1,6 @@ -import { EpochInfo, EpochInfoAmino, EpochInfoSDKType } from "./genesis"; +import { EpochInfo, EpochInfoSDKType } from "./genesis"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryEpochsInfoRequest, QueryEpochsInfoRequestAmino, QueryEpochsInfoRequestSDKType, QueryEpochsInfoResponse, QueryEpochsInfoResponseAmino, QueryEpochsInfoResponseSDKType, QueryCurrentEpochRequest, QueryCurrentEpochRequestAmino, QueryCurrentEpochRequestSDKType, QueryCurrentEpochResponse, QueryCurrentEpochResponseAmino, QueryCurrentEpochResponseSDKType } from "./query"; +import { QueryEpochsInfoRequest, QueryEpochsInfoRequestSDKType, QueryEpochsInfoResponse, QueryEpochsInfoResponseSDKType, QueryCurrentEpochRequest, QueryCurrentEpochRequestSDKType, QueryCurrentEpochResponse, QueryCurrentEpochResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/osmosis/epochs/query.rpc.Query.ts b/__fixtures__/outputv2/osmosis/epochs/query.rpc.Query.ts index 5bc7ebeac3..0feb8fd6fa 100644 --- a/__fixtures__/outputv2/osmosis/epochs/query.rpc.Query.ts +++ b/__fixtures__/outputv2/osmosis/epochs/query.rpc.Query.ts @@ -1,8 +1,8 @@ -import { EpochInfo, EpochInfoAmino, EpochInfoSDKType } from "./genesis"; +import { EpochInfo, EpochInfoSDKType } from "./genesis"; import { Rpc } from "../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryEpochsInfoRequest, QueryEpochsInfoRequestAmino, QueryEpochsInfoRequestSDKType, QueryEpochsInfoResponse, QueryEpochsInfoResponseAmino, QueryEpochsInfoResponseSDKType, QueryCurrentEpochRequest, QueryCurrentEpochRequestAmino, QueryCurrentEpochRequestSDKType, QueryCurrentEpochResponse, QueryCurrentEpochResponseAmino, QueryCurrentEpochResponseSDKType } from "./query"; +import { QueryEpochsInfoRequest, QueryEpochsInfoRequestSDKType, QueryEpochsInfoResponse, QueryEpochsInfoResponseSDKType, QueryCurrentEpochRequest, QueryCurrentEpochRequestSDKType, QueryCurrentEpochResponse, QueryCurrentEpochResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.amino.ts b/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.amino.ts index bb43e29ccc..b534a5b986 100644 --- a/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.amino.ts +++ b/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.amino.ts @@ -1,6 +1,6 @@ //@ts-nocheck -import { PoolParams, PoolParamsAmino, PoolParamsSDKType, PoolAsset, PoolAssetAmino, PoolAssetSDKType } from "../balancerPool"; -import { MsgCreateBalancerPool, MsgCreateBalancerPoolAmino, MsgCreateBalancerPoolSDKType } from "./tx"; +import { PoolParams, PoolParamsSDKType, PoolAsset, PoolAssetSDKType } from "../balancerPool"; +import { MsgCreateBalancerPool, MsgCreateBalancerPoolSDKType } from "./tx"; export const AminoConverter = { "/osmosis.gamm.poolmodels.balancer.v1beta1.MsgCreateBalancerPool": { aminoType: "osmosis/gamm/poolmodels/balancer/create-balancer-pool", diff --git a/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.registry.ts b/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.registry.ts index 4f7da77e08..03cb2f53d7 100644 --- a/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.registry.ts +++ b/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.registry.ts @@ -1,6 +1,6 @@ -import { PoolParams, PoolParamsAmino, PoolParamsSDKType, PoolAsset, PoolAssetAmino, PoolAssetSDKType } from "../balancerPool"; +import { PoolParams, PoolParamsSDKType, PoolAsset, PoolAssetSDKType } from "../balancerPool"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgCreateBalancerPool, MsgCreateBalancerPoolAmino, MsgCreateBalancerPoolSDKType } from "./tx"; +import { MsgCreateBalancerPool, MsgCreateBalancerPoolSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/osmosis.gamm.poolmodels.balancer.v1beta1.MsgCreateBalancerPool", MsgCreateBalancerPool]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.rpc.msg.ts b/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.rpc.msg.ts index b095669ec3..96208e4162 100644 --- a/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/osmosis/gamm/pool-models/balancer/tx/tx.rpc.msg.ts @@ -1,7 +1,7 @@ -import { PoolParams, PoolParamsAmino, PoolParamsSDKType, PoolAsset, PoolAssetAmino, PoolAssetSDKType } from "../balancerPool"; +import { PoolParams, PoolParamsSDKType, PoolAsset, PoolAssetSDKType } from "../balancerPool"; import { Rpc } from "../../../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgCreateBalancerPool, MsgCreateBalancerPoolAmino, MsgCreateBalancerPoolSDKType, MsgCreateBalancerPoolResponse, MsgCreateBalancerPoolResponseAmino, MsgCreateBalancerPoolResponseSDKType } from "./tx"; +import { MsgCreateBalancerPool, MsgCreateBalancerPoolSDKType, MsgCreateBalancerPoolResponse, MsgCreateBalancerPoolResponseSDKType } from "./tx"; export interface Msg { createBalancerPool(request: MsgCreateBalancerPool): Promise; } diff --git a/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/tx.amino.ts b/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/tx.amino.ts index 3724580dcb..bcfb446197 100644 --- a/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/tx.amino.ts +++ b/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/tx.amino.ts @@ -1,7 +1,7 @@ //@ts-nocheck -import { PoolParams, PoolParamsAmino, PoolParamsSDKType } from "./stableswap_pool"; -import { Coin, CoinAmino, CoinSDKType } from "../../../../cosmos/base/v1beta1/coin"; -import { MsgCreateStableswapPool, MsgCreateStableswapPoolAmino, MsgCreateStableswapPoolSDKType, MsgStableSwapAdjustScalingFactors, MsgStableSwapAdjustScalingFactorsAmino, MsgStableSwapAdjustScalingFactorsSDKType } from "./tx"; +import { PoolParams, PoolParamsSDKType } from "./stableswap_pool"; +import { Coin, CoinSDKType } from "../../../../cosmos/base/v1beta1/coin"; +import { MsgCreateStableswapPool, MsgCreateStableswapPoolSDKType, MsgStableSwapAdjustScalingFactors, MsgStableSwapAdjustScalingFactorsSDKType } from "./tx"; export const AminoConverter = { "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgCreateStableswapPool": { aminoType: "osmosis/gamm/create-stableswap-pool", diff --git a/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/tx.registry.ts b/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/tx.registry.ts index eb6ed6c7f1..9a4e26594a 100644 --- a/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/tx.registry.ts +++ b/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/tx.registry.ts @@ -1,7 +1,7 @@ -import { PoolParams, PoolParamsAmino, PoolParamsSDKType } from "./stableswap_pool"; -import { Coin, CoinAmino, CoinSDKType } from "../../../../cosmos/base/v1beta1/coin"; +import { PoolParams, PoolParamsSDKType } from "./stableswap_pool"; +import { Coin, CoinSDKType } from "../../../../cosmos/base/v1beta1/coin"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgCreateStableswapPool, MsgCreateStableswapPoolAmino, MsgCreateStableswapPoolSDKType, MsgStableSwapAdjustScalingFactors, MsgStableSwapAdjustScalingFactorsAmino, MsgStableSwapAdjustScalingFactorsSDKType } from "./tx"; +import { MsgCreateStableswapPool, MsgCreateStableswapPoolSDKType, MsgStableSwapAdjustScalingFactors, MsgStableSwapAdjustScalingFactorsSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgCreateStableswapPool", MsgCreateStableswapPool], ["/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgStableSwapAdjustScalingFactors", MsgStableSwapAdjustScalingFactors]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/tx.rpc.msg.ts b/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/tx.rpc.msg.ts index 16a4c7ae58..b1f8be4e48 100644 --- a/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/osmosis/gamm/pool-models/stableswap/tx.rpc.msg.ts @@ -1,8 +1,8 @@ -import { PoolParams, PoolParamsAmino, PoolParamsSDKType } from "./stableswap_pool"; -import { Coin, CoinAmino, CoinSDKType } from "../../../../cosmos/base/v1beta1/coin"; +import { PoolParams, PoolParamsSDKType } from "./stableswap_pool"; +import { Coin, CoinSDKType } from "../../../../cosmos/base/v1beta1/coin"; import { Rpc } from "../../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgCreateStableswapPool, MsgCreateStableswapPoolAmino, MsgCreateStableswapPoolSDKType, MsgCreateStableswapPoolResponse, MsgCreateStableswapPoolResponseAmino, MsgCreateStableswapPoolResponseSDKType, MsgStableSwapAdjustScalingFactors, MsgStableSwapAdjustScalingFactorsAmino, MsgStableSwapAdjustScalingFactorsSDKType, MsgStableSwapAdjustScalingFactorsResponse, MsgStableSwapAdjustScalingFactorsResponseAmino, MsgStableSwapAdjustScalingFactorsResponseSDKType } from "./tx"; +import { MsgCreateStableswapPool, MsgCreateStableswapPoolSDKType, MsgCreateStableswapPoolResponse, MsgCreateStableswapPoolResponseSDKType, MsgStableSwapAdjustScalingFactors, MsgStableSwapAdjustScalingFactorsSDKType, MsgStableSwapAdjustScalingFactorsResponse, MsgStableSwapAdjustScalingFactorsResponseSDKType } from "./tx"; export interface Msg { createStableswapPool(request: MsgCreateStableswapPool): Promise; stableSwapAdjustScalingFactors(request: MsgStableSwapAdjustScalingFactors): Promise; diff --git a/__fixtures__/outputv2/osmosis/gamm/v1beta1/genesis.ts b/__fixtures__/outputv2/osmosis/gamm/v1beta1/genesis.ts index 4dd2f81597..5caafdea4f 100644 --- a/__fixtures__/outputv2/osmosis/gamm/v1beta1/genesis.ts +++ b/__fixtures__/outputv2/osmosis/gamm/v1beta1/genesis.ts @@ -1,10 +1,10 @@ import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Pool as Pool1 } from "../pool-models/balancer/balancerPool"; -import { PoolAmino as Pool1Amino } from "../pool-models/balancer/balancerPool"; +import { PoolProtoMsg as Pool1ProtoMsg } from "../pool-models/balancer/balancerPool"; import { PoolSDKType as Pool1SDKType } from "../pool-models/balancer/balancerPool"; import { Pool as Pool2 } from "../pool-models/stableswap/stableswap_pool"; -import { PoolAmino as Pool2Amino } from "../pool-models/stableswap/stableswap_pool"; +import { PoolProtoMsg as Pool2ProtoMsg } from "../pool-models/stableswap/stableswap_pool"; import { PoolSDKType as Pool2SDKType } from "../pool-models/stableswap/stableswap_pool"; import * as _m0 from "protobufjs/minimal"; import { DeepPartial, Long, isSet } from "../../../helpers"; @@ -45,6 +45,9 @@ export interface GenesisStateProtoMsg { typeUrl: "/osmosis.gamm.v1beta1.GenesisState"; value: Uint8Array; } +export type GenesisStateEncoded = Omit & { + pools: (Pool1ProtoMsg | Pool2ProtoMsg | AnyProtoMsg)[]; +}; /** GenesisState defines the gamm module's genesis state. */ export interface GenesisStateAmino { @@ -61,7 +64,7 @@ export interface GenesisStateAminoMsg { /** GenesisState defines the gamm module's genesis state. */ export interface GenesisStateSDKType { - pools: AnySDKType[]; + pools: (Pool1SDKType | Pool2SDKType | AnySDKType)[]; next_pool_number: Long; params?: ParamsSDKType; } diff --git a/__fixtures__/outputv2/osmosis/gamm/v1beta1/query.lcd.ts b/__fixtures__/outputv2/osmosis/gamm/v1beta1/query.lcd.ts index 8c24402f99..624e10a7f6 100644 --- a/__fixtures__/outputv2/osmosis/gamm/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/osmosis/gamm/v1beta1/query.lcd.ts @@ -1,16 +1,14 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { SwapAmountInRoute, SwapAmountInRouteAmino, SwapAmountInRouteSDKType, SwapAmountOutRoute, SwapAmountOutRouteAmino, SwapAmountOutRouteSDKType } from "./tx"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { SwapAmountInRoute, SwapAmountInRouteSDKType, SwapAmountOutRoute, SwapAmountOutRouteSDKType } from "./tx"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Pool as Pool1 } from "../pool-models/balancer/balancerPool"; -import { PoolAmino as Pool1Amino } from "../pool-models/balancer/balancerPool"; import { PoolSDKType as Pool1SDKType } from "../pool-models/balancer/balancerPool"; import { Pool as Pool2 } from "../pool-models/stableswap/stableswap_pool"; -import { PoolAmino as Pool2Amino } from "../pool-models/stableswap/stableswap_pool"; import { PoolSDKType as Pool2SDKType } from "../pool-models/stableswap/stableswap_pool"; import { setPaginationParams } from "../../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryPoolsRequest, QueryPoolsRequestAmino, QueryPoolsRequestSDKType, QueryPoolsResponse, QueryPoolsResponseAmino, QueryPoolsResponseSDKType, QueryNumPoolsRequest, QueryNumPoolsRequestAmino, QueryNumPoolsRequestSDKType, QueryNumPoolsResponse, QueryNumPoolsResponseAmino, QueryNumPoolsResponseSDKType, QueryTotalLiquidityRequest, QueryTotalLiquidityRequestAmino, QueryTotalLiquidityRequestSDKType, QueryTotalLiquidityResponse, QueryTotalLiquidityResponseAmino, QueryTotalLiquidityResponseSDKType, QueryPoolsWithFilterRequest, QueryPoolsWithFilterRequestAmino, QueryPoolsWithFilterRequestSDKType, QueryPoolsWithFilterResponse, QueryPoolsWithFilterResponseAmino, QueryPoolsWithFilterResponseSDKType, QueryPoolRequest, QueryPoolRequestAmino, QueryPoolRequestSDKType, QueryPoolResponse, QueryPoolResponseAmino, QueryPoolResponseSDKType, QueryPoolTypeRequest, QueryPoolTypeRequestAmino, QueryPoolTypeRequestSDKType, QueryPoolTypeResponse, QueryPoolTypeResponseAmino, QueryPoolTypeResponseSDKType, QueryCalcJoinPoolNoSwapSharesRequest, QueryCalcJoinPoolNoSwapSharesRequestAmino, QueryCalcJoinPoolNoSwapSharesRequestSDKType, QueryCalcJoinPoolNoSwapSharesResponse, QueryCalcJoinPoolNoSwapSharesResponseAmino, QueryCalcJoinPoolNoSwapSharesResponseSDKType, QueryCalcJoinPoolSharesRequest, QueryCalcJoinPoolSharesRequestAmino, QueryCalcJoinPoolSharesRequestSDKType, QueryCalcJoinPoolSharesResponse, QueryCalcJoinPoolSharesResponseAmino, QueryCalcJoinPoolSharesResponseSDKType, QueryCalcExitPoolCoinsFromSharesRequest, QueryCalcExitPoolCoinsFromSharesRequestAmino, QueryCalcExitPoolCoinsFromSharesRequestSDKType, QueryCalcExitPoolCoinsFromSharesResponse, QueryCalcExitPoolCoinsFromSharesResponseAmino, QueryCalcExitPoolCoinsFromSharesResponseSDKType, QueryPoolParamsRequest, QueryPoolParamsRequestAmino, QueryPoolParamsRequestSDKType, QueryPoolParamsResponse, QueryPoolParamsResponseAmino, QueryPoolParamsResponseSDKType, QueryTotalPoolLiquidityRequest, QueryTotalPoolLiquidityRequestAmino, QueryTotalPoolLiquidityRequestSDKType, QueryTotalPoolLiquidityResponse, QueryTotalPoolLiquidityResponseAmino, QueryTotalPoolLiquidityResponseSDKType, QueryTotalSharesRequest, QueryTotalSharesRequestAmino, QueryTotalSharesRequestSDKType, QueryTotalSharesResponse, QueryTotalSharesResponseAmino, QueryTotalSharesResponseSDKType, QuerySpotPriceRequest, QuerySpotPriceRequestAmino, QuerySpotPriceRequestSDKType, QuerySpotPriceResponse, QuerySpotPriceResponseAmino, QuerySpotPriceResponseSDKType, QuerySwapExactAmountInRequest, QuerySwapExactAmountInRequestAmino, QuerySwapExactAmountInRequestSDKType, QuerySwapExactAmountInResponse, QuerySwapExactAmountInResponseAmino, QuerySwapExactAmountInResponseSDKType, QuerySwapExactAmountOutRequest, QuerySwapExactAmountOutRequestAmino, QuerySwapExactAmountOutRequestSDKType, QuerySwapExactAmountOutResponse, QuerySwapExactAmountOutResponseAmino, QuerySwapExactAmountOutResponseSDKType } from "./query"; +import { QueryPoolsRequest, QueryPoolsRequestSDKType, QueryPoolsResponse, QueryPoolsResponseSDKType, QueryNumPoolsRequest, QueryNumPoolsRequestSDKType, QueryNumPoolsResponse, QueryNumPoolsResponseSDKType, QueryTotalLiquidityRequest, QueryTotalLiquidityRequestSDKType, QueryTotalLiquidityResponse, QueryTotalLiquidityResponseSDKType, QueryPoolsWithFilterRequest, QueryPoolsWithFilterRequestSDKType, QueryPoolsWithFilterResponse, QueryPoolsWithFilterResponseSDKType, QueryPoolRequest, QueryPoolRequestSDKType, QueryPoolResponse, QueryPoolResponseSDKType, QueryPoolTypeRequest, QueryPoolTypeRequestSDKType, QueryPoolTypeResponse, QueryPoolTypeResponseSDKType, QueryCalcJoinPoolNoSwapSharesRequest, QueryCalcJoinPoolNoSwapSharesRequestSDKType, QueryCalcJoinPoolNoSwapSharesResponse, QueryCalcJoinPoolNoSwapSharesResponseSDKType, QueryCalcJoinPoolSharesRequest, QueryCalcJoinPoolSharesRequestSDKType, QueryCalcJoinPoolSharesResponse, QueryCalcJoinPoolSharesResponseSDKType, QueryCalcExitPoolCoinsFromSharesRequest, QueryCalcExitPoolCoinsFromSharesRequestSDKType, QueryCalcExitPoolCoinsFromSharesResponse, QueryCalcExitPoolCoinsFromSharesResponseSDKType, QueryPoolParamsRequest, QueryPoolParamsRequestSDKType, QueryPoolParamsResponse, QueryPoolParamsResponseSDKType, QueryTotalPoolLiquidityRequest, QueryTotalPoolLiquidityRequestSDKType, QueryTotalPoolLiquidityResponse, QueryTotalPoolLiquidityResponseSDKType, QueryTotalSharesRequest, QueryTotalSharesRequestSDKType, QueryTotalSharesResponse, QueryTotalSharesResponseSDKType, QuerySpotPriceRequest, QuerySpotPriceRequestSDKType, QuerySpotPriceResponse, QuerySpotPriceResponseSDKType, QuerySwapExactAmountInRequest, QuerySwapExactAmountInRequestSDKType, QuerySwapExactAmountInResponse, QuerySwapExactAmountInResponseSDKType, QuerySwapExactAmountOutRequest, QuerySwapExactAmountOutRequestSDKType, QuerySwapExactAmountOutResponse, QuerySwapExactAmountOutResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/osmosis/gamm/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/osmosis/gamm/v1beta1/query.rpc.Query.ts index 863817d3df..28227bdbbc 100644 --- a/__fixtures__/outputv2/osmosis/gamm/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/osmosis/gamm/v1beta1/query.rpc.Query.ts @@ -1,19 +1,17 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { SwapAmountInRoute, SwapAmountInRouteAmino, SwapAmountInRouteSDKType, SwapAmountOutRoute, SwapAmountOutRouteAmino, SwapAmountOutRouteSDKType } from "./tx"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { SwapAmountInRoute, SwapAmountInRouteSDKType, SwapAmountOutRoute, SwapAmountOutRouteSDKType } from "./tx"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Pool as Pool1 } from "../pool-models/balancer/balancerPool"; -import { PoolAmino as Pool1Amino } from "../pool-models/balancer/balancerPool"; import { PoolSDKType as Pool1SDKType } from "../pool-models/balancer/balancerPool"; import { Pool as Pool2 } from "../pool-models/stableswap/stableswap_pool"; -import { PoolAmino as Pool2Amino } from "../pool-models/stableswap/stableswap_pool"; import { PoolSDKType as Pool2SDKType } from "../pool-models/stableswap/stableswap_pool"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient, ProtobufRpcClient } from "@cosmjs/stargate"; import { ReactQueryParams } from "../../../react-query"; import { useQuery } from "@tanstack/react-query"; -import { QueryPoolsRequest, QueryPoolsRequestAmino, QueryPoolsRequestSDKType, QueryPoolsResponse, QueryPoolsResponseAmino, QueryPoolsResponseSDKType, QueryNumPoolsRequest, QueryNumPoolsRequestAmino, QueryNumPoolsRequestSDKType, QueryNumPoolsResponse, QueryNumPoolsResponseAmino, QueryNumPoolsResponseSDKType, QueryTotalLiquidityRequest, QueryTotalLiquidityRequestAmino, QueryTotalLiquidityRequestSDKType, QueryTotalLiquidityResponse, QueryTotalLiquidityResponseAmino, QueryTotalLiquidityResponseSDKType, QueryPoolsWithFilterRequest, QueryPoolsWithFilterRequestAmino, QueryPoolsWithFilterRequestSDKType, QueryPoolsWithFilterResponse, QueryPoolsWithFilterResponseAmino, QueryPoolsWithFilterResponseSDKType, QueryPoolRequest, QueryPoolRequestAmino, QueryPoolRequestSDKType, QueryPoolResponse, QueryPoolResponseAmino, QueryPoolResponseSDKType, QueryPoolTypeRequest, QueryPoolTypeRequestAmino, QueryPoolTypeRequestSDKType, QueryPoolTypeResponse, QueryPoolTypeResponseAmino, QueryPoolTypeResponseSDKType, QueryCalcJoinPoolNoSwapSharesRequest, QueryCalcJoinPoolNoSwapSharesRequestAmino, QueryCalcJoinPoolNoSwapSharesRequestSDKType, QueryCalcJoinPoolNoSwapSharesResponse, QueryCalcJoinPoolNoSwapSharesResponseAmino, QueryCalcJoinPoolNoSwapSharesResponseSDKType, QueryCalcJoinPoolSharesRequest, QueryCalcJoinPoolSharesRequestAmino, QueryCalcJoinPoolSharesRequestSDKType, QueryCalcJoinPoolSharesResponse, QueryCalcJoinPoolSharesResponseAmino, QueryCalcJoinPoolSharesResponseSDKType, QueryCalcExitPoolCoinsFromSharesRequest, QueryCalcExitPoolCoinsFromSharesRequestAmino, QueryCalcExitPoolCoinsFromSharesRequestSDKType, QueryCalcExitPoolCoinsFromSharesResponse, QueryCalcExitPoolCoinsFromSharesResponseAmino, QueryCalcExitPoolCoinsFromSharesResponseSDKType, QueryPoolParamsRequest, QueryPoolParamsRequestAmino, QueryPoolParamsRequestSDKType, QueryPoolParamsResponse, QueryPoolParamsResponseAmino, QueryPoolParamsResponseSDKType, QueryTotalPoolLiquidityRequest, QueryTotalPoolLiquidityRequestAmino, QueryTotalPoolLiquidityRequestSDKType, QueryTotalPoolLiquidityResponse, QueryTotalPoolLiquidityResponseAmino, QueryTotalPoolLiquidityResponseSDKType, QueryTotalSharesRequest, QueryTotalSharesRequestAmino, QueryTotalSharesRequestSDKType, QueryTotalSharesResponse, QueryTotalSharesResponseAmino, QueryTotalSharesResponseSDKType, QuerySpotPriceRequest, QuerySpotPriceRequestAmino, QuerySpotPriceRequestSDKType, QuerySpotPriceResponse, QuerySpotPriceResponseAmino, QuerySpotPriceResponseSDKType, QuerySwapExactAmountInRequest, QuerySwapExactAmountInRequestAmino, QuerySwapExactAmountInRequestSDKType, QuerySwapExactAmountInResponse, QuerySwapExactAmountInResponseAmino, QuerySwapExactAmountInResponseSDKType, QuerySwapExactAmountOutRequest, QuerySwapExactAmountOutRequestAmino, QuerySwapExactAmountOutRequestSDKType, QuerySwapExactAmountOutResponse, QuerySwapExactAmountOutResponseAmino, QuerySwapExactAmountOutResponseSDKType } from "./query"; +import { QueryPoolsRequest, QueryPoolsRequestSDKType, QueryPoolsResponse, QueryPoolsResponseSDKType, QueryNumPoolsRequest, QueryNumPoolsRequestSDKType, QueryNumPoolsResponse, QueryNumPoolsResponseSDKType, QueryTotalLiquidityRequest, QueryTotalLiquidityRequestSDKType, QueryTotalLiquidityResponse, QueryTotalLiquidityResponseSDKType, QueryPoolsWithFilterRequest, QueryPoolsWithFilterRequestSDKType, QueryPoolsWithFilterResponse, QueryPoolsWithFilterResponseSDKType, QueryPoolRequest, QueryPoolRequestSDKType, QueryPoolResponse, QueryPoolResponseSDKType, QueryPoolTypeRequest, QueryPoolTypeRequestSDKType, QueryPoolTypeResponse, QueryPoolTypeResponseSDKType, QueryCalcJoinPoolNoSwapSharesRequest, QueryCalcJoinPoolNoSwapSharesRequestSDKType, QueryCalcJoinPoolNoSwapSharesResponse, QueryCalcJoinPoolNoSwapSharesResponseSDKType, QueryCalcJoinPoolSharesRequest, QueryCalcJoinPoolSharesRequestSDKType, QueryCalcJoinPoolSharesResponse, QueryCalcJoinPoolSharesResponseSDKType, QueryCalcExitPoolCoinsFromSharesRequest, QueryCalcExitPoolCoinsFromSharesRequestSDKType, QueryCalcExitPoolCoinsFromSharesResponse, QueryCalcExitPoolCoinsFromSharesResponseSDKType, QueryPoolParamsRequest, QueryPoolParamsRequestSDKType, QueryPoolParamsResponse, QueryPoolParamsResponseSDKType, QueryTotalPoolLiquidityRequest, QueryTotalPoolLiquidityRequestSDKType, QueryTotalPoolLiquidityResponse, QueryTotalPoolLiquidityResponseSDKType, QueryTotalSharesRequest, QueryTotalSharesRequestSDKType, QueryTotalSharesResponse, QueryTotalSharesResponseSDKType, QuerySpotPriceRequest, QuerySpotPriceRequestSDKType, QuerySpotPriceResponse, QuerySpotPriceResponseSDKType, QuerySwapExactAmountInRequest, QuerySwapExactAmountInRequestSDKType, QuerySwapExactAmountInResponse, QuerySwapExactAmountInResponseSDKType, QuerySwapExactAmountOutRequest, QuerySwapExactAmountOutRequestSDKType, QuerySwapExactAmountOutResponse, QuerySwapExactAmountOutResponseSDKType } from "./query"; export interface Query { pools(request?: QueryPoolsRequest): Promise; numPools(request?: QueryNumPoolsRequest): Promise; diff --git a/__fixtures__/outputv2/osmosis/gamm/v1beta1/query.ts b/__fixtures__/outputv2/osmosis/gamm/v1beta1/query.ts index 416dda2251..41d8ab88d6 100644 --- a/__fixtures__/outputv2/osmosis/gamm/v1beta1/query.ts +++ b/__fixtures__/outputv2/osmosis/gamm/v1beta1/query.ts @@ -1,12 +1,12 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { SwapAmountInRoute, SwapAmountInRouteAmino, SwapAmountInRouteSDKType, SwapAmountOutRoute, SwapAmountOutRouteAmino, SwapAmountOutRouteSDKType } from "./tx"; -import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Pool as Pool1 } from "../pool-models/balancer/balancerPool"; -import { PoolAmino as Pool1Amino } from "../pool-models/balancer/balancerPool"; +import { PoolProtoMsg as Pool1ProtoMsg } from "../pool-models/balancer/balancerPool"; import { PoolSDKType as Pool1SDKType } from "../pool-models/balancer/balancerPool"; import { Pool as Pool2 } from "../pool-models/stableswap/stableswap_pool"; -import { PoolAmino as Pool2Amino } from "../pool-models/stableswap/stableswap_pool"; +import { PoolProtoMsg as Pool2ProtoMsg } from "../pool-models/stableswap/stableswap_pool"; import { PoolSDKType as Pool2SDKType } from "../pool-models/stableswap/stableswap_pool"; import { Long, isSet, DeepPartial } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; @@ -41,6 +41,9 @@ export interface QueryPoolResponseProtoMsg { typeUrl: "/osmosis.gamm.v1beta1.QueryPoolResponse"; value: Uint8Array; } +export type QueryPoolResponseEncoded = Omit & { + pool?: Pool1ProtoMsg | Pool2ProtoMsg | AnyProtoMsg | undefined; +}; export interface QueryPoolResponseAmino { pool?: AnyAmino; } @@ -49,7 +52,7 @@ export interface QueryPoolResponseAminoMsg { value: QueryPoolResponseAmino; } export interface QueryPoolResponseSDKType { - pool?: AnySDKType; + pool?: Pool1SDKType | Pool2SDKType | AnySDKType | undefined; } /** =============================== Pools */ @@ -86,6 +89,9 @@ export interface QueryPoolsResponseProtoMsg { typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsResponse"; value: Uint8Array; } +export type QueryPoolsResponseEncoded = Omit & { + pools: (Pool1ProtoMsg | Pool2ProtoMsg | AnyProtoMsg)[]; +}; export interface QueryPoolsResponseAmino { pools: AnyAmino[]; @@ -97,7 +103,7 @@ export interface QueryPoolsResponseAminoMsg { value: QueryPoolsResponseAmino; } export interface QueryPoolsResponseSDKType { - pools: AnySDKType[]; + pools: (Pool1SDKType | Pool2SDKType | AnySDKType)[]; pagination?: PageResponseSDKType; } @@ -506,6 +512,9 @@ export interface QueryPoolsWithFilterResponseProtoMsg { typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsWithFilterResponse"; value: Uint8Array; } +export type QueryPoolsWithFilterResponseEncoded = Omit & { + pools: (Pool1ProtoMsg | Pool2ProtoMsg | AnyProtoMsg)[]; +}; export interface QueryPoolsWithFilterResponseAmino { pools: AnyAmino[]; @@ -517,7 +526,7 @@ export interface QueryPoolsWithFilterResponseAminoMsg { value: QueryPoolsWithFilterResponseAmino; } export interface QueryPoolsWithFilterResponseSDKType { - pools: AnySDKType[]; + pools: (Pool1SDKType | Pool2SDKType | AnySDKType)[]; pagination?: PageResponseSDKType; } diff --git a/__fixtures__/outputv2/osmosis/gamm/v1beta1/tx.amino.ts b/__fixtures__/outputv2/osmosis/gamm/v1beta1/tx.amino.ts index dc0b376f5c..2cb9f2d54d 100644 --- a/__fixtures__/outputv2/osmosis/gamm/v1beta1/tx.amino.ts +++ b/__fixtures__/outputv2/osmosis/gamm/v1beta1/tx.amino.ts @@ -1,6 +1,6 @@ //@ts-nocheck -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { MsgJoinPool, MsgJoinPoolAmino, MsgJoinPoolSDKType, MsgExitPool, MsgExitPoolAmino, MsgExitPoolSDKType, MsgSwapExactAmountIn, MsgSwapExactAmountInAmino, MsgSwapExactAmountInSDKType, MsgSwapExactAmountOut, MsgSwapExactAmountOutAmino, MsgSwapExactAmountOutSDKType, MsgJoinSwapExternAmountIn, MsgJoinSwapExternAmountInAmino, MsgJoinSwapExternAmountInSDKType, MsgJoinSwapShareAmountOut, MsgJoinSwapShareAmountOutAmino, MsgJoinSwapShareAmountOutSDKType, MsgExitSwapExternAmountOut, MsgExitSwapExternAmountOutAmino, MsgExitSwapExternAmountOutSDKType, MsgExitSwapShareAmountIn, MsgExitSwapShareAmountInAmino, MsgExitSwapShareAmountInSDKType } from "./tx"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { MsgJoinPool, MsgJoinPoolSDKType, MsgExitPool, MsgExitPoolSDKType, MsgSwapExactAmountIn, MsgSwapExactAmountInSDKType, MsgSwapExactAmountOut, MsgSwapExactAmountOutSDKType, MsgJoinSwapExternAmountIn, MsgJoinSwapExternAmountInSDKType, MsgJoinSwapShareAmountOut, MsgJoinSwapShareAmountOutSDKType, MsgExitSwapExternAmountOut, MsgExitSwapExternAmountOutSDKType, MsgExitSwapShareAmountIn, MsgExitSwapShareAmountInSDKType } from "./tx"; export const AminoConverter = { "/osmosis.gamm.v1beta1.MsgJoinPool": { aminoType: "osmosis/gamm/join-pool", diff --git a/__fixtures__/outputv2/osmosis/gamm/v1beta1/tx.registry.ts b/__fixtures__/outputv2/osmosis/gamm/v1beta1/tx.registry.ts index b596104ff7..3e36ff1a55 100644 --- a/__fixtures__/outputv2/osmosis/gamm/v1beta1/tx.registry.ts +++ b/__fixtures__/outputv2/osmosis/gamm/v1beta1/tx.registry.ts @@ -1,6 +1,6 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgJoinPool, MsgJoinPoolAmino, MsgJoinPoolSDKType, MsgExitPool, MsgExitPoolAmino, MsgExitPoolSDKType, MsgSwapExactAmountIn, MsgSwapExactAmountInAmino, MsgSwapExactAmountInSDKType, MsgSwapExactAmountOut, MsgSwapExactAmountOutAmino, MsgSwapExactAmountOutSDKType, MsgJoinSwapExternAmountIn, MsgJoinSwapExternAmountInAmino, MsgJoinSwapExternAmountInSDKType, MsgJoinSwapShareAmountOut, MsgJoinSwapShareAmountOutAmino, MsgJoinSwapShareAmountOutSDKType, MsgExitSwapExternAmountOut, MsgExitSwapExternAmountOutAmino, MsgExitSwapExternAmountOutSDKType, MsgExitSwapShareAmountIn, MsgExitSwapShareAmountInAmino, MsgExitSwapShareAmountInSDKType } from "./tx"; +import { MsgJoinPool, MsgJoinPoolSDKType, MsgExitPool, MsgExitPoolSDKType, MsgSwapExactAmountIn, MsgSwapExactAmountInSDKType, MsgSwapExactAmountOut, MsgSwapExactAmountOutSDKType, MsgJoinSwapExternAmountIn, MsgJoinSwapExternAmountInSDKType, MsgJoinSwapShareAmountOut, MsgJoinSwapShareAmountOutSDKType, MsgExitSwapExternAmountOut, MsgExitSwapExternAmountOutSDKType, MsgExitSwapShareAmountIn, MsgExitSwapShareAmountInSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/osmosis.gamm.v1beta1.MsgJoinPool", MsgJoinPool], ["/osmosis.gamm.v1beta1.MsgExitPool", MsgExitPool], ["/osmosis.gamm.v1beta1.MsgSwapExactAmountIn", MsgSwapExactAmountIn], ["/osmosis.gamm.v1beta1.MsgSwapExactAmountOut", MsgSwapExactAmountOut], ["/osmosis.gamm.v1beta1.MsgJoinSwapExternAmountIn", MsgJoinSwapExternAmountIn], ["/osmosis.gamm.v1beta1.MsgJoinSwapShareAmountOut", MsgJoinSwapShareAmountOut], ["/osmosis.gamm.v1beta1.MsgExitSwapExternAmountOut", MsgExitSwapExternAmountOut], ["/osmosis.gamm.v1beta1.MsgExitSwapShareAmountIn", MsgExitSwapShareAmountIn]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/osmosis/gamm/v1beta1/tx.rpc.msg.ts b/__fixtures__/outputv2/osmosis/gamm/v1beta1/tx.rpc.msg.ts index 093f427e84..85ef2916a6 100644 --- a/__fixtures__/outputv2/osmosis/gamm/v1beta1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/osmosis/gamm/v1beta1/tx.rpc.msg.ts @@ -1,7 +1,7 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgJoinPool, MsgJoinPoolAmino, MsgJoinPoolSDKType, MsgJoinPoolResponse, MsgJoinPoolResponseAmino, MsgJoinPoolResponseSDKType, MsgExitPool, MsgExitPoolAmino, MsgExitPoolSDKType, MsgExitPoolResponse, MsgExitPoolResponseAmino, MsgExitPoolResponseSDKType, MsgSwapExactAmountIn, MsgSwapExactAmountInAmino, MsgSwapExactAmountInSDKType, MsgSwapExactAmountInResponse, MsgSwapExactAmountInResponseAmino, MsgSwapExactAmountInResponseSDKType, MsgSwapExactAmountOut, MsgSwapExactAmountOutAmino, MsgSwapExactAmountOutSDKType, MsgSwapExactAmountOutResponse, MsgSwapExactAmountOutResponseAmino, MsgSwapExactAmountOutResponseSDKType, MsgJoinSwapExternAmountIn, MsgJoinSwapExternAmountInAmino, MsgJoinSwapExternAmountInSDKType, MsgJoinSwapExternAmountInResponse, MsgJoinSwapExternAmountInResponseAmino, MsgJoinSwapExternAmountInResponseSDKType, MsgJoinSwapShareAmountOut, MsgJoinSwapShareAmountOutAmino, MsgJoinSwapShareAmountOutSDKType, MsgJoinSwapShareAmountOutResponse, MsgJoinSwapShareAmountOutResponseAmino, MsgJoinSwapShareAmountOutResponseSDKType, MsgExitSwapExternAmountOut, MsgExitSwapExternAmountOutAmino, MsgExitSwapExternAmountOutSDKType, MsgExitSwapExternAmountOutResponse, MsgExitSwapExternAmountOutResponseAmino, MsgExitSwapExternAmountOutResponseSDKType, MsgExitSwapShareAmountIn, MsgExitSwapShareAmountInAmino, MsgExitSwapShareAmountInSDKType, MsgExitSwapShareAmountInResponse, MsgExitSwapShareAmountInResponseAmino, MsgExitSwapShareAmountInResponseSDKType } from "./tx"; +import { MsgJoinPool, MsgJoinPoolSDKType, MsgJoinPoolResponse, MsgJoinPoolResponseSDKType, MsgExitPool, MsgExitPoolSDKType, MsgExitPoolResponse, MsgExitPoolResponseSDKType, MsgSwapExactAmountIn, MsgSwapExactAmountInSDKType, MsgSwapExactAmountInResponse, MsgSwapExactAmountInResponseSDKType, MsgSwapExactAmountOut, MsgSwapExactAmountOutSDKType, MsgSwapExactAmountOutResponse, MsgSwapExactAmountOutResponseSDKType, MsgJoinSwapExternAmountIn, MsgJoinSwapExternAmountInSDKType, MsgJoinSwapExternAmountInResponse, MsgJoinSwapExternAmountInResponseSDKType, MsgJoinSwapShareAmountOut, MsgJoinSwapShareAmountOutSDKType, MsgJoinSwapShareAmountOutResponse, MsgJoinSwapShareAmountOutResponseSDKType, MsgExitSwapExternAmountOut, MsgExitSwapExternAmountOutSDKType, MsgExitSwapExternAmountOutResponse, MsgExitSwapExternAmountOutResponseSDKType, MsgExitSwapShareAmountIn, MsgExitSwapShareAmountInSDKType, MsgExitSwapShareAmountInResponse, MsgExitSwapShareAmountInResponseSDKType } from "./tx"; export interface Msg { joinPool(request: MsgJoinPool): Promise; exitPool(request: MsgExitPool): Promise; diff --git a/__fixtures__/outputv2/osmosis/gamm/v2/query.lcd.ts b/__fixtures__/outputv2/osmosis/gamm/v2/query.lcd.ts index 223ecaecea..64ea5859a5 100644 --- a/__fixtures__/outputv2/osmosis/gamm/v2/query.lcd.ts +++ b/__fixtures__/outputv2/osmosis/gamm/v2/query.lcd.ts @@ -1,5 +1,5 @@ import { LCDClient } from "@osmonauts/lcd"; -import { QuerySpotPriceRequest, QuerySpotPriceRequestAmino, QuerySpotPriceRequestSDKType, QuerySpotPriceResponse, QuerySpotPriceResponseAmino, QuerySpotPriceResponseSDKType } from "./query"; +import { QuerySpotPriceRequest, QuerySpotPriceRequestSDKType, QuerySpotPriceResponse, QuerySpotPriceResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/osmosis/gamm/v2/query.rpc.Query.ts b/__fixtures__/outputv2/osmosis/gamm/v2/query.rpc.Query.ts index b4f8d402e9..9b6026f705 100644 --- a/__fixtures__/outputv2/osmosis/gamm/v2/query.rpc.Query.ts +++ b/__fixtures__/outputv2/osmosis/gamm/v2/query.rpc.Query.ts @@ -3,7 +3,7 @@ import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient, ProtobufRpcClient } from "@cosmjs/stargate"; import { ReactQueryParams } from "../../../react-query"; import { useQuery } from "@tanstack/react-query"; -import { QuerySpotPriceRequest, QuerySpotPriceRequestAmino, QuerySpotPriceRequestSDKType, QuerySpotPriceResponse, QuerySpotPriceResponseAmino, QuerySpotPriceResponseSDKType } from "./query"; +import { QuerySpotPriceRequest, QuerySpotPriceRequestSDKType, QuerySpotPriceResponse, QuerySpotPriceResponseSDKType } from "./query"; export interface Query { /** * SpotPrice defines a gRPC query handler that returns the spot price given diff --git a/__fixtures__/outputv2/osmosis/ibc-rate-limit/v1beta1/query.lcd.ts b/__fixtures__/outputv2/osmosis/ibc-rate-limit/v1beta1/query.lcd.ts index aafdf22f07..9ba67d2574 100644 --- a/__fixtures__/outputv2/osmosis/ibc-rate-limit/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/osmosis/ibc-rate-limit/v1beta1/query.lcd.ts @@ -1,6 +1,6 @@ -import { Params, ParamsAmino, ParamsSDKType } from "./params"; +import { Params, ParamsSDKType } from "./params"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType } from "./query"; +import { QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/osmosis/ibc-rate-limit/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/osmosis/ibc-rate-limit/v1beta1/query.rpc.Query.ts index fe55d2c546..3c63dcef7e 100644 --- a/__fixtures__/outputv2/osmosis/ibc-rate-limit/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/osmosis/ibc-rate-limit/v1beta1/query.rpc.Query.ts @@ -1,8 +1,8 @@ -import { Params, ParamsAmino, ParamsSDKType } from "./params"; +import { Params, ParamsSDKType } from "./params"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType } from "./query"; +import { QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/osmosis/incentives/query.lcd.ts b/__fixtures__/outputv2/osmosis/incentives/query.lcd.ts index 0a221ee41f..7ee4b05685 100644 --- a/__fixtures__/outputv2/osmosis/incentives/query.lcd.ts +++ b/__fixtures__/outputv2/osmosis/incentives/query.lcd.ts @@ -1,10 +1,10 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../cosmos/base/query/v1beta1/pagination"; -import { Coin, CoinAmino, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; -import { Gauge, GaugeAmino, GaugeSDKType } from "./gauge"; -import { Duration, DurationAmino, DurationSDKType } from "../../google/protobuf/duration"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../cosmos/base/query/v1beta1/pagination"; +import { Coin, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; +import { Gauge, GaugeSDKType } from "./gauge"; +import { Duration, DurationSDKType } from "../../google/protobuf/duration"; import { setPaginationParams } from "../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { ModuleToDistributeCoinsRequest, ModuleToDistributeCoinsRequestAmino, ModuleToDistributeCoinsRequestSDKType, ModuleToDistributeCoinsResponse, ModuleToDistributeCoinsResponseAmino, ModuleToDistributeCoinsResponseSDKType, GaugeByIDRequest, GaugeByIDRequestAmino, GaugeByIDRequestSDKType, GaugeByIDResponse, GaugeByIDResponseAmino, GaugeByIDResponseSDKType, GaugesRequest, GaugesRequestAmino, GaugesRequestSDKType, GaugesResponse, GaugesResponseAmino, GaugesResponseSDKType, ActiveGaugesRequest, ActiveGaugesRequestAmino, ActiveGaugesRequestSDKType, ActiveGaugesResponse, ActiveGaugesResponseAmino, ActiveGaugesResponseSDKType, ActiveGaugesPerDenomRequest, ActiveGaugesPerDenomRequestAmino, ActiveGaugesPerDenomRequestSDKType, ActiveGaugesPerDenomResponse, ActiveGaugesPerDenomResponseAmino, ActiveGaugesPerDenomResponseSDKType, UpcomingGaugesRequest, UpcomingGaugesRequestAmino, UpcomingGaugesRequestSDKType, UpcomingGaugesResponse, UpcomingGaugesResponseAmino, UpcomingGaugesResponseSDKType, UpcomingGaugesPerDenomRequest, UpcomingGaugesPerDenomRequestAmino, UpcomingGaugesPerDenomRequestSDKType, UpcomingGaugesPerDenomResponse, UpcomingGaugesPerDenomResponseAmino, UpcomingGaugesPerDenomResponseSDKType, RewardsEstRequest, RewardsEstRequestAmino, RewardsEstRequestSDKType, RewardsEstResponse, RewardsEstResponseAmino, RewardsEstResponseSDKType, QueryLockableDurationsRequest, QueryLockableDurationsRequestAmino, QueryLockableDurationsRequestSDKType, QueryLockableDurationsResponse, QueryLockableDurationsResponseAmino, QueryLockableDurationsResponseSDKType } from "./query"; +import { ModuleToDistributeCoinsRequest, ModuleToDistributeCoinsRequestSDKType, ModuleToDistributeCoinsResponse, ModuleToDistributeCoinsResponseSDKType, GaugeByIDRequest, GaugeByIDRequestSDKType, GaugeByIDResponse, GaugeByIDResponseSDKType, GaugesRequest, GaugesRequestSDKType, GaugesResponse, GaugesResponseSDKType, ActiveGaugesRequest, ActiveGaugesRequestSDKType, ActiveGaugesResponse, ActiveGaugesResponseSDKType, ActiveGaugesPerDenomRequest, ActiveGaugesPerDenomRequestSDKType, ActiveGaugesPerDenomResponse, ActiveGaugesPerDenomResponseSDKType, UpcomingGaugesRequest, UpcomingGaugesRequestSDKType, UpcomingGaugesResponse, UpcomingGaugesResponseSDKType, UpcomingGaugesPerDenomRequest, UpcomingGaugesPerDenomRequestSDKType, UpcomingGaugesPerDenomResponse, UpcomingGaugesPerDenomResponseSDKType, RewardsEstRequest, RewardsEstRequestSDKType, RewardsEstResponse, RewardsEstResponseSDKType, QueryLockableDurationsRequest, QueryLockableDurationsRequestSDKType, QueryLockableDurationsResponse, QueryLockableDurationsResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/osmosis/incentives/query.rpc.Query.ts b/__fixtures__/outputv2/osmosis/incentives/query.rpc.Query.ts index 3c9c6474e6..d2ab2efa7b 100644 --- a/__fixtures__/outputv2/osmosis/incentives/query.rpc.Query.ts +++ b/__fixtures__/outputv2/osmosis/incentives/query.rpc.Query.ts @@ -1,11 +1,11 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../cosmos/base/query/v1beta1/pagination"; -import { Coin, CoinAmino, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; -import { Gauge, GaugeAmino, GaugeSDKType } from "./gauge"; -import { Duration, DurationAmino, DurationSDKType } from "../../google/protobuf/duration"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../cosmos/base/query/v1beta1/pagination"; +import { Coin, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; +import { Gauge, GaugeSDKType } from "./gauge"; +import { Duration, DurationSDKType } from "../../google/protobuf/duration"; import { Rpc } from "../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { ModuleToDistributeCoinsRequest, ModuleToDistributeCoinsRequestAmino, ModuleToDistributeCoinsRequestSDKType, ModuleToDistributeCoinsResponse, ModuleToDistributeCoinsResponseAmino, ModuleToDistributeCoinsResponseSDKType, GaugeByIDRequest, GaugeByIDRequestAmino, GaugeByIDRequestSDKType, GaugeByIDResponse, GaugeByIDResponseAmino, GaugeByIDResponseSDKType, GaugesRequest, GaugesRequestAmino, GaugesRequestSDKType, GaugesResponse, GaugesResponseAmino, GaugesResponseSDKType, ActiveGaugesRequest, ActiveGaugesRequestAmino, ActiveGaugesRequestSDKType, ActiveGaugesResponse, ActiveGaugesResponseAmino, ActiveGaugesResponseSDKType, ActiveGaugesPerDenomRequest, ActiveGaugesPerDenomRequestAmino, ActiveGaugesPerDenomRequestSDKType, ActiveGaugesPerDenomResponse, ActiveGaugesPerDenomResponseAmino, ActiveGaugesPerDenomResponseSDKType, UpcomingGaugesRequest, UpcomingGaugesRequestAmino, UpcomingGaugesRequestSDKType, UpcomingGaugesResponse, UpcomingGaugesResponseAmino, UpcomingGaugesResponseSDKType, UpcomingGaugesPerDenomRequest, UpcomingGaugesPerDenomRequestAmino, UpcomingGaugesPerDenomRequestSDKType, UpcomingGaugesPerDenomResponse, UpcomingGaugesPerDenomResponseAmino, UpcomingGaugesPerDenomResponseSDKType, RewardsEstRequest, RewardsEstRequestAmino, RewardsEstRequestSDKType, RewardsEstResponse, RewardsEstResponseAmino, RewardsEstResponseSDKType, QueryLockableDurationsRequest, QueryLockableDurationsRequestAmino, QueryLockableDurationsRequestSDKType, QueryLockableDurationsResponse, QueryLockableDurationsResponseAmino, QueryLockableDurationsResponseSDKType } from "./query"; +import { ModuleToDistributeCoinsRequest, ModuleToDistributeCoinsRequestSDKType, ModuleToDistributeCoinsResponse, ModuleToDistributeCoinsResponseSDKType, GaugeByIDRequest, GaugeByIDRequestSDKType, GaugeByIDResponse, GaugeByIDResponseSDKType, GaugesRequest, GaugesRequestSDKType, GaugesResponse, GaugesResponseSDKType, ActiveGaugesRequest, ActiveGaugesRequestSDKType, ActiveGaugesResponse, ActiveGaugesResponseSDKType, ActiveGaugesPerDenomRequest, ActiveGaugesPerDenomRequestSDKType, ActiveGaugesPerDenomResponse, ActiveGaugesPerDenomResponseSDKType, UpcomingGaugesRequest, UpcomingGaugesRequestSDKType, UpcomingGaugesResponse, UpcomingGaugesResponseSDKType, UpcomingGaugesPerDenomRequest, UpcomingGaugesPerDenomRequestSDKType, UpcomingGaugesPerDenomResponse, UpcomingGaugesPerDenomResponseSDKType, RewardsEstRequest, RewardsEstRequestSDKType, RewardsEstResponse, RewardsEstResponseSDKType, QueryLockableDurationsRequest, QueryLockableDurationsRequestSDKType, QueryLockableDurationsResponse, QueryLockableDurationsResponseSDKType } from "./query"; /** Query defines the gRPC querier service */ export interface Query { diff --git a/__fixtures__/outputv2/osmosis/incentives/tx.amino.ts b/__fixtures__/outputv2/osmosis/incentives/tx.amino.ts index cdf1e04a70..611329d2ee 100644 --- a/__fixtures__/outputv2/osmosis/incentives/tx.amino.ts +++ b/__fixtures__/outputv2/osmosis/incentives/tx.amino.ts @@ -1,8 +1,8 @@ //@ts-nocheck -import { QueryCondition, QueryConditionAmino, QueryConditionSDKType } from "../lockup/lock"; -import { Coin, CoinAmino, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; -import { Timestamp, TimestampAmino, TimestampSDKType } from "../../google/protobuf/timestamp"; -import { MsgCreateGauge, MsgCreateGaugeAmino, MsgCreateGaugeSDKType, MsgAddToGauge, MsgAddToGaugeAmino, MsgAddToGaugeSDKType } from "./tx"; +import { QueryCondition, QueryConditionSDKType } from "../lockup/lock"; +import { Coin, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; +import { Timestamp, TimestampSDKType } from "../../google/protobuf/timestamp"; +import { MsgCreateGauge, MsgCreateGaugeSDKType, MsgAddToGauge, MsgAddToGaugeSDKType } from "./tx"; export const AminoConverter = { "/osmosis.incentives.MsgCreateGauge": { aminoType: "osmosis/incentives/create-gauge", diff --git a/__fixtures__/outputv2/osmosis/incentives/tx.registry.ts b/__fixtures__/outputv2/osmosis/incentives/tx.registry.ts index c362fb791e..bfd5ee6b38 100644 --- a/__fixtures__/outputv2/osmosis/incentives/tx.registry.ts +++ b/__fixtures__/outputv2/osmosis/incentives/tx.registry.ts @@ -1,8 +1,8 @@ -import { QueryCondition, QueryConditionAmino, QueryConditionSDKType } from "../lockup/lock"; -import { Coin, CoinAmino, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; -import { Timestamp, TimestampAmino, TimestampSDKType } from "../../google/protobuf/timestamp"; +import { QueryCondition, QueryConditionSDKType } from "../lockup/lock"; +import { Coin, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; +import { Timestamp, TimestampSDKType } from "../../google/protobuf/timestamp"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgCreateGauge, MsgCreateGaugeAmino, MsgCreateGaugeSDKType, MsgAddToGauge, MsgAddToGaugeAmino, MsgAddToGaugeSDKType } from "./tx"; +import { MsgCreateGauge, MsgCreateGaugeSDKType, MsgAddToGauge, MsgAddToGaugeSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/osmosis.incentives.MsgCreateGauge", MsgCreateGauge], ["/osmosis.incentives.MsgAddToGauge", MsgAddToGauge]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/osmosis/incentives/tx.rpc.msg.ts b/__fixtures__/outputv2/osmosis/incentives/tx.rpc.msg.ts index dcd90f8dc1..b478c16460 100644 --- a/__fixtures__/outputv2/osmosis/incentives/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/osmosis/incentives/tx.rpc.msg.ts @@ -1,9 +1,9 @@ -import { QueryCondition, QueryConditionAmino, QueryConditionSDKType } from "../lockup/lock"; -import { Coin, CoinAmino, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; -import { Timestamp, TimestampAmino, TimestampSDKType } from "../../google/protobuf/timestamp"; +import { QueryCondition, QueryConditionSDKType } from "../lockup/lock"; +import { Coin, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; +import { Timestamp, TimestampSDKType } from "../../google/protobuf/timestamp"; import { Rpc } from "../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgCreateGauge, MsgCreateGaugeAmino, MsgCreateGaugeSDKType, MsgCreateGaugeResponse, MsgCreateGaugeResponseAmino, MsgCreateGaugeResponseSDKType, MsgAddToGauge, MsgAddToGaugeAmino, MsgAddToGaugeSDKType, MsgAddToGaugeResponse, MsgAddToGaugeResponseAmino, MsgAddToGaugeResponseSDKType } from "./tx"; +import { MsgCreateGauge, MsgCreateGaugeSDKType, MsgCreateGaugeResponse, MsgCreateGaugeResponseSDKType, MsgAddToGauge, MsgAddToGaugeSDKType, MsgAddToGaugeResponse, MsgAddToGaugeResponseSDKType } from "./tx"; export interface Msg { createGauge(request: MsgCreateGauge): Promise; addToGauge(request: MsgAddToGauge): Promise; diff --git a/__fixtures__/outputv2/osmosis/lockup/query.lcd.ts b/__fixtures__/outputv2/osmosis/lockup/query.lcd.ts index 7c1cff5dbe..5b56f96b80 100644 --- a/__fixtures__/outputv2/osmosis/lockup/query.lcd.ts +++ b/__fixtures__/outputv2/osmosis/lockup/query.lcd.ts @@ -1,10 +1,10 @@ -import { Timestamp, TimestampAmino, TimestampSDKType } from "../../google/protobuf/timestamp"; -import { Duration, DurationAmino, DurationSDKType } from "../../google/protobuf/duration"; -import { Coin, CoinAmino, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; -import { PeriodLock, PeriodLockAmino, PeriodLockSDKType, SyntheticLock, SyntheticLockAmino, SyntheticLockSDKType } from "./lock"; -import { Params, ParamsAmino, ParamsSDKType } from "./params"; +import { Timestamp, TimestampSDKType } from "../../google/protobuf/timestamp"; +import { Duration, DurationSDKType } from "../../google/protobuf/duration"; +import { Coin, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; +import { PeriodLock, PeriodLockSDKType, SyntheticLock, SyntheticLockSDKType } from "./lock"; +import { Params, ParamsSDKType } from "./params"; import { LCDClient } from "@osmonauts/lcd"; -import { ModuleBalanceRequest, ModuleBalanceRequestAmino, ModuleBalanceRequestSDKType, ModuleBalanceResponse, ModuleBalanceResponseAmino, ModuleBalanceResponseSDKType, ModuleLockedAmountRequest, ModuleLockedAmountRequestAmino, ModuleLockedAmountRequestSDKType, ModuleLockedAmountResponse, ModuleLockedAmountResponseAmino, ModuleLockedAmountResponseSDKType, AccountUnlockableCoinsRequest, AccountUnlockableCoinsRequestAmino, AccountUnlockableCoinsRequestSDKType, AccountUnlockableCoinsResponse, AccountUnlockableCoinsResponseAmino, AccountUnlockableCoinsResponseSDKType, AccountUnlockingCoinsRequest, AccountUnlockingCoinsRequestAmino, AccountUnlockingCoinsRequestSDKType, AccountUnlockingCoinsResponse, AccountUnlockingCoinsResponseAmino, AccountUnlockingCoinsResponseSDKType, AccountLockedCoinsRequest, AccountLockedCoinsRequestAmino, AccountLockedCoinsRequestSDKType, AccountLockedCoinsResponse, AccountLockedCoinsResponseAmino, AccountLockedCoinsResponseSDKType, AccountLockedPastTimeRequest, AccountLockedPastTimeRequestAmino, AccountLockedPastTimeRequestSDKType, AccountLockedPastTimeResponse, AccountLockedPastTimeResponseAmino, AccountLockedPastTimeResponseSDKType, AccountLockedPastTimeNotUnlockingOnlyRequest, AccountLockedPastTimeNotUnlockingOnlyRequestAmino, AccountLockedPastTimeNotUnlockingOnlyRequestSDKType, AccountLockedPastTimeNotUnlockingOnlyResponse, AccountLockedPastTimeNotUnlockingOnlyResponseAmino, AccountLockedPastTimeNotUnlockingOnlyResponseSDKType, AccountUnlockedBeforeTimeRequest, AccountUnlockedBeforeTimeRequestAmino, AccountUnlockedBeforeTimeRequestSDKType, AccountUnlockedBeforeTimeResponse, AccountUnlockedBeforeTimeResponseAmino, AccountUnlockedBeforeTimeResponseSDKType, AccountLockedPastTimeDenomRequest, AccountLockedPastTimeDenomRequestAmino, AccountLockedPastTimeDenomRequestSDKType, AccountLockedPastTimeDenomResponse, AccountLockedPastTimeDenomResponseAmino, AccountLockedPastTimeDenomResponseSDKType, LockedDenomRequest, LockedDenomRequestAmino, LockedDenomRequestSDKType, LockedDenomResponse, LockedDenomResponseAmino, LockedDenomResponseSDKType, LockedRequest, LockedRequestAmino, LockedRequestSDKType, LockedResponse, LockedResponseAmino, LockedResponseSDKType, SyntheticLockupsByLockupIDRequest, SyntheticLockupsByLockupIDRequestAmino, SyntheticLockupsByLockupIDRequestSDKType, SyntheticLockupsByLockupIDResponse, SyntheticLockupsByLockupIDResponseAmino, SyntheticLockupsByLockupIDResponseSDKType, AccountLockedLongerDurationRequest, AccountLockedLongerDurationRequestAmino, AccountLockedLongerDurationRequestSDKType, AccountLockedLongerDurationResponse, AccountLockedLongerDurationResponseAmino, AccountLockedLongerDurationResponseSDKType, AccountLockedDurationRequest, AccountLockedDurationRequestAmino, AccountLockedDurationRequestSDKType, AccountLockedDurationResponse, AccountLockedDurationResponseAmino, AccountLockedDurationResponseSDKType, AccountLockedLongerDurationNotUnlockingOnlyRequest, AccountLockedLongerDurationNotUnlockingOnlyRequestAmino, AccountLockedLongerDurationNotUnlockingOnlyRequestSDKType, AccountLockedLongerDurationNotUnlockingOnlyResponse, AccountLockedLongerDurationNotUnlockingOnlyResponseAmino, AccountLockedLongerDurationNotUnlockingOnlyResponseSDKType, AccountLockedLongerDurationDenomRequest, AccountLockedLongerDurationDenomRequestAmino, AccountLockedLongerDurationDenomRequestSDKType, AccountLockedLongerDurationDenomResponse, AccountLockedLongerDurationDenomResponseAmino, AccountLockedLongerDurationDenomResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType } from "./query"; +import { ModuleBalanceRequest, ModuleBalanceRequestSDKType, ModuleBalanceResponse, ModuleBalanceResponseSDKType, ModuleLockedAmountRequest, ModuleLockedAmountRequestSDKType, ModuleLockedAmountResponse, ModuleLockedAmountResponseSDKType, AccountUnlockableCoinsRequest, AccountUnlockableCoinsRequestSDKType, AccountUnlockableCoinsResponse, AccountUnlockableCoinsResponseSDKType, AccountUnlockingCoinsRequest, AccountUnlockingCoinsRequestSDKType, AccountUnlockingCoinsResponse, AccountUnlockingCoinsResponseSDKType, AccountLockedCoinsRequest, AccountLockedCoinsRequestSDKType, AccountLockedCoinsResponse, AccountLockedCoinsResponseSDKType, AccountLockedPastTimeRequest, AccountLockedPastTimeRequestSDKType, AccountLockedPastTimeResponse, AccountLockedPastTimeResponseSDKType, AccountLockedPastTimeNotUnlockingOnlyRequest, AccountLockedPastTimeNotUnlockingOnlyRequestSDKType, AccountLockedPastTimeNotUnlockingOnlyResponse, AccountLockedPastTimeNotUnlockingOnlyResponseSDKType, AccountUnlockedBeforeTimeRequest, AccountUnlockedBeforeTimeRequestSDKType, AccountUnlockedBeforeTimeResponse, AccountUnlockedBeforeTimeResponseSDKType, AccountLockedPastTimeDenomRequest, AccountLockedPastTimeDenomRequestSDKType, AccountLockedPastTimeDenomResponse, AccountLockedPastTimeDenomResponseSDKType, LockedDenomRequest, LockedDenomRequestSDKType, LockedDenomResponse, LockedDenomResponseSDKType, LockedRequest, LockedRequestSDKType, LockedResponse, LockedResponseSDKType, SyntheticLockupsByLockupIDRequest, SyntheticLockupsByLockupIDRequestSDKType, SyntheticLockupsByLockupIDResponse, SyntheticLockupsByLockupIDResponseSDKType, AccountLockedLongerDurationRequest, AccountLockedLongerDurationRequestSDKType, AccountLockedLongerDurationResponse, AccountLockedLongerDurationResponseSDKType, AccountLockedDurationRequest, AccountLockedDurationRequestSDKType, AccountLockedDurationResponse, AccountLockedDurationResponseSDKType, AccountLockedLongerDurationNotUnlockingOnlyRequest, AccountLockedLongerDurationNotUnlockingOnlyRequestSDKType, AccountLockedLongerDurationNotUnlockingOnlyResponse, AccountLockedLongerDurationNotUnlockingOnlyResponseSDKType, AccountLockedLongerDurationDenomRequest, AccountLockedLongerDurationDenomRequestSDKType, AccountLockedLongerDurationDenomResponse, AccountLockedLongerDurationDenomResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/osmosis/lockup/query.rpc.Query.ts b/__fixtures__/outputv2/osmosis/lockup/query.rpc.Query.ts index 6a73426dbf..d6b308154a 100644 --- a/__fixtures__/outputv2/osmosis/lockup/query.rpc.Query.ts +++ b/__fixtures__/outputv2/osmosis/lockup/query.rpc.Query.ts @@ -1,12 +1,12 @@ -import { Timestamp, TimestampAmino, TimestampSDKType } from "../../google/protobuf/timestamp"; -import { Duration, DurationAmino, DurationSDKType } from "../../google/protobuf/duration"; -import { Coin, CoinAmino, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; -import { PeriodLock, PeriodLockAmino, PeriodLockSDKType, SyntheticLock, SyntheticLockAmino, SyntheticLockSDKType } from "./lock"; -import { Params, ParamsAmino, ParamsSDKType } from "./params"; +import { Timestamp, TimestampSDKType } from "../../google/protobuf/timestamp"; +import { Duration, DurationSDKType } from "../../google/protobuf/duration"; +import { Coin, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; +import { PeriodLock, PeriodLockSDKType, SyntheticLock, SyntheticLockSDKType } from "./lock"; +import { Params, ParamsSDKType } from "./params"; import { Rpc } from "../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { ModuleBalanceRequest, ModuleBalanceRequestAmino, ModuleBalanceRequestSDKType, ModuleBalanceResponse, ModuleBalanceResponseAmino, ModuleBalanceResponseSDKType, ModuleLockedAmountRequest, ModuleLockedAmountRequestAmino, ModuleLockedAmountRequestSDKType, ModuleLockedAmountResponse, ModuleLockedAmountResponseAmino, ModuleLockedAmountResponseSDKType, AccountUnlockableCoinsRequest, AccountUnlockableCoinsRequestAmino, AccountUnlockableCoinsRequestSDKType, AccountUnlockableCoinsResponse, AccountUnlockableCoinsResponseAmino, AccountUnlockableCoinsResponseSDKType, AccountUnlockingCoinsRequest, AccountUnlockingCoinsRequestAmino, AccountUnlockingCoinsRequestSDKType, AccountUnlockingCoinsResponse, AccountUnlockingCoinsResponseAmino, AccountUnlockingCoinsResponseSDKType, AccountLockedCoinsRequest, AccountLockedCoinsRequestAmino, AccountLockedCoinsRequestSDKType, AccountLockedCoinsResponse, AccountLockedCoinsResponseAmino, AccountLockedCoinsResponseSDKType, AccountLockedPastTimeRequest, AccountLockedPastTimeRequestAmino, AccountLockedPastTimeRequestSDKType, AccountLockedPastTimeResponse, AccountLockedPastTimeResponseAmino, AccountLockedPastTimeResponseSDKType, AccountLockedPastTimeNotUnlockingOnlyRequest, AccountLockedPastTimeNotUnlockingOnlyRequestAmino, AccountLockedPastTimeNotUnlockingOnlyRequestSDKType, AccountLockedPastTimeNotUnlockingOnlyResponse, AccountLockedPastTimeNotUnlockingOnlyResponseAmino, AccountLockedPastTimeNotUnlockingOnlyResponseSDKType, AccountUnlockedBeforeTimeRequest, AccountUnlockedBeforeTimeRequestAmino, AccountUnlockedBeforeTimeRequestSDKType, AccountUnlockedBeforeTimeResponse, AccountUnlockedBeforeTimeResponseAmino, AccountUnlockedBeforeTimeResponseSDKType, AccountLockedPastTimeDenomRequest, AccountLockedPastTimeDenomRequestAmino, AccountLockedPastTimeDenomRequestSDKType, AccountLockedPastTimeDenomResponse, AccountLockedPastTimeDenomResponseAmino, AccountLockedPastTimeDenomResponseSDKType, LockedDenomRequest, LockedDenomRequestAmino, LockedDenomRequestSDKType, LockedDenomResponse, LockedDenomResponseAmino, LockedDenomResponseSDKType, LockedRequest, LockedRequestAmino, LockedRequestSDKType, LockedResponse, LockedResponseAmino, LockedResponseSDKType, SyntheticLockupsByLockupIDRequest, SyntheticLockupsByLockupIDRequestAmino, SyntheticLockupsByLockupIDRequestSDKType, SyntheticLockupsByLockupIDResponse, SyntheticLockupsByLockupIDResponseAmino, SyntheticLockupsByLockupIDResponseSDKType, AccountLockedLongerDurationRequest, AccountLockedLongerDurationRequestAmino, AccountLockedLongerDurationRequestSDKType, AccountLockedLongerDurationResponse, AccountLockedLongerDurationResponseAmino, AccountLockedLongerDurationResponseSDKType, AccountLockedDurationRequest, AccountLockedDurationRequestAmino, AccountLockedDurationRequestSDKType, AccountLockedDurationResponse, AccountLockedDurationResponseAmino, AccountLockedDurationResponseSDKType, AccountLockedLongerDurationNotUnlockingOnlyRequest, AccountLockedLongerDurationNotUnlockingOnlyRequestAmino, AccountLockedLongerDurationNotUnlockingOnlyRequestSDKType, AccountLockedLongerDurationNotUnlockingOnlyResponse, AccountLockedLongerDurationNotUnlockingOnlyResponseAmino, AccountLockedLongerDurationNotUnlockingOnlyResponseSDKType, AccountLockedLongerDurationDenomRequest, AccountLockedLongerDurationDenomRequestAmino, AccountLockedLongerDurationDenomRequestSDKType, AccountLockedLongerDurationDenomResponse, AccountLockedLongerDurationDenomResponseAmino, AccountLockedLongerDurationDenomResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType } from "./query"; +import { ModuleBalanceRequest, ModuleBalanceRequestSDKType, ModuleBalanceResponse, ModuleBalanceResponseSDKType, ModuleLockedAmountRequest, ModuleLockedAmountRequestSDKType, ModuleLockedAmountResponse, ModuleLockedAmountResponseSDKType, AccountUnlockableCoinsRequest, AccountUnlockableCoinsRequestSDKType, AccountUnlockableCoinsResponse, AccountUnlockableCoinsResponseSDKType, AccountUnlockingCoinsRequest, AccountUnlockingCoinsRequestSDKType, AccountUnlockingCoinsResponse, AccountUnlockingCoinsResponseSDKType, AccountLockedCoinsRequest, AccountLockedCoinsRequestSDKType, AccountLockedCoinsResponse, AccountLockedCoinsResponseSDKType, AccountLockedPastTimeRequest, AccountLockedPastTimeRequestSDKType, AccountLockedPastTimeResponse, AccountLockedPastTimeResponseSDKType, AccountLockedPastTimeNotUnlockingOnlyRequest, AccountLockedPastTimeNotUnlockingOnlyRequestSDKType, AccountLockedPastTimeNotUnlockingOnlyResponse, AccountLockedPastTimeNotUnlockingOnlyResponseSDKType, AccountUnlockedBeforeTimeRequest, AccountUnlockedBeforeTimeRequestSDKType, AccountUnlockedBeforeTimeResponse, AccountUnlockedBeforeTimeResponseSDKType, AccountLockedPastTimeDenomRequest, AccountLockedPastTimeDenomRequestSDKType, AccountLockedPastTimeDenomResponse, AccountLockedPastTimeDenomResponseSDKType, LockedDenomRequest, LockedDenomRequestSDKType, LockedDenomResponse, LockedDenomResponseSDKType, LockedRequest, LockedRequestSDKType, LockedResponse, LockedResponseSDKType, SyntheticLockupsByLockupIDRequest, SyntheticLockupsByLockupIDRequestSDKType, SyntheticLockupsByLockupIDResponse, SyntheticLockupsByLockupIDResponseSDKType, AccountLockedLongerDurationRequest, AccountLockedLongerDurationRequestSDKType, AccountLockedLongerDurationResponse, AccountLockedLongerDurationResponseSDKType, AccountLockedDurationRequest, AccountLockedDurationRequestSDKType, AccountLockedDurationResponse, AccountLockedDurationResponseSDKType, AccountLockedLongerDurationNotUnlockingOnlyRequest, AccountLockedLongerDurationNotUnlockingOnlyRequestSDKType, AccountLockedLongerDurationNotUnlockingOnlyResponse, AccountLockedLongerDurationNotUnlockingOnlyResponseSDKType, AccountLockedLongerDurationDenomRequest, AccountLockedLongerDurationDenomRequestSDKType, AccountLockedLongerDurationDenomResponse, AccountLockedLongerDurationDenomResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/osmosis/lockup/tx.amino.ts b/__fixtures__/outputv2/osmosis/lockup/tx.amino.ts index d70cdf954e..ece28f0b74 100644 --- a/__fixtures__/outputv2/osmosis/lockup/tx.amino.ts +++ b/__fixtures__/outputv2/osmosis/lockup/tx.amino.ts @@ -1,8 +1,8 @@ //@ts-nocheck -import { Duration, DurationAmino, DurationSDKType } from "../../google/protobuf/duration"; -import { Coin, CoinAmino, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; -import { PeriodLock, PeriodLockAmino, PeriodLockSDKType } from "./lock"; -import { MsgLockTokens, MsgLockTokensAmino, MsgLockTokensSDKType, MsgBeginUnlockingAll, MsgBeginUnlockingAllAmino, MsgBeginUnlockingAllSDKType, MsgBeginUnlocking, MsgBeginUnlockingAmino, MsgBeginUnlockingSDKType, MsgExtendLockup, MsgExtendLockupAmino, MsgExtendLockupSDKType, MsgForceUnlock, MsgForceUnlockAmino, MsgForceUnlockSDKType } from "./tx"; +import { Duration, DurationSDKType } from "../../google/protobuf/duration"; +import { Coin, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; +import { PeriodLock, PeriodLockSDKType } from "./lock"; +import { MsgLockTokens, MsgLockTokensSDKType, MsgBeginUnlockingAll, MsgBeginUnlockingAllSDKType, MsgBeginUnlocking, MsgBeginUnlockingSDKType, MsgExtendLockup, MsgExtendLockupSDKType, MsgForceUnlock, MsgForceUnlockSDKType } from "./tx"; export const AminoConverter = { "/osmosis.lockup.MsgLockTokens": { aminoType: "osmosis/lockup/lock-tokens", diff --git a/__fixtures__/outputv2/osmosis/lockup/tx.registry.ts b/__fixtures__/outputv2/osmosis/lockup/tx.registry.ts index af655626d5..d7919e0f61 100644 --- a/__fixtures__/outputv2/osmosis/lockup/tx.registry.ts +++ b/__fixtures__/outputv2/osmosis/lockup/tx.registry.ts @@ -1,8 +1,8 @@ -import { Duration, DurationAmino, DurationSDKType } from "../../google/protobuf/duration"; -import { Coin, CoinAmino, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; -import { PeriodLock, PeriodLockAmino, PeriodLockSDKType } from "./lock"; +import { Duration, DurationSDKType } from "../../google/protobuf/duration"; +import { Coin, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; +import { PeriodLock, PeriodLockSDKType } from "./lock"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgLockTokens, MsgLockTokensAmino, MsgLockTokensSDKType, MsgBeginUnlockingAll, MsgBeginUnlockingAllAmino, MsgBeginUnlockingAllSDKType, MsgBeginUnlocking, MsgBeginUnlockingAmino, MsgBeginUnlockingSDKType, MsgExtendLockup, MsgExtendLockupAmino, MsgExtendLockupSDKType, MsgForceUnlock, MsgForceUnlockAmino, MsgForceUnlockSDKType } from "./tx"; +import { MsgLockTokens, MsgLockTokensSDKType, MsgBeginUnlockingAll, MsgBeginUnlockingAllSDKType, MsgBeginUnlocking, MsgBeginUnlockingSDKType, MsgExtendLockup, MsgExtendLockupSDKType, MsgForceUnlock, MsgForceUnlockSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/osmosis.lockup.MsgLockTokens", MsgLockTokens], ["/osmosis.lockup.MsgBeginUnlockingAll", MsgBeginUnlockingAll], ["/osmosis.lockup.MsgBeginUnlocking", MsgBeginUnlocking], ["/osmosis.lockup.MsgExtendLockup", MsgExtendLockup], ["/osmosis.lockup.MsgForceUnlock", MsgForceUnlock]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/osmosis/lockup/tx.rpc.msg.ts b/__fixtures__/outputv2/osmosis/lockup/tx.rpc.msg.ts index 85d913e070..05fbb0bc9e 100644 --- a/__fixtures__/outputv2/osmosis/lockup/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/osmosis/lockup/tx.rpc.msg.ts @@ -1,9 +1,9 @@ -import { Duration, DurationAmino, DurationSDKType } from "../../google/protobuf/duration"; -import { Coin, CoinAmino, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; -import { PeriodLock, PeriodLockAmino, PeriodLockSDKType } from "./lock"; +import { Duration, DurationSDKType } from "../../google/protobuf/duration"; +import { Coin, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; +import { PeriodLock, PeriodLockSDKType } from "./lock"; import { Rpc } from "../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgLockTokens, MsgLockTokensAmino, MsgLockTokensSDKType, MsgLockTokensResponse, MsgLockTokensResponseAmino, MsgLockTokensResponseSDKType, MsgBeginUnlockingAll, MsgBeginUnlockingAllAmino, MsgBeginUnlockingAllSDKType, MsgBeginUnlockingAllResponse, MsgBeginUnlockingAllResponseAmino, MsgBeginUnlockingAllResponseSDKType, MsgBeginUnlocking, MsgBeginUnlockingAmino, MsgBeginUnlockingSDKType, MsgBeginUnlockingResponse, MsgBeginUnlockingResponseAmino, MsgBeginUnlockingResponseSDKType, MsgExtendLockup, MsgExtendLockupAmino, MsgExtendLockupSDKType, MsgExtendLockupResponse, MsgExtendLockupResponseAmino, MsgExtendLockupResponseSDKType, MsgForceUnlock, MsgForceUnlockAmino, MsgForceUnlockSDKType, MsgForceUnlockResponse, MsgForceUnlockResponseAmino, MsgForceUnlockResponseSDKType } from "./tx"; +import { MsgLockTokens, MsgLockTokensSDKType, MsgLockTokensResponse, MsgLockTokensResponseSDKType, MsgBeginUnlockingAll, MsgBeginUnlockingAllSDKType, MsgBeginUnlockingAllResponse, MsgBeginUnlockingAllResponseSDKType, MsgBeginUnlocking, MsgBeginUnlockingSDKType, MsgBeginUnlockingResponse, MsgBeginUnlockingResponseSDKType, MsgExtendLockup, MsgExtendLockupSDKType, MsgExtendLockupResponse, MsgExtendLockupResponseSDKType, MsgForceUnlock, MsgForceUnlockSDKType, MsgForceUnlockResponse, MsgForceUnlockResponseSDKType } from "./tx"; /** Msg defines the Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/osmosis/mint/v1beta1/query.lcd.ts b/__fixtures__/outputv2/osmosis/mint/v1beta1/query.lcd.ts index ce61ac6f44..f6a19538a9 100644 --- a/__fixtures__/outputv2/osmosis/mint/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/osmosis/mint/v1beta1/query.lcd.ts @@ -1,6 +1,6 @@ -import { Params, ParamsAmino, ParamsSDKType } from "./mint"; +import { Params, ParamsSDKType } from "./mint"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryEpochProvisionsRequest, QueryEpochProvisionsRequestAmino, QueryEpochProvisionsRequestSDKType, QueryEpochProvisionsResponse, QueryEpochProvisionsResponseAmino, QueryEpochProvisionsResponseSDKType } from "./query"; +import { QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryEpochProvisionsRequest, QueryEpochProvisionsRequestSDKType, QueryEpochProvisionsResponse, QueryEpochProvisionsResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/osmosis/mint/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/osmosis/mint/v1beta1/query.rpc.Query.ts index 288ac2f06c..6c5665b41a 100644 --- a/__fixtures__/outputv2/osmosis/mint/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/osmosis/mint/v1beta1/query.rpc.Query.ts @@ -1,8 +1,8 @@ -import { Params, ParamsAmino, ParamsSDKType } from "./mint"; +import { Params, ParamsSDKType } from "./mint"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryEpochProvisionsRequest, QueryEpochProvisionsRequestAmino, QueryEpochProvisionsRequestSDKType, QueryEpochProvisionsResponse, QueryEpochProvisionsResponseAmino, QueryEpochProvisionsResponseSDKType } from "./query"; +import { QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryEpochProvisionsRequest, QueryEpochProvisionsRequestSDKType, QueryEpochProvisionsResponse, QueryEpochProvisionsResponseSDKType } from "./query"; /** Query provides defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/query.lcd.ts b/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/query.lcd.ts index 9f1ad401c8..cea1043c29 100644 --- a/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/query.lcd.ts @@ -1,8 +1,8 @@ -import { Duration, DurationAmino, DurationSDKType } from "../../../google/protobuf/duration"; -import { DistrInfo, DistrInfoAmino, DistrInfoSDKType, Params, ParamsAmino, ParamsSDKType } from "./incentives"; -import { Gauge, GaugeAmino, GaugeSDKType } from "../../incentives/gauge"; +import { Duration, DurationSDKType } from "../../../google/protobuf/duration"; +import { DistrInfo, DistrInfoSDKType, Params, ParamsSDKType } from "./incentives"; +import { Gauge, GaugeSDKType } from "../../incentives/gauge"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryGaugeIdsRequest, QueryGaugeIdsRequestAmino, QueryGaugeIdsRequestSDKType, QueryGaugeIdsResponse, QueryGaugeIdsResponseAmino, QueryGaugeIdsResponseSDKType, QueryDistrInfoRequest, QueryDistrInfoRequestAmino, QueryDistrInfoRequestSDKType, QueryDistrInfoResponse, QueryDistrInfoResponseAmino, QueryDistrInfoResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryLockableDurationsRequest, QueryLockableDurationsRequestAmino, QueryLockableDurationsRequestSDKType, QueryLockableDurationsResponse, QueryLockableDurationsResponseAmino, QueryLockableDurationsResponseSDKType, QueryIncentivizedPoolsRequest, QueryIncentivizedPoolsRequestAmino, QueryIncentivizedPoolsRequestSDKType, QueryIncentivizedPoolsResponse, QueryIncentivizedPoolsResponseAmino, QueryIncentivizedPoolsResponseSDKType, QueryExternalIncentiveGaugesRequest, QueryExternalIncentiveGaugesRequestAmino, QueryExternalIncentiveGaugesRequestSDKType, QueryExternalIncentiveGaugesResponse, QueryExternalIncentiveGaugesResponseAmino, QueryExternalIncentiveGaugesResponseSDKType } from "./query"; +import { QueryGaugeIdsRequest, QueryGaugeIdsRequestSDKType, QueryGaugeIdsResponse, QueryGaugeIdsResponseSDKType, QueryDistrInfoRequest, QueryDistrInfoRequestSDKType, QueryDistrInfoResponse, QueryDistrInfoResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryLockableDurationsRequest, QueryLockableDurationsRequestSDKType, QueryLockableDurationsResponse, QueryLockableDurationsResponseSDKType, QueryIncentivizedPoolsRequest, QueryIncentivizedPoolsRequestSDKType, QueryIncentivizedPoolsResponse, QueryIncentivizedPoolsResponseSDKType, QueryExternalIncentiveGaugesRequest, QueryExternalIncentiveGaugesRequestSDKType, QueryExternalIncentiveGaugesResponse, QueryExternalIncentiveGaugesResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/query.rpc.Query.ts index 3227a0f381..6a9688c93c 100644 --- a/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/osmosis/pool-incentives/v1beta1/query.rpc.Query.ts @@ -1,10 +1,10 @@ -import { Duration, DurationAmino, DurationSDKType } from "../../../google/protobuf/duration"; -import { DistrInfo, DistrInfoAmino, DistrInfoSDKType, Params, ParamsAmino, ParamsSDKType } from "./incentives"; -import { Gauge, GaugeAmino, GaugeSDKType } from "../../incentives/gauge"; +import { Duration, DurationSDKType } from "../../../google/protobuf/duration"; +import { DistrInfo, DistrInfoSDKType, Params, ParamsSDKType } from "./incentives"; +import { Gauge, GaugeSDKType } from "../../incentives/gauge"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryGaugeIdsRequest, QueryGaugeIdsRequestAmino, QueryGaugeIdsRequestSDKType, QueryGaugeIdsResponse, QueryGaugeIdsResponseAmino, QueryGaugeIdsResponseSDKType, QueryDistrInfoRequest, QueryDistrInfoRequestAmino, QueryDistrInfoRequestSDKType, QueryDistrInfoResponse, QueryDistrInfoResponseAmino, QueryDistrInfoResponseSDKType, QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryLockableDurationsRequest, QueryLockableDurationsRequestAmino, QueryLockableDurationsRequestSDKType, QueryLockableDurationsResponse, QueryLockableDurationsResponseAmino, QueryLockableDurationsResponseSDKType, QueryIncentivizedPoolsRequest, QueryIncentivizedPoolsRequestAmino, QueryIncentivizedPoolsRequestSDKType, QueryIncentivizedPoolsResponse, QueryIncentivizedPoolsResponseAmino, QueryIncentivizedPoolsResponseSDKType, QueryExternalIncentiveGaugesRequest, QueryExternalIncentiveGaugesRequestAmino, QueryExternalIncentiveGaugesRequestSDKType, QueryExternalIncentiveGaugesResponse, QueryExternalIncentiveGaugesResponseAmino, QueryExternalIncentiveGaugesResponseSDKType } from "./query"; +import { QueryGaugeIdsRequest, QueryGaugeIdsRequestSDKType, QueryGaugeIdsResponse, QueryGaugeIdsResponseSDKType, QueryDistrInfoRequest, QueryDistrInfoRequestSDKType, QueryDistrInfoResponse, QueryDistrInfoResponseSDKType, QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryLockableDurationsRequest, QueryLockableDurationsRequestSDKType, QueryLockableDurationsResponse, QueryLockableDurationsResponseSDKType, QueryIncentivizedPoolsRequest, QueryIncentivizedPoolsRequestSDKType, QueryIncentivizedPoolsResponse, QueryIncentivizedPoolsResponseSDKType, QueryExternalIncentiveGaugesRequest, QueryExternalIncentiveGaugesRequestSDKType, QueryExternalIncentiveGaugesResponse, QueryExternalIncentiveGaugesResponseSDKType } from "./query"; export interface Query { /** GaugeIds takes the pool id and returns the matching gauge ids and durations */ gaugeIds(request: QueryGaugeIdsRequest): Promise; diff --git a/__fixtures__/outputv2/osmosis/superfluid/query.lcd.ts b/__fixtures__/outputv2/osmosis/superfluid/query.lcd.ts index 01342d7ebf..b6dddcbb8f 100644 --- a/__fixtures__/outputv2/osmosis/superfluid/query.lcd.ts +++ b/__fixtures__/outputv2/osmosis/superfluid/query.lcd.ts @@ -1,12 +1,12 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../cosmos/base/query/v1beta1/pagination"; -import { Params, ParamsAmino, ParamsSDKType } from "./params"; -import { SuperfluidAssetType, SuperfluidAssetTypeAmino, 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"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../cosmos/base/query/v1beta1/pagination"; +import { Params, ParamsSDKType } from "./params"; +import { SuperfluidAssetType, SuperfluidAssetTypeSDKType, SuperfluidAsset, SuperfluidAssetSDKType, OsmoEquivalentMultiplierRecord, OsmoEquivalentMultiplierRecordSDKType, SuperfluidDelegationRecord, SuperfluidDelegationRecordSDKType } from "./superfluid"; +import { Coin, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; +import { SyntheticLock, SyntheticLockSDKType } from "../lockup/lock"; +import { DelegationResponse, DelegationResponseSDKType } from "../../cosmos/staking/v1beta1/staking"; import { setPaginationParams } from "../../helpers"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, AssetTypeRequest, AssetTypeRequestAmino, AssetTypeRequestSDKType, AssetTypeResponse, AssetTypeResponseAmino, AssetTypeResponseSDKType, AllAssetsRequest, AllAssetsRequestAmino, AllAssetsRequestSDKType, AllAssetsResponse, AllAssetsResponseAmino, AllAssetsResponseSDKType, AssetMultiplierRequest, AssetMultiplierRequestAmino, AssetMultiplierRequestSDKType, AssetMultiplierResponse, AssetMultiplierResponseAmino, AssetMultiplierResponseSDKType, AllIntermediaryAccountsRequest, AllIntermediaryAccountsRequestAmino, AllIntermediaryAccountsRequestSDKType, AllIntermediaryAccountsResponse, AllIntermediaryAccountsResponseAmino, AllIntermediaryAccountsResponseSDKType, ConnectedIntermediaryAccountRequest, ConnectedIntermediaryAccountRequestAmino, ConnectedIntermediaryAccountRequestSDKType, ConnectedIntermediaryAccountResponse, ConnectedIntermediaryAccountResponseAmino, ConnectedIntermediaryAccountResponseSDKType, QueryTotalDelegationByValidatorForDenomRequest, QueryTotalDelegationByValidatorForDenomRequestAmino, QueryTotalDelegationByValidatorForDenomRequestSDKType, QueryTotalDelegationByValidatorForDenomResponse, QueryTotalDelegationByValidatorForDenomResponseAmino, QueryTotalDelegationByValidatorForDenomResponseSDKType, TotalSuperfluidDelegationsRequest, TotalSuperfluidDelegationsRequestAmino, TotalSuperfluidDelegationsRequestSDKType, TotalSuperfluidDelegationsResponse, TotalSuperfluidDelegationsResponseAmino, TotalSuperfluidDelegationsResponseSDKType, SuperfluidDelegationAmountRequest, SuperfluidDelegationAmountRequestAmino, SuperfluidDelegationAmountRequestSDKType, SuperfluidDelegationAmountResponse, SuperfluidDelegationAmountResponseAmino, SuperfluidDelegationAmountResponseSDKType, SuperfluidDelegationsByDelegatorRequest, SuperfluidDelegationsByDelegatorRequestAmino, SuperfluidDelegationsByDelegatorRequestSDKType, SuperfluidDelegationsByDelegatorResponse, SuperfluidDelegationsByDelegatorResponseAmino, SuperfluidDelegationsByDelegatorResponseSDKType, SuperfluidUndelegationsByDelegatorRequest, SuperfluidUndelegationsByDelegatorRequestAmino, SuperfluidUndelegationsByDelegatorRequestSDKType, SuperfluidUndelegationsByDelegatorResponse, SuperfluidUndelegationsByDelegatorResponseAmino, SuperfluidUndelegationsByDelegatorResponseSDKType, SuperfluidDelegationsByValidatorDenomRequest, SuperfluidDelegationsByValidatorDenomRequestAmino, SuperfluidDelegationsByValidatorDenomRequestSDKType, SuperfluidDelegationsByValidatorDenomResponse, SuperfluidDelegationsByValidatorDenomResponseAmino, SuperfluidDelegationsByValidatorDenomResponseSDKType, EstimateSuperfluidDelegatedAmountByValidatorDenomRequest, EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAmino, EstimateSuperfluidDelegatedAmountByValidatorDenomRequestSDKType, EstimateSuperfluidDelegatedAmountByValidatorDenomResponse, EstimateSuperfluidDelegatedAmountByValidatorDenomResponseAmino, EstimateSuperfluidDelegatedAmountByValidatorDenomResponseSDKType, QueryTotalDelegationByDelegatorRequest, QueryTotalDelegationByDelegatorRequestAmino, QueryTotalDelegationByDelegatorRequestSDKType, QueryTotalDelegationByDelegatorResponse, QueryTotalDelegationByDelegatorResponseAmino, QueryTotalDelegationByDelegatorResponseSDKType, QueryUnpoolWhitelistRequest, QueryUnpoolWhitelistRequestAmino, QueryUnpoolWhitelistRequestSDKType, QueryUnpoolWhitelistResponse, QueryUnpoolWhitelistResponseAmino, QueryUnpoolWhitelistResponseSDKType } from "./query"; +import { QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, AssetTypeRequest, AssetTypeRequestSDKType, AssetTypeResponse, AssetTypeResponseSDKType, AllAssetsRequest, AllAssetsRequestSDKType, AllAssetsResponse, AllAssetsResponseSDKType, AssetMultiplierRequest, AssetMultiplierRequestSDKType, AssetMultiplierResponse, AssetMultiplierResponseSDKType, AllIntermediaryAccountsRequest, AllIntermediaryAccountsRequestSDKType, AllIntermediaryAccountsResponse, AllIntermediaryAccountsResponseSDKType, ConnectedIntermediaryAccountRequest, ConnectedIntermediaryAccountRequestSDKType, ConnectedIntermediaryAccountResponse, ConnectedIntermediaryAccountResponseSDKType, QueryTotalDelegationByValidatorForDenomRequest, QueryTotalDelegationByValidatorForDenomRequestSDKType, QueryTotalDelegationByValidatorForDenomResponse, QueryTotalDelegationByValidatorForDenomResponseSDKType, TotalSuperfluidDelegationsRequest, TotalSuperfluidDelegationsRequestSDKType, TotalSuperfluidDelegationsResponse, TotalSuperfluidDelegationsResponseSDKType, SuperfluidDelegationAmountRequest, SuperfluidDelegationAmountRequestSDKType, SuperfluidDelegationAmountResponse, SuperfluidDelegationAmountResponseSDKType, SuperfluidDelegationsByDelegatorRequest, SuperfluidDelegationsByDelegatorRequestSDKType, SuperfluidDelegationsByDelegatorResponse, SuperfluidDelegationsByDelegatorResponseSDKType, SuperfluidUndelegationsByDelegatorRequest, SuperfluidUndelegationsByDelegatorRequestSDKType, SuperfluidUndelegationsByDelegatorResponse, SuperfluidUndelegationsByDelegatorResponseSDKType, SuperfluidDelegationsByValidatorDenomRequest, SuperfluidDelegationsByValidatorDenomRequestSDKType, SuperfluidDelegationsByValidatorDenomResponse, SuperfluidDelegationsByValidatorDenomResponseSDKType, EstimateSuperfluidDelegatedAmountByValidatorDenomRequest, EstimateSuperfluidDelegatedAmountByValidatorDenomRequestSDKType, EstimateSuperfluidDelegatedAmountByValidatorDenomResponse, EstimateSuperfluidDelegatedAmountByValidatorDenomResponseSDKType, QueryTotalDelegationByDelegatorRequest, QueryTotalDelegationByDelegatorRequestSDKType, QueryTotalDelegationByDelegatorResponse, QueryTotalDelegationByDelegatorResponseSDKType, QueryUnpoolWhitelistRequest, QueryUnpoolWhitelistRequestSDKType, QueryUnpoolWhitelistResponse, QueryUnpoolWhitelistResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/osmosis/superfluid/query.rpc.Query.ts b/__fixtures__/outputv2/osmosis/superfluid/query.rpc.Query.ts index 3403cc227d..dbbe76b580 100644 --- a/__fixtures__/outputv2/osmosis/superfluid/query.rpc.Query.ts +++ b/__fixtures__/outputv2/osmosis/superfluid/query.rpc.Query.ts @@ -1,13 +1,13 @@ -import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../cosmos/base/query/v1beta1/pagination"; -import { Params, ParamsAmino, ParamsSDKType } from "./params"; -import { SuperfluidAssetType, SuperfluidAssetTypeAmino, 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"; +import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } from "../../cosmos/base/query/v1beta1/pagination"; +import { Params, ParamsSDKType } from "./params"; +import { SuperfluidAssetType, SuperfluidAssetTypeSDKType, SuperfluidAsset, SuperfluidAssetSDKType, OsmoEquivalentMultiplierRecord, OsmoEquivalentMultiplierRecordSDKType, SuperfluidDelegationRecord, SuperfluidDelegationRecordSDKType } from "./superfluid"; +import { Coin, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; +import { SyntheticLock, SyntheticLockSDKType } from "../lockup/lock"; +import { DelegationResponse, DelegationResponseSDKType } from "../../cosmos/staking/v1beta1/staking"; import { Rpc } from "../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, AssetTypeRequest, AssetTypeRequestAmino, AssetTypeRequestSDKType, AssetTypeResponse, AssetTypeResponseAmino, AssetTypeResponseSDKType, AllAssetsRequest, AllAssetsRequestAmino, AllAssetsRequestSDKType, AllAssetsResponse, AllAssetsResponseAmino, AllAssetsResponseSDKType, AssetMultiplierRequest, AssetMultiplierRequestAmino, AssetMultiplierRequestSDKType, AssetMultiplierResponse, AssetMultiplierResponseAmino, AssetMultiplierResponseSDKType, AllIntermediaryAccountsRequest, AllIntermediaryAccountsRequestAmino, AllIntermediaryAccountsRequestSDKType, AllIntermediaryAccountsResponse, AllIntermediaryAccountsResponseAmino, AllIntermediaryAccountsResponseSDKType, ConnectedIntermediaryAccountRequest, ConnectedIntermediaryAccountRequestAmino, ConnectedIntermediaryAccountRequestSDKType, ConnectedIntermediaryAccountResponse, ConnectedIntermediaryAccountResponseAmino, ConnectedIntermediaryAccountResponseSDKType, QueryTotalDelegationByValidatorForDenomRequest, QueryTotalDelegationByValidatorForDenomRequestAmino, QueryTotalDelegationByValidatorForDenomRequestSDKType, QueryTotalDelegationByValidatorForDenomResponse, QueryTotalDelegationByValidatorForDenomResponseAmino, QueryTotalDelegationByValidatorForDenomResponseSDKType, TotalSuperfluidDelegationsRequest, TotalSuperfluidDelegationsRequestAmino, TotalSuperfluidDelegationsRequestSDKType, TotalSuperfluidDelegationsResponse, TotalSuperfluidDelegationsResponseAmino, TotalSuperfluidDelegationsResponseSDKType, SuperfluidDelegationAmountRequest, SuperfluidDelegationAmountRequestAmino, SuperfluidDelegationAmountRequestSDKType, SuperfluidDelegationAmountResponse, SuperfluidDelegationAmountResponseAmino, SuperfluidDelegationAmountResponseSDKType, SuperfluidDelegationsByDelegatorRequest, SuperfluidDelegationsByDelegatorRequestAmino, SuperfluidDelegationsByDelegatorRequestSDKType, SuperfluidDelegationsByDelegatorResponse, SuperfluidDelegationsByDelegatorResponseAmino, SuperfluidDelegationsByDelegatorResponseSDKType, SuperfluidUndelegationsByDelegatorRequest, SuperfluidUndelegationsByDelegatorRequestAmino, SuperfluidUndelegationsByDelegatorRequestSDKType, SuperfluidUndelegationsByDelegatorResponse, SuperfluidUndelegationsByDelegatorResponseAmino, SuperfluidUndelegationsByDelegatorResponseSDKType, SuperfluidDelegationsByValidatorDenomRequest, SuperfluidDelegationsByValidatorDenomRequestAmino, SuperfluidDelegationsByValidatorDenomRequestSDKType, SuperfluidDelegationsByValidatorDenomResponse, SuperfluidDelegationsByValidatorDenomResponseAmino, SuperfluidDelegationsByValidatorDenomResponseSDKType, EstimateSuperfluidDelegatedAmountByValidatorDenomRequest, EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAmino, EstimateSuperfluidDelegatedAmountByValidatorDenomRequestSDKType, EstimateSuperfluidDelegatedAmountByValidatorDenomResponse, EstimateSuperfluidDelegatedAmountByValidatorDenomResponseAmino, EstimateSuperfluidDelegatedAmountByValidatorDenomResponseSDKType, QueryTotalDelegationByDelegatorRequest, QueryTotalDelegationByDelegatorRequestAmino, QueryTotalDelegationByDelegatorRequestSDKType, QueryTotalDelegationByDelegatorResponse, QueryTotalDelegationByDelegatorResponseAmino, QueryTotalDelegationByDelegatorResponseSDKType, QueryUnpoolWhitelistRequest, QueryUnpoolWhitelistRequestAmino, QueryUnpoolWhitelistRequestSDKType, QueryUnpoolWhitelistResponse, QueryUnpoolWhitelistResponseAmino, QueryUnpoolWhitelistResponseSDKType } from "./query"; +import { QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, AssetTypeRequest, AssetTypeRequestSDKType, AssetTypeResponse, AssetTypeResponseSDKType, AllAssetsRequest, AllAssetsRequestSDKType, AllAssetsResponse, AllAssetsResponseSDKType, AssetMultiplierRequest, AssetMultiplierRequestSDKType, AssetMultiplierResponse, AssetMultiplierResponseSDKType, AllIntermediaryAccountsRequest, AllIntermediaryAccountsRequestSDKType, AllIntermediaryAccountsResponse, AllIntermediaryAccountsResponseSDKType, ConnectedIntermediaryAccountRequest, ConnectedIntermediaryAccountRequestSDKType, ConnectedIntermediaryAccountResponse, ConnectedIntermediaryAccountResponseSDKType, QueryTotalDelegationByValidatorForDenomRequest, QueryTotalDelegationByValidatorForDenomRequestSDKType, QueryTotalDelegationByValidatorForDenomResponse, QueryTotalDelegationByValidatorForDenomResponseSDKType, TotalSuperfluidDelegationsRequest, TotalSuperfluidDelegationsRequestSDKType, TotalSuperfluidDelegationsResponse, TotalSuperfluidDelegationsResponseSDKType, SuperfluidDelegationAmountRequest, SuperfluidDelegationAmountRequestSDKType, SuperfluidDelegationAmountResponse, SuperfluidDelegationAmountResponseSDKType, SuperfluidDelegationsByDelegatorRequest, SuperfluidDelegationsByDelegatorRequestSDKType, SuperfluidDelegationsByDelegatorResponse, SuperfluidDelegationsByDelegatorResponseSDKType, SuperfluidUndelegationsByDelegatorRequest, SuperfluidUndelegationsByDelegatorRequestSDKType, SuperfluidUndelegationsByDelegatorResponse, SuperfluidUndelegationsByDelegatorResponseSDKType, SuperfluidDelegationsByValidatorDenomRequest, SuperfluidDelegationsByValidatorDenomRequestSDKType, SuperfluidDelegationsByValidatorDenomResponse, SuperfluidDelegationsByValidatorDenomResponseSDKType, EstimateSuperfluidDelegatedAmountByValidatorDenomRequest, EstimateSuperfluidDelegatedAmountByValidatorDenomRequestSDKType, EstimateSuperfluidDelegatedAmountByValidatorDenomResponse, EstimateSuperfluidDelegatedAmountByValidatorDenomResponseSDKType, QueryTotalDelegationByDelegatorRequest, QueryTotalDelegationByDelegatorRequestSDKType, QueryTotalDelegationByDelegatorResponse, QueryTotalDelegationByDelegatorResponseSDKType, QueryUnpoolWhitelistRequest, QueryUnpoolWhitelistRequestSDKType, QueryUnpoolWhitelistResponse, QueryUnpoolWhitelistResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/osmosis/superfluid/query.ts b/__fixtures__/outputv2/osmosis/superfluid/query.ts index df6193f66c..e45dad3dd2 100644 --- a/__fixtures__/outputv2/osmosis/superfluid/query.ts +++ b/__fixtures__/outputv2/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, SuperfluidAssetTypeAmino, SuperfluidAssetTypeSDKType, SuperfluidAsset, SuperfluidAssetAmino, SuperfluidAssetSDKType, OsmoEquivalentMultiplierRecord, OsmoEquivalentMultiplierRecordAmino, OsmoEquivalentMultiplierRecordSDKType, SuperfluidDelegationRecord, SuperfluidDelegationRecordAmino, SuperfluidDelegationRecordSDKType, superfluidAssetTypeFromJSON, superfluidAssetTypeToJSON } from "./superfluid"; +import { SuperfluidAssetType, SuperfluidAssetTypeSDKType, SuperfluidAsset, SuperfluidAssetAmino, SuperfluidAssetSDKType, OsmoEquivalentMultiplierRecord, OsmoEquivalentMultiplierRecordAmino, OsmoEquivalentMultiplierRecordSDKType, SuperfluidDelegationRecord, SuperfluidDelegationRecordAmino, SuperfluidDelegationRecordSDKType, superfluidAssetTypeFromJSON, superfluidAssetTypeToJSON } 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"; diff --git a/__fixtures__/outputv2/osmosis/superfluid/tx.amino.ts b/__fixtures__/outputv2/osmosis/superfluid/tx.amino.ts index 0d4bb6391d..c3aab7d8ce 100644 --- a/__fixtures__/outputv2/osmosis/superfluid/tx.amino.ts +++ b/__fixtures__/outputv2/osmosis/superfluid/tx.amino.ts @@ -1,6 +1,6 @@ //@ts-nocheck -import { Coin, CoinAmino, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; -import { MsgSuperfluidDelegate, MsgSuperfluidDelegateAmino, MsgSuperfluidDelegateSDKType, MsgSuperfluidUndelegate, MsgSuperfluidUndelegateAmino, MsgSuperfluidUndelegateSDKType, MsgSuperfluidUnbondLock, MsgSuperfluidUnbondLockAmino, MsgSuperfluidUnbondLockSDKType, MsgLockAndSuperfluidDelegate, MsgLockAndSuperfluidDelegateAmino, MsgLockAndSuperfluidDelegateSDKType, MsgUnPoolWhitelistedPool, MsgUnPoolWhitelistedPoolAmino, MsgUnPoolWhitelistedPoolSDKType } from "./tx"; +import { Coin, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; +import { MsgSuperfluidDelegate, MsgSuperfluidDelegateSDKType, MsgSuperfluidUndelegate, MsgSuperfluidUndelegateSDKType, MsgSuperfluidUnbondLock, MsgSuperfluidUnbondLockSDKType, MsgLockAndSuperfluidDelegate, MsgLockAndSuperfluidDelegateSDKType, MsgUnPoolWhitelistedPool, MsgUnPoolWhitelistedPoolSDKType } from "./tx"; export const AminoConverter = { "/osmosis.superfluid.MsgSuperfluidDelegate": { aminoType: "osmosis/superfluid-delegate", diff --git a/__fixtures__/outputv2/osmosis/superfluid/tx.registry.ts b/__fixtures__/outputv2/osmosis/superfluid/tx.registry.ts index 9cff0b7d1d..57992389b3 100644 --- a/__fixtures__/outputv2/osmosis/superfluid/tx.registry.ts +++ b/__fixtures__/outputv2/osmosis/superfluid/tx.registry.ts @@ -1,6 +1,6 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; +import { Coin, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgSuperfluidDelegate, MsgSuperfluidDelegateAmino, MsgSuperfluidDelegateSDKType, MsgSuperfluidUndelegate, MsgSuperfluidUndelegateAmino, MsgSuperfluidUndelegateSDKType, MsgSuperfluidUnbondLock, MsgSuperfluidUnbondLockAmino, MsgSuperfluidUnbondLockSDKType, MsgLockAndSuperfluidDelegate, MsgLockAndSuperfluidDelegateAmino, MsgLockAndSuperfluidDelegateSDKType, MsgUnPoolWhitelistedPool, MsgUnPoolWhitelistedPoolAmino, MsgUnPoolWhitelistedPoolSDKType } from "./tx"; +import { MsgSuperfluidDelegate, MsgSuperfluidDelegateSDKType, MsgSuperfluidUndelegate, MsgSuperfluidUndelegateSDKType, MsgSuperfluidUnbondLock, MsgSuperfluidUnbondLockSDKType, MsgLockAndSuperfluidDelegate, MsgLockAndSuperfluidDelegateSDKType, MsgUnPoolWhitelistedPool, MsgUnPoolWhitelistedPoolSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/osmosis.superfluid.MsgSuperfluidDelegate", MsgSuperfluidDelegate], ["/osmosis.superfluid.MsgSuperfluidUndelegate", MsgSuperfluidUndelegate], ["/osmosis.superfluid.MsgSuperfluidUnbondLock", MsgSuperfluidUnbondLock], ["/osmosis.superfluid.MsgLockAndSuperfluidDelegate", MsgLockAndSuperfluidDelegate], ["/osmosis.superfluid.MsgUnPoolWhitelistedPool", MsgUnPoolWhitelistedPool]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/osmosis/superfluid/tx.rpc.msg.ts b/__fixtures__/outputv2/osmosis/superfluid/tx.rpc.msg.ts index 4fd103a53d..b4f1d01c76 100644 --- a/__fixtures__/outputv2/osmosis/superfluid/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/osmosis/superfluid/tx.rpc.msg.ts @@ -1,7 +1,7 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; +import { Coin, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; import { Rpc } from "../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgSuperfluidDelegate, MsgSuperfluidDelegateAmino, MsgSuperfluidDelegateSDKType, MsgSuperfluidDelegateResponse, MsgSuperfluidDelegateResponseAmino, MsgSuperfluidDelegateResponseSDKType, MsgSuperfluidUndelegate, MsgSuperfluidUndelegateAmino, MsgSuperfluidUndelegateSDKType, MsgSuperfluidUndelegateResponse, MsgSuperfluidUndelegateResponseAmino, MsgSuperfluidUndelegateResponseSDKType, MsgSuperfluidUnbondLock, MsgSuperfluidUnbondLockAmino, MsgSuperfluidUnbondLockSDKType, MsgSuperfluidUnbondLockResponse, MsgSuperfluidUnbondLockResponseAmino, MsgSuperfluidUnbondLockResponseSDKType, MsgLockAndSuperfluidDelegate, MsgLockAndSuperfluidDelegateAmino, MsgLockAndSuperfluidDelegateSDKType, MsgLockAndSuperfluidDelegateResponse, MsgLockAndSuperfluidDelegateResponseAmino, MsgLockAndSuperfluidDelegateResponseSDKType, MsgUnPoolWhitelistedPool, MsgUnPoolWhitelistedPoolAmino, MsgUnPoolWhitelistedPoolSDKType, MsgUnPoolWhitelistedPoolResponse, MsgUnPoolWhitelistedPoolResponseAmino, MsgUnPoolWhitelistedPoolResponseSDKType } from "./tx"; +import { MsgSuperfluidDelegate, MsgSuperfluidDelegateSDKType, MsgSuperfluidDelegateResponse, MsgSuperfluidDelegateResponseSDKType, MsgSuperfluidUndelegate, MsgSuperfluidUndelegateSDKType, MsgSuperfluidUndelegateResponse, MsgSuperfluidUndelegateResponseSDKType, MsgSuperfluidUnbondLock, MsgSuperfluidUnbondLockSDKType, MsgSuperfluidUnbondLockResponse, MsgSuperfluidUnbondLockResponseSDKType, MsgLockAndSuperfluidDelegate, MsgLockAndSuperfluidDelegateSDKType, MsgLockAndSuperfluidDelegateResponse, MsgLockAndSuperfluidDelegateResponseSDKType, MsgUnPoolWhitelistedPool, MsgUnPoolWhitelistedPoolSDKType, MsgUnPoolWhitelistedPoolResponse, MsgUnPoolWhitelistedPoolResponseSDKType } from "./tx"; /** Msg defines the Msg service. */ export interface Msg { diff --git a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/query.lcd.ts b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/query.lcd.ts index 6b0c76beff..5b8e4747c6 100644 --- a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/query.lcd.ts @@ -1,7 +1,7 @@ -import { Params, ParamsAmino, ParamsSDKType } from "./params"; -import { DenomAuthorityMetadata, DenomAuthorityMetadataAmino, DenomAuthorityMetadataSDKType } from "./authorityMetadata"; +import { Params, ParamsSDKType } from "./params"; +import { DenomAuthorityMetadata, DenomAuthorityMetadataSDKType } from "./authorityMetadata"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryDenomAuthorityMetadataRequest, QueryDenomAuthorityMetadataRequestAmino, QueryDenomAuthorityMetadataRequestSDKType, QueryDenomAuthorityMetadataResponse, QueryDenomAuthorityMetadataResponseAmino, QueryDenomAuthorityMetadataResponseSDKType, QueryDenomsFromCreatorRequest, QueryDenomsFromCreatorRequestAmino, QueryDenomsFromCreatorRequestSDKType, QueryDenomsFromCreatorResponse, QueryDenomsFromCreatorResponseAmino, QueryDenomsFromCreatorResponseSDKType } from "./query"; +import { QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryDenomAuthorityMetadataRequest, QueryDenomAuthorityMetadataRequestSDKType, QueryDenomAuthorityMetadataResponse, QueryDenomAuthorityMetadataResponseSDKType, QueryDenomsFromCreatorRequest, QueryDenomsFromCreatorRequestSDKType, QueryDenomsFromCreatorResponse, QueryDenomsFromCreatorResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/query.rpc.Query.ts index e0ba6614a3..31803eec37 100644 --- a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/query.rpc.Query.ts @@ -1,9 +1,9 @@ -import { Params, ParamsAmino, ParamsSDKType } from "./params"; -import { DenomAuthorityMetadata, DenomAuthorityMetadataAmino, DenomAuthorityMetadataSDKType } from "./authorityMetadata"; +import { Params, ParamsSDKType } from "./params"; +import { DenomAuthorityMetadata, DenomAuthorityMetadataSDKType } from "./authorityMetadata"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryParamsRequest, QueryParamsRequestAmino, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseAmino, QueryParamsResponseSDKType, QueryDenomAuthorityMetadataRequest, QueryDenomAuthorityMetadataRequestAmino, QueryDenomAuthorityMetadataRequestSDKType, QueryDenomAuthorityMetadataResponse, QueryDenomAuthorityMetadataResponseAmino, QueryDenomAuthorityMetadataResponseSDKType, QueryDenomsFromCreatorRequest, QueryDenomsFromCreatorRequestAmino, QueryDenomsFromCreatorRequestSDKType, QueryDenomsFromCreatorResponse, QueryDenomsFromCreatorResponseAmino, QueryDenomsFromCreatorResponseSDKType } from "./query"; +import { QueryParamsRequest, QueryParamsRequestSDKType, QueryParamsResponse, QueryParamsResponseSDKType, QueryDenomAuthorityMetadataRequest, QueryDenomAuthorityMetadataRequestSDKType, QueryDenomAuthorityMetadataResponse, QueryDenomAuthorityMetadataResponseSDKType, QueryDenomsFromCreatorRequest, QueryDenomsFromCreatorRequestSDKType, QueryDenomsFromCreatorResponse, QueryDenomsFromCreatorResponseSDKType } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { diff --git a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/tx.amino.ts b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/tx.amino.ts index ef6b169142..433c283fc0 100644 --- a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/tx.amino.ts +++ b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/tx.amino.ts @@ -1,7 +1,7 @@ //@ts-nocheck -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { Metadata, MetadataAmino, MetadataSDKType } from "../../../cosmos/bank/v1beta1/bank"; -import { MsgCreateDenom, MsgCreateDenomAmino, MsgCreateDenomSDKType, MsgMint, MsgMintAmino, MsgMintSDKType, MsgBurn, MsgBurnAmino, MsgBurnSDKType, MsgChangeAdmin, MsgChangeAdminAmino, MsgChangeAdminSDKType, MsgSetDenomMetadata, MsgSetDenomMetadataAmino, MsgSetDenomMetadataSDKType } from "./tx"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { Metadata, MetadataSDKType } from "../../../cosmos/bank/v1beta1/bank"; +import { MsgCreateDenom, MsgCreateDenomSDKType, MsgMint, MsgMintSDKType, MsgBurn, MsgBurnSDKType, MsgChangeAdmin, MsgChangeAdminSDKType, MsgSetDenomMetadata, MsgSetDenomMetadataSDKType } from "./tx"; export const AminoConverter = { "/osmosis.tokenfactory.v1beta1.MsgCreateDenom": { aminoType: "osmosis/tokenfactory/create-denom", diff --git a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/tx.registry.ts b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/tx.registry.ts index 5b2fa0c4c6..80b2a72ef7 100644 --- a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/tx.registry.ts +++ b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/tx.registry.ts @@ -1,7 +1,7 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { Metadata, MetadataAmino, MetadataSDKType } from "../../../cosmos/bank/v1beta1/bank"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { Metadata, MetadataSDKType } from "../../../cosmos/bank/v1beta1/bank"; import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgCreateDenom, MsgCreateDenomAmino, MsgCreateDenomSDKType, MsgMint, MsgMintAmino, MsgMintSDKType, MsgBurn, MsgBurnAmino, MsgBurnSDKType, MsgChangeAdmin, MsgChangeAdminAmino, MsgChangeAdminSDKType, MsgSetDenomMetadata, MsgSetDenomMetadataAmino, MsgSetDenomMetadataSDKType } from "./tx"; +import { MsgCreateDenom, MsgCreateDenomSDKType, MsgMint, MsgMintSDKType, MsgBurn, MsgBurnSDKType, MsgChangeAdmin, MsgChangeAdminSDKType, MsgSetDenomMetadata, MsgSetDenomMetadataSDKType } from "./tx"; export const registry: ReadonlyArray<[string, GeneratedType]> = [["/osmosis.tokenfactory.v1beta1.MsgCreateDenom", MsgCreateDenom], ["/osmosis.tokenfactory.v1beta1.MsgMint", MsgMint], ["/osmosis.tokenfactory.v1beta1.MsgBurn", MsgBurn], ["/osmosis.tokenfactory.v1beta1.MsgChangeAdmin", MsgChangeAdmin], ["/osmosis.tokenfactory.v1beta1.MsgSetDenomMetadata", MsgSetDenomMetadata]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { diff --git a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/tx.rpc.msg.ts b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/tx.rpc.msg.ts index f1bf1bc05d..00f2069c66 100644 --- a/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/tx.rpc.msg.ts +++ b/__fixtures__/outputv2/osmosis/tokenfactory/v1beta1/tx.rpc.msg.ts @@ -1,8 +1,8 @@ -import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { Metadata, MetadataAmino, MetadataSDKType } from "../../../cosmos/bank/v1beta1/bank"; +import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; +import { Metadata, MetadataSDKType } from "../../../cosmos/bank/v1beta1/bank"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; -import { MsgCreateDenom, MsgCreateDenomAmino, MsgCreateDenomSDKType, MsgCreateDenomResponse, MsgCreateDenomResponseAmino, MsgCreateDenomResponseSDKType, MsgMint, MsgMintAmino, MsgMintSDKType, MsgMintResponse, MsgMintResponseAmino, MsgMintResponseSDKType, MsgBurn, MsgBurnAmino, MsgBurnSDKType, MsgBurnResponse, MsgBurnResponseAmino, MsgBurnResponseSDKType, MsgChangeAdmin, MsgChangeAdminAmino, MsgChangeAdminSDKType, MsgChangeAdminResponse, MsgChangeAdminResponseAmino, MsgChangeAdminResponseSDKType, MsgSetDenomMetadata, MsgSetDenomMetadataAmino, MsgSetDenomMetadataSDKType, MsgSetDenomMetadataResponse, MsgSetDenomMetadataResponseAmino, MsgSetDenomMetadataResponseSDKType } from "./tx"; +import { MsgCreateDenom, MsgCreateDenomSDKType, MsgCreateDenomResponse, MsgCreateDenomResponseSDKType, MsgMint, MsgMintSDKType, MsgMintResponse, MsgMintResponseSDKType, MsgBurn, MsgBurnSDKType, MsgBurnResponse, MsgBurnResponseSDKType, MsgChangeAdmin, MsgChangeAdminSDKType, MsgChangeAdminResponse, MsgChangeAdminResponseSDKType, MsgSetDenomMetadata, MsgSetDenomMetadataSDKType, MsgSetDenomMetadataResponse, MsgSetDenomMetadataResponseSDKType } from "./tx"; /** Msg defines the tokefactory module's gRPC message service. */ export interface Msg { diff --git a/__fixtures__/outputv2/osmosis/twap/v1beta1/query.lcd.ts b/__fixtures__/outputv2/osmosis/twap/v1beta1/query.lcd.ts index 4bea4f75c1..2607f62ad0 100644 --- a/__fixtures__/outputv2/osmosis/twap/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/osmosis/twap/v1beta1/query.lcd.ts @@ -1,7 +1,7 @@ -import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../google/protobuf/timestamp"; -import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; +import { Timestamp, TimestampSDKType } from "../../../google/protobuf/timestamp"; +import { Params, ParamsSDKType } from "./genesis"; import { LCDClient } from "@osmonauts/lcd"; -import { ParamsRequest, ParamsRequestAmino, ParamsRequestSDKType, ParamsResponse, ParamsResponseAmino, ParamsResponseSDKType, ArithmeticTwapRequest, ArithmeticTwapRequestAmino, ArithmeticTwapRequestSDKType, ArithmeticTwapResponse, ArithmeticTwapResponseAmino, ArithmeticTwapResponseSDKType, ArithmeticTwapToNowRequest, ArithmeticTwapToNowRequestAmino, ArithmeticTwapToNowRequestSDKType, ArithmeticTwapToNowResponse, ArithmeticTwapToNowResponseAmino, ArithmeticTwapToNowResponseSDKType } from "./query"; +import { ParamsRequest, ParamsRequestSDKType, ParamsResponse, ParamsResponseSDKType, ArithmeticTwapRequest, ArithmeticTwapRequestSDKType, ArithmeticTwapResponse, ArithmeticTwapResponseSDKType, ArithmeticTwapToNowRequest, ArithmeticTwapToNowRequestSDKType, ArithmeticTwapToNowResponse, ArithmeticTwapToNowResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/osmosis/twap/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/osmosis/twap/v1beta1/query.rpc.Query.ts index 1abf87bc04..f1b4643191 100644 --- a/__fixtures__/outputv2/osmosis/twap/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/osmosis/twap/v1beta1/query.rpc.Query.ts @@ -1,9 +1,9 @@ -import { Timestamp, TimestampAmino, TimestampSDKType } from "../../../google/protobuf/timestamp"; -import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; +import { Timestamp, TimestampSDKType } from "../../../google/protobuf/timestamp"; +import { Params, ParamsSDKType } from "./genesis"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { ParamsRequest, ParamsRequestAmino, ParamsRequestSDKType, ParamsResponse, ParamsResponseAmino, ParamsResponseSDKType, ArithmeticTwapRequest, ArithmeticTwapRequestAmino, ArithmeticTwapRequestSDKType, ArithmeticTwapResponse, ArithmeticTwapResponseAmino, ArithmeticTwapResponseSDKType, ArithmeticTwapToNowRequest, ArithmeticTwapToNowRequestAmino, ArithmeticTwapToNowRequestSDKType, ArithmeticTwapToNowResponse, ArithmeticTwapToNowResponseAmino, ArithmeticTwapToNowResponseSDKType } from "./query"; +import { ParamsRequest, ParamsRequestSDKType, ParamsResponse, ParamsResponseSDKType, ArithmeticTwapRequest, ArithmeticTwapRequestSDKType, ArithmeticTwapResponse, ArithmeticTwapResponseSDKType, ArithmeticTwapToNowRequest, ArithmeticTwapToNowRequestSDKType, ArithmeticTwapToNowResponse, ArithmeticTwapToNowResponseSDKType } from "./query"; export interface Query { params(request?: ParamsRequest): Promise; arithmeticTwap(request: ArithmeticTwapRequest): Promise; diff --git a/__fixtures__/outputv2/osmosis/txfees/v1beta1/query.lcd.ts b/__fixtures__/outputv2/osmosis/txfees/v1beta1/query.lcd.ts index 1f9fcc75c3..2e72d36805 100644 --- a/__fixtures__/outputv2/osmosis/txfees/v1beta1/query.lcd.ts +++ b/__fixtures__/outputv2/osmosis/txfees/v1beta1/query.lcd.ts @@ -1,6 +1,6 @@ -import { FeeToken, FeeTokenAmino, FeeTokenSDKType } from "./feetoken"; +import { FeeToken, FeeTokenSDKType } from "./feetoken"; import { LCDClient } from "@osmonauts/lcd"; -import { QueryFeeTokensRequest, QueryFeeTokensRequestAmino, QueryFeeTokensRequestSDKType, QueryFeeTokensResponse, QueryFeeTokensResponseAmino, QueryFeeTokensResponseSDKType, QueryDenomSpotPriceRequest, QueryDenomSpotPriceRequestAmino, QueryDenomSpotPriceRequestSDKType, QueryDenomSpotPriceResponse, QueryDenomSpotPriceResponseAmino, QueryDenomSpotPriceResponseSDKType, QueryDenomPoolIdRequest, QueryDenomPoolIdRequestAmino, QueryDenomPoolIdRequestSDKType, QueryDenomPoolIdResponse, QueryDenomPoolIdResponseAmino, QueryDenomPoolIdResponseSDKType, QueryBaseDenomRequest, QueryBaseDenomRequestAmino, QueryBaseDenomRequestSDKType, QueryBaseDenomResponse, QueryBaseDenomResponseAmino, QueryBaseDenomResponseSDKType } from "./query"; +import { QueryFeeTokensRequest, QueryFeeTokensRequestSDKType, QueryFeeTokensResponse, QueryFeeTokensResponseSDKType, QueryDenomSpotPriceRequest, QueryDenomSpotPriceRequestSDKType, QueryDenomSpotPriceResponse, QueryDenomSpotPriceResponseSDKType, QueryDenomPoolIdRequest, QueryDenomPoolIdRequestSDKType, QueryDenomPoolIdResponse, QueryDenomPoolIdResponseSDKType, QueryBaseDenomRequest, QueryBaseDenomRequestSDKType, QueryBaseDenomResponse, QueryBaseDenomResponseSDKType } from "./query"; export class LCDQueryClient { req: LCDClient; diff --git a/__fixtures__/outputv2/osmosis/txfees/v1beta1/query.rpc.Query.ts b/__fixtures__/outputv2/osmosis/txfees/v1beta1/query.rpc.Query.ts index f2d748b9c4..10afc4d03a 100644 --- a/__fixtures__/outputv2/osmosis/txfees/v1beta1/query.rpc.Query.ts +++ b/__fixtures__/outputv2/osmosis/txfees/v1beta1/query.rpc.Query.ts @@ -1,8 +1,8 @@ -import { FeeToken, FeeTokenAmino, FeeTokenSDKType } from "./feetoken"; +import { FeeToken, FeeTokenSDKType } from "./feetoken"; import { Rpc } from "../../../helpers"; import * as _m0 from "protobufjs/minimal"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryFeeTokensRequest, QueryFeeTokensRequestAmino, QueryFeeTokensRequestSDKType, QueryFeeTokensResponse, QueryFeeTokensResponseAmino, QueryFeeTokensResponseSDKType, QueryDenomSpotPriceRequest, QueryDenomSpotPriceRequestAmino, QueryDenomSpotPriceRequestSDKType, QueryDenomSpotPriceResponse, QueryDenomSpotPriceResponseAmino, QueryDenomSpotPriceResponseSDKType, QueryDenomPoolIdRequest, QueryDenomPoolIdRequestAmino, QueryDenomPoolIdRequestSDKType, QueryDenomPoolIdResponse, QueryDenomPoolIdResponseAmino, QueryDenomPoolIdResponseSDKType, QueryBaseDenomRequest, QueryBaseDenomRequestAmino, QueryBaseDenomRequestSDKType, QueryBaseDenomResponse, QueryBaseDenomResponseAmino, QueryBaseDenomResponseSDKType } from "./query"; +import { QueryFeeTokensRequest, QueryFeeTokensRequestSDKType, QueryFeeTokensResponse, QueryFeeTokensResponseSDKType, QueryDenomSpotPriceRequest, QueryDenomSpotPriceRequestSDKType, QueryDenomSpotPriceResponse, QueryDenomSpotPriceResponseSDKType, QueryDenomPoolIdRequest, QueryDenomPoolIdRequestSDKType, QueryDenomPoolIdResponse, QueryDenomPoolIdResponseSDKType, QueryBaseDenomRequest, QueryBaseDenomRequestSDKType, QueryBaseDenomResponse, QueryBaseDenomResponseSDKType } from "./query"; export interface Query { /** * FeeTokens returns a list of all the whitelisted fee tokens and their diff --git a/package.json b/package.json index b392b6a03e..a5635db0f6 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "build": "lerna run prepare --parallel", "buidl": "lerna run buidl --parallel", "ast:fixture": "lerna run test:ast --parallel --scope \"@osmonauts/ast\"", + "buidl:clean": "lerna run buidl:clean", "buidl:ast": "lerna run buidl --parallel --scope \"@osmonauts/ast\"", "buidl:parser": "lerna run buidl --parallel --scope \"@osmonauts/proto-parser\"", "buidl:telescope": "lerna run buidl --parallel --scope \"@osmonauts/telescope\"", diff --git a/packages/ast/package.json b/packages/ast/package.json index 231e3458de..7dd3f0ebb5 100644 --- a/packages/ast/package.json +++ b/packages/ast/package.json @@ -24,6 +24,8 @@ "build:ts": "tsc --project ./tsconfig.json", "build": "npm run build:module && npm run build:main", "buidl": "npm run build && npm run build:ts", + "buidl:clean": "npm run clean && npm run buidl", + "clean": "rimraf ./types", "prepare": "npm run build", "lint": "eslint .", "format": "eslint . --fix", @@ -79,6 +81,7 @@ "mkdirp": "1.0.4", "prettier": "^2.7.0", "regenerator-runtime": "^0.13.7", + "rimraf": "3.0.2", "ts-jest": "^29.0.3", "typescript": "^4.8.4" }, @@ -92,4 +95,4 @@ "case": "1.6.3", "dotty": "0.1.2" } -} +} \ No newline at end of file diff --git a/packages/ast/src/clients/helpers/helpers.test.ts b/packages/ast/src/clients/helpers/helpers.test.ts index bbd72395e4..6da177f497 100644 --- a/packages/ast/src/clients/helpers/helpers.test.ts +++ b/packages/ast/src/clients/helpers/helpers.test.ts @@ -46,6 +46,7 @@ it('addJsonMethod', async () => { it('createHelperObject', async () => { const context = getGenericParseContext() + // @ts-ignore context.ref = { proto: { package: 'a.b.c', diff --git a/packages/ast/src/clients/lcd/class/lcd.test.ts b/packages/ast/src/clients/lcd/class/lcd.test.ts index ad8467fa6e..675d1eab44 100644 --- a/packages/ast/src/clients/lcd/class/lcd.test.ts +++ b/packages/ast/src/clients/lcd/class/lcd.test.ts @@ -30,6 +30,7 @@ it('template tags', () => { 'grantee' ] }; + // @ts-ignore expectCode(makeTemplateTagLegacy(info)); }) diff --git a/packages/ast/src/clients/lcd/class/lcd.ts b/packages/ast/src/clients/lcd/class/lcd.ts index e42006791a..e7618a0a82 100644 --- a/packages/ast/src/clients/lcd/class/lcd.ts +++ b/packages/ast/src/clients/lcd/class/lcd.ts @@ -251,6 +251,7 @@ export const makeTemplateTag = (info: ProtoServiceMethodInfo) => { .join('/'); const parsed = getAstFromString(`\`${route}\``); + // @ts-ignore const ast: t.TemplateLiteral = parsed.program.body[0].expression; ast.expressions = ast.expressions.map((identifier: t.Identifier) => { diff --git a/packages/ast/src/clients/lcd/class/template-tag.test.ts b/packages/ast/src/clients/lcd/class/template-tag.test.ts index 9c653ba8b6..727723c823 100644 --- a/packages/ast/src/clients/lcd/class/template-tag.test.ts +++ b/packages/ast/src/clients/lcd/class/template-tag.test.ts @@ -1,11 +1,9 @@ import { getUrlTemplateString, - makeTemplateTag, - makeTemplateTagLegacy, - parseUrlTemplateString + makeTemplateTag } from './lcd'; import generate from '@babel/generator'; -import { getTestProtoStore, expectCode, printCode } from '../../../../test-utils'; +import { getTestProtoStore } from '../../../../test-utils'; const store = getTestProtoStore(); store.traverseAll(); diff --git a/packages/ast/src/encoding/context.ts b/packages/ast/src/encoding/context.ts index 65cfd6d5ea..41c3e80563 100644 --- a/packages/ast/src/encoding/context.ts +++ b/packages/ast/src/encoding/context.ts @@ -1,7 +1,8 @@ -import { TelescopeOptions, ProtoField, ProtoRef } from '@osmonauts/types'; +import { TelescopeOptions, ProtoField, ProtoRef, TraversalSymbol } from '@osmonauts/types'; import { ProtoStore, getObjectName } from '@osmonauts/proto-parser'; import { getEnumFromJsonName, getEnumToJsonName, getFieldsTypeName } from './proto'; import { getPluginValue } from '../plugins'; +import { TelescopeBaseTypes } from './types'; export interface ParseContext { options: TelescopeOptions; imports: ImportUsage[]; @@ -15,9 +16,15 @@ export interface ImportUsage { import: string; importedAs?: string; } + +interface DerivativeImport { + type: TelescopeBaseTypes, + symbol: TraversalSymbol +} export class GenericParseContext implements ParseContext { options: TelescopeOptions; imports: ImportUsage[] = []; + derivedImports: DerivativeImport[] = []; utils: Record = {}; store: ProtoStore; ref: ProtoRef; @@ -56,6 +63,17 @@ export class GenericParseContext implements ParseContext { this.imports.push(imp) } + addImportDerivative(imp: DerivativeImport) { + const found = this.derivedImports.find(a => { + return a.type === imp.type && + a.symbol.symbolName === imp.symbol.symbolName && + a.symbol.source === imp.symbol.source; + }); + if (!found) { + this.derivedImports.push(imp); + } + } + getTypeNameFromFieldName(name: string, importSrc: string) { let importedAs = name; const names = this.ref.traversed?.importNames; diff --git a/packages/ast/src/encoding/proto/enums.ts b/packages/ast/src/encoding/proto/enums.ts index b70663069e..131a1fe28f 100644 --- a/packages/ast/src/encoding/proto/enums.ts +++ b/packages/ast/src/encoding/proto/enums.ts @@ -54,6 +54,7 @@ export const createProtoEnum = ( t.numericLiteral(e.value), e.comment ? [{ type: 'CommentBlock', + // @ts-ignore value: processEnumComment(e) }] : [] ); diff --git a/packages/ast/src/encoding/proto/interface/__tests__/__snapshots__/iinterface.type-encoded.test.ts.snap b/packages/ast/src/encoding/proto/interface/__tests__/__snapshots__/iinterface.type-encoded.test.ts.snap new file mode 100644 index 0000000000..c18894ea22 --- /dev/null +++ b/packages/ast/src/encoding/proto/interface/__tests__/__snapshots__/iinterface.type-encoded.test.ts.snap @@ -0,0 +1,19 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`cosmos/gov/v1beta1/tx.proto createProtoInterfaceEncodedType 1`] = ` +"export type MsgSubmitProposalEncoded = Omit & { + content?: TextProposalProtoMsg | RegisterIncentiveProposalProtoMsg | ClientUpdateProposalProtoMsg | UpgradeProposalProtoMsg | ReplacePoolIncentivesProposalProtoMsg | UpdatePoolIncentivesProposalProtoMsg | SetSuperfluidAssetsProposalProtoMsg | RemoveSuperfluidAssetsProposalProtoMsg | UpdateUnpoolWhiteListProposalProtoMsg | UpdateFeeTokenProposalProtoMsg | AnyProtoMsg | undefined; +};" +`; + +exports[`cosmos/gov/v1beta1/tx.proto createProtoType 1`] = ` +"/** + * MsgSubmitProposal defines an sdk.Msg type that supports submitting arbitrary + * proposal Content. + */ +export interface MsgSubmitProposal { + content?: (TextProposal & RegisterIncentiveProposal & ClientUpdateProposal & UpgradeProposal & ReplacePoolIncentivesProposal & UpdatePoolIncentivesProposal & SetSuperfluidAssetsProposal & RemoveSuperfluidAssetsProposal & UpdateUnpoolWhiteListProposal & UpdateFeeTokenProposal & Any) | undefined; + initialDeposit: Coin[]; + proposer: string; +}" +`; diff --git a/packages/ast/src/encoding/proto/interface/__tests__/amino.interface.test.ts b/packages/ast/src/encoding/proto/interface/__tests__/amino.interface.test.ts index 8e6de1e2f5..92786def0c 100644 --- a/packages/ast/src/encoding/proto/interface/__tests__/amino.interface.test.ts +++ b/packages/ast/src/encoding/proto/interface/__tests__/amino.interface.test.ts @@ -2,6 +2,7 @@ import { getNestedProto } from '@osmonauts/proto-parser'; import { expectCode, getTestProtoStore } from '../../../../../test-utils/' import { ProtoParseContext } from '../../../context'; import { createAminoType } from '../amino'; +import { createProtoInterfaceEncodedType } from '../proto'; const store = getTestProtoStore(); store.traverseAll(); diff --git a/packages/ast/src/encoding/proto/interface/__tests__/iinterface.type-encoded.test.ts b/packages/ast/src/encoding/proto/interface/__tests__/iinterface.type-encoded.test.ts new file mode 100644 index 0000000000..adc1ccece9 --- /dev/null +++ b/packages/ast/src/encoding/proto/interface/__tests__/iinterface.type-encoded.test.ts @@ -0,0 +1,25 @@ +import { getNestedProto } from '@osmonauts/proto-parser'; +import { expectCode, getTestProtoStore } from '../../../../../test-utils/' +import { ProtoParseContext } from '../../../context'; +import { createSDKType, createProtoType, createProtoInterfaceEncodedType } from '..'; +import { createAminoType } from '../amino'; + +const store = getTestProtoStore(); +store.options.interfaces.enabled = true; +store.options.aminoEncoding.useRecursiveV2encoding = true; +store.traverseAll(); + +describe('cosmos/gov/v1beta1/tx.proto', () => { + const ref = store.findProto('cosmos/gov/v1beta1/tx.proto'); + const context = new ProtoParseContext(ref, store, store.options); + it('createProtoType', () => { + expectCode(createProtoType(context, 'MsgSubmitProposal', + getNestedProto(ref.traversed).MsgSubmitProposal + )); + }); + it('createProtoInterfaceEncodedType', () => { + expectCode(createProtoInterfaceEncodedType(context, 'MsgSubmitProposal', + getNestedProto(ref.traversed).MsgSubmitProposal + )); + }); +}); diff --git a/packages/ast/src/encoding/proto/interface/__tests__/interface.test.ts b/packages/ast/src/encoding/proto/interface/__tests__/interface.test.ts index 65f62d3ca6..5533add8eb 100644 --- a/packages/ast/src/encoding/proto/interface/__tests__/interface.test.ts +++ b/packages/ast/src/encoding/proto/interface/__tests__/interface.test.ts @@ -1,6 +1,5 @@ import { getNestedProto } from '@osmonauts/proto-parser'; -import { defaultTelescopeOptions } from '@osmonauts/types'; -import { expectCode, getTestProtoStore, printCode } from '../../../../../test-utils/' +import { expectCode, getTestProtoStore } from '../../../../../test-utils/' import { ProtoParseContext } from '../../../context'; import { createSDKType, createProtoType, createProtoTypeType } from '..'; import { createAminoType } from '../amino'; @@ -10,7 +9,7 @@ store.traverseAll(); describe('MsgSend', () => { const ref = store.findProto('cosmos/bank/v1beta1/tx.proto'); - const context = new ProtoParseContext(ref, store, defaultTelescopeOptions); + const context = new ProtoParseContext(ref, store, store.options); it('interface', () => { expectCode(createProtoType(context, 'MsgSend', getNestedProto(ref.traversed).MsgSend @@ -40,7 +39,7 @@ describe('MsgSend', () => { describe('PageRequest', () => { const ref = store.findProto('cosmos/base/query/v1beta1/pagination.proto'); - const context = new ProtoParseContext(ref, store, defaultTelescopeOptions); + const context = new ProtoParseContext(ref, store, store.options); it('interface', () => { expectCode(createProtoType(context, 'PageRequest', getNestedProto(ref.traversed).PageRequest @@ -55,7 +54,7 @@ describe('PageRequest', () => { describe('PageResponse', () => { const ref = store.findProto('cosmos/base/query/v1beta1/pagination.proto'); - const context = new ProtoParseContext(ref, store, defaultTelescopeOptions); + const context = new ProtoParseContext(ref, store, store.options); it('interface', () => { expectCode(createProtoType(context, 'PageResponse', getNestedProto(ref.traversed).PageResponse @@ -70,7 +69,7 @@ describe('PageResponse', () => { describe('cosmos/auth/v1beta1/auth.proto', () => { const ref = store.findProto('cosmos/auth/v1beta1/auth.proto'); - const context = new ProtoParseContext(ref, store, defaultTelescopeOptions); + const context = new ProtoParseContext(ref, store, store.options); it('BaseAccount', () => { expectCode(createProtoType(context, 'BaseAccount', getNestedProto(ref.traversed).BaseAccount @@ -85,7 +84,7 @@ describe('cosmos/auth/v1beta1/auth.proto', () => { describe('GenesisState', () => { const ref = store.findProto('cosmos/auth/v1beta1/genesis.proto'); - const context = new ProtoParseContext(ref, store, defaultTelescopeOptions); + const context = new ProtoParseContext(ref, store, store.options); it('interface', () => { expectCode(createProtoType(context, 'GenesisState', getNestedProto(ref.traversed).GenesisState @@ -95,7 +94,7 @@ describe('GenesisState', () => { describe('cosmos/authz/v1beta1/authz.proto', () => { const ref = store.findProto('cosmos/authz/v1beta1/authz.proto'); - const context = new ProtoParseContext(ref, store, defaultTelescopeOptions); + const context = new ProtoParseContext(ref, store, store.options); it('Grant Type', () => { expectCode(createProtoTypeType(context, 'Grant', getNestedProto(ref.traversed).Grant @@ -120,7 +119,7 @@ describe('cosmos/authz/v1beta1/authz.proto', () => { describe('cosmos/authz/v1beta1/query.proto', () => { const ref = store.findProto('cosmos/authz/v1beta1/query.proto'); - const context = new ProtoParseContext(ref, store, defaultTelescopeOptions); + const context = new ProtoParseContext(ref, store, store.options); it('QueryGrantsRequest', () => { expectCode(createProtoType(context, 'QueryGrantsRequest', getNestedProto(ref.traversed).QueryGrantsRequest @@ -130,10 +129,10 @@ describe('cosmos/authz/v1beta1/query.proto', () => { describe('confio/proofs.proto', () => { const ref = store.findProto('confio/proofs.proto'); - const context = new ProtoParseContext(ref, store, defaultTelescopeOptions); + const context = new ProtoParseContext(ref, store, store.options); it('ExistenceProof', () => { expectCode(createProtoType(context, 'ExistenceProof', getNestedProto(ref.traversed).ExistenceProof )); }); -}); \ No newline at end of file +}); diff --git a/packages/ast/src/encoding/proto/interface/amino.ts b/packages/ast/src/encoding/proto/interface/amino.ts index fa82481742..c12334ba10 100644 --- a/packages/ast/src/encoding/proto/interface/amino.ts +++ b/packages/ast/src/encoding/proto/interface/amino.ts @@ -202,7 +202,7 @@ export const createEnumAminoType = ( return t.exportNamedDeclaration( t.variableDeclaration('const', [ t.variableDeclarator( - t.identifier(name + 'Amino'), + t.identifier(SymbolNames.Amino(name)), t.identifier(name) ) ]) diff --git a/packages/ast/src/encoding/proto/interface/proto.ts b/packages/ast/src/encoding/proto/interface/proto.ts index 3b26e809d0..a76684eec0 100644 --- a/packages/ast/src/encoding/proto/interface/proto.ts +++ b/packages/ast/src/encoding/proto/interface/proto.ts @@ -1,5 +1,5 @@ import * as t from '@babel/types'; -import { ProtoType, ProtoField } from '@osmonauts/types'; +import { ProtoType, ProtoField, TelescopeLogLevel } from '@osmonauts/types'; import { identifier, tsPropertySignature, functionDeclaration, makeCommentBlock } from '../../../utils'; import { ProtoParseContext } from '../../context'; @@ -17,6 +17,7 @@ import { getTSType } from '../../types'; import { getTypeUrlWithPkgAndName, getTypeUrl } from '../../amino'; +import { TraversalSymbol } from '@osmonauts/types'; const getProtoField = ( context: ProtoParseContext, @@ -247,6 +248,126 @@ export const createProtoTypeType = ( ]))); }; +interface FieldInfo { + isOneOf: boolean, + field: ProtoField, + name: string, + lookupInterface: string, + isAnyType: boolean, + symbols: TraversalSymbol[] +} + +export const createProtoInterfaceEncodedType = ( + context: ProtoParseContext, + name: string, + proto: ProtoType +) => { + + const MsgName = SymbolNames.Msg(name); + const EncodedMsgName = SymbolNames.Encoded(name); + + const oneOfs = getOneOfs(proto); + + const implementsAcceptsAny = context.pluginValue('interfaces.enabled'); + + const fieldsWithInfo: FieldInfo[] = Object.keys(proto.fields) + .reduce((m, fieldName) => { + const isOneOf = oneOfs.includes(fieldName); + const field = proto.fields[fieldName]; + + const lookupInterface = field.options?.['(cosmos_proto.accepts_interface)']; + const isAnyType = field.parsedType?.type === 'Type' && field.parsedType?.name === 'Any'; + + // MARKED AS NOT DRY (symbols) + let symbols = null; + if (implementsAcceptsAny && lookupInterface) { + symbols = context.store._symbols.filter(s => s.implementsType === lookupInterface && s.ref === context.ref.filename); + if (!symbols.length && context.options.logLevel >= TelescopeLogLevel.Warn) { + console.warn(`[WARN] ${lookupInterface} is accepted but not implemented`); + } + } + + const isAnyInterface = isAnyType && lookupInterface && implementsAcceptsAny && symbols; + if (!isAnyInterface) return m; + // ONLY INTERFACES! + + return [...m, { + isOneOf, + field, + name: fieldName, + lookupInterface, + isAnyType, + symbols + }]; + }, []).filter(Boolean); + + if (!fieldsWithInfo.length) return; + + const interfaceFields = fieldsWithInfo.map(fieldInfo => { + return t.tsLiteralType( + t.stringLiteral(fieldInfo.name) + ); + }); + + const fields = fieldsWithInfo.map(fieldsInfo => { + const { + field, + isOneOf, + name: fieldName + } = fieldsInfo; + + let optional = false; + const protoField = getProtoField(context, field, 'ProtoMsg'); + + const propSig = tsPropertySignature( + t.identifier(fieldName), + t.tsTypeAnnotation( + protoField + ), + optional || getFieldOptionality(context, field, isOneOf) + ); + + const comments = []; + if (field.comment) { + comments.push( + makeCommentBlock(field.comment) + ); + } + if (field.options?.deprecated) { + comments.push( + makeCommentBlock('@deprecated') + ); + } + if (comments.length) { + propSig.leadingComments = comments; + } + + return propSig; + }); + + return t.exportNamedDeclaration(t.tsTypeAliasDeclaration( + t.identifier(EncodedMsgName), + null, + t.tsIntersectionType([ + t.tsTypeReference( + t.identifier('Omit'), + t.tsTypeParameterInstantiation([ + t.tsTypeReference( + t.identifier(MsgName) + ), + interfaceFields.length > 1 ? t.tsUnionType([ + ...interfaceFields + ]) : interfaceFields[0] + ]) + ), + t.tsTypeLiteral([ + ...fields + ]) + ]) + )); + +}; + export const createCreateProtoType = ( context: ProtoParseContext, diff --git a/packages/ast/src/encoding/proto/to-proto/index.ts b/packages/ast/src/encoding/proto/to-proto/index.ts index 43faa9f450..e9e8883254 100644 --- a/packages/ast/src/encoding/proto/to-proto/index.ts +++ b/packages/ast/src/encoding/proto/to-proto/index.ts @@ -6,7 +6,7 @@ import { SymbolNames } from '../../types'; import { getTypeUrl } from '../../amino'; export const toProtoMsgMethod = (context: ProtoParseContext, name: string, proto: ProtoType) => { - let varName = 'message'; + const varName = 'message'; const ReturnType = SymbolNames.ProtoMsg(name); const TypeName = SymbolNames.Msg(name); @@ -72,7 +72,7 @@ export const toProtoMsgMethod = (context: ProtoParseContext, name: string, proto }; export const toProtoMethod = (context: ProtoParseContext, name: string, proto: ProtoType) => { - let varName = 'message'; + const varName = 'message'; const ReturnType = 'Uint8Array'; const TypeName = SymbolNames.Msg(name); diff --git a/packages/ast/src/encoding/types.ts b/packages/ast/src/encoding/types.ts index b786393a0a..da0fa50825 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 { ProtoField, TelescopeLogLevel } from '@osmonauts/types'; +import { TraversalSymbol, ProtoField, TelescopeLogLevel } from '@osmonauts/types'; import { getProtoFieldTypeName } from '../utils'; import { GenericParseContext, ProtoParseContext } from './context'; import { getFieldOptionalityForDefaults, GOOGLE_TYPES, SCALAR_TYPES } from './proto'; @@ -17,7 +17,8 @@ export type TelescopeBaseTypes = 'Msg' | 'SDKType' | 'Amino' | 'AminoMsg' | - 'ProtoMsg'; + 'ProtoMsg' | + 'Encoded'; const getSymbolName = ( @@ -38,6 +39,9 @@ const getSymbolName = ( case 'SDKType': typeNameSuffix = 'SDKType'; break; + case 'Encoded': + typeNameSuffix = 'Encoded'; + break; case 'Msg': default: } @@ -65,6 +69,10 @@ export const SymbolNames = { name: string ) => getSymbolName(name, 'Amino'), + Encoded: ( + name: string + ) => getSymbolName(name, 'Encoded'), + }; export const getFieldTypeReference = ( @@ -96,7 +104,11 @@ export const getFieldTypeReference = ( const isAnyType = field.parsedType?.type === 'Type' && field.parsedType?.name === 'Any'; const isArray = field.rule === 'repeated'; const isBaseType = type === 'Msg'; - let symbols = null; + const isEncodedType = type === 'ProtoMsg'; + const isSDKType = type === 'SDKType'; + + // MARKED AS NOT DRY (symbols) + let symbols: TraversalSymbol[] = null; if (implementsAcceptsAny && lookupInterface) { symbols = context.store._symbols.filter(s => s.implementsType === lookupInterface && s.ref === context.ref.filename); if (!symbols.length && context.options.logLevel >= TelescopeLogLevel.Warn) { @@ -104,14 +116,47 @@ export const getFieldTypeReference = ( } } + if (!isBaseType) { + if (['ProtoMsg', 'SDKType'].includes(type)) { + symbols?.forEach(s => { + context.addImportDerivative({ + type, + symbol: s + }) + }); + } + // main type could be Any + + if (['SDKType'].includes(type) && + // no derivatives for Enums! + field.parsedType.type === 'Type') { + + context.addImportDerivative({ + type, + symbol: { + ref: context.ref.filename, + readAs: field.parsedType.name, // maybe not! + source: field.import, + symbolName: field.parsedType.name, + type: 'import' + }, + }) + } + } + + // cast Any types! - const isTypeCastable = isAnyType && lookupInterface && implementsAcceptsAny && symbols && isBaseType; + const isAnyInterface = isAnyType && lookupInterface && implementsAcceptsAny && symbols; + const isTypeCastable = isAnyInterface && isBaseType; + const isProtoTypeCastable = isAnyInterface && isEncodedType; + const isSDKTypeCastable = isAnyInterface && isSDKType; + const isNonArrayNullableType = field.parsedType?.type === 'Type' && field.rule !== 'repeated' && context.pluginValue('prototypes.allowUndefinedTypes'); if (isTypeCastable) { - const tp = symbols.map(a => t.tsTypeReference(t.identifier(a.readAs))); + const tp: any[] = symbols.map(a => t.tsTypeReference(t.identifier(a.readAs))); tp.push(typ); if (context.pluginValue('interfaces.useUnionTypes')) { @@ -132,6 +177,43 @@ export const getFieldTypeReference = ( ) } } + } else if (isProtoTypeCastable) { + + const tp: any[] = symbols.map(a => t.tsTypeReference(t.identifier( + SymbolNames.ProtoMsg(a.readAs) + ))); + symbols.forEach(a => { + context.addImportDerivative({ + type: 'ProtoMsg', + symbol: a + }); + }); + + tp.push(typ); + + if (!isArray) { + tp.push(t.tsUndefinedKeyword()) + } + ast = t.tsUnionType(tp) + } else if (isSDKTypeCastable) { + + const tp: any[] = symbols.map(a => t.tsTypeReference(t.identifier( + SymbolNames.SDKType(a.readAs) + ))); + symbols.forEach(a => { + context.addImportDerivative({ + type: 'SDKType', + symbol: a + }); + }); + + tp.push(typ); + + if (!isArray) { + tp.push(t.tsUndefinedKeyword()) + } + ast = t.tsUnionType(tp) + } else if (isNonArrayNullableType) { // regular types! ast = t.tsUnionType( @@ -169,6 +251,20 @@ export const getFieldAminoTypeReference = ( typ = t.tsTypeReference(t.identifier(MsgName)); } + + if (field.parsedType?.type === 'Type') { + context.addImportDerivative({ + type: 'Amino', + symbol: { + ref: context.ref.filename, + readAs: field.parsedType.name, // maybe not! + source: field.import, + symbolName: field.parsedType.name, + type: 'import' + }, + }) + } + if ( field.parsedType?.type === 'Type' && field.rule !== 'repeated' && diff --git a/packages/ast/types/src/encoding/context.d.ts b/packages/ast/types/src/encoding/context.d.ts index 8fa52b0a80..50971a00b0 100644 --- a/packages/ast/types/src/encoding/context.d.ts +++ b/packages/ast/types/src/encoding/context.d.ts @@ -1,5 +1,6 @@ -import { TelescopeOptions, ProtoField, ProtoRef } from '@osmonauts/types'; +import { TelescopeOptions, ProtoField, ProtoRef, TraversalSymbol } from '@osmonauts/types'; import { ProtoStore } from '@osmonauts/proto-parser'; +import { TelescopeBaseTypes } from './types'; export interface ParseContext { options: TelescopeOptions; imports: ImportUsage[]; @@ -12,9 +13,14 @@ export interface ImportUsage { import: string; importedAs?: string; } +interface DerivativeImport { + type: TelescopeBaseTypes; + symbol: TraversalSymbol; +} export declare class GenericParseContext implements ParseContext { options: TelescopeOptions; imports: ImportUsage[]; + derivedImports: DerivativeImport[]; utils: Record; store: ProtoStore; ref: ProtoRef; @@ -23,6 +29,7 @@ export declare class GenericParseContext implements ParseContext { isExcluded(): any; addUtil(util: any): void; addImport(imp: ImportUsage): void; + addImportDerivative(imp: DerivativeImport): void; getTypeNameFromFieldName(name: string, importSrc: string): string; getTypeName(field: ProtoField): string; lookupTypeFromCurrentPath(field: ProtoField, currentProtoPath: string): import("@osmonauts/proto-parser").Lookup; @@ -41,3 +48,4 @@ export declare class ProtoParseContext extends GenericParseContext implements Pa getToEnum(field: ProtoField): string; getFromEnum(field: ProtoField): string; } +export {}; diff --git a/packages/ast/types/src/encoding/proto/interface/__tests__/iinterface.type-encoded.test.d.ts b/packages/ast/types/src/encoding/proto/interface/__tests__/iinterface.type-encoded.test.d.ts new file mode 100644 index 0000000000..cb0ff5c3b5 --- /dev/null +++ b/packages/ast/types/src/encoding/proto/interface/__tests__/iinterface.type-encoded.test.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/packages/ast/types/src/encoding/proto/interface/proto.d.ts b/packages/ast/types/src/encoding/proto/interface/proto.d.ts index 656c04246d..d49ec475dc 100644 --- a/packages/ast/types/src/encoding/proto/interface/proto.d.ts +++ b/packages/ast/types/src/encoding/proto/interface/proto.d.ts @@ -4,4 +4,5 @@ import { ProtoParseContext } from '../../context'; import { TelescopeBaseTypes } from '../../types'; export declare const createProtoType: (context: ProtoParseContext, name: string, proto: ProtoType, type?: TelescopeBaseTypes) => t.ExportNamedDeclaration; export declare const createProtoTypeType: (context: ProtoParseContext, name: string, proto: ProtoType) => t.ExportNamedDeclaration; +export declare const createProtoInterfaceEncodedType: (context: ProtoParseContext, name: string, proto: ProtoType) => t.ExportNamedDeclaration; export declare const createCreateProtoType: (context: ProtoParseContext, name: string, proto: ProtoType) => t.FunctionDeclaration; diff --git a/packages/ast/types/src/encoding/types.d.ts b/packages/ast/types/src/encoding/types.d.ts index 63cb8268c3..adf37776e7 100644 --- a/packages/ast/types/src/encoding/types.d.ts +++ b/packages/ast/types/src/encoding/types.d.ts @@ -5,13 +5,14 @@ export declare const getFieldNames: (field: ProtoField) => { propName: string; origName: string; }; -export declare type TelescopeBaseTypes = 'Msg' | 'SDKType' | 'Amino' | 'AminoMsg' | 'ProtoMsg'; +export declare type TelescopeBaseTypes = 'Msg' | 'SDKType' | 'Amino' | 'AminoMsg' | 'ProtoMsg' | 'Encoded'; export declare const SymbolNames: { Msg: (name: string) => string; SDKType: (name: string) => string; ProtoMsg: (name: string) => string; AminoMsg: (name: string) => string; Amino: (name: string) => string; + Encoded: (name: string) => string; }; export declare const getFieldTypeReference: (context: ProtoParseContext, field: ProtoField, type?: TelescopeBaseTypes) => { ast: any; diff --git a/packages/babel/package.json b/packages/babel/package.json index 1baa1c106b..c5bf661377 100644 --- a/packages/babel/package.json +++ b/packages/babel/package.json @@ -17,8 +17,10 @@ ], "scripts": { "build": "cross-env BABEL_ENV=production babel src --out-dir main --delete-dir-on-start --extensions \".tsx,.ts,.js\"", - "buidl": "npm run build && npm run build:ts", "build:ts": "tsc --project ./tsconfig.json", + "buidl": "npm run build && npm run build:ts", + "buidl:clean": "npm run clean && npm run buidl", + "clean": "rimraf ./types", "prepare": "npm run build", "lint": "eslint .", "format": "eslint . --fix", @@ -69,6 +71,7 @@ "jest-in-case": "^1.0.2", "prettier": "^2.7.0", "regenerator-runtime": "^0.13.7", + "rimraf": "3.0.2", "ts-jest": "^29.0.3", "typescript": "^4.8.4" }, @@ -76,4 +79,4 @@ "@babel/runtime": "^7.19.0", "long": "^5.2.0" } -} +} \ No newline at end of file diff --git a/packages/lcd/package.json b/packages/lcd/package.json index 2ac89f118d..7a6ee49c76 100644 --- a/packages/lcd/package.json +++ b/packages/lcd/package.json @@ -24,6 +24,8 @@ "build:ts": "tsc --project ./tsconfig.json", "build": "npm run build:module && npm run build:main", "buidl": "npm run build && npm run build:ts", + "buidl:clean": "npm run clean && npm run buidl", + "clean": "rimraf ./types", "prepare": "npm run build", "lint": "eslint .", "format": "eslint . --fix" @@ -71,6 +73,7 @@ "jest-in-case": "^1.0.2", "prettier": "^2.7.0", "regenerator-runtime": "^0.13.7", + "rimraf": "3.0.2", "ts-jest": "^29.0.3", "typescript": "^4.8.4" }, @@ -78,4 +81,4 @@ "@babel/runtime": "^7.19.0", "axios": "0.27.2" } -} +} \ No newline at end of file diff --git a/packages/parser/package.json b/packages/parser/package.json index 4fb66ec80e..031c911413 100644 --- a/packages/parser/package.json +++ b/packages/parser/package.json @@ -19,6 +19,8 @@ "build": "cross-env BABEL_ENV=production babel src --out-dir main --delete-dir-on-start --extensions \".tsx,.ts,.js\"", "build:ts": "tsc --project ./tsconfig.json", "buidl": "npm run build && npm run build:ts", + "buidl:clean": "npm run clean && npm run buidl", + "clean": "rimraf ./types", "prepare": "npm run build", "lint": "eslint .", "format": "eslint . --fix", @@ -62,6 +64,7 @@ "long": "^5.2.0", "prettier": "^2.7.0", "regenerator-runtime": "^0.13.7", + "rimraf": "3.0.2", "ts-jest": "^29.0.3", "typescript": "^4.8.4" }, @@ -74,4 +77,4 @@ "minimatch": "5.1.0", "mkdirp": "1.0.4" } -} +} \ No newline at end of file diff --git a/packages/parser/src/store.ts b/packages/parser/src/store.ts index 6f525c90d9..64a48e9535 100644 --- a/packages/parser/src/store.ts +++ b/packages/parser/src/store.ts @@ -4,9 +4,9 @@ import { readFileSync } from 'fs'; import { join, resolve as pathResolve } from 'path'; import { ALLOWED_RPC_SERVICES, ProtoDep, ProtoField, ProtoRef, ProtoServiceMethod, ProtoType, TelescopeOptions } from '@osmonauts/types'; import { createTypeUrlTypeMap, getNestedProto, getPackageAndNestedFromStr } from './utils'; -import { parseFullyTraversedProtoImports, symbolsToImportNames, TraversalSymbols, traverse } from './traverse'; +import { parseFullyTraversedProtoImports, symbolsToImportNames, traverse } from './traverse'; import { lookupAny, lookupAnyFromImports } from './lookup'; -import { defaultTelescopeOptions, TelescopeLogLevel } from '@osmonauts/types'; +import { defaultTelescopeOptions, TelescopeLogLevel, TraversalSymbol } from '@osmonauts/types'; import google_any from './native/any'; import google_descriptor from './native/descriptor'; @@ -58,7 +58,7 @@ export class ProtoStore { responses: Record = {}; _traversed: boolean = false; - _symbols: TraversalSymbols[] = []; + _symbols: TraversalSymbol[] = []; constructor(protoDirs: string[] = [], options: TelescopeOptions = defaultTelescopeOptions) { this.protoDirs = protoDirs.map(protoDir => pathResolve(protoDir)); diff --git a/packages/parser/src/traverse.ts b/packages/parser/src/traverse.ts index 88809d40bc..9b2012ac48 100644 --- a/packages/parser/src/traverse.ts +++ b/packages/parser/src/traverse.ts @@ -12,7 +12,8 @@ import { TraverseImplement, TraverseExport, TraverseLocalSymbol, - TraverseImportNames + TraverseImportNames, + TraversalSymbol } from '@osmonauts/types'; import { getPluginValue @@ -64,13 +65,9 @@ export class TraverseContext implements TraverseContext { } } -export type TraversalSymbols = TraverseLocalSymbol & { - ref: string; -} - export const symbolsToImportNames = ( ref: ProtoRef, - symbols: TraversalSymbols[] + symbols: TraversalSymbol[] ): TraverseImportNames => { return symbols.reduce((m, v) => { // imports to self... nope. @@ -84,10 +81,10 @@ export const symbolsToImportNames = ( export const parseFullyTraversedProtoImports = ( store: ProtoStore -): TraversalSymbols[] => { +): TraversalSymbol[] => { const protos = store.getProtos(); const records: TraverseRecord[] = []; - const symbols: TraversalSymbols[] = []; + const symbols: TraversalSymbol[] = []; // AGGREGATE ALL implements @@ -202,6 +199,7 @@ export const parseFullyTraversedProtoImports = ( export const traverse = (store: ProtoStore, ref: ProtoRef) => { const context = new TraverseContext(store, ref); + // @ts-ignore const obj: TraversedProtoRoot = { imports: ref.proto.imports, package: ref.proto.package, @@ -507,6 +505,7 @@ const traverseServiceMethod = ( const fields = traverseFields(store, ref, requestObject.obj, context, traversal); + // @ts-ignore const info: ProtoServiceMethodInfo = parseService({ options, fields diff --git a/packages/parser/types/store.d.ts b/packages/parser/types/store.d.ts index 5e4371ca26..956af4e8fa 100644 --- a/packages/parser/types/store.d.ts +++ b/packages/parser/types/store.d.ts @@ -1,5 +1,5 @@ import { ProtoDep, ProtoRef, ProtoServiceMethod, TelescopeOptions } from '@osmonauts/types'; -import { TraversalSymbols } from './traverse'; +import { TraversalSymbol } from '@osmonauts/types'; interface ParseProtoOptions { keepCase?: boolean; alternateCommentMode?: boolean; @@ -16,7 +16,7 @@ export declare class ProtoStore { requests: Record; responses: Record; _traversed: boolean; - _symbols: TraversalSymbols[]; + _symbols: TraversalSymbol[]; constructor(protoDirs?: string[], options?: TelescopeOptions); findProto(filename: any): ProtoRef; findProtoWhere(fn: (ref: ProtoRef) => boolean): ProtoRef; diff --git a/packages/parser/types/traverse.d.ts b/packages/parser/types/traverse.d.ts index afdf03e5cc..c176f34738 100644 --- a/packages/parser/types/traverse.d.ts +++ b/packages/parser/types/traverse.d.ts @@ -1,4 +1,4 @@ -import { TraversedProtoRoot, ProtoRef, TraverseImport, TraverseAccept, TraverseImplement, TraverseExport, TraverseLocalSymbol, TraverseImportNames } from '@osmonauts/types'; +import { TraversedProtoRoot, ProtoRef, TraverseImport, TraverseAccept, TraverseImplement, TraverseExport, TraverseImportNames, TraversalSymbol } from '@osmonauts/types'; import { ProtoStore } from './store'; export interface TraverseContext { imports: TraverseImport; @@ -15,10 +15,7 @@ export declare class TraverseContext implements TraverseContext { addAccepts(symbolName: string, msgName: string): void; addExport(symbolName: string): void; } -export declare type TraversalSymbols = TraverseLocalSymbol & { - ref: string; -}; -export declare const symbolsToImportNames: (ref: ProtoRef, symbols: TraversalSymbols[]) => TraverseImportNames; -export declare const parseFullyTraversedProtoImports: (store: ProtoStore) => TraversalSymbols[]; +export declare const symbolsToImportNames: (ref: ProtoRef, symbols: TraversalSymbol[]) => TraverseImportNames; +export declare const parseFullyTraversedProtoImports: (store: ProtoStore) => TraversalSymbol[]; export declare const traverse: (store: ProtoStore, ref: ProtoRef) => TraversedProtoRoot; export declare const recursiveTraversal: (store: ProtoStore, ref: ProtoRef, obj: any, context: TraverseContext, traversal: string[], isNested: boolean) => any; diff --git a/packages/telescope/package.json b/packages/telescope/package.json index b0ceac000c..2c664526b7 100644 --- a/packages/telescope/package.json +++ b/packages/telescope/package.json @@ -27,6 +27,8 @@ "build:ts": "tsc --project ./tsconfig.json", "build": "npm run build:module && npm run build:main", "buidl": "npm run build && npm run build:ts", + "buidl:clean": "npm run clean && npm run buidl", + "clean": "rimraf ./types", "prepare": "npm run build", "dev": "cross-env NODE_ENV=development babel-node src/telescope --extensions \".tsx,.ts,.js\"", "watch": "cross-env NODE_ENV=development babel-watch src/telescope --extensions \".tsx,.ts,.js\"", @@ -102,4 +104,4 @@ "rimraf": "3.0.2", "shelljs": "0.8.5" } -} +} \ No newline at end of file diff --git a/packages/telescope/src/build.ts b/packages/telescope/src/build.ts index 40c275c44e..8a44b6da80 100644 --- a/packages/telescope/src/build.ts +++ b/packages/telescope/src/build.ts @@ -9,6 +9,7 @@ import { createProtoEnumToJSON, createProtoEnumFromJSON, createProtoType, + createProtoInterfaceEncodedType, createProtoTypeType, createSDKType, createAminoType, @@ -66,6 +67,11 @@ export const buildBaseTypeScriptInterface = ( if (context.options.aminoEncoding.useRecursiveV2encoding) { context.body.push(createProtoTypeType(context.proto, name, obj)); + // conditional type + const interfaceType = createProtoInterfaceEncodedType(context.proto, name, obj); + if (interfaceType) { + context.body.push(interfaceType); + } context.body.push(createAminoType(context.proto, name, obj)); // TODO optimization: diff --git a/packages/telescope/src/imports.ts b/packages/telescope/src/imports.ts index 98dd71c3a6..23e77ff8da 100644 --- a/packages/telescope/src/imports.ts +++ b/packages/telescope/src/imports.ts @@ -1,8 +1,8 @@ import * as t from '@babel/types'; -import { GenericParseContext, importStmt } from '@osmonauts/ast'; +import { GenericParseContext, SymbolNames, TelescopeBaseTypes, importStmt } from '@osmonauts/ast'; import { ServiceMutation } from '@osmonauts/types'; -import { ImportHash, ImportObj } from './types'; +import { DerivedImportObj, ImportHash, ImportObj } from './types'; import { UTILS, getRelativePath, UTIL_HELPERS } from './utils'; import { TelescopeParseContext } from './build'; @@ -263,6 +263,7 @@ const addDerivativeTypesToImports = ( imports: ImportObj[] ) => { const ref = context.ref; + return imports.reduce((m, obj) => { // SDKType // probably wont need this until we start generating osmonauts/helpers inline @@ -272,17 +273,18 @@ const addDerivativeTypesToImports = ( lookup = context.store.getImportFromRef(ref, obj.name); } catch (e) { } - const appendSuffix = (obj, suffix) => { + const appendSuffix = (obj: ImportObj, baseType: TelescopeBaseTypes): DerivedImportObj => { return { ...obj, - name: obj.name + suffix, - importAs: (obj.importAs ?? obj.name) + suffix, + orig: obj.name, + name: SymbolNames[baseType](obj.name), + importAs: SymbolNames[baseType](obj.importAs ?? obj.name), }; } // MARKED AS NOT DRY [google.protobuf names] // TODO some have google.protobuf.Any shows up... figure out the better way to handle this - const removeProtoPrefix = obj => { + const removeProtoPrefix = (obj: DerivedImportObj): DerivedImportObj => { if (/\./.test(obj.name)) { obj.name = obj.name.split('.')[obj.name.split('.').length - 1]; obj.importAs = obj.importAs.split('.')[obj.importAs.split('.').length - 1]; @@ -292,6 +294,7 @@ const addDerivativeTypesToImports = ( const SDKTypeObject = removeProtoPrefix(appendSuffix(obj, 'SDKType')); const AminoTypeObject = removeProtoPrefix(appendSuffix(obj, 'Amino')); + const EncodedTypeObject = removeProtoPrefix(appendSuffix(obj, 'ProtoMsg')); // const AminoTypeUrlObject = removeProtoPrefix(appendSuffix(obj, 'AminoType')); if (lookup && ['Type', 'Enum'].includes(lookup.obj.type)) { @@ -302,11 +305,57 @@ const addDerivativeTypesToImports = ( ]; if (context.options.aminoEncoding.useRecursiveV2encoding) { - arr.push(AminoTypeObject); - // arr.push(AminoTypeUrlObject); + + // check and see if this derived import has been required... + const foundEnc = context.proto.derivedImports.find(a => { + if (a.type !== 'ProtoMsg') return false; + if (EncodedTypeObject.orig === a.symbol.symbolName) { + // UNTIL you fix the ImportObjs to have ref... + let rel = getRelativePath(a.symbol.ref, a.symbol.source); + if (rel === EncodedTypeObject.path) { + return true; + } + } + }); + const foundAmino = context.proto.derivedImports.find(a => { + if (a.type !== 'Amino') return false; + if (AminoTypeObject.orig === a.symbol.symbolName) { + // UNTIL you fix the ImportObjs to have ref... + let rel = getRelativePath(a.symbol.ref, a.symbol.source); + if (rel === AminoTypeObject.path) { + return true; + } + } + }); + + // we need Any types as defaults... + if (foundEnc || EncodedTypeObject.orig === 'Any') { + arr.push(EncodedTypeObject); + } + if (foundAmino || AminoTypeObject.orig === 'Any') { + arr.push(AminoTypeObject); + } } if (context.options.useSDKTypes) { + // issue in output1 (probably legacy v1 amino transpiler) + // ProposalSDKType wasn't being found in QueryProposalResponseSDKType arr.push(SDKTypeObject); + // const foundSDK = context.proto.derivedImports.find(a => { + // if (a.type !== 'SDKType') return false; + + + // if (SDKTypeObject.orig === a.symbol.symbolName) { + // // UNTIL you fix the ImportObjs to have ref... + // let rel = getRelativePath(a.symbol.ref, a.symbol.source); + // if (rel === SDKTypeObject.path) { + // return true; + // } + // } + // }); + + // if (foundSDK) { + // arr.push(SDKTypeObject); + // } } return arr; diff --git a/packages/telescope/src/types.ts b/packages/telescope/src/types.ts index a35ac46ca9..935377c9f8 100644 --- a/packages/telescope/src/types.ts +++ b/packages/telescope/src/types.ts @@ -17,6 +17,10 @@ export interface ImportObj { path: string; importAs?: string; } + +export interface DerivedImportObj extends ImportObj { + orig: string; +} export interface ImportHash { [key: string]: string[]; } diff --git a/packages/telescope/types/bundle.d.ts b/packages/telescope/types/bundle.d.ts index 7de4242251..dea06000fc 100644 --- a/packages/telescope/types/bundle.d.ts +++ b/packages/telescope/types/bundle.d.ts @@ -1,7 +1,8 @@ +import { ProtoStore } from '@osmonauts/proto-parser'; import { TelescopeBuilder } from './index'; import { TelescopeParseContext } from './build'; import { TelescopeOptions } from '@osmonauts/types'; -export declare const getPackages: (store: ProtoStore) => any; +export declare const getPackages: (store: ProtoStore) => {}; export declare const getPackagesBundled: (store: ProtoStore) => {}; export declare const bundlePackages: (store: ProtoStore) => { bundleVariables: {}; diff --git a/packages/telescope/types/imports.d.ts b/packages/telescope/types/imports.d.ts index 6b37ac3fb5..644cbff716 100644 --- a/packages/telescope/types/imports.d.ts +++ b/packages/telescope/types/imports.d.ts @@ -1,3 +1,4 @@ +import { GenericParseContext } from '@osmonauts/ast'; import { ServiceMutation } from '@osmonauts/types'; import { ImportHash, ImportObj } from './types'; import { TelescopeParseContext } from './build'; diff --git a/packages/telescope/types/parse.d.ts b/packages/telescope/types/parse.d.ts index d9bf5298db..a98ba174b6 100644 --- a/packages/telescope/types/parse.d.ts +++ b/packages/telescope/types/parse.d.ts @@ -1,7 +1,7 @@ import { ProtoRef } from '@osmonauts/types'; import { TelescopeParseContext } from './build'; export declare const parse: (context: TelescopeParseContext) => void; -export declare const getParsedObjectName: (ref: ProtoRef, obj: any, scope: string[]) => any; +export declare const getParsedObjectName: (ref: ProtoRef, obj: any, scope: string[]) => string; export declare const parseType: (context: TelescopeParseContext, obj: any, scope: string[], isNested?: boolean) => void; export declare const parseEnum: (context: TelescopeParseContext, obj: any, scope: string[], isNested?: boolean) => void; export declare const parseService: (context: TelescopeParseContext, obj: any, scope: string[], isNested?: boolean) => void; diff --git a/packages/telescope/types/types.d.ts b/packages/telescope/types/types.d.ts index 4470fd6eb2..d221364a5f 100644 --- a/packages/telescope/types/types.d.ts +++ b/packages/telescope/types/types.d.ts @@ -16,6 +16,9 @@ export interface ImportObj { path: string; importAs?: string; } +export interface DerivedImportObj extends ImportObj { + orig: string; +} export interface ImportHash { [key: string]: string[]; } diff --git a/packages/test/package.json b/packages/test/package.json index f5fd9c4932..161f3868a3 100644 --- a/packages/test/package.json +++ b/packages/test/package.json @@ -14,10 +14,10 @@ ], "scripts": { "build": "cross-env BABEL_ENV=production babel src --out-dir main --delete-dir-on-start --extensions \".tsx,.ts,.js\"", - "buidl": "npm run build && npm run build:ts", "build:proto": "npm run clean && npm run proto", "codegen": "cross-env NODE_ENV=development babel-node scripts/codegen.js", "build:ts": "tsc --project ./tsconfig.json", + "buidl": "npm run build && npm run build:ts", "prepare": "npm run build", "test:rpc": "cross-env NODE_ENV=development babel-node src/test-rpc --extensions \".tsx,.ts,.js\"", "test:lcd": "cross-env NODE_ENV=development babel-node src/test-lcd --extensions \".tsx,.ts,.js\"", @@ -104,4 +104,4 @@ "react": "18.2.0", "react-dom": "18.2.0" } -} +} \ No newline at end of file diff --git a/packages/types/package.json b/packages/types/package.json index 7e24924c72..b122039d04 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -19,6 +19,8 @@ "build": "cross-env BABEL_ENV=production babel src --out-dir main --delete-dir-on-start --extensions \".tsx,.ts,.js\"", "buidl": "npm run build && npm run build:ts", "build:ts": "tsc --project ./tsconfig.json", + "buidl:clean": "npm run clean && npm run buidl", + "clean": "rimraf ./types", "prepare": "npm run build", "lint": "eslint .", "format": "eslint . --fix" @@ -67,6 +69,7 @@ "jest-in-case": "^1.0.2", "prettier": "^2.7.0", "regenerator-runtime": "^0.13.7", + "rimraf": "3.0.2", "ts-jest": "^29.0.3", "typescript": "^4.8.4" }, @@ -75,4 +78,4 @@ "@osmonauts/utils": "^0.9.1", "case": "1.6.3" } -} +} \ No newline at end of file diff --git a/packages/types/src/base.ts b/packages/types/src/base.ts index b617355b83..c4e908dfae 100644 --- a/packages/types/src/base.ts +++ b/packages/types/src/base.ts @@ -187,4 +187,8 @@ export type TraversedProtoRoot = ProtoRoot & { symbols: TraverseLocalSymbol | null; }; -export type InterfaceTypeUrlMap = Record \ No newline at end of file +export type InterfaceTypeUrlMap = Record + +export type TraversalSymbol = TraverseLocalSymbol & { + ref: string; +} diff --git a/packages/types/types/base.d.ts b/packages/types/types/base.d.ts index a892ea882e..0e90ecb3df 100644 --- a/packages/types/types/base.d.ts +++ b/packages/types/types/base.d.ts @@ -155,3 +155,6 @@ export declare type TraversedProtoRoot = ProtoRoot & { symbols: TraverseLocalSymbol | null; }; export declare type InterfaceTypeUrlMap = Record; +export declare type TraversalSymbol = TraverseLocalSymbol & { + ref: string; +}; diff --git a/packages/utils/package.json b/packages/utils/package.json index 29d66f2096..7b83e0e37a 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -24,6 +24,8 @@ "build:ts": "tsc --project ./tsconfig.json", "build": "npm run build:module && npm run build:main", "buidl": "npm run build && npm run build:ts", + "buidl:clean": "npm run clean && npm run buidl", + "clean": "rimraf ./types", "prepare": "npm run build", "lint": "eslint .", "format": "eslint . --fix" @@ -72,10 +74,11 @@ "jest-in-case": "^1.0.2", "prettier": "^2.7.0", "regenerator-runtime": "^0.13.7", + "rimraf": "3.0.2", "ts-jest": "^29.0.3", "typescript": "^4.8.4" }, "dependencies": { "@babel/runtime": "^7.19.0" } -} +} \ No newline at end of file