diff --git a/packages/protobuf/codegen/cosmos/bundle.ts b/packages/protobuf/codegen/cosmos/bundle.ts index ae632fb25..b238d95b3 100644 --- a/packages/protobuf/codegen/cosmos/bundle.ts +++ b/packages/protobuf/codegen/cosmos/bundle.ts @@ -54,51 +54,51 @@ import * as _54 from "./tx/v1beta1/tx"; import * as _55 from "./upgrade/v1beta1/query"; import * as _56 from "./upgrade/v1beta1/tx"; import * as _57 from "./upgrade/v1beta1/upgrade"; -import * as _167 from "./auth/v1beta1/tx.amino"; -import * as _168 from "./authz/v1beta1/tx.amino"; -import * as _169 from "./bank/v1beta1/tx.amino"; -import * as _170 from "./distribution/v1beta1/tx.amino"; -import * as _171 from "./gov/v1/tx.amino"; -import * as _172 from "./gov/v1beta1/tx.amino"; -import * as _173 from "./mint/v1beta1/tx.amino"; -import * as _174 from "./slashing/v1beta1/tx.amino"; -import * as _175 from "./staking/v1beta1/tx.amino"; -import * as _176 from "./upgrade/v1beta1/tx.amino"; -import * as _177 from "./auth/v1beta1/tx.registry"; -import * as _178 from "./authz/v1beta1/tx.registry"; -import * as _179 from "./bank/v1beta1/tx.registry"; -import * as _180 from "./distribution/v1beta1/tx.registry"; -import * as _181 from "./gov/v1/tx.registry"; -import * as _182 from "./gov/v1beta1/tx.registry"; -import * as _183 from "./mint/v1beta1/tx.registry"; -import * as _184 from "./slashing/v1beta1/tx.registry"; -import * as _185 from "./staking/v1beta1/tx.registry"; -import * as _186 from "./upgrade/v1beta1/tx.registry"; -import * as _187 from "./auth/v1beta1/query.rpc.Query"; -import * as _188 from "./authz/v1beta1/query.rpc.Query"; -import * as _189 from "./bank/v1beta1/query.rpc.Query"; -import * as _190 from "./base/tendermint/v1beta1/query.rpc.Service"; -import * as _191 from "./distribution/v1beta1/query.rpc.Query"; -import * as _192 from "./gov/v1/query.rpc.Query"; -import * as _193 from "./gov/v1beta1/query.rpc.Query"; -import * as _194 from "./mint/v1beta1/query.rpc.Query"; -import * as _195 from "./params/v1beta1/query.rpc.Query"; -import * as _196 from "./slashing/v1beta1/query.rpc.Query"; -import * as _197 from "./staking/v1beta1/query.rpc.Query"; -import * as _198 from "./tx/v1beta1/service.rpc.Service"; -import * as _199 from "./upgrade/v1beta1/query.rpc.Query"; -import * as _200 from "./auth/v1beta1/tx.rpc.msg"; -import * as _201 from "./authz/v1beta1/tx.rpc.msg"; -import * as _202 from "./bank/v1beta1/tx.rpc.msg"; -import * as _203 from "./distribution/v1beta1/tx.rpc.msg"; -import * as _204 from "./gov/v1/tx.rpc.msg"; -import * as _205 from "./gov/v1beta1/tx.rpc.msg"; -import * as _206 from "./mint/v1beta1/tx.rpc.msg"; -import * as _207 from "./slashing/v1beta1/tx.rpc.msg"; -import * as _208 from "./staking/v1beta1/tx.rpc.msg"; -import * as _209 from "./upgrade/v1beta1/tx.rpc.msg"; -import * as _278 from "./rpc.query"; -import * as _279 from "./rpc.tx"; +import * as _168 from "./auth/v1beta1/tx.amino"; +import * as _169 from "./authz/v1beta1/tx.amino"; +import * as _170 from "./bank/v1beta1/tx.amino"; +import * as _171 from "./distribution/v1beta1/tx.amino"; +import * as _172 from "./gov/v1/tx.amino"; +import * as _173 from "./gov/v1beta1/tx.amino"; +import * as _174 from "./mint/v1beta1/tx.amino"; +import * as _175 from "./slashing/v1beta1/tx.amino"; +import * as _176 from "./staking/v1beta1/tx.amino"; +import * as _177 from "./upgrade/v1beta1/tx.amino"; +import * as _178 from "./auth/v1beta1/tx.registry"; +import * as _179 from "./authz/v1beta1/tx.registry"; +import * as _180 from "./bank/v1beta1/tx.registry"; +import * as _181 from "./distribution/v1beta1/tx.registry"; +import * as _182 from "./gov/v1/tx.registry"; +import * as _183 from "./gov/v1beta1/tx.registry"; +import * as _184 from "./mint/v1beta1/tx.registry"; +import * as _185 from "./slashing/v1beta1/tx.registry"; +import * as _186 from "./staking/v1beta1/tx.registry"; +import * as _187 from "./upgrade/v1beta1/tx.registry"; +import * as _188 from "./auth/v1beta1/query.rpc.Query"; +import * as _189 from "./authz/v1beta1/query.rpc.Query"; +import * as _190 from "./bank/v1beta1/query.rpc.Query"; +import * as _191 from "./base/tendermint/v1beta1/query.rpc.Service"; +import * as _192 from "./distribution/v1beta1/query.rpc.Query"; +import * as _193 from "./gov/v1/query.rpc.Query"; +import * as _194 from "./gov/v1beta1/query.rpc.Query"; +import * as _195 from "./mint/v1beta1/query.rpc.Query"; +import * as _196 from "./params/v1beta1/query.rpc.Query"; +import * as _197 from "./slashing/v1beta1/query.rpc.Query"; +import * as _198 from "./staking/v1beta1/query.rpc.Query"; +import * as _199 from "./tx/v1beta1/service.rpc.Service"; +import * as _200 from "./upgrade/v1beta1/query.rpc.Query"; +import * as _201 from "./auth/v1beta1/tx.rpc.msg"; +import * as _202 from "./authz/v1beta1/tx.rpc.msg"; +import * as _203 from "./bank/v1beta1/tx.rpc.msg"; +import * as _204 from "./distribution/v1beta1/tx.rpc.msg"; +import * as _205 from "./gov/v1/tx.rpc.msg"; +import * as _206 from "./gov/v1beta1/tx.rpc.msg"; +import * as _207 from "./mint/v1beta1/tx.rpc.msg"; +import * as _208 from "./slashing/v1beta1/tx.rpc.msg"; +import * as _209 from "./staking/v1beta1/tx.rpc.msg"; +import * as _210 from "./upgrade/v1beta1/tx.rpc.msg"; +import * as _279 from "./rpc.query"; +import * as _280 from "./rpc.tx"; export namespace cosmos { export namespace auth { export const v1beta1 = { @@ -106,10 +106,10 @@ export namespace cosmos { ..._3, ..._4, ..._5, - ..._167, - ..._177, - ..._187, - ..._200 + ..._168, + ..._178, + ..._188, + ..._201 }; } export namespace authz { @@ -119,10 +119,10 @@ export namespace cosmos { ..._8, ..._9, ..._10, - ..._168, - ..._178, - ..._188, - ..._201 + ..._169, + ..._179, + ..._189, + ..._202 }; } export namespace bank { @@ -132,10 +132,10 @@ export namespace cosmos { ..._13, ..._14, ..._15, - ..._169, - ..._179, - ..._189, - ..._202 + ..._170, + ..._180, + ..._190, + ..._203 }; } export namespace base { @@ -153,7 +153,7 @@ export namespace cosmos { export const v1beta1 = { ..._18, ..._19, - ..._190 + ..._191 }; } export const v1beta1 = { @@ -176,10 +176,10 @@ export namespace cosmos { ..._24, ..._25, ..._26, - ..._170, - ..._180, - ..._191, - ..._203 + ..._171, + ..._181, + ..._192, + ..._204 }; } export namespace gov { @@ -188,20 +188,20 @@ export namespace cosmos { ..._28, ..._29, ..._30, - ..._171, - ..._181, - ..._192, - ..._204 + ..._172, + ..._182, + ..._193, + ..._205 }; export const v1beta1 = { ..._31, ..._32, ..._33, ..._34, - ..._172, - ..._182, - ..._193, - ..._205 + ..._173, + ..._183, + ..._194, + ..._206 }; } export namespace mint { @@ -210,10 +210,10 @@ export namespace cosmos { ..._36, ..._37, ..._38, - ..._173, - ..._183, - ..._194, - ..._206 + ..._174, + ..._184, + ..._195, + ..._207 }; } export namespace msg { @@ -225,7 +225,7 @@ export namespace cosmos { export const v1beta1 = { ..._40, ..._41, - ..._195 + ..._196 }; } export namespace query { @@ -239,10 +239,10 @@ export namespace cosmos { ..._44, ..._45, ..._46, - ..._174, - ..._184, - ..._196, - ..._207 + ..._175, + ..._185, + ..._197, + ..._208 }; } export namespace staking { @@ -252,10 +252,10 @@ export namespace cosmos { ..._49, ..._50, ..._51, - ..._175, - ..._185, - ..._197, - ..._208 + ..._176, + ..._186, + ..._198, + ..._209 }; } export namespace tx { @@ -267,7 +267,7 @@ export namespace cosmos { export const v1beta1 = { ..._53, ..._54, - ..._198 + ..._199 }; } export namespace upgrade { @@ -275,14 +275,14 @@ export namespace cosmos { ..._55, ..._56, ..._57, - ..._176, - ..._186, - ..._199, - ..._209 + ..._177, + ..._187, + ..._200, + ..._210 }; } export const ClientFactory = { - ..._278, - ..._279 + ..._279, + ..._280 }; } \ No newline at end of file diff --git a/packages/protobuf/codegen/cosmos/gov/v1/tx.ts b/packages/protobuf/codegen/cosmos/gov/v1/tx.ts index 08d20c908..6004e3bbe 100644 --- a/packages/protobuf/codegen/cosmos/gov/v1/tx.ts +++ b/packages/protobuf/codegen/cosmos/gov/v1/tx.ts @@ -9,7 +9,7 @@ import { ParameterChangeProposal, ParameterChangeProposalProtoMsg, ParameterChan import { SoftwareUpgradeProposal, SoftwareUpgradeProposalProtoMsg, SoftwareUpgradeProposalSDKType, CancelSoftwareUpgradeProposal, CancelSoftwareUpgradeProposalProtoMsg, CancelSoftwareUpgradeProposalSDKType } from "../../upgrade/v1beta1/upgrade"; import { StoreCodeProposal, StoreCodeProposalProtoMsg, StoreCodeProposalSDKType, InstantiateContractProposal, InstantiateContractProposalProtoMsg, InstantiateContractProposalSDKType, InstantiateContract2Proposal, InstantiateContract2ProposalProtoMsg, InstantiateContract2ProposalSDKType, MigrateContractProposal, MigrateContractProposalProtoMsg, MigrateContractProposalSDKType, SudoContractProposal, SudoContractProposalProtoMsg, SudoContractProposalSDKType, ExecuteContractProposal, ExecuteContractProposalProtoMsg, ExecuteContractProposalSDKType, UpdateAdminProposal, UpdateAdminProposalProtoMsg, UpdateAdminProposalSDKType, ClearAdminProposal, ClearAdminProposalProtoMsg, ClearAdminProposalSDKType, PinCodesProposal, PinCodesProposalProtoMsg, PinCodesProposalSDKType, UnpinCodesProposal, UnpinCodesProposalProtoMsg, UnpinCodesProposalSDKType, UpdateInstantiateConfigProposal, UpdateInstantiateConfigProposalProtoMsg, UpdateInstantiateConfigProposalSDKType, StoreAndInstantiateContractProposal, StoreAndInstantiateContractProposalProtoMsg, StoreAndInstantiateContractProposalSDKType } from "../../../cosmwasm/wasm/v1/proposal"; import { ClientUpdateProposal, ClientUpdateProposalProtoMsg, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalProtoMsg, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; -import { ReplaceMigrationRecordsProposal, ReplaceMigrationRecordsProposalProtoMsg, ReplaceMigrationRecordsProposalSDKType, UpdateMigrationRecordsProposal, UpdateMigrationRecordsProposalProtoMsg, UpdateMigrationRecordsProposalSDKType } from "../../../osmosis/gamm/v1beta1/gov"; +import { ReplaceMigrationRecordsProposal, ReplaceMigrationRecordsProposalProtoMsg, ReplaceMigrationRecordsProposalSDKType, UpdateMigrationRecordsProposal, UpdateMigrationRecordsProposalProtoMsg, UpdateMigrationRecordsProposalSDKType, CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal, CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalProtoMsg, CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalSDKType, SetScalingFactorControllerProposal, SetScalingFactorControllerProposalProtoMsg, SetScalingFactorControllerProposalSDKType } from "../../../osmosis/gamm/v1beta1/gov"; import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalProtoMsg, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalProtoMsg, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; import { SetProtoRevEnabledProposal, SetProtoRevEnabledProposalProtoMsg, SetProtoRevEnabledProposalSDKType, SetProtoRevAdminAccountProposal, SetProtoRevAdminAccountProposalProtoMsg, SetProtoRevAdminAccountProposalSDKType } from "../../../osmosis/protorev/v1beta1/gov"; import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalProtoMsg, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalProtoMsg, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalProtoMsg, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; @@ -129,7 +129,7 @@ export interface MsgSubmitProposalResponseSDKType { */ export interface MsgExecLegacyContent { /** content is the proposal's content. */ - content: (CommunityPoolSpendProposal & CommunityPoolSpendProposalWithDeposit & TextProposal & ParameterChangeProposal & SoftwareUpgradeProposal & CancelSoftwareUpgradeProposal & StoreCodeProposal & InstantiateContractProposal & InstantiateContract2Proposal & MigrateContractProposal & SudoContractProposal & ExecuteContractProposal & UpdateAdminProposal & ClearAdminProposal & PinCodesProposal & UnpinCodesProposal & UpdateInstantiateConfigProposal & StoreAndInstantiateContractProposal & ClientUpdateProposal & UpgradeProposal & ReplaceMigrationRecordsProposal & UpdateMigrationRecordsProposal & ReplacePoolIncentivesProposal & UpdatePoolIncentivesProposal & SetProtoRevEnabledProposal & SetProtoRevAdminAccountProposal & SetSuperfluidAssetsProposal & RemoveSuperfluidAssetsProposal & UpdateUnpoolWhiteListProposal & UpdateFeeTokenProposal & Any) | undefined; + content: (CommunityPoolSpendProposal & CommunityPoolSpendProposalWithDeposit & TextProposal & ParameterChangeProposal & SoftwareUpgradeProposal & CancelSoftwareUpgradeProposal & StoreCodeProposal & InstantiateContractProposal & InstantiateContract2Proposal & MigrateContractProposal & SudoContractProposal & ExecuteContractProposal & UpdateAdminProposal & ClearAdminProposal & PinCodesProposal & UnpinCodesProposal & UpdateInstantiateConfigProposal & StoreAndInstantiateContractProposal & ClientUpdateProposal & UpgradeProposal & ReplaceMigrationRecordsProposal & UpdateMigrationRecordsProposal & CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal & SetScalingFactorControllerProposal & ReplacePoolIncentivesProposal & UpdatePoolIncentivesProposal & SetProtoRevEnabledProposal & SetProtoRevAdminAccountProposal & SetSuperfluidAssetsProposal & RemoveSuperfluidAssetsProposal & UpdateUnpoolWhiteListProposal & UpdateFeeTokenProposal & Any) | undefined; /** authority must be the gov module address. */ authority: string; } @@ -138,7 +138,7 @@ export interface MsgExecLegacyContentProtoMsg { value: Uint8Array; } export type MsgExecLegacyContentEncoded = Omit & { - /** content is the proposal's content. */content?: CommunityPoolSpendProposalProtoMsg | CommunityPoolSpendProposalWithDepositProtoMsg | TextProposalProtoMsg | ParameterChangeProposalProtoMsg | SoftwareUpgradeProposalProtoMsg | CancelSoftwareUpgradeProposalProtoMsg | StoreCodeProposalProtoMsg | InstantiateContractProposalProtoMsg | InstantiateContract2ProposalProtoMsg | MigrateContractProposalProtoMsg | SudoContractProposalProtoMsg | ExecuteContractProposalProtoMsg | UpdateAdminProposalProtoMsg | ClearAdminProposalProtoMsg | PinCodesProposalProtoMsg | UnpinCodesProposalProtoMsg | UpdateInstantiateConfigProposalProtoMsg | StoreAndInstantiateContractProposalProtoMsg | ClientUpdateProposalProtoMsg | UpgradeProposalProtoMsg | ReplaceMigrationRecordsProposalProtoMsg | UpdateMigrationRecordsProposalProtoMsg | ReplacePoolIncentivesProposalProtoMsg | UpdatePoolIncentivesProposalProtoMsg | SetProtoRevEnabledProposalProtoMsg | SetProtoRevAdminAccountProposalProtoMsg | SetSuperfluidAssetsProposalProtoMsg | RemoveSuperfluidAssetsProposalProtoMsg | UpdateUnpoolWhiteListProposalProtoMsg | UpdateFeeTokenProposalProtoMsg | AnyProtoMsg | undefined; + /** content is the proposal's content. */content?: CommunityPoolSpendProposalProtoMsg | CommunityPoolSpendProposalWithDepositProtoMsg | TextProposalProtoMsg | ParameterChangeProposalProtoMsg | SoftwareUpgradeProposalProtoMsg | CancelSoftwareUpgradeProposalProtoMsg | StoreCodeProposalProtoMsg | InstantiateContractProposalProtoMsg | InstantiateContract2ProposalProtoMsg | MigrateContractProposalProtoMsg | SudoContractProposalProtoMsg | ExecuteContractProposalProtoMsg | UpdateAdminProposalProtoMsg | ClearAdminProposalProtoMsg | PinCodesProposalProtoMsg | UnpinCodesProposalProtoMsg | UpdateInstantiateConfigProposalProtoMsg | StoreAndInstantiateContractProposalProtoMsg | ClientUpdateProposalProtoMsg | UpgradeProposalProtoMsg | ReplaceMigrationRecordsProposalProtoMsg | UpdateMigrationRecordsProposalProtoMsg | CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalProtoMsg | SetScalingFactorControllerProposalProtoMsg | ReplacePoolIncentivesProposalProtoMsg | UpdatePoolIncentivesProposalProtoMsg | SetProtoRevEnabledProposalProtoMsg | SetProtoRevAdminAccountProposalProtoMsg | SetSuperfluidAssetsProposalProtoMsg | RemoveSuperfluidAssetsProposalProtoMsg | UpdateUnpoolWhiteListProposalProtoMsg | UpdateFeeTokenProposalProtoMsg | AnyProtoMsg | undefined; }; /** * MsgExecLegacyContent is used to wrap the legacy content field into a message. @@ -159,7 +159,7 @@ export interface MsgExecLegacyContentAminoMsg { * This ensures backwards compatibility with v1beta1.MsgSubmitProposal. */ export interface MsgExecLegacyContentSDKType { - content: CommunityPoolSpendProposalSDKType | CommunityPoolSpendProposalWithDepositSDKType | TextProposalSDKType | ParameterChangeProposalSDKType | SoftwareUpgradeProposalSDKType | CancelSoftwareUpgradeProposalSDKType | StoreCodeProposalSDKType | InstantiateContractProposalSDKType | InstantiateContract2ProposalSDKType | MigrateContractProposalSDKType | SudoContractProposalSDKType | ExecuteContractProposalSDKType | UpdateAdminProposalSDKType | ClearAdminProposalSDKType | PinCodesProposalSDKType | UnpinCodesProposalSDKType | UpdateInstantiateConfigProposalSDKType | StoreAndInstantiateContractProposalSDKType | ClientUpdateProposalSDKType | UpgradeProposalSDKType | ReplaceMigrationRecordsProposalSDKType | UpdateMigrationRecordsProposalSDKType | ReplacePoolIncentivesProposalSDKType | UpdatePoolIncentivesProposalSDKType | SetProtoRevEnabledProposalSDKType | SetProtoRevAdminAccountProposalSDKType | SetSuperfluidAssetsProposalSDKType | RemoveSuperfluidAssetsProposalSDKType | UpdateUnpoolWhiteListProposalSDKType | UpdateFeeTokenProposalSDKType | AnySDKType | undefined; + content: CommunityPoolSpendProposalSDKType | CommunityPoolSpendProposalWithDepositSDKType | TextProposalSDKType | ParameterChangeProposalSDKType | SoftwareUpgradeProposalSDKType | CancelSoftwareUpgradeProposalSDKType | StoreCodeProposalSDKType | InstantiateContractProposalSDKType | InstantiateContract2ProposalSDKType | MigrateContractProposalSDKType | SudoContractProposalSDKType | ExecuteContractProposalSDKType | UpdateAdminProposalSDKType | ClearAdminProposalSDKType | PinCodesProposalSDKType | UnpinCodesProposalSDKType | UpdateInstantiateConfigProposalSDKType | StoreAndInstantiateContractProposalSDKType | ClientUpdateProposalSDKType | UpgradeProposalSDKType | ReplaceMigrationRecordsProposalSDKType | UpdateMigrationRecordsProposalSDKType | CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalSDKType | SetScalingFactorControllerProposalSDKType | ReplacePoolIncentivesProposalSDKType | UpdatePoolIncentivesProposalSDKType | SetProtoRevEnabledProposalSDKType | SetProtoRevAdminAccountProposalSDKType | SetSuperfluidAssetsProposalSDKType | RemoveSuperfluidAssetsProposalSDKType | UpdateUnpoolWhiteListProposalSDKType | UpdateFeeTokenProposalSDKType | AnySDKType | undefined; authority: string; } /** MsgExecLegacyContentResponse defines the Msg/ExecLegacyContent response type. */ @@ -1570,7 +1570,7 @@ export const MsgCancelProposalResponse = { }; } }; -export const Cosmos_govv1beta1Content_InterfaceDecoder = (input: BinaryReader | Uint8Array): CommunityPoolSpendProposal | CommunityPoolSpendProposalWithDeposit | TextProposal | ParameterChangeProposal | SoftwareUpgradeProposal | CancelSoftwareUpgradeProposal | StoreCodeProposal | InstantiateContractProposal | InstantiateContract2Proposal | MigrateContractProposal | SudoContractProposal | ExecuteContractProposal | UpdateAdminProposal | ClearAdminProposal | PinCodesProposal | UnpinCodesProposal | UpdateInstantiateConfigProposal | StoreAndInstantiateContractProposal | ClientUpdateProposal | UpgradeProposal | ReplaceMigrationRecordsProposal | UpdateMigrationRecordsProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetProtoRevEnabledProposal | SetProtoRevAdminAccountProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any => { +export const Cosmos_govv1beta1Content_InterfaceDecoder = (input: BinaryReader | Uint8Array): CommunityPoolSpendProposal | CommunityPoolSpendProposalWithDeposit | TextProposal | ParameterChangeProposal | SoftwareUpgradeProposal | CancelSoftwareUpgradeProposal | StoreCodeProposal | InstantiateContractProposal | InstantiateContract2Proposal | MigrateContractProposal | SudoContractProposal | ExecuteContractProposal | UpdateAdminProposal | ClearAdminProposal | PinCodesProposal | UnpinCodesProposal | UpdateInstantiateConfigProposal | StoreAndInstantiateContractProposal | ClientUpdateProposal | UpgradeProposal | ReplaceMigrationRecordsProposal | UpdateMigrationRecordsProposal | CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal | SetScalingFactorControllerProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetProtoRevEnabledProposal | SetProtoRevAdminAccountProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any => { const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); switch (data.typeUrl) { @@ -1618,6 +1618,10 @@ export const Cosmos_govv1beta1Content_InterfaceDecoder = (input: BinaryReader | return ReplaceMigrationRecordsProposal.decode(data.value); case "/osmosis.gamm.v1beta1.UpdateMigrationRecordsProposal": return UpdateMigrationRecordsProposal.decode(data.value); + case "/osmosis.gamm.v1beta1.CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal": + return CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.decode(data.value); + case "/osmosis.gamm.v1beta1.SetScalingFactorControllerProposal": + return SetScalingFactorControllerProposal.decode(data.value); case "/osmosis.poolincentives.v1beta1.ReplacePoolIncentivesProposal": return ReplacePoolIncentivesProposal.decode(data.value); case "/osmosis.poolincentives.v1beta1.UpdatePoolIncentivesProposal": @@ -1750,6 +1754,16 @@ export const Cosmos_govv1beta1Content_FromAmino = (content: AnyAmino) => { typeUrl: "/osmosis.gamm.v1beta1.UpdateMigrationRecordsProposal", value: UpdateMigrationRecordsProposal.encode(UpdateMigrationRecordsProposal.fromPartial(UpdateMigrationRecordsProposal.fromAmino(content.value))).finish() }); + case "osmosis/CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal": + return Any.fromPartial({ + typeUrl: "/osmosis.gamm.v1beta1.CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal", + value: CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.encode(CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.fromPartial(CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.fromAmino(content.value))).finish() + }); + case "osmosis/SetScalingFactorControllerProposal": + return Any.fromPartial({ + typeUrl: "/osmosis.gamm.v1beta1.SetScalingFactorControllerProposal", + value: SetScalingFactorControllerProposal.encode(SetScalingFactorControllerProposal.fromPartial(SetScalingFactorControllerProposal.fromAmino(content.value))).finish() + }); case "osmosis/ReplacePoolIncentivesProposal": return Any.fromPartial({ typeUrl: "/osmosis.poolincentives.v1beta1.ReplacePoolIncentivesProposal", @@ -1906,6 +1920,16 @@ export const Cosmos_govv1beta1Content_ToAmino = (content: Any) => { type: "osmosis/UpdateMigrationRecordsProposal", value: UpdateMigrationRecordsProposal.toAmino(UpdateMigrationRecordsProposal.decode(content.value)) }; + case "/osmosis.gamm.v1beta1.CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal": + return { + type: "osmosis/CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal", + value: CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.toAmino(CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.decode(content.value)) + }; + case "/osmosis.gamm.v1beta1.SetScalingFactorControllerProposal": + return { + type: "osmosis/SetScalingFactorControllerProposal", + value: SetScalingFactorControllerProposal.toAmino(SetScalingFactorControllerProposal.decode(content.value)) + }; case "/osmosis.poolincentives.v1beta1.ReplacePoolIncentivesProposal": return { type: "osmosis/ReplacePoolIncentivesProposal", diff --git a/packages/protobuf/codegen/cosmos/gov/v1beta1/gov.ts b/packages/protobuf/codegen/cosmos/gov/v1beta1/gov.ts index 1a26ee7f5..402ede782 100644 --- a/packages/protobuf/codegen/cosmos/gov/v1beta1/gov.ts +++ b/packages/protobuf/codegen/cosmos/gov/v1beta1/gov.ts @@ -8,7 +8,7 @@ import { ParameterChangeProposal, ParameterChangeProposalProtoMsg, ParameterChan import { SoftwareUpgradeProposal, SoftwareUpgradeProposalProtoMsg, SoftwareUpgradeProposalSDKType, CancelSoftwareUpgradeProposal, CancelSoftwareUpgradeProposalProtoMsg, CancelSoftwareUpgradeProposalSDKType } from "../../upgrade/v1beta1/upgrade"; import { StoreCodeProposal, StoreCodeProposalProtoMsg, StoreCodeProposalSDKType, InstantiateContractProposal, InstantiateContractProposalProtoMsg, InstantiateContractProposalSDKType, InstantiateContract2Proposal, InstantiateContract2ProposalProtoMsg, InstantiateContract2ProposalSDKType, MigrateContractProposal, MigrateContractProposalProtoMsg, MigrateContractProposalSDKType, SudoContractProposal, SudoContractProposalProtoMsg, SudoContractProposalSDKType, ExecuteContractProposal, ExecuteContractProposalProtoMsg, ExecuteContractProposalSDKType, UpdateAdminProposal, UpdateAdminProposalProtoMsg, UpdateAdminProposalSDKType, ClearAdminProposal, ClearAdminProposalProtoMsg, ClearAdminProposalSDKType, PinCodesProposal, PinCodesProposalProtoMsg, PinCodesProposalSDKType, UnpinCodesProposal, UnpinCodesProposalProtoMsg, UnpinCodesProposalSDKType, UpdateInstantiateConfigProposal, UpdateInstantiateConfigProposalProtoMsg, UpdateInstantiateConfigProposalSDKType, StoreAndInstantiateContractProposal, StoreAndInstantiateContractProposalProtoMsg, StoreAndInstantiateContractProposalSDKType } from "../../../cosmwasm/wasm/v1/proposal"; import { ClientUpdateProposal, ClientUpdateProposalProtoMsg, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalProtoMsg, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; -import { ReplaceMigrationRecordsProposal, ReplaceMigrationRecordsProposalProtoMsg, ReplaceMigrationRecordsProposalSDKType, UpdateMigrationRecordsProposal, UpdateMigrationRecordsProposalProtoMsg, UpdateMigrationRecordsProposalSDKType } from "../../../osmosis/gamm/v1beta1/gov"; +import { ReplaceMigrationRecordsProposal, ReplaceMigrationRecordsProposalProtoMsg, ReplaceMigrationRecordsProposalSDKType, UpdateMigrationRecordsProposal, UpdateMigrationRecordsProposalProtoMsg, UpdateMigrationRecordsProposalSDKType, CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal, CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalProtoMsg, CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalSDKType, SetScalingFactorControllerProposal, SetScalingFactorControllerProposalProtoMsg, SetScalingFactorControllerProposalSDKType } from "../../../osmosis/gamm/v1beta1/gov"; import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalProtoMsg, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalProtoMsg, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; import { SetProtoRevEnabledProposal, SetProtoRevEnabledProposalProtoMsg, SetProtoRevEnabledProposalSDKType, SetProtoRevAdminAccountProposal, SetProtoRevAdminAccountProposalProtoMsg, SetProtoRevAdminAccountProposalSDKType } from "../../../osmosis/protorev/v1beta1/gov"; import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalProtoMsg, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalProtoMsg, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalProtoMsg, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; @@ -272,7 +272,7 @@ export interface Proposal { /** proposal_id defines the unique id of the proposal. */ proposalId: bigint; /** content is the proposal's content. */ - content: (TextProposal & CommunityPoolSpendProposal & CommunityPoolSpendProposalWithDeposit & ParameterChangeProposal & SoftwareUpgradeProposal & CancelSoftwareUpgradeProposal & StoreCodeProposal & InstantiateContractProposal & InstantiateContract2Proposal & MigrateContractProposal & SudoContractProposal & ExecuteContractProposal & UpdateAdminProposal & ClearAdminProposal & PinCodesProposal & UnpinCodesProposal & UpdateInstantiateConfigProposal & StoreAndInstantiateContractProposal & ClientUpdateProposal & UpgradeProposal & ReplaceMigrationRecordsProposal & UpdateMigrationRecordsProposal & ReplacePoolIncentivesProposal & UpdatePoolIncentivesProposal & SetProtoRevEnabledProposal & SetProtoRevAdminAccountProposal & SetSuperfluidAssetsProposal & RemoveSuperfluidAssetsProposal & UpdateUnpoolWhiteListProposal & UpdateFeeTokenProposal & Any) | undefined; + content: (TextProposal & CommunityPoolSpendProposal & CommunityPoolSpendProposalWithDeposit & ParameterChangeProposal & SoftwareUpgradeProposal & CancelSoftwareUpgradeProposal & StoreCodeProposal & InstantiateContractProposal & InstantiateContract2Proposal & MigrateContractProposal & SudoContractProposal & ExecuteContractProposal & UpdateAdminProposal & ClearAdminProposal & PinCodesProposal & UnpinCodesProposal & UpdateInstantiateConfigProposal & StoreAndInstantiateContractProposal & ClientUpdateProposal & UpgradeProposal & ReplaceMigrationRecordsProposal & UpdateMigrationRecordsProposal & CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal & SetScalingFactorControllerProposal & ReplacePoolIncentivesProposal & UpdatePoolIncentivesProposal & SetProtoRevEnabledProposal & SetProtoRevAdminAccountProposal & SetSuperfluidAssetsProposal & RemoveSuperfluidAssetsProposal & UpdateUnpoolWhiteListProposal & UpdateFeeTokenProposal & Any) | undefined; /** status defines the proposal status. */ status: ProposalStatus; /** @@ -297,7 +297,7 @@ export interface ProposalProtoMsg { value: Uint8Array; } export type ProposalEncoded = Omit & { - /** content is the proposal's content. */content?: TextProposalProtoMsg | CommunityPoolSpendProposalProtoMsg | CommunityPoolSpendProposalWithDepositProtoMsg | ParameterChangeProposalProtoMsg | SoftwareUpgradeProposalProtoMsg | CancelSoftwareUpgradeProposalProtoMsg | StoreCodeProposalProtoMsg | InstantiateContractProposalProtoMsg | InstantiateContract2ProposalProtoMsg | MigrateContractProposalProtoMsg | SudoContractProposalProtoMsg | ExecuteContractProposalProtoMsg | UpdateAdminProposalProtoMsg | ClearAdminProposalProtoMsg | PinCodesProposalProtoMsg | UnpinCodesProposalProtoMsg | UpdateInstantiateConfigProposalProtoMsg | StoreAndInstantiateContractProposalProtoMsg | ClientUpdateProposalProtoMsg | UpgradeProposalProtoMsg | ReplaceMigrationRecordsProposalProtoMsg | UpdateMigrationRecordsProposalProtoMsg | ReplacePoolIncentivesProposalProtoMsg | UpdatePoolIncentivesProposalProtoMsg | SetProtoRevEnabledProposalProtoMsg | SetProtoRevAdminAccountProposalProtoMsg | SetSuperfluidAssetsProposalProtoMsg | RemoveSuperfluidAssetsProposalProtoMsg | UpdateUnpoolWhiteListProposalProtoMsg | UpdateFeeTokenProposalProtoMsg | AnyProtoMsg | undefined; + /** content is the proposal's content. */content?: TextProposalProtoMsg | CommunityPoolSpendProposalProtoMsg | CommunityPoolSpendProposalWithDepositProtoMsg | ParameterChangeProposalProtoMsg | SoftwareUpgradeProposalProtoMsg | CancelSoftwareUpgradeProposalProtoMsg | StoreCodeProposalProtoMsg | InstantiateContractProposalProtoMsg | InstantiateContract2ProposalProtoMsg | MigrateContractProposalProtoMsg | SudoContractProposalProtoMsg | ExecuteContractProposalProtoMsg | UpdateAdminProposalProtoMsg | ClearAdminProposalProtoMsg | PinCodesProposalProtoMsg | UnpinCodesProposalProtoMsg | UpdateInstantiateConfigProposalProtoMsg | StoreAndInstantiateContractProposalProtoMsg | ClientUpdateProposalProtoMsg | UpgradeProposalProtoMsg | ReplaceMigrationRecordsProposalProtoMsg | UpdateMigrationRecordsProposalProtoMsg | CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalProtoMsg | SetScalingFactorControllerProposalProtoMsg | ReplacePoolIncentivesProposalProtoMsg | UpdatePoolIncentivesProposalProtoMsg | SetProtoRevEnabledProposalProtoMsg | SetProtoRevAdminAccountProposalProtoMsg | SetSuperfluidAssetsProposalProtoMsg | RemoveSuperfluidAssetsProposalProtoMsg | UpdateUnpoolWhiteListProposalProtoMsg | UpdateFeeTokenProposalProtoMsg | AnyProtoMsg | undefined; }; /** Proposal defines the core field members of a governance proposal. */ export interface ProposalAmino { @@ -331,7 +331,7 @@ export interface ProposalAminoMsg { /** Proposal defines the core field members of a governance proposal. */ export interface ProposalSDKType { proposal_id: bigint; - content: TextProposalSDKType | CommunityPoolSpendProposalSDKType | CommunityPoolSpendProposalWithDepositSDKType | ParameterChangeProposalSDKType | SoftwareUpgradeProposalSDKType | CancelSoftwareUpgradeProposalSDKType | StoreCodeProposalSDKType | InstantiateContractProposalSDKType | InstantiateContract2ProposalSDKType | MigrateContractProposalSDKType | SudoContractProposalSDKType | ExecuteContractProposalSDKType | UpdateAdminProposalSDKType | ClearAdminProposalSDKType | PinCodesProposalSDKType | UnpinCodesProposalSDKType | UpdateInstantiateConfigProposalSDKType | StoreAndInstantiateContractProposalSDKType | ClientUpdateProposalSDKType | UpgradeProposalSDKType | ReplaceMigrationRecordsProposalSDKType | UpdateMigrationRecordsProposalSDKType | ReplacePoolIncentivesProposalSDKType | UpdatePoolIncentivesProposalSDKType | SetProtoRevEnabledProposalSDKType | SetProtoRevAdminAccountProposalSDKType | SetSuperfluidAssetsProposalSDKType | RemoveSuperfluidAssetsProposalSDKType | UpdateUnpoolWhiteListProposalSDKType | UpdateFeeTokenProposalSDKType | AnySDKType | undefined; + content: TextProposalSDKType | CommunityPoolSpendProposalSDKType | CommunityPoolSpendProposalWithDepositSDKType | ParameterChangeProposalSDKType | SoftwareUpgradeProposalSDKType | CancelSoftwareUpgradeProposalSDKType | StoreCodeProposalSDKType | InstantiateContractProposalSDKType | InstantiateContract2ProposalSDKType | MigrateContractProposalSDKType | SudoContractProposalSDKType | ExecuteContractProposalSDKType | UpdateAdminProposalSDKType | ClearAdminProposalSDKType | PinCodesProposalSDKType | UnpinCodesProposalSDKType | UpdateInstantiateConfigProposalSDKType | StoreAndInstantiateContractProposalSDKType | ClientUpdateProposalSDKType | UpgradeProposalSDKType | ReplaceMigrationRecordsProposalSDKType | UpdateMigrationRecordsProposalSDKType | CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalSDKType | SetScalingFactorControllerProposalSDKType | ReplacePoolIncentivesProposalSDKType | UpdatePoolIncentivesProposalSDKType | SetProtoRevEnabledProposalSDKType | SetProtoRevAdminAccountProposalSDKType | SetSuperfluidAssetsProposalSDKType | RemoveSuperfluidAssetsProposalSDKType | UpdateUnpoolWhiteListProposalSDKType | UpdateFeeTokenProposalSDKType | AnySDKType | undefined; status: ProposalStatus; final_tally_result: TallyResultSDKType | undefined; submit_time: Date | undefined; @@ -1371,7 +1371,7 @@ export const TallyParams = { }; } }; -export const Cosmos_govv1beta1Content_InterfaceDecoder = (input: BinaryReader | Uint8Array): CommunityPoolSpendProposal | CommunityPoolSpendProposalWithDeposit | TextProposal | ParameterChangeProposal | SoftwareUpgradeProposal | CancelSoftwareUpgradeProposal | StoreCodeProposal | InstantiateContractProposal | InstantiateContract2Proposal | MigrateContractProposal | SudoContractProposal | ExecuteContractProposal | UpdateAdminProposal | ClearAdminProposal | PinCodesProposal | UnpinCodesProposal | UpdateInstantiateConfigProposal | StoreAndInstantiateContractProposal | ClientUpdateProposal | UpgradeProposal | ReplaceMigrationRecordsProposal | UpdateMigrationRecordsProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetProtoRevEnabledProposal | SetProtoRevAdminAccountProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any => { +export const Cosmos_govv1beta1Content_InterfaceDecoder = (input: BinaryReader | Uint8Array): CommunityPoolSpendProposal | CommunityPoolSpendProposalWithDeposit | TextProposal | ParameterChangeProposal | SoftwareUpgradeProposal | CancelSoftwareUpgradeProposal | StoreCodeProposal | InstantiateContractProposal | InstantiateContract2Proposal | MigrateContractProposal | SudoContractProposal | ExecuteContractProposal | UpdateAdminProposal | ClearAdminProposal | PinCodesProposal | UnpinCodesProposal | UpdateInstantiateConfigProposal | StoreAndInstantiateContractProposal | ClientUpdateProposal | UpgradeProposal | ReplaceMigrationRecordsProposal | UpdateMigrationRecordsProposal | CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal | SetScalingFactorControllerProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetProtoRevEnabledProposal | SetProtoRevAdminAccountProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any => { const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); switch (data.typeUrl) { @@ -1419,6 +1419,10 @@ export const Cosmos_govv1beta1Content_InterfaceDecoder = (input: BinaryReader | return ReplaceMigrationRecordsProposal.decode(data.value); case "/osmosis.gamm.v1beta1.UpdateMigrationRecordsProposal": return UpdateMigrationRecordsProposal.decode(data.value); + case "/osmosis.gamm.v1beta1.CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal": + return CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.decode(data.value); + case "/osmosis.gamm.v1beta1.SetScalingFactorControllerProposal": + return SetScalingFactorControllerProposal.decode(data.value); case "/osmosis.poolincentives.v1beta1.ReplacePoolIncentivesProposal": return ReplacePoolIncentivesProposal.decode(data.value); case "/osmosis.poolincentives.v1beta1.UpdatePoolIncentivesProposal": @@ -1551,6 +1555,16 @@ export const Cosmos_govv1beta1Content_FromAmino = (content: AnyAmino) => { typeUrl: "/osmosis.gamm.v1beta1.UpdateMigrationRecordsProposal", value: UpdateMigrationRecordsProposal.encode(UpdateMigrationRecordsProposal.fromPartial(UpdateMigrationRecordsProposal.fromAmino(content.value))).finish() }); + case "osmosis/CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal": + return Any.fromPartial({ + typeUrl: "/osmosis.gamm.v1beta1.CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal", + value: CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.encode(CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.fromPartial(CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.fromAmino(content.value))).finish() + }); + case "osmosis/SetScalingFactorControllerProposal": + return Any.fromPartial({ + typeUrl: "/osmosis.gamm.v1beta1.SetScalingFactorControllerProposal", + value: SetScalingFactorControllerProposal.encode(SetScalingFactorControllerProposal.fromPartial(SetScalingFactorControllerProposal.fromAmino(content.value))).finish() + }); case "osmosis/ReplacePoolIncentivesProposal": return Any.fromPartial({ typeUrl: "/osmosis.poolincentives.v1beta1.ReplacePoolIncentivesProposal", @@ -1707,6 +1721,16 @@ export const Cosmos_govv1beta1Content_ToAmino = (content: Any) => { type: "osmosis/UpdateMigrationRecordsProposal", value: UpdateMigrationRecordsProposal.toAmino(UpdateMigrationRecordsProposal.decode(content.value)) }; + case "/osmosis.gamm.v1beta1.CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal": + return { + type: "osmosis/CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal", + value: CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.toAmino(CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.decode(content.value)) + }; + case "/osmosis.gamm.v1beta1.SetScalingFactorControllerProposal": + return { + type: "osmosis/SetScalingFactorControllerProposal", + value: SetScalingFactorControllerProposal.toAmino(SetScalingFactorControllerProposal.decode(content.value)) + }; case "/osmosis.poolincentives.v1beta1.ReplacePoolIncentivesProposal": return { type: "osmosis/ReplacePoolIncentivesProposal", diff --git a/packages/protobuf/codegen/cosmos/gov/v1beta1/tx.ts b/packages/protobuf/codegen/cosmos/gov/v1beta1/tx.ts index 5a888ad20..bdb613034 100644 --- a/packages/protobuf/codegen/cosmos/gov/v1beta1/tx.ts +++ b/packages/protobuf/codegen/cosmos/gov/v1beta1/tx.ts @@ -7,7 +7,7 @@ import { ParameterChangeProposal, ParameterChangeProposalProtoMsg, ParameterChan import { SoftwareUpgradeProposal, SoftwareUpgradeProposalProtoMsg, SoftwareUpgradeProposalSDKType, CancelSoftwareUpgradeProposal, CancelSoftwareUpgradeProposalProtoMsg, CancelSoftwareUpgradeProposalSDKType } from "../../upgrade/v1beta1/upgrade"; import { StoreCodeProposal, StoreCodeProposalProtoMsg, StoreCodeProposalSDKType, InstantiateContractProposal, InstantiateContractProposalProtoMsg, InstantiateContractProposalSDKType, InstantiateContract2Proposal, InstantiateContract2ProposalProtoMsg, InstantiateContract2ProposalSDKType, MigrateContractProposal, MigrateContractProposalProtoMsg, MigrateContractProposalSDKType, SudoContractProposal, SudoContractProposalProtoMsg, SudoContractProposalSDKType, ExecuteContractProposal, ExecuteContractProposalProtoMsg, ExecuteContractProposalSDKType, UpdateAdminProposal, UpdateAdminProposalProtoMsg, UpdateAdminProposalSDKType, ClearAdminProposal, ClearAdminProposalProtoMsg, ClearAdminProposalSDKType, PinCodesProposal, PinCodesProposalProtoMsg, PinCodesProposalSDKType, UnpinCodesProposal, UnpinCodesProposalProtoMsg, UnpinCodesProposalSDKType, UpdateInstantiateConfigProposal, UpdateInstantiateConfigProposalProtoMsg, UpdateInstantiateConfigProposalSDKType, StoreAndInstantiateContractProposal, StoreAndInstantiateContractProposalProtoMsg, StoreAndInstantiateContractProposalSDKType } from "../../../cosmwasm/wasm/v1/proposal"; import { ClientUpdateProposal, ClientUpdateProposalProtoMsg, ClientUpdateProposalSDKType, UpgradeProposal, UpgradeProposalProtoMsg, UpgradeProposalSDKType } from "../../../ibc/core/client/v1/client"; -import { ReplaceMigrationRecordsProposal, ReplaceMigrationRecordsProposalProtoMsg, ReplaceMigrationRecordsProposalSDKType, UpdateMigrationRecordsProposal, UpdateMigrationRecordsProposalProtoMsg, UpdateMigrationRecordsProposalSDKType } from "../../../osmosis/gamm/v1beta1/gov"; +import { ReplaceMigrationRecordsProposal, ReplaceMigrationRecordsProposalProtoMsg, ReplaceMigrationRecordsProposalSDKType, UpdateMigrationRecordsProposal, UpdateMigrationRecordsProposalProtoMsg, UpdateMigrationRecordsProposalSDKType, CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal, CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalProtoMsg, CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalSDKType, SetScalingFactorControllerProposal, SetScalingFactorControllerProposalProtoMsg, SetScalingFactorControllerProposalSDKType } from "../../../osmosis/gamm/v1beta1/gov"; import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalProtoMsg, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalProtoMsg, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; import { SetProtoRevEnabledProposal, SetProtoRevEnabledProposalProtoMsg, SetProtoRevEnabledProposalSDKType, SetProtoRevAdminAccountProposal, SetProtoRevAdminAccountProposalProtoMsg, SetProtoRevAdminAccountProposalSDKType } from "../../../osmosis/protorev/v1beta1/gov"; import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalProtoMsg, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalProtoMsg, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalProtoMsg, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; @@ -20,7 +20,7 @@ import { isSet } from "../../../helpers"; */ export interface MsgSubmitProposal { /** content is the proposal's content. */ - content: (CommunityPoolSpendProposal & CommunityPoolSpendProposalWithDeposit & TextProposal & ParameterChangeProposal & SoftwareUpgradeProposal & CancelSoftwareUpgradeProposal & StoreCodeProposal & InstantiateContractProposal & InstantiateContract2Proposal & MigrateContractProposal & SudoContractProposal & ExecuteContractProposal & UpdateAdminProposal & ClearAdminProposal & PinCodesProposal & UnpinCodesProposal & UpdateInstantiateConfigProposal & StoreAndInstantiateContractProposal & ClientUpdateProposal & UpgradeProposal & ReplaceMigrationRecordsProposal & UpdateMigrationRecordsProposal & ReplacePoolIncentivesProposal & UpdatePoolIncentivesProposal & SetProtoRevEnabledProposal & SetProtoRevAdminAccountProposal & SetSuperfluidAssetsProposal & RemoveSuperfluidAssetsProposal & UpdateUnpoolWhiteListProposal & UpdateFeeTokenProposal & Any) | undefined; + content: (CommunityPoolSpendProposal & CommunityPoolSpendProposalWithDeposit & TextProposal & ParameterChangeProposal & SoftwareUpgradeProposal & CancelSoftwareUpgradeProposal & StoreCodeProposal & InstantiateContractProposal & InstantiateContract2Proposal & MigrateContractProposal & SudoContractProposal & ExecuteContractProposal & UpdateAdminProposal & ClearAdminProposal & PinCodesProposal & UnpinCodesProposal & UpdateInstantiateConfigProposal & StoreAndInstantiateContractProposal & ClientUpdateProposal & UpgradeProposal & ReplaceMigrationRecordsProposal & UpdateMigrationRecordsProposal & CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal & SetScalingFactorControllerProposal & ReplacePoolIncentivesProposal & UpdatePoolIncentivesProposal & SetProtoRevEnabledProposal & SetProtoRevAdminAccountProposal & SetSuperfluidAssetsProposal & RemoveSuperfluidAssetsProposal & UpdateUnpoolWhiteListProposal & UpdateFeeTokenProposal & Any) | undefined; /** initial_deposit is the deposit value that must be paid at proposal submission. */ initialDeposit: Coin[]; /** proposer is the account address of the proposer. */ @@ -31,7 +31,7 @@ export interface MsgSubmitProposalProtoMsg { value: Uint8Array; } export type MsgSubmitProposalEncoded = Omit & { - /** content is the proposal's content. */content?: CommunityPoolSpendProposalProtoMsg | CommunityPoolSpendProposalWithDepositProtoMsg | TextProposalProtoMsg | ParameterChangeProposalProtoMsg | SoftwareUpgradeProposalProtoMsg | CancelSoftwareUpgradeProposalProtoMsg | StoreCodeProposalProtoMsg | InstantiateContractProposalProtoMsg | InstantiateContract2ProposalProtoMsg | MigrateContractProposalProtoMsg | SudoContractProposalProtoMsg | ExecuteContractProposalProtoMsg | UpdateAdminProposalProtoMsg | ClearAdminProposalProtoMsg | PinCodesProposalProtoMsg | UnpinCodesProposalProtoMsg | UpdateInstantiateConfigProposalProtoMsg | StoreAndInstantiateContractProposalProtoMsg | ClientUpdateProposalProtoMsg | UpgradeProposalProtoMsg | ReplaceMigrationRecordsProposalProtoMsg | UpdateMigrationRecordsProposalProtoMsg | ReplacePoolIncentivesProposalProtoMsg | UpdatePoolIncentivesProposalProtoMsg | SetProtoRevEnabledProposalProtoMsg | SetProtoRevAdminAccountProposalProtoMsg | SetSuperfluidAssetsProposalProtoMsg | RemoveSuperfluidAssetsProposalProtoMsg | UpdateUnpoolWhiteListProposalProtoMsg | UpdateFeeTokenProposalProtoMsg | AnyProtoMsg | undefined; + /** content is the proposal's content. */content?: CommunityPoolSpendProposalProtoMsg | CommunityPoolSpendProposalWithDepositProtoMsg | TextProposalProtoMsg | ParameterChangeProposalProtoMsg | SoftwareUpgradeProposalProtoMsg | CancelSoftwareUpgradeProposalProtoMsg | StoreCodeProposalProtoMsg | InstantiateContractProposalProtoMsg | InstantiateContract2ProposalProtoMsg | MigrateContractProposalProtoMsg | SudoContractProposalProtoMsg | ExecuteContractProposalProtoMsg | UpdateAdminProposalProtoMsg | ClearAdminProposalProtoMsg | PinCodesProposalProtoMsg | UnpinCodesProposalProtoMsg | UpdateInstantiateConfigProposalProtoMsg | StoreAndInstantiateContractProposalProtoMsg | ClientUpdateProposalProtoMsg | UpgradeProposalProtoMsg | ReplaceMigrationRecordsProposalProtoMsg | UpdateMigrationRecordsProposalProtoMsg | CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalProtoMsg | SetScalingFactorControllerProposalProtoMsg | ReplacePoolIncentivesProposalProtoMsg | UpdatePoolIncentivesProposalProtoMsg | SetProtoRevEnabledProposalProtoMsg | SetProtoRevAdminAccountProposalProtoMsg | SetSuperfluidAssetsProposalProtoMsg | RemoveSuperfluidAssetsProposalProtoMsg | UpdateUnpoolWhiteListProposalProtoMsg | UpdateFeeTokenProposalProtoMsg | AnyProtoMsg | undefined; }; /** * MsgSubmitProposal defines an sdk.Msg type that supports submitting arbitrary @@ -54,7 +54,7 @@ export interface MsgSubmitProposalAminoMsg { * proposal Content. */ export interface MsgSubmitProposalSDKType { - content: CommunityPoolSpendProposalSDKType | CommunityPoolSpendProposalWithDepositSDKType | TextProposalSDKType | ParameterChangeProposalSDKType | SoftwareUpgradeProposalSDKType | CancelSoftwareUpgradeProposalSDKType | StoreCodeProposalSDKType | InstantiateContractProposalSDKType | InstantiateContract2ProposalSDKType | MigrateContractProposalSDKType | SudoContractProposalSDKType | ExecuteContractProposalSDKType | UpdateAdminProposalSDKType | ClearAdminProposalSDKType | PinCodesProposalSDKType | UnpinCodesProposalSDKType | UpdateInstantiateConfigProposalSDKType | StoreAndInstantiateContractProposalSDKType | ClientUpdateProposalSDKType | UpgradeProposalSDKType | ReplaceMigrationRecordsProposalSDKType | UpdateMigrationRecordsProposalSDKType | ReplacePoolIncentivesProposalSDKType | UpdatePoolIncentivesProposalSDKType | SetProtoRevEnabledProposalSDKType | SetProtoRevAdminAccountProposalSDKType | SetSuperfluidAssetsProposalSDKType | RemoveSuperfluidAssetsProposalSDKType | UpdateUnpoolWhiteListProposalSDKType | UpdateFeeTokenProposalSDKType | AnySDKType | undefined; + content: CommunityPoolSpendProposalSDKType | CommunityPoolSpendProposalWithDepositSDKType | TextProposalSDKType | ParameterChangeProposalSDKType | SoftwareUpgradeProposalSDKType | CancelSoftwareUpgradeProposalSDKType | StoreCodeProposalSDKType | InstantiateContractProposalSDKType | InstantiateContract2ProposalSDKType | MigrateContractProposalSDKType | SudoContractProposalSDKType | ExecuteContractProposalSDKType | UpdateAdminProposalSDKType | ClearAdminProposalSDKType | PinCodesProposalSDKType | UnpinCodesProposalSDKType | UpdateInstantiateConfigProposalSDKType | StoreAndInstantiateContractProposalSDKType | ClientUpdateProposalSDKType | UpgradeProposalSDKType | ReplaceMigrationRecordsProposalSDKType | UpdateMigrationRecordsProposalSDKType | CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalSDKType | SetScalingFactorControllerProposalSDKType | ReplacePoolIncentivesProposalSDKType | UpdatePoolIncentivesProposalSDKType | SetProtoRevEnabledProposalSDKType | SetProtoRevAdminAccountProposalSDKType | SetSuperfluidAssetsProposalSDKType | RemoveSuperfluidAssetsProposalSDKType | UpdateUnpoolWhiteListProposalSDKType | UpdateFeeTokenProposalSDKType | AnySDKType | undefined; initial_deposit: CoinSDKType[]; proposer: string; } @@ -834,7 +834,7 @@ export const MsgDepositResponse = { }; } }; -export const Cosmos_govv1beta1Content_InterfaceDecoder = (input: BinaryReader | Uint8Array): CommunityPoolSpendProposal | CommunityPoolSpendProposalWithDeposit | TextProposal | ParameterChangeProposal | SoftwareUpgradeProposal | CancelSoftwareUpgradeProposal | StoreCodeProposal | InstantiateContractProposal | InstantiateContract2Proposal | MigrateContractProposal | SudoContractProposal | ExecuteContractProposal | UpdateAdminProposal | ClearAdminProposal | PinCodesProposal | UnpinCodesProposal | UpdateInstantiateConfigProposal | StoreAndInstantiateContractProposal | ClientUpdateProposal | UpgradeProposal | ReplaceMigrationRecordsProposal | UpdateMigrationRecordsProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetProtoRevEnabledProposal | SetProtoRevAdminAccountProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any => { +export const Cosmos_govv1beta1Content_InterfaceDecoder = (input: BinaryReader | Uint8Array): CommunityPoolSpendProposal | CommunityPoolSpendProposalWithDeposit | TextProposal | ParameterChangeProposal | SoftwareUpgradeProposal | CancelSoftwareUpgradeProposal | StoreCodeProposal | InstantiateContractProposal | InstantiateContract2Proposal | MigrateContractProposal | SudoContractProposal | ExecuteContractProposal | UpdateAdminProposal | ClearAdminProposal | PinCodesProposal | UnpinCodesProposal | UpdateInstantiateConfigProposal | StoreAndInstantiateContractProposal | ClientUpdateProposal | UpgradeProposal | ReplaceMigrationRecordsProposal | UpdateMigrationRecordsProposal | CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal | SetScalingFactorControllerProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetProtoRevEnabledProposal | SetProtoRevAdminAccountProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any => { const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); switch (data.typeUrl) { @@ -882,6 +882,10 @@ export const Cosmos_govv1beta1Content_InterfaceDecoder = (input: BinaryReader | return ReplaceMigrationRecordsProposal.decode(data.value); case "/osmosis.gamm.v1beta1.UpdateMigrationRecordsProposal": return UpdateMigrationRecordsProposal.decode(data.value); + case "/osmosis.gamm.v1beta1.CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal": + return CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.decode(data.value); + case "/osmosis.gamm.v1beta1.SetScalingFactorControllerProposal": + return SetScalingFactorControllerProposal.decode(data.value); case "/osmosis.poolincentives.v1beta1.ReplacePoolIncentivesProposal": return ReplacePoolIncentivesProposal.decode(data.value); case "/osmosis.poolincentives.v1beta1.UpdatePoolIncentivesProposal": @@ -1014,6 +1018,16 @@ export const Cosmos_govv1beta1Content_FromAmino = (content: AnyAmino) => { typeUrl: "/osmosis.gamm.v1beta1.UpdateMigrationRecordsProposal", value: UpdateMigrationRecordsProposal.encode(UpdateMigrationRecordsProposal.fromPartial(UpdateMigrationRecordsProposal.fromAmino(content.value))).finish() }); + case "osmosis/CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal": + return Any.fromPartial({ + typeUrl: "/osmosis.gamm.v1beta1.CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal", + value: CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.encode(CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.fromPartial(CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.fromAmino(content.value))).finish() + }); + case "osmosis/SetScalingFactorControllerProposal": + return Any.fromPartial({ + typeUrl: "/osmosis.gamm.v1beta1.SetScalingFactorControllerProposal", + value: SetScalingFactorControllerProposal.encode(SetScalingFactorControllerProposal.fromPartial(SetScalingFactorControllerProposal.fromAmino(content.value))).finish() + }); case "osmosis/ReplacePoolIncentivesProposal": return Any.fromPartial({ typeUrl: "/osmosis.poolincentives.v1beta1.ReplacePoolIncentivesProposal", @@ -1170,6 +1184,16 @@ export const Cosmos_govv1beta1Content_ToAmino = (content: Any) => { type: "osmosis/UpdateMigrationRecordsProposal", value: UpdateMigrationRecordsProposal.toAmino(UpdateMigrationRecordsProposal.decode(content.value)) }; + case "/osmosis.gamm.v1beta1.CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal": + return { + type: "osmosis/CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal", + value: CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.toAmino(CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.decode(content.value)) + }; + case "/osmosis.gamm.v1beta1.SetScalingFactorControllerProposal": + return { + type: "osmosis/SetScalingFactorControllerProposal", + value: SetScalingFactorControllerProposal.toAmino(SetScalingFactorControllerProposal.decode(content.value)) + }; case "/osmosis.poolincentives.v1beta1.ReplacePoolIncentivesProposal": return { type: "osmosis/ReplacePoolIncentivesProposal", diff --git a/packages/protobuf/codegen/cosmwasm/bundle.ts b/packages/protobuf/codegen/cosmwasm/bundle.ts index 3fc25dafb..b864713d4 100644 --- a/packages/protobuf/codegen/cosmwasm/bundle.ts +++ b/packages/protobuf/codegen/cosmwasm/bundle.ts @@ -5,12 +5,12 @@ import * as _61 from "./wasm/v1/proposal"; import * as _62 from "./wasm/v1/query"; import * as _63 from "./wasm/v1/tx"; import * as _64 from "./wasm/v1/types"; -import * as _210 from "./wasm/v1/tx.amino"; -import * as _211 from "./wasm/v1/tx.registry"; -import * as _212 from "./wasm/v1/query.rpc.Query"; -import * as _213 from "./wasm/v1/tx.rpc.msg"; -import * as _280 from "./rpc.query"; -import * as _281 from "./rpc.tx"; +import * as _211 from "./wasm/v1/tx.amino"; +import * as _212 from "./wasm/v1/tx.registry"; +import * as _213 from "./wasm/v1/query.rpc.Query"; +import * as _214 from "./wasm/v1/tx.rpc.msg"; +import * as _281 from "./rpc.query"; +import * as _282 from "./rpc.tx"; export namespace cosmwasm { export namespace wasm { export const v1 = { @@ -21,14 +21,14 @@ export namespace cosmwasm { ..._62, ..._63, ..._64, - ..._210, ..._211, ..._212, - ..._213 + ..._213, + ..._214 }; } export const ClientFactory = { - ..._280, - ..._281 + ..._281, + ..._282 }; } \ No newline at end of file diff --git a/packages/protobuf/codegen/ibc/bundle.ts b/packages/protobuf/codegen/ibc/bundle.ts index f796ee632..d96d8ea5f 100644 --- a/packages/protobuf/codegen/ibc/bundle.ts +++ b/packages/protobuf/codegen/ibc/bundle.ts @@ -8,16 +8,16 @@ import * as _79 from "./core/channel/v1/genesis"; import * as _80 from "./core/channel/v1/query"; import * as _81 from "./core/channel/v1/tx"; import * as _82 from "./core/client/v1/client"; -import * as _214 from "./applications/transfer/v1/tx.amino"; -import * as _215 from "./core/channel/v1/tx.amino"; -import * as _216 from "./applications/transfer/v1/tx.registry"; -import * as _217 from "./core/channel/v1/tx.registry"; -import * as _218 from "./applications/transfer/v1/query.rpc.Query"; -import * as _219 from "./core/channel/v1/query.rpc.Query"; -import * as _220 from "./applications/transfer/v1/tx.rpc.msg"; -import * as _221 from "./core/channel/v1/tx.rpc.msg"; -import * as _282 from "./rpc.query"; -import * as _283 from "./rpc.tx"; +import * as _215 from "./applications/transfer/v1/tx.amino"; +import * as _216 from "./core/channel/v1/tx.amino"; +import * as _217 from "./applications/transfer/v1/tx.registry"; +import * as _218 from "./core/channel/v1/tx.registry"; +import * as _219 from "./applications/transfer/v1/query.rpc.Query"; +import * as _220 from "./core/channel/v1/query.rpc.Query"; +import * as _221 from "./applications/transfer/v1/tx.rpc.msg"; +import * as _222 from "./core/channel/v1/tx.rpc.msg"; +import * as _283 from "./rpc.query"; +import * as _284 from "./rpc.tx"; export namespace ibc { export namespace applications { export namespace transfer { @@ -27,10 +27,10 @@ export namespace ibc { ..._75, ..._76, ..._77, - ..._214, - ..._216, - ..._218, - ..._220 + ..._215, + ..._217, + ..._219, + ..._221 }; } } @@ -41,10 +41,10 @@ export namespace ibc { ..._79, ..._80, ..._81, - ..._215, - ..._217, - ..._219, - ..._221 + ..._216, + ..._218, + ..._220, + ..._222 }; } export namespace client { @@ -54,7 +54,7 @@ export namespace ibc { } } export const ClientFactory = { - ..._282, - ..._283 + ..._283, + ..._284 }; } \ No newline at end of file diff --git a/packages/protobuf/codegen/juno/bundle.ts b/packages/protobuf/codegen/juno/bundle.ts index 2cb2a40fb..36956521d 100644 --- a/packages/protobuf/codegen/juno/bundle.ts +++ b/packages/protobuf/codegen/juno/bundle.ts @@ -6,16 +6,16 @@ import * as _87 from "./mint/genesis"; import * as _88 from "./mint/mint"; import * as _89 from "./mint/query"; import * as _90 from "./mint/tx"; -import * as _222 from "./feeshare/v1/tx.amino"; -import * as _223 from "./mint/tx.amino"; -import * as _224 from "./feeshare/v1/tx.registry"; -import * as _225 from "./mint/tx.registry"; -import * as _226 from "./feeshare/v1/query.rpc.Query"; -import * as _227 from "./mint/query.rpc.Query"; -import * as _228 from "./feeshare/v1/tx.rpc.msg"; -import * as _229 from "./mint/tx.rpc.msg"; -import * as _284 from "./rpc.query"; -import * as _285 from "./rpc.tx"; +import * as _223 from "./feeshare/v1/tx.amino"; +import * as _224 from "./mint/tx.amino"; +import * as _225 from "./feeshare/v1/tx.registry"; +import * as _226 from "./mint/tx.registry"; +import * as _227 from "./feeshare/v1/query.rpc.Query"; +import * as _228 from "./mint/query.rpc.Query"; +import * as _229 from "./feeshare/v1/tx.rpc.msg"; +import * as _230 from "./mint/tx.rpc.msg"; +import * as _285 from "./rpc.query"; +import * as _286 from "./rpc.tx"; export namespace juno { export namespace feeshare { export const v1 = { @@ -23,10 +23,10 @@ export namespace juno { ..._84, ..._85, ..._86, - ..._222, - ..._224, - ..._226, - ..._228 + ..._223, + ..._225, + ..._227, + ..._229 }; } export const mint = { @@ -34,13 +34,13 @@ export namespace juno { ..._88, ..._89, ..._90, - ..._223, - ..._225, - ..._227, - ..._229 + ..._224, + ..._226, + ..._228, + ..._230 }; export const ClientFactory = { - ..._284, - ..._285 + ..._285, + ..._286 }; } \ No newline at end of file diff --git a/packages/protobuf/codegen/osmosis/accum/v1beta1/accum.ts b/packages/protobuf/codegen/osmosis/accum/v1beta1/accum.ts index 43fd44f54..d33d73e8f 100644 --- a/packages/protobuf/codegen/osmosis/accum/v1beta1/accum.ts +++ b/packages/protobuf/codegen/osmosis/accum/v1beta1/accum.ts @@ -1,6 +1,5 @@ import { DecCoin, DecCoinAmino, DecCoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { BinaryReader, BinaryWriter } from "../../../binary"; -import { Decimal } from "@cosmjs/math"; /** * AccumulatorContent is the state-entry for the global accumulator. * It contains the name of the global accumulator and the total value of @@ -158,7 +157,7 @@ export const AccumulatorContent = { DecCoin.encode(v!, writer.uint32(10).fork()).ldelim(); } if (message.totalShares !== "") { - writer.uint32(18).string(Decimal.fromUserInput(message.totalShares, 18).atomics); + writer.uint32(18).string(message.totalShares); } return writer; }, @@ -173,7 +172,7 @@ export const AccumulatorContent = { message.accumValue.push(DecCoin.decode(reader, reader.uint32())); break; case 2: - message.totalShares = Decimal.fromAtomics(reader.string(), 18).toString(); + message.totalShares = reader.string(); break; default: reader.skipType(tag & 7); @@ -293,7 +292,7 @@ export const Record = { typeUrl: "/osmosis.accum.v1beta1.Record", encode(message: Record, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.numShares !== "") { - writer.uint32(10).string(Decimal.fromUserInput(message.numShares, 18).atomics); + writer.uint32(10).string(message.numShares); } for (const v of message.accumValuePerShare) { DecCoin.encode(v!, writer.uint32(18).fork()).ldelim(); @@ -314,7 +313,7 @@ export const Record = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.numShares = Decimal.fromAtomics(reader.string(), 18).toString(); + message.numShares = reader.string(); break; case 2: message.accumValuePerShare.push(DecCoin.decode(reader, reader.uint32())); diff --git a/packages/protobuf/codegen/osmosis/bundle.ts b/packages/protobuf/codegen/osmosis/bundle.ts index bfafa8086..d402d4646 100644 --- a/packages/protobuf/codegen/osmosis/bundle.ts +++ b/packages/protobuf/codegen/osmosis/bundle.ts @@ -37,83 +37,84 @@ import * as _126 from "./pool-incentives/v1beta1/incentives"; import * as _127 from "./pool-incentives/v1beta1/query"; import * as _128 from "./pool-incentives/v1beta1/shared"; import * as _129 from "./poolmanager/v1beta1/genesis"; -import * as _130 from "./poolmanager/v1beta1/module_route"; -import * as _131 from "./poolmanager/v1beta1/query"; -import * as _132 from "./poolmanager/v1beta1/swap_route"; -import * as _133 from "./poolmanager/v1beta1/tx"; -import * as _134 from "./protorev/v1beta1/genesis"; -import * as _135 from "./protorev/v1beta1/gov"; -import * as _136 from "./protorev/v1beta1/params"; -import * as _137 from "./protorev/v1beta1/protorev"; -import * as _138 from "./protorev/v1beta1/query"; -import * as _139 from "./protorev/v1beta1/tx"; -import * as _140 from "./superfluid/genesis"; -import * as _141 from "./superfluid/params"; -import * as _142 from "./superfluid/query"; -import * as _143 from "./superfluid/superfluid"; -import * as _144 from "./superfluid/tx"; -import * as _145 from "./tokenfactory/v1beta1/authorityMetadata"; -import * as _146 from "./tokenfactory/v1beta1/genesis"; -import * as _147 from "./tokenfactory/v1beta1/params"; -import * as _148 from "./tokenfactory/v1beta1/query"; -import * as _149 from "./tokenfactory/v1beta1/tx"; -import * as _150 from "./txfees/v1beta1/feetoken"; -import * as _151 from "./txfees/v1beta1/genesis"; -import * as _152 from "./txfees/v1beta1/gov"; -import * as _153 from "./txfees/v1beta1/query"; -import * as _154 from "./valset-pref/v1beta1/query"; -import * as _155 from "./valset-pref/v1beta1/state"; -import * as _156 from "./valset-pref/v1beta1/tx"; -import * as _230 from "./concentrated-liquidity/pool-model/concentrated/tx.amino"; -import * as _231 from "./concentrated-liquidity/tx.amino"; -import * as _232 from "./gamm/pool-models/balancer/tx/tx.amino"; -import * as _233 from "./gamm/pool-models/stableswap/tx.amino"; -import * as _234 from "./gamm/v1beta1/tx.amino"; -import * as _235 from "./incentives/tx.amino"; -import * as _236 from "./lockup/tx.amino"; -import * as _237 from "./poolmanager/v1beta1/tx.amino"; -import * as _238 from "./protorev/v1beta1/tx.amino"; -import * as _239 from "./superfluid/tx.amino"; -import * as _240 from "./tokenfactory/v1beta1/tx.amino"; -import * as _241 from "./valset-pref/v1beta1/tx.amino"; -import * as _242 from "./concentrated-liquidity/pool-model/concentrated/tx.registry"; -import * as _243 from "./concentrated-liquidity/tx.registry"; -import * as _244 from "./gamm/pool-models/balancer/tx/tx.registry"; -import * as _245 from "./gamm/pool-models/stableswap/tx.registry"; -import * as _246 from "./gamm/v1beta1/tx.registry"; -import * as _247 from "./incentives/tx.registry"; -import * as _248 from "./lockup/tx.registry"; -import * as _249 from "./poolmanager/v1beta1/tx.registry"; -import * as _250 from "./protorev/v1beta1/tx.registry"; -import * as _251 from "./superfluid/tx.registry"; -import * as _252 from "./tokenfactory/v1beta1/tx.registry"; -import * as _253 from "./valset-pref/v1beta1/tx.registry"; -import * as _254 from "./concentrated-liquidity/query.rpc.Query"; -import * as _255 from "./cosmwasmpool/v1beta1/query.rpc.Query"; -import * as _256 from "./gamm/v1beta1/query.rpc.Query"; -import * as _257 from "./incentives/query.rpc.Query"; -import * as _258 from "./lockup/query.rpc.Query"; -import * as _259 from "./pool-incentives/v1beta1/query.rpc.Query"; -import * as _260 from "./poolmanager/v1beta1/query.rpc.Query"; -import * as _261 from "./protorev/v1beta1/query.rpc.Query"; -import * as _262 from "./superfluid/query.rpc.Query"; -import * as _263 from "./tokenfactory/v1beta1/query.rpc.Query"; -import * as _264 from "./txfees/v1beta1/query.rpc.Query"; -import * as _265 from "./valset-pref/v1beta1/query.rpc.Query"; -import * as _266 from "./concentrated-liquidity/pool-model/concentrated/tx.rpc.msg"; -import * as _267 from "./concentrated-liquidity/tx.rpc.msg"; -import * as _268 from "./gamm/pool-models/balancer/tx/tx.rpc.msg"; -import * as _269 from "./gamm/pool-models/stableswap/tx.rpc.msg"; -import * as _270 from "./gamm/v1beta1/tx.rpc.msg"; -import * as _271 from "./incentives/tx.rpc.msg"; -import * as _272 from "./lockup/tx.rpc.msg"; -import * as _273 from "./poolmanager/v1beta1/tx.rpc.msg"; -import * as _274 from "./protorev/v1beta1/tx.rpc.msg"; -import * as _275 from "./superfluid/tx.rpc.msg"; -import * as _276 from "./tokenfactory/v1beta1/tx.rpc.msg"; -import * as _277 from "./valset-pref/v1beta1/tx.rpc.msg"; -import * as _286 from "./rpc.query"; -import * as _287 from "./rpc.tx"; +import * as _130 from "./poolmanager/v1beta1/gov"; +import * as _131 from "./poolmanager/v1beta1/module_route"; +import * as _132 from "./poolmanager/v1beta1/query"; +import * as _133 from "./poolmanager/v1beta1/swap_route"; +import * as _134 from "./poolmanager/v1beta1/tx"; +import * as _135 from "./protorev/v1beta1/genesis"; +import * as _136 from "./protorev/v1beta1/gov"; +import * as _137 from "./protorev/v1beta1/params"; +import * as _138 from "./protorev/v1beta1/protorev"; +import * as _139 from "./protorev/v1beta1/query"; +import * as _140 from "./protorev/v1beta1/tx"; +import * as _141 from "./superfluid/genesis"; +import * as _142 from "./superfluid/params"; +import * as _143 from "./superfluid/query"; +import * as _144 from "./superfluid/superfluid"; +import * as _145 from "./superfluid/tx"; +import * as _146 from "./tokenfactory/v1beta1/authorityMetadata"; +import * as _147 from "./tokenfactory/v1beta1/genesis"; +import * as _148 from "./tokenfactory/v1beta1/params"; +import * as _149 from "./tokenfactory/v1beta1/query"; +import * as _150 from "./tokenfactory/v1beta1/tx"; +import * as _151 from "./txfees/v1beta1/feetoken"; +import * as _152 from "./txfees/v1beta1/genesis"; +import * as _153 from "./txfees/v1beta1/gov"; +import * as _154 from "./txfees/v1beta1/query"; +import * as _155 from "./valset-pref/v1beta1/query"; +import * as _156 from "./valset-pref/v1beta1/state"; +import * as _157 from "./valset-pref/v1beta1/tx"; +import * as _231 from "./concentrated-liquidity/pool-model/concentrated/tx.amino"; +import * as _232 from "./concentrated-liquidity/tx.amino"; +import * as _233 from "./gamm/pool-models/balancer/tx/tx.amino"; +import * as _234 from "./gamm/pool-models/stableswap/tx.amino"; +import * as _235 from "./gamm/v1beta1/tx.amino"; +import * as _236 from "./incentives/tx.amino"; +import * as _237 from "./lockup/tx.amino"; +import * as _238 from "./poolmanager/v1beta1/tx.amino"; +import * as _239 from "./protorev/v1beta1/tx.amino"; +import * as _240 from "./superfluid/tx.amino"; +import * as _241 from "./tokenfactory/v1beta1/tx.amino"; +import * as _242 from "./valset-pref/v1beta1/tx.amino"; +import * as _243 from "./concentrated-liquidity/pool-model/concentrated/tx.registry"; +import * as _244 from "./concentrated-liquidity/tx.registry"; +import * as _245 from "./gamm/pool-models/balancer/tx/tx.registry"; +import * as _246 from "./gamm/pool-models/stableswap/tx.registry"; +import * as _247 from "./gamm/v1beta1/tx.registry"; +import * as _248 from "./incentives/tx.registry"; +import * as _249 from "./lockup/tx.registry"; +import * as _250 from "./poolmanager/v1beta1/tx.registry"; +import * as _251 from "./protorev/v1beta1/tx.registry"; +import * as _252 from "./superfluid/tx.registry"; +import * as _253 from "./tokenfactory/v1beta1/tx.registry"; +import * as _254 from "./valset-pref/v1beta1/tx.registry"; +import * as _255 from "./concentrated-liquidity/query.rpc.Query"; +import * as _256 from "./cosmwasmpool/v1beta1/query.rpc.Query"; +import * as _257 from "./gamm/v1beta1/query.rpc.Query"; +import * as _258 from "./incentives/query.rpc.Query"; +import * as _259 from "./lockup/query.rpc.Query"; +import * as _260 from "./pool-incentives/v1beta1/query.rpc.Query"; +import * as _261 from "./poolmanager/v1beta1/query.rpc.Query"; +import * as _262 from "./protorev/v1beta1/query.rpc.Query"; +import * as _263 from "./superfluid/query.rpc.Query"; +import * as _264 from "./tokenfactory/v1beta1/query.rpc.Query"; +import * as _265 from "./txfees/v1beta1/query.rpc.Query"; +import * as _266 from "./valset-pref/v1beta1/query.rpc.Query"; +import * as _267 from "./concentrated-liquidity/pool-model/concentrated/tx.rpc.msg"; +import * as _268 from "./concentrated-liquidity/tx.rpc.msg"; +import * as _269 from "./gamm/pool-models/balancer/tx/tx.rpc.msg"; +import * as _270 from "./gamm/pool-models/stableswap/tx.rpc.msg"; +import * as _271 from "./gamm/v1beta1/tx.rpc.msg"; +import * as _272 from "./incentives/tx.rpc.msg"; +import * as _273 from "./lockup/tx.rpc.msg"; +import * as _274 from "./poolmanager/v1beta1/tx.rpc.msg"; +import * as _275 from "./protorev/v1beta1/tx.rpc.msg"; +import * as _276 from "./superfluid/tx.rpc.msg"; +import * as _277 from "./tokenfactory/v1beta1/tx.rpc.msg"; +import * as _278 from "./valset-pref/v1beta1/tx.rpc.msg"; +import * as _287 from "./rpc.query"; +import * as _288 from "./rpc.tx"; export namespace osmosis { export namespace accum { export const v1beta1 = { @@ -125,17 +126,17 @@ export namespace osmosis { poolmodel: { concentrated: { v1beta1: { - ..._230, - ..._242, - ..._266 + ..._231, + ..._243, + ..._267 } } }, v1beta1: { - ..._231, - ..._243, - ..._254, - ..._267 + ..._232, + ..._244, + ..._255, + ..._268 } }; export namespace cosmwasmpool { @@ -152,7 +153,7 @@ export namespace osmosis { ..._102, ..._103, ..._104, - ..._255 + ..._256 }; } export namespace gamm { @@ -163,27 +164,27 @@ export namespace osmosis { ..._108, ..._109, ..._110, - ..._234, - ..._246, - ..._256, - ..._270 + ..._235, + ..._247, + ..._257, + ..._271 }; export namespace poolmodels { export namespace balancer { export const v1beta1 = { ..._111, - ..._232, - ..._244, - ..._268 + ..._233, + ..._245, + ..._269 }; } export namespace stableswap { export const v1beta1 = { ..._112, ..._113, - ..._233, - ..._245, - ..._269 + ..._234, + ..._246, + ..._270 }; } } @@ -194,10 +195,10 @@ export namespace osmosis { ..._116, ..._117, ..._118, - ..._235, - ..._247, - ..._257, - ..._271 + ..._236, + ..._248, + ..._258, + ..._272 }; export const lockup = { ..._119, @@ -205,10 +206,10 @@ export namespace osmosis { ..._121, ..._122, ..._123, - ..._236, - ..._248, - ..._258, - ..._272 + ..._237, + ..._249, + ..._259, + ..._273 }; export namespace poolincentives { export const v1beta1 = { @@ -217,7 +218,7 @@ export namespace osmosis { ..._126, ..._127, ..._128, - ..._259 + ..._260 }; } export namespace poolmanager { @@ -227,72 +228,73 @@ export namespace osmosis { ..._131, ..._132, ..._133, - ..._237, - ..._249, - ..._260, - ..._273 + ..._134, + ..._238, + ..._250, + ..._261, + ..._274 }; } export namespace protorev { export const v1beta1 = { - ..._134, ..._135, ..._136, ..._137, ..._138, ..._139, - ..._238, - ..._250, - ..._261, - ..._274 + ..._140, + ..._239, + ..._251, + ..._262, + ..._275 }; } export const superfluid = { - ..._140, ..._141, ..._142, ..._143, ..._144, - ..._239, - ..._251, - ..._262, - ..._275 + ..._145, + ..._240, + ..._252, + ..._263, + ..._276 }; export namespace tokenfactory { export const v1beta1 = { - ..._145, ..._146, ..._147, ..._148, ..._149, - ..._240, - ..._252, - ..._263, - ..._276 + ..._150, + ..._241, + ..._253, + ..._264, + ..._277 }; } export namespace txfees { export const v1beta1 = { - ..._150, ..._151, ..._152, ..._153, - ..._264 + ..._154, + ..._265 }; } export namespace valsetpref { export const v1beta1 = { - ..._154, ..._155, ..._156, - ..._241, - ..._253, - ..._265, - ..._277 + ..._157, + ..._242, + ..._254, + ..._266, + ..._278 }; } export const ClientFactory = { - ..._286, - ..._287 + ..._287, + ..._288 }; } \ No newline at end of file diff --git a/packages/protobuf/codegen/osmosis/concentrated-liquidity/gov.ts b/packages/protobuf/codegen/osmosis/concentrated-liquidity/gov.ts index f793de663..aed21b8ff 100644 --- a/packages/protobuf/codegen/osmosis/concentrated-liquidity/gov.ts +++ b/packages/protobuf/codegen/osmosis/concentrated-liquidity/gov.ts @@ -1,6 +1,5 @@ //@ts-nocheck import { BinaryReader, BinaryWriter } from "../../binary"; -import { Decimal } from "@cosmjs/math"; /** * CreateConcentratedLiquidityPoolsProposal is a gov Content type for creating * concentrated liquidity pools. If a CreateConcentratedLiquidityPoolsProposal @@ -116,7 +115,6 @@ export interface PoolRecord { denom0: string; denom1: string; tickSpacing: bigint; - exponentAtPriceOne: string; spreadFactor: string; } export interface PoolRecordProtoMsg { @@ -127,7 +125,6 @@ export interface PoolRecordAmino { denom0: string; denom1: string; tick_spacing: string; - exponent_at_price_one: string; spread_factor: string; } export interface PoolRecordAminoMsg { @@ -138,7 +135,6 @@ export interface PoolRecordSDKType { denom0: string; denom1: string; tick_spacing: bigint; - exponent_at_price_one: string; spread_factor: string; } function createBaseCreateConcentratedLiquidityPoolsProposal(): CreateConcentratedLiquidityPoolsProposal { @@ -405,7 +401,6 @@ function createBasePoolRecord(): PoolRecord { denom0: "", denom1: "", tickSpacing: BigInt(0), - exponentAtPriceOne: "", spreadFactor: "" }; } @@ -421,11 +416,8 @@ export const PoolRecord = { if (message.tickSpacing !== BigInt(0)) { writer.uint32(24).uint64(message.tickSpacing); } - if (message.exponentAtPriceOne !== "") { - writer.uint32(34).string(message.exponentAtPriceOne); - } if (message.spreadFactor !== "") { - writer.uint32(42).string(Decimal.fromUserInput(message.spreadFactor, 18).atomics); + writer.uint32(42).string(message.spreadFactor); } return writer; }, @@ -445,11 +437,8 @@ export const PoolRecord = { case 3: message.tickSpacing = reader.uint64(); break; - case 4: - message.exponentAtPriceOne = reader.string(); - break; case 5: - message.spreadFactor = Decimal.fromAtomics(reader.string(), 18).toString(); + message.spreadFactor = reader.string(); break; default: reader.skipType(tag & 7); @@ -463,7 +452,6 @@ export const PoolRecord = { message.denom0 = object.denom0 ?? ""; message.denom1 = object.denom1 ?? ""; message.tickSpacing = object.tickSpacing !== undefined && object.tickSpacing !== null ? BigInt(object.tickSpacing.toString()) : BigInt(0); - message.exponentAtPriceOne = object.exponentAtPriceOne ?? ""; message.spreadFactor = object.spreadFactor ?? ""; return message; }, @@ -472,7 +460,6 @@ export const PoolRecord = { denom0: object.denom0, denom1: object.denom1, tickSpacing: BigInt(object.tick_spacing), - exponentAtPriceOne: object.exponent_at_price_one, spreadFactor: object.spread_factor }; }, @@ -481,7 +468,6 @@ export const PoolRecord = { obj.denom0 = message.denom0; obj.denom1 = message.denom1; obj.tick_spacing = message.tickSpacing ? message.tickSpacing.toString() : undefined; - obj.exponent_at_price_one = message.exponentAtPriceOne; obj.spread_factor = message.spreadFactor; return obj; }, diff --git a/packages/protobuf/codegen/osmosis/concentrated-liquidity/incentive_record.ts b/packages/protobuf/codegen/osmosis/concentrated-liquidity/incentive_record.ts index 619479339..7cbddeddd 100644 --- a/packages/protobuf/codegen/osmosis/concentrated-liquidity/incentive_record.ts +++ b/packages/protobuf/codegen/osmosis/concentrated-liquidity/incentive_record.ts @@ -2,7 +2,6 @@ import { Duration, DurationAmino, DurationSDKType } from "../../google/protobuf/ import { DecCoin, DecCoinAmino, DecCoinSDKType } from "../../cosmos/base/v1beta1/coin"; import { Timestamp } from "../../google/protobuf/timestamp"; import { BinaryReader, BinaryWriter } from "../../binary"; -import { Decimal } from "@cosmjs/math"; import { toTimestamp, fromTimestamp } from "../../helpers"; /** * IncentiveRecord is the high-level struct we use to deal with an independent @@ -214,7 +213,7 @@ export const IncentiveRecordBody = { DecCoin.encode(message.remainingCoin, writer.uint32(10).fork()).ldelim(); } if (message.emissionRate !== "") { - writer.uint32(18).string(Decimal.fromUserInput(message.emissionRate, 18).atomics); + writer.uint32(18).string(message.emissionRate); } if (message.startTime !== undefined) { Timestamp.encode(toTimestamp(message.startTime), writer.uint32(26).fork()).ldelim(); @@ -232,7 +231,7 @@ export const IncentiveRecordBody = { message.remainingCoin = DecCoin.decode(reader, reader.uint32()); break; case 2: - message.emissionRate = Decimal.fromAtomics(reader.string(), 18).toString(); + message.emissionRate = reader.string(); break; case 3: message.startTime = fromTimestamp(Timestamp.decode(reader, reader.uint32())); diff --git a/packages/protobuf/codegen/osmosis/concentrated-liquidity/params.ts b/packages/protobuf/codegen/osmosis/concentrated-liquidity/params.ts index 9078bd9ab..926250dc2 100644 --- a/packages/protobuf/codegen/osmosis/concentrated-liquidity/params.ts +++ b/packages/protobuf/codegen/osmosis/concentrated-liquidity/params.ts @@ -1,6 +1,5 @@ import { Duration, DurationAmino, DurationSDKType } from "../../google/protobuf/duration"; import { BinaryReader, BinaryWriter } from "../../binary"; -import { Decimal } from "@cosmjs/math"; export interface Params { /** * authorized_tick_spacing is an array of uint64s that represents the tick @@ -112,10 +111,10 @@ export const Params = { } writer.ldelim(); for (const v of message.authorizedSpreadFactors) { - writer.uint32(18).string(Decimal.fromUserInput(v!, 18).atomics); + writer.uint32(18).string(v!); } if (message.balancerSharesRewardDiscount !== "") { - writer.uint32(26).string(Decimal.fromUserInput(message.balancerSharesRewardDiscount, 18).atomics); + writer.uint32(26).string(message.balancerSharesRewardDiscount); } for (const v of message.authorizedQuoteDenoms) { writer.uint32(34).string(v!); @@ -146,10 +145,10 @@ export const Params = { } break; case 2: - message.authorizedSpreadFactors.push(Decimal.fromAtomics(reader.string(), 18).toString()); + message.authorizedSpreadFactors.push(reader.string()); break; case 3: - message.balancerSharesRewardDiscount = Decimal.fromAtomics(reader.string(), 18).toString(); + message.balancerSharesRewardDiscount = reader.string(); break; case 4: message.authorizedQuoteDenoms.push(reader.string()); diff --git a/packages/protobuf/codegen/osmosis/concentrated-liquidity/pool-model/concentrated/tx.ts b/packages/protobuf/codegen/osmosis/concentrated-liquidity/pool-model/concentrated/tx.ts index ff12f19db..82af9ca7d 100644 --- a/packages/protobuf/codegen/osmosis/concentrated-liquidity/pool-model/concentrated/tx.ts +++ b/packages/protobuf/codegen/osmosis/concentrated-liquidity/pool-model/concentrated/tx.ts @@ -1,6 +1,5 @@ //@ts-nocheck import { BinaryReader, BinaryWriter } from "../../../../binary"; -import { Decimal } from "@cosmjs/math"; /** ===================== MsgCreateConcentratedPool */ export interface MsgCreateConcentratedPool { sender: string; @@ -78,7 +77,7 @@ export const MsgCreateConcentratedPool = { writer.uint32(32).uint64(message.tickSpacing); } if (message.spreadFactor !== "") { - writer.uint32(42).string(Decimal.fromUserInput(message.spreadFactor, 18).atomics); + writer.uint32(42).string(message.spreadFactor); } return writer; }, @@ -102,7 +101,7 @@ export const MsgCreateConcentratedPool = { message.tickSpacing = reader.uint64(); break; case 5: - message.spreadFactor = Decimal.fromAtomics(reader.string(), 18).toString(); + message.spreadFactor = reader.string(); break; default: reader.skipType(tag & 7); diff --git a/packages/protobuf/codegen/osmosis/concentrated-liquidity/pool.ts b/packages/protobuf/codegen/osmosis/concentrated-liquidity/pool.ts index 475191e15..eea456e7c 100644 --- a/packages/protobuf/codegen/osmosis/concentrated-liquidity/pool.ts +++ b/packages/protobuf/codegen/osmosis/concentrated-liquidity/pool.ts @@ -1,6 +1,5 @@ import { Timestamp } from "../../google/protobuf/timestamp"; import { BinaryReader, BinaryWriter } from "../../binary"; -import { Decimal } from "@cosmjs/math"; import { toTimestamp, fromTimestamp } from "../../helpers"; export interface Pool { $typeUrl?: string; @@ -117,7 +116,7 @@ export const Pool = { writer.uint32(32).uint64(message.id); } if (message.currentTickLiquidity !== "") { - writer.uint32(42).string(Decimal.fromUserInput(message.currentTickLiquidity, 18).atomics); + writer.uint32(42).string(message.currentTickLiquidity); } if (message.token0 !== "") { writer.uint32(50).string(message.token0); @@ -138,7 +137,7 @@ export const Pool = { writer.uint32(88).int64(message.exponentAtPriceOne); } if (message.spreadFactor !== "") { - writer.uint32(98).string(Decimal.fromUserInput(message.spreadFactor, 18).atomics); + writer.uint32(98).string(message.spreadFactor); } if (message.lastLiquidityUpdate !== undefined) { Timestamp.encode(toTimestamp(message.lastLiquidityUpdate), writer.uint32(106).fork()).ldelim(); @@ -165,7 +164,7 @@ export const Pool = { message.id = reader.uint64(); break; case 5: - message.currentTickLiquidity = Decimal.fromAtomics(reader.string(), 18).toString(); + message.currentTickLiquidity = reader.string(); break; case 6: message.token0 = reader.string(); @@ -186,7 +185,7 @@ export const Pool = { message.exponentAtPriceOne = reader.int64(); break; case 12: - message.spreadFactor = Decimal.fromAtomics(reader.string(), 18).toString(); + message.spreadFactor = reader.string(); break; case 13: message.lastLiquidityUpdate = fromTimestamp(Timestamp.decode(reader, reader.uint32())); diff --git a/packages/protobuf/codegen/osmosis/concentrated-liquidity/position.ts b/packages/protobuf/codegen/osmosis/concentrated-liquidity/position.ts index 26aa49874..dc7320bbc 100644 --- a/packages/protobuf/codegen/osmosis/concentrated-liquidity/position.ts +++ b/packages/protobuf/codegen/osmosis/concentrated-liquidity/position.ts @@ -3,7 +3,6 @@ import { Coin, CoinAmino, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; import { PeriodLock, PeriodLockAmino, PeriodLockSDKType } from "../lockup/lock"; import { BinaryReader, BinaryWriter } from "../../binary"; import { toTimestamp, fromTimestamp } from "../../helpers"; -import { Decimal } from "@cosmjs/math"; /** * Position contains position's id, address, pool id, lower tick, upper tick * join time, and liquidity. @@ -163,7 +162,7 @@ export const Position = { Timestamp.encode(toTimestamp(message.joinTime), writer.uint32(50).fork()).ldelim(); } if (message.liquidity !== "") { - writer.uint32(58).string(Decimal.fromUserInput(message.liquidity, 18).atomics); + writer.uint32(58).string(message.liquidity); } return writer; }, @@ -193,7 +192,7 @@ export const Position = { message.joinTime = fromTimestamp(Timestamp.decode(reader, reader.uint32())); break; case 7: - message.liquidity = Decimal.fromAtomics(reader.string(), 18).toString(); + message.liquidity = reader.string(); break; default: reader.skipType(tag & 7); diff --git a/packages/protobuf/codegen/osmosis/concentrated-liquidity/query.rpc.Query.ts b/packages/protobuf/codegen/osmosis/concentrated-liquidity/query.rpc.Query.ts index f7e9e53c8..e31d90872 100644 --- a/packages/protobuf/codegen/osmosis/concentrated-liquidity/query.rpc.Query.ts +++ b/packages/protobuf/codegen/osmosis/concentrated-liquidity/query.rpc.Query.ts @@ -1,7 +1,7 @@ import { Rpc } from "../../helpers"; import { BinaryReader } from "../../binary"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { PoolsRequest, PoolsResponse, ParamsRequest, ParamsResponse, UserPositionsRequest, UserPositionsResponse, LiquidityPerTickRangeRequest, LiquidityPerTickRangeResponse, LiquidityNetInDirectionRequest, LiquidityNetInDirectionResponse, ClaimableSpreadRewardsRequest, ClaimableSpreadRewardsResponse, ClaimableIncentivesRequest, ClaimableIncentivesResponse, PositionByIdRequest, PositionByIdResponse, PoolAccumulatorRewardsRequest, PoolAccumulatorRewardsResponse, IncentiveRecordsRequest, IncentiveRecordsResponse, TickAccumulatorTrackersRequest, TickAccumulatorTrackersResponse, CFMMPoolIdLinkFromConcentratedPoolIdRequest, CFMMPoolIdLinkFromConcentratedPoolIdResponse, UserUnbondingPositionsRequest, UserUnbondingPositionsResponse, GetTotalLiquidityRequest, GetTotalLiquidityResponse } from "./query"; +import { PoolsRequest, PoolsResponse, ParamsRequest, ParamsResponse, UserPositionsRequest, UserPositionsResponse, LiquidityPerTickRangeRequest, LiquidityPerTickRangeResponse, LiquidityNetInDirectionRequest, LiquidityNetInDirectionResponse, ClaimableSpreadRewardsRequest, ClaimableSpreadRewardsResponse, ClaimableIncentivesRequest, ClaimableIncentivesResponse, PositionByIdRequest, PositionByIdResponse, PoolAccumulatorRewardsRequest, PoolAccumulatorRewardsResponse, IncentiveRecordsRequest, IncentiveRecordsResponse, TickAccumulatorTrackersRequest, TickAccumulatorTrackersResponse, CFMMPoolIdLinkFromConcentratedPoolIdRequest, CFMMPoolIdLinkFromConcentratedPoolIdResponse, UserUnbondingPositionsRequest, UserUnbondingPositionsResponse, GetTotalLiquidityRequest, GetTotalLiquidityResponse, NumNextInitializedTicksRequest, NumNextInitializedTicksResponse } from "./query"; export interface Query { /** Pools returns all concentrated liquidity pools */ pools(request?: PoolsRequest): Promise; @@ -56,6 +56,11 @@ export interface Query { userUnbondingPositions(request: UserUnbondingPositionsRequest): Promise; /** GetTotalLiquidity returns total liquidity across all cl pools. */ getTotalLiquidity(request?: GetTotalLiquidityRequest): Promise; + /** + * NumNextInitializedTicks returns the provided number of next initialized + * ticks in the direction of swapping the token in denom. + */ + numNextInitializedTicks(request: NumNextInitializedTicksRequest): Promise; } export class QueryClientImpl implements Query { private readonly rpc: Rpc; @@ -75,6 +80,7 @@ export class QueryClientImpl implements Query { this.cFMMPoolIdLinkFromConcentratedPoolId = this.cFMMPoolIdLinkFromConcentratedPoolId.bind(this); this.userUnbondingPositions = this.userUnbondingPositions.bind(this); this.getTotalLiquidity = this.getTotalLiquidity.bind(this); + this.numNextInitializedTicks = this.numNextInitializedTicks.bind(this); } pools(request: PoolsRequest = { pagination: undefined @@ -148,6 +154,11 @@ export class QueryClientImpl implements Query { const promise = this.rpc.request("osmosis.concentratedliquidity.v1beta1.Query", "GetTotalLiquidity", data); return promise.then(data => GetTotalLiquidityResponse.decode(new BinaryReader(data))); } + numNextInitializedTicks(request: NumNextInitializedTicksRequest): Promise { + const data = NumNextInitializedTicksRequest.encode(request).finish(); + const promise = this.rpc.request("osmosis.concentratedliquidity.v1beta1.Query", "NumNextInitializedTicks", data); + return promise.then(data => NumNextInitializedTicksResponse.decode(new BinaryReader(data))); + } } export const createRpcQueryExtension = (base: QueryClient) => { const rpc = createProtobufRpcClient(base); @@ -194,6 +205,9 @@ export const createRpcQueryExtension = (base: QueryClient) => { }, getTotalLiquidity(request?: GetTotalLiquidityRequest): Promise { return queryService.getTotalLiquidity(request); + }, + numNextInitializedTicks(request: NumNextInitializedTicksRequest): Promise { + return queryService.numNextInitializedTicks(request); } }; }; \ No newline at end of file diff --git a/packages/protobuf/codegen/osmosis/concentrated-liquidity/query.ts b/packages/protobuf/codegen/osmosis/concentrated-liquidity/query.ts index f84a6c358..807d75966 100644 --- a/packages/protobuf/codegen/osmosis/concentrated-liquidity/query.ts +++ b/packages/protobuf/codegen/osmosis/concentrated-liquidity/query.ts @@ -627,6 +627,55 @@ export interface GetTotalLiquidityResponseAminoMsg { export interface GetTotalLiquidityResponseSDKType { total_liquidity: CoinSDKType[]; } +/** =============================== NumNextInitializedTicks */ +export interface NumNextInitializedTicksRequest { + poolId: bigint; + tokenInDenom: string; + numNextInitializedTicks: bigint; +} +export interface NumNextInitializedTicksRequestProtoMsg { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.NumNextInitializedTicksRequest"; + value: Uint8Array; +} +/** =============================== NumNextInitializedTicks */ +export interface NumNextInitializedTicksRequestAmino { + pool_id: string; + token_in_denom: string; + num_next_initialized_ticks: string; +} +export interface NumNextInitializedTicksRequestAminoMsg { + type: "osmosis/concentratedliquidity/num-next-initialized-ticks-request"; + value: NumNextInitializedTicksRequestAmino; +} +/** =============================== NumNextInitializedTicks */ +export interface NumNextInitializedTicksRequestSDKType { + pool_id: bigint; + token_in_denom: string; + num_next_initialized_ticks: bigint; +} +export interface NumNextInitializedTicksResponse { + liquidityDepths: TickLiquidityNet[]; + currentTick: bigint; + currentLiquidity: string; +} +export interface NumNextInitializedTicksResponseProtoMsg { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.NumNextInitializedTicksResponse"; + value: Uint8Array; +} +export interface NumNextInitializedTicksResponseAmino { + liquidity_depths: TickLiquidityNetAmino[]; + current_tick: string; + current_liquidity: string; +} +export interface NumNextInitializedTicksResponseAminoMsg { + type: "osmosis/concentratedliquidity/num-next-initialized-ticks-response"; + value: NumNextInitializedTicksResponseAmino; +} +export interface NumNextInitializedTicksResponseSDKType { + liquidity_depths: TickLiquidityNetSDKType[]; + current_tick: bigint; + current_liquidity: string; +} function createBaseUserPositionsRequest(): UserPositionsRequest { return { address: "", @@ -1209,7 +1258,7 @@ export const TickLiquidityNet = { typeUrl: "/osmosis.concentratedliquidity.v1beta1.TickLiquidityNet", encode(message: TickLiquidityNet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.liquidityNet !== "") { - writer.uint32(10).string(Decimal.fromUserInput(message.liquidityNet, 18).atomics); + writer.uint32(10).string(message.liquidityNet); } if (message.tickIndex !== BigInt(0)) { writer.uint32(16).int64(message.tickIndex); @@ -1224,7 +1273,7 @@ export const TickLiquidityNet = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.liquidityNet = Decimal.fromAtomics(reader.string(), 18).toString(); + message.liquidityNet = reader.string(); break; case 2: message.tickIndex = reader.int64(); @@ -1287,7 +1336,7 @@ export const LiquidityDepthWithRange = { typeUrl: "/osmosis.concentratedliquidity.v1beta1.LiquidityDepthWithRange", encode(message: LiquidityDepthWithRange, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.liquidityAmount !== "") { - writer.uint32(10).string(Decimal.fromUserInput(message.liquidityAmount, 18).atomics); + writer.uint32(10).string(message.liquidityAmount); } if (message.lowerTick !== BigInt(0)) { writer.uint32(16).int64(message.lowerTick); @@ -1305,7 +1354,7 @@ export const LiquidityDepthWithRange = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.liquidityAmount = Decimal.fromAtomics(reader.string(), 18).toString(); + message.liquidityAmount = reader.string(); break; case 2: message.lowerTick = reader.int64(); @@ -1497,7 +1546,7 @@ export const LiquidityNetInDirectionResponse = { writer.uint32(16).int64(message.currentTick); } if (message.currentLiquidity !== "") { - writer.uint32(26).string(Decimal.fromUserInput(message.currentLiquidity, 18).atomics); + writer.uint32(26).string(message.currentLiquidity); } return writer; }, @@ -1515,7 +1564,7 @@ export const LiquidityNetInDirectionResponse = { message.currentTick = reader.int64(); break; case 3: - message.currentLiquidity = Decimal.fromAtomics(reader.string(), 18).toString(); + message.currentLiquidity = reader.string(); break; default: reader.skipType(tag & 7); @@ -2869,6 +2918,184 @@ export const GetTotalLiquidityResponse = { }; } }; +function createBaseNumNextInitializedTicksRequest(): NumNextInitializedTicksRequest { + return { + poolId: BigInt(0), + tokenInDenom: "", + numNextInitializedTicks: BigInt(0) + }; +} +export const NumNextInitializedTicksRequest = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.NumNextInitializedTicksRequest", + encode(message: NumNextInitializedTicksRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.poolId !== BigInt(0)) { + writer.uint32(8).uint64(message.poolId); + } + if (message.tokenInDenom !== "") { + writer.uint32(18).string(message.tokenInDenom); + } + if (message.numNextInitializedTicks !== BigInt(0)) { + writer.uint32(24).uint64(message.numNextInitializedTicks); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): NumNextInitializedTicksRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseNumNextInitializedTicksRequest(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.poolId = reader.uint64(); + break; + case 2: + message.tokenInDenom = reader.string(); + break; + case 3: + message.numNextInitializedTicks = reader.uint64(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): NumNextInitializedTicksRequest { + const message = createBaseNumNextInitializedTicksRequest(); + message.poolId = object.poolId !== undefined && object.poolId !== null ? BigInt(object.poolId.toString()) : BigInt(0); + message.tokenInDenom = object.tokenInDenom ?? ""; + message.numNextInitializedTicks = object.numNextInitializedTicks !== undefined && object.numNextInitializedTicks !== null ? BigInt(object.numNextInitializedTicks.toString()) : BigInt(0); + return message; + }, + fromAmino(object: NumNextInitializedTicksRequestAmino): NumNextInitializedTicksRequest { + return { + poolId: BigInt(object.pool_id), + tokenInDenom: object.token_in_denom, + numNextInitializedTicks: BigInt(object.num_next_initialized_ticks) + }; + }, + toAmino(message: NumNextInitializedTicksRequest): NumNextInitializedTicksRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.token_in_denom = message.tokenInDenom; + obj.num_next_initialized_ticks = message.numNextInitializedTicks ? message.numNextInitializedTicks.toString() : undefined; + return obj; + }, + fromAminoMsg(object: NumNextInitializedTicksRequestAminoMsg): NumNextInitializedTicksRequest { + return NumNextInitializedTicksRequest.fromAmino(object.value); + }, + toAminoMsg(message: NumNextInitializedTicksRequest): NumNextInitializedTicksRequestAminoMsg { + return { + type: "osmosis/concentratedliquidity/num-next-initialized-ticks-request", + value: NumNextInitializedTicksRequest.toAmino(message) + }; + }, + fromProtoMsg(message: NumNextInitializedTicksRequestProtoMsg): NumNextInitializedTicksRequest { + return NumNextInitializedTicksRequest.decode(message.value); + }, + toProto(message: NumNextInitializedTicksRequest): Uint8Array { + return NumNextInitializedTicksRequest.encode(message).finish(); + }, + toProtoMsg(message: NumNextInitializedTicksRequest): NumNextInitializedTicksRequestProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.NumNextInitializedTicksRequest", + value: NumNextInitializedTicksRequest.encode(message).finish() + }; + } +}; +function createBaseNumNextInitializedTicksResponse(): NumNextInitializedTicksResponse { + return { + liquidityDepths: [], + currentTick: BigInt(0), + currentLiquidity: "" + }; +} +export const NumNextInitializedTicksResponse = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.NumNextInitializedTicksResponse", + encode(message: NumNextInitializedTicksResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + for (const v of message.liquidityDepths) { + TickLiquidityNet.encode(v!, writer.uint32(10).fork()).ldelim(); + } + if (message.currentTick !== BigInt(0)) { + writer.uint32(16).int64(message.currentTick); + } + if (message.currentLiquidity !== "") { + writer.uint32(26).string(Decimal.fromUserInput(message.currentLiquidity, 18).atomics); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): NumNextInitializedTicksResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseNumNextInitializedTicksResponse(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.liquidityDepths.push(TickLiquidityNet.decode(reader, reader.uint32())); + break; + case 2: + message.currentTick = reader.int64(); + break; + case 3: + message.currentLiquidity = Decimal.fromAtomics(reader.string(), 18).toString(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): NumNextInitializedTicksResponse { + const message = createBaseNumNextInitializedTicksResponse(); + message.liquidityDepths = object.liquidityDepths?.map(e => TickLiquidityNet.fromPartial(e)) || []; + message.currentTick = object.currentTick !== undefined && object.currentTick !== null ? BigInt(object.currentTick.toString()) : BigInt(0); + message.currentLiquidity = object.currentLiquidity ?? ""; + return message; + }, + fromAmino(object: NumNextInitializedTicksResponseAmino): NumNextInitializedTicksResponse { + return { + liquidityDepths: Array.isArray(object?.liquidity_depths) ? object.liquidity_depths.map((e: any) => TickLiquidityNet.fromAmino(e)) : [], + currentTick: BigInt(object.current_tick), + currentLiquidity: object.current_liquidity + }; + }, + toAmino(message: NumNextInitializedTicksResponse): NumNextInitializedTicksResponseAmino { + const obj: any = {}; + if (message.liquidityDepths) { + obj.liquidity_depths = message.liquidityDepths.map(e => e ? TickLiquidityNet.toAmino(e) : undefined); + } else { + obj.liquidity_depths = []; + } + obj.current_tick = message.currentTick ? message.currentTick.toString() : undefined; + obj.current_liquidity = message.currentLiquidity; + return obj; + }, + fromAminoMsg(object: NumNextInitializedTicksResponseAminoMsg): NumNextInitializedTicksResponse { + return NumNextInitializedTicksResponse.fromAmino(object.value); + }, + toAminoMsg(message: NumNextInitializedTicksResponse): NumNextInitializedTicksResponseAminoMsg { + return { + type: "osmosis/concentratedliquidity/num-next-initialized-ticks-response", + value: NumNextInitializedTicksResponse.toAmino(message) + }; + }, + fromProtoMsg(message: NumNextInitializedTicksResponseProtoMsg): NumNextInitializedTicksResponse { + return NumNextInitializedTicksResponse.decode(message.value); + }, + toProto(message: NumNextInitializedTicksResponse): Uint8Array { + return NumNextInitializedTicksResponse.encode(message).finish(); + }, + toProtoMsg(message: NumNextInitializedTicksResponse): NumNextInitializedTicksResponseProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.NumNextInitializedTicksResponse", + value: NumNextInitializedTicksResponse.encode(message).finish() + }; + } +}; export const PoolI_InterfaceDecoder = (input: BinaryReader | Uint8Array): Pool1 | CosmWasmPool | Pool2 | Pool3 | Any => { const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); diff --git a/packages/protobuf/codegen/osmosis/concentrated-liquidity/tickInfo.ts b/packages/protobuf/codegen/osmosis/concentrated-liquidity/tickInfo.ts index d1ed5e73f..ff3339b9a 100644 --- a/packages/protobuf/codegen/osmosis/concentrated-liquidity/tickInfo.ts +++ b/packages/protobuf/codegen/osmosis/concentrated-liquidity/tickInfo.ts @@ -1,6 +1,5 @@ import { DecCoin, DecCoinAmino, DecCoinSDKType } from "../../cosmos/base/v1beta1/coin"; import { BinaryReader, BinaryWriter } from "../../binary"; -import { Decimal } from "@cosmjs/math"; export interface TickInfo { liquidityGross: string; liquidityNet: string; @@ -85,10 +84,10 @@ export const TickInfo = { typeUrl: "/osmosis.concentratedliquidity.v1beta1.TickInfo", encode(message: TickInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.liquidityGross !== "") { - writer.uint32(10).string(Decimal.fromUserInput(message.liquidityGross, 18).atomics); + writer.uint32(10).string(message.liquidityGross); } if (message.liquidityNet !== "") { - writer.uint32(18).string(Decimal.fromUserInput(message.liquidityNet, 18).atomics); + writer.uint32(18).string(message.liquidityNet); } for (const v of message.spreadRewardGrowthOppositeDirectionOfLastTraversal) { DecCoin.encode(v!, writer.uint32(26).fork()).ldelim(); @@ -106,10 +105,10 @@ export const TickInfo = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.liquidityGross = Decimal.fromAtomics(reader.string(), 18).toString(); + message.liquidityGross = reader.string(); break; case 2: - message.liquidityNet = Decimal.fromAtomics(reader.string(), 18).toString(); + message.liquidityNet = reader.string(); break; case 3: message.spreadRewardGrowthOppositeDirectionOfLastTraversal.push(DecCoin.decode(reader, reader.uint32())); diff --git a/packages/protobuf/codegen/osmosis/concentrated-liquidity/tx.ts b/packages/protobuf/codegen/osmosis/concentrated-liquidity/tx.ts index 8489194cb..03fab16d5 100644 --- a/packages/protobuf/codegen/osmosis/concentrated-liquidity/tx.ts +++ b/packages/protobuf/codegen/osmosis/concentrated-liquidity/tx.ts @@ -1,7 +1,6 @@ //@ts-nocheck import { Coin, CoinAmino, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; import { BinaryReader, BinaryWriter } from "../../binary"; -import { Decimal } from "@cosmjs/math"; /** ===================== MsgCreatePosition */ export interface MsgCreatePosition { poolId: bigint; @@ -505,7 +504,7 @@ export const MsgCreatePositionResponse = { writer.uint32(26).string(message.amount1); } if (message.liquidityCreated !== "") { - writer.uint32(42).string(Decimal.fromUserInput(message.liquidityCreated, 18).atomics); + writer.uint32(42).string(message.liquidityCreated); } if (message.lowerTick !== BigInt(0)) { writer.uint32(48).int64(message.lowerTick); @@ -532,7 +531,7 @@ export const MsgCreatePositionResponse = { message.amount1 = reader.string(); break; case 5: - message.liquidityCreated = Decimal.fromAtomics(reader.string(), 18).toString(); + message.liquidityCreated = reader.string(); break; case 6: message.lowerTick = reader.int64(); @@ -820,7 +819,7 @@ export const MsgWithdrawPosition = { writer.uint32(18).string(message.sender); } if (message.liquidityAmount !== "") { - writer.uint32(26).string(Decimal.fromUserInput(message.liquidityAmount, 18).atomics); + writer.uint32(26).string(message.liquidityAmount); } return writer; }, @@ -838,7 +837,7 @@ export const MsgWithdrawPosition = { message.sender = reader.string(); break; case 3: - message.liquidityAmount = Decimal.fromAtomics(reader.string(), 18).toString(); + message.liquidityAmount = reader.string(); break; default: reader.skipType(tag & 7); diff --git a/packages/protobuf/codegen/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.ts b/packages/protobuf/codegen/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.ts index 1a319fc61..1cfe4e609 100644 --- a/packages/protobuf/codegen/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.ts +++ b/packages/protobuf/codegen/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.ts @@ -1,6 +1,5 @@ import { Coin, CoinAmino, CoinSDKType } from "../../../../cosmos/base/v1beta1/coin"; import { BinaryReader, BinaryWriter } from "../../../../binary"; -import { Decimal } from "@cosmjs/math"; /** ===================== CalcOutAmtGivenIn */ export interface CalcOutAmtGivenIn { /** token_in is the token to be sent to the pool. */ @@ -170,7 +169,7 @@ export const CalcOutAmtGivenIn = { writer.uint32(18).string(message.tokenOutDenom); } if (message.swapFee !== "") { - writer.uint32(26).string(Decimal.fromUserInput(message.swapFee, 18).atomics); + writer.uint32(26).string(message.swapFee); } return writer; }, @@ -188,7 +187,7 @@ export const CalcOutAmtGivenIn = { message.tokenOutDenom = reader.string(); break; case 3: - message.swapFee = Decimal.fromAtomics(reader.string(), 18).toString(); + message.swapFee = reader.string(); break; default: reader.skipType(tag & 7); @@ -391,7 +390,7 @@ export const CalcInAmtGivenOut = { writer.uint32(18).string(message.tokenInDenom); } if (message.swapFee !== "") { - writer.uint32(26).string(Decimal.fromUserInput(message.swapFee, 18).atomics); + writer.uint32(26).string(message.swapFee); } return writer; }, @@ -409,7 +408,7 @@ export const CalcInAmtGivenOut = { message.tokenInDenom = reader.string(); break; case 3: - message.swapFee = Decimal.fromAtomics(reader.string(), 18).toString(); + message.swapFee = reader.string(); break; default: reader.skipType(tag & 7); diff --git a/packages/protobuf/codegen/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.ts b/packages/protobuf/codegen/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.ts index 8bed93150..faeeb5993 100644 --- a/packages/protobuf/codegen/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.ts +++ b/packages/protobuf/codegen/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.ts @@ -1,6 +1,5 @@ import { Coin, CoinAmino, CoinSDKType } from "../../../../cosmos/base/v1beta1/coin"; import { BinaryReader, BinaryWriter } from "../../../../binary"; -import { Decimal } from "@cosmjs/math"; /** ===================== SwapExactAmountIn */ export interface SwapExactAmountIn { sender: string; @@ -206,7 +205,7 @@ export const SwapExactAmountIn = { writer.uint32(34).string(message.tokenOutMinAmount); } if (message.swapFee !== "") { - writer.uint32(42).string(Decimal.fromUserInput(message.swapFee, 18).atomics); + writer.uint32(42).string(message.swapFee); } return writer; }, @@ -230,7 +229,7 @@ export const SwapExactAmountIn = { message.tokenOutMinAmount = reader.string(); break; case 5: - message.swapFee = Decimal.fromAtomics(reader.string(), 18).toString(); + message.swapFee = reader.string(); break; default: reader.skipType(tag & 7); @@ -447,7 +446,7 @@ export const SwapExactAmountOut = { writer.uint32(34).string(message.tokenInMaxAmount); } if (message.swapFee !== "") { - writer.uint32(42).string(Decimal.fromUserInput(message.swapFee, 18).atomics); + writer.uint32(42).string(message.swapFee); } return writer; }, @@ -471,7 +470,7 @@ export const SwapExactAmountOut = { message.tokenInMaxAmount = reader.string(); break; case 5: - message.swapFee = Decimal.fromAtomics(reader.string(), 18).toString(); + message.swapFee = reader.string(); break; default: reader.skipType(tag & 7); diff --git a/packages/protobuf/codegen/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.ts b/packages/protobuf/codegen/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.ts index d969f466b..1596ce478 100644 --- a/packages/protobuf/codegen/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.ts +++ b/packages/protobuf/codegen/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.ts @@ -1,6 +1,5 @@ import { Coin, CoinAmino, CoinSDKType } from "../../../../cosmos/base/v1beta1/coin"; import { BinaryReader, BinaryWriter } from "../../../../binary"; -import { Decimal } from "@cosmjs/math"; /** ===================== GetSwapFeeQueryMsg */ export interface GetSwapFeeQueryMsg { /** get_swap_fee is the query strcuture to get swap fee. */ @@ -300,7 +299,7 @@ export const GetSwapFeeQueryMsgResponse = { typeUrl: "/osmosis.cosmwasmpool.v1beta1.GetSwapFeeQueryMsgResponse", encode(message: GetSwapFeeQueryMsgResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.swapFee !== "") { - writer.uint32(26).string(Decimal.fromUserInput(message.swapFee, 18).atomics); + writer.uint32(26).string(message.swapFee); } return writer; }, @@ -312,7 +311,7 @@ export const GetSwapFeeQueryMsgResponse = { const tag = reader.uint32(); switch (tag >>> 3) { case 3: - message.swapFee = Decimal.fromAtomics(reader.string(), 18).toString(); + message.swapFee = reader.string(); break; default: reader.skipType(tag & 7); diff --git a/packages/protobuf/codegen/osmosis/gamm/pool-models/balancer/balancerPool.ts b/packages/protobuf/codegen/osmosis/gamm/pool-models/balancer/balancerPool.ts index a29297dab..4c227d6ca 100644 --- a/packages/protobuf/codegen/osmosis/gamm/pool-models/balancer/balancerPool.ts +++ b/packages/protobuf/codegen/osmosis/gamm/pool-models/balancer/balancerPool.ts @@ -3,7 +3,6 @@ import { Duration, DurationAmino, DurationSDKType } from "../../../../google/pro import { Coin, CoinAmino, CoinSDKType } from "../../../../cosmos/base/v1beta1/coin"; import { BinaryReader, BinaryWriter } from "../../../../binary"; import { toTimestamp, fromTimestamp } from "../../../../helpers"; -import { Decimal } from "@cosmjs/math"; /** * Parameters for changing the weights in a balancer pool smoothly from * a start weight and end weight over a period of time. @@ -393,10 +392,10 @@ export const PoolParams = { typeUrl: "/osmosis.gamm.v1beta1.PoolParams", encode(message: PoolParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.swapFee !== "") { - writer.uint32(10).string(Decimal.fromUserInput(message.swapFee, 18).atomics); + writer.uint32(10).string(message.swapFee); } if (message.exitFee !== "") { - writer.uint32(18).string(Decimal.fromUserInput(message.exitFee, 18).atomics); + writer.uint32(18).string(message.exitFee); } if (message.smoothWeightChangeParams !== undefined) { SmoothWeightChangeParams.encode(message.smoothWeightChangeParams, writer.uint32(26).fork()).ldelim(); @@ -411,10 +410,10 @@ export const PoolParams = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.swapFee = Decimal.fromAtomics(reader.string(), 18).toString(); + message.swapFee = reader.string(); break; case 2: - message.exitFee = Decimal.fromAtomics(reader.string(), 18).toString(); + message.exitFee = reader.string(); break; case 3: message.smoothWeightChangeParams = SmoothWeightChangeParams.decode(reader, reader.uint32()); diff --git a/packages/protobuf/codegen/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts b/packages/protobuf/codegen/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts index e0323b9d9..2b41dfadf 100644 --- a/packages/protobuf/codegen/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts +++ b/packages/protobuf/codegen/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts @@ -1,6 +1,5 @@ import { Coin, CoinAmino, CoinSDKType } from "../../../../cosmos/base/v1beta1/coin"; import { BinaryReader, BinaryWriter } from "../../../../binary"; -import { Decimal } from "@cosmjs/math"; /** * PoolParams defined the parameters that will be managed by the pool * governance in the future. This params are not managed by the chain @@ -130,10 +129,10 @@ export const PoolParams = { typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.PoolParams", encode(message: PoolParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.swapFee !== "") { - writer.uint32(10).string(Decimal.fromUserInput(message.swapFee, 18).atomics); + writer.uint32(10).string(message.swapFee); } if (message.exitFee !== "") { - writer.uint32(18).string(Decimal.fromUserInput(message.exitFee, 18).atomics); + writer.uint32(18).string(message.exitFee); } return writer; }, @@ -145,10 +144,10 @@ export const PoolParams = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.swapFee = Decimal.fromAtomics(reader.string(), 18).toString(); + message.swapFee = reader.string(); break; case 2: - message.exitFee = Decimal.fromAtomics(reader.string(), 18).toString(); + message.exitFee = reader.string(); break; default: reader.skipType(tag & 7); diff --git a/packages/protobuf/codegen/osmosis/gamm/v1beta1/gov.ts b/packages/protobuf/codegen/osmosis/gamm/v1beta1/gov.ts index 0f94b66d7..6438d075b 100644 --- a/packages/protobuf/codegen/osmosis/gamm/v1beta1/gov.ts +++ b/packages/protobuf/codegen/osmosis/gamm/v1beta1/gov.ts @@ -102,6 +102,115 @@ export interface UpdateMigrationRecordsProposalSDKType { description: string; records: BalancerToConcentratedPoolLinkSDKType[]; } +export interface PoolRecordWithCFMMLink { + denom0: string; + denom1: string; + tickSpacing: bigint; + exponentAtPriceOne: string; + spreadFactor: string; + balancerPoolId: bigint; +} +export interface PoolRecordWithCFMMLinkProtoMsg { + typeUrl: "/osmosis.gamm.v1beta1.PoolRecordWithCFMMLink"; + value: Uint8Array; +} +export interface PoolRecordWithCFMMLinkAmino { + denom0: string; + denom1: string; + tick_spacing: string; + exponent_at_price_one: string; + spread_factor: string; + balancer_pool_id: string; +} +export interface PoolRecordWithCFMMLinkAminoMsg { + type: "osmosis/gamm/pool-record-with-cfmm-link"; + value: PoolRecordWithCFMMLinkAmino; +} +export interface PoolRecordWithCFMMLinkSDKType { + denom0: string; + denom1: string; + tick_spacing: bigint; + exponent_at_price_one: string; + spread_factor: string; + balancer_pool_id: bigint; +} +/** + * CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal is a gov Content type + * for creating concentrated liquidity pools and linking it to a CFMM pool. + */ +export interface CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal { + $typeUrl?: string; + title: string; + description: string; + poolRecordsWithCfmmLink: PoolRecordWithCFMMLink[]; +} +export interface CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalProtoMsg { + typeUrl: "/osmosis.gamm.v1beta1.CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal"; + value: Uint8Array; +} +/** + * CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal is a gov Content type + * for creating concentrated liquidity pools and linking it to a CFMM pool. + */ +export interface CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalAmino { + title: string; + description: string; + pool_records_with_cfmm_link: PoolRecordWithCFMMLinkAmino[]; +} +export interface CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalAminoMsg { + type: "osmosis/CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal"; + value: CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalAmino; +} +/** + * CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal is a gov Content type + * for creating concentrated liquidity pools and linking it to a CFMM pool. + */ +export interface CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalSDKType { + $typeUrl?: string; + title: string; + description: string; + pool_records_with_cfmm_link: PoolRecordWithCFMMLinkSDKType[]; +} +/** + * SetScalingFactorControllerProposal is a gov Content type for updating the + * scaling factor controller address of a stableswap pool + */ +export interface SetScalingFactorControllerProposal { + $typeUrl?: string; + title: string; + description: string; + poolId: bigint; + controllerAddress: string; +} +export interface SetScalingFactorControllerProposalProtoMsg { + typeUrl: "/osmosis.gamm.v1beta1.SetScalingFactorControllerProposal"; + value: Uint8Array; +} +/** + * SetScalingFactorControllerProposal is a gov Content type for updating the + * scaling factor controller address of a stableswap pool + */ +export interface SetScalingFactorControllerProposalAmino { + title: string; + description: string; + pool_id: string; + controller_address: string; +} +export interface SetScalingFactorControllerProposalAminoMsg { + type: "osmosis/SetScalingFactorControllerProposal"; + value: SetScalingFactorControllerProposalAmino; +} +/** + * SetScalingFactorControllerProposal is a gov Content type for updating the + * scaling factor controller address of a stableswap pool + */ +export interface SetScalingFactorControllerProposalSDKType { + $typeUrl?: string; + title: string; + description: string; + pool_id: bigint; + controller_address: string; +} function createBaseReplaceMigrationRecordsProposal(): ReplaceMigrationRecordsProposal { return { $typeUrl: "/osmosis.gamm.v1beta1.ReplaceMigrationRecordsProposal", @@ -285,4 +394,311 @@ export const UpdateMigrationRecordsProposal = { value: UpdateMigrationRecordsProposal.encode(message).finish() }; } +}; +function createBasePoolRecordWithCFMMLink(): PoolRecordWithCFMMLink { + return { + denom0: "", + denom1: "", + tickSpacing: BigInt(0), + exponentAtPriceOne: "", + spreadFactor: "", + balancerPoolId: BigInt(0) + }; +} +export const PoolRecordWithCFMMLink = { + typeUrl: "/osmosis.gamm.v1beta1.PoolRecordWithCFMMLink", + encode(message: PoolRecordWithCFMMLink, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.denom0 !== "") { + writer.uint32(10).string(message.denom0); + } + if (message.denom1 !== "") { + writer.uint32(18).string(message.denom1); + } + if (message.tickSpacing !== BigInt(0)) { + writer.uint32(24).uint64(message.tickSpacing); + } + if (message.exponentAtPriceOne !== "") { + writer.uint32(34).string(message.exponentAtPriceOne); + } + if (message.spreadFactor !== "") { + writer.uint32(42).string(message.spreadFactor); + } + if (message.balancerPoolId !== BigInt(0)) { + writer.uint32(48).uint64(message.balancerPoolId); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): PoolRecordWithCFMMLink { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBasePoolRecordWithCFMMLink(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.denom0 = reader.string(); + break; + case 2: + message.denom1 = reader.string(); + break; + case 3: + message.tickSpacing = reader.uint64(); + break; + case 4: + message.exponentAtPriceOne = reader.string(); + break; + case 5: + message.spreadFactor = reader.string(); + break; + case 6: + message.balancerPoolId = reader.uint64(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): PoolRecordWithCFMMLink { + const message = createBasePoolRecordWithCFMMLink(); + message.denom0 = object.denom0 ?? ""; + message.denom1 = object.denom1 ?? ""; + message.tickSpacing = object.tickSpacing !== undefined && object.tickSpacing !== null ? BigInt(object.tickSpacing.toString()) : BigInt(0); + message.exponentAtPriceOne = object.exponentAtPriceOne ?? ""; + message.spreadFactor = object.spreadFactor ?? ""; + message.balancerPoolId = object.balancerPoolId !== undefined && object.balancerPoolId !== null ? BigInt(object.balancerPoolId.toString()) : BigInt(0); + return message; + }, + fromAmino(object: PoolRecordWithCFMMLinkAmino): PoolRecordWithCFMMLink { + return { + denom0: object.denom0, + denom1: object.denom1, + tickSpacing: BigInt(object.tick_spacing), + exponentAtPriceOne: object.exponent_at_price_one, + spreadFactor: object.spread_factor, + balancerPoolId: BigInt(object.balancer_pool_id) + }; + }, + toAmino(message: PoolRecordWithCFMMLink): PoolRecordWithCFMMLinkAmino { + const obj: any = {}; + obj.denom0 = message.denom0; + obj.denom1 = message.denom1; + obj.tick_spacing = message.tickSpacing ? message.tickSpacing.toString() : undefined; + obj.exponent_at_price_one = message.exponentAtPriceOne; + obj.spread_factor = message.spreadFactor; + obj.balancer_pool_id = message.balancerPoolId ? message.balancerPoolId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: PoolRecordWithCFMMLinkAminoMsg): PoolRecordWithCFMMLink { + return PoolRecordWithCFMMLink.fromAmino(object.value); + }, + toAminoMsg(message: PoolRecordWithCFMMLink): PoolRecordWithCFMMLinkAminoMsg { + return { + type: "osmosis/gamm/pool-record-with-cfmm-link", + value: PoolRecordWithCFMMLink.toAmino(message) + }; + }, + fromProtoMsg(message: PoolRecordWithCFMMLinkProtoMsg): PoolRecordWithCFMMLink { + return PoolRecordWithCFMMLink.decode(message.value); + }, + toProto(message: PoolRecordWithCFMMLink): Uint8Array { + return PoolRecordWithCFMMLink.encode(message).finish(); + }, + toProtoMsg(message: PoolRecordWithCFMMLink): PoolRecordWithCFMMLinkProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.PoolRecordWithCFMMLink", + value: PoolRecordWithCFMMLink.encode(message).finish() + }; + } +}; +function createBaseCreateConcentratedLiquidityPoolsAndLinktoCFMMProposal(): CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal { + return { + $typeUrl: "/osmosis.gamm.v1beta1.CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal", + title: "", + description: "", + poolRecordsWithCfmmLink: [] + }; +} +export const CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal = { + typeUrl: "/osmosis.gamm.v1beta1.CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal", + encode(message: CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.title !== "") { + writer.uint32(10).string(message.title); + } + if (message.description !== "") { + writer.uint32(18).string(message.description); + } + for (const v of message.poolRecordsWithCfmmLink) { + PoolRecordWithCFMMLink.encode(v!, writer.uint32(26).fork()).ldelim(); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseCreateConcentratedLiquidityPoolsAndLinktoCFMMProposal(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.title = reader.string(); + break; + case 2: + message.description = reader.string(); + break; + case 3: + message.poolRecordsWithCfmmLink.push(PoolRecordWithCFMMLink.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal { + const message = createBaseCreateConcentratedLiquidityPoolsAndLinktoCFMMProposal(); + message.title = object.title ?? ""; + message.description = object.description ?? ""; + message.poolRecordsWithCfmmLink = object.poolRecordsWithCfmmLink?.map(e => PoolRecordWithCFMMLink.fromPartial(e)) || []; + return message; + }, + fromAmino(object: CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalAmino): CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal { + return { + title: object.title, + description: object.description, + poolRecordsWithCfmmLink: Array.isArray(object?.pool_records_with_cfmm_link) ? object.pool_records_with_cfmm_link.map((e: any) => PoolRecordWithCFMMLink.fromAmino(e)) : [] + }; + }, + toAmino(message: CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal): CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + if (message.poolRecordsWithCfmmLink) { + obj.pool_records_with_cfmm_link = message.poolRecordsWithCfmmLink.map(e => e ? PoolRecordWithCFMMLink.toAmino(e) : undefined); + } else { + obj.pool_records_with_cfmm_link = []; + } + return obj; + }, + fromAminoMsg(object: CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalAminoMsg): CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal { + return CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.fromAmino(object.value); + }, + toAminoMsg(message: CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal): CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalAminoMsg { + return { + type: "osmosis/CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal", + value: CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.toAmino(message) + }; + }, + fromProtoMsg(message: CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalProtoMsg): CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal { + return CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.decode(message.value); + }, + toProto(message: CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal): Uint8Array { + return CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.encode(message).finish(); + }, + toProtoMsg(message: CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal): CreateConcentratedLiquidityPoolsAndLinktoCFMMProposalProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal", + value: CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal.encode(message).finish() + }; + } +}; +function createBaseSetScalingFactorControllerProposal(): SetScalingFactorControllerProposal { + return { + $typeUrl: "/osmosis.gamm.v1beta1.SetScalingFactorControllerProposal", + title: "", + description: "", + poolId: BigInt(0), + controllerAddress: "" + }; +} +export const SetScalingFactorControllerProposal = { + typeUrl: "/osmosis.gamm.v1beta1.SetScalingFactorControllerProposal", + encode(message: SetScalingFactorControllerProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.title !== "") { + writer.uint32(10).string(message.title); + } + if (message.description !== "") { + writer.uint32(18).string(message.description); + } + if (message.poolId !== BigInt(0)) { + writer.uint32(24).uint64(message.poolId); + } + if (message.controllerAddress !== "") { + writer.uint32(34).string(message.controllerAddress); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): SetScalingFactorControllerProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseSetScalingFactorControllerProposal(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.title = reader.string(); + break; + case 2: + message.description = reader.string(); + break; + case 3: + message.poolId = reader.uint64(); + break; + case 4: + message.controllerAddress = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): SetScalingFactorControllerProposal { + const message = createBaseSetScalingFactorControllerProposal(); + message.title = object.title ?? ""; + message.description = object.description ?? ""; + message.poolId = object.poolId !== undefined && object.poolId !== null ? BigInt(object.poolId.toString()) : BigInt(0); + message.controllerAddress = object.controllerAddress ?? ""; + return message; + }, + fromAmino(object: SetScalingFactorControllerProposalAmino): SetScalingFactorControllerProposal { + return { + title: object.title, + description: object.description, + poolId: BigInt(object.pool_id), + controllerAddress: object.controller_address + }; + }, + toAmino(message: SetScalingFactorControllerProposal): SetScalingFactorControllerProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.controller_address = message.controllerAddress; + return obj; + }, + fromAminoMsg(object: SetScalingFactorControllerProposalAminoMsg): SetScalingFactorControllerProposal { + return SetScalingFactorControllerProposal.fromAmino(object.value); + }, + toAminoMsg(message: SetScalingFactorControllerProposal): SetScalingFactorControllerProposalAminoMsg { + return { + type: "osmosis/SetScalingFactorControllerProposal", + value: SetScalingFactorControllerProposal.toAmino(message) + }; + }, + fromProtoMsg(message: SetScalingFactorControllerProposalProtoMsg): SetScalingFactorControllerProposal { + return SetScalingFactorControllerProposal.decode(message.value); + }, + toProto(message: SetScalingFactorControllerProposal): Uint8Array { + return SetScalingFactorControllerProposal.encode(message).finish(); + }, + toProtoMsg(message: SetScalingFactorControllerProposal): SetScalingFactorControllerProposalProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.SetScalingFactorControllerProposal", + value: SetScalingFactorControllerProposal.encode(message).finish() + }; + } }; \ No newline at end of file diff --git a/packages/protobuf/codegen/osmosis/gamm/v1beta1/query.rpc.Query.ts b/packages/protobuf/codegen/osmosis/gamm/v1beta1/query.rpc.Query.ts index dcf490d8b..3c061928b 100644 --- a/packages/protobuf/codegen/osmosis/gamm/v1beta1/query.rpc.Query.ts +++ b/packages/protobuf/codegen/osmosis/gamm/v1beta1/query.rpc.Query.ts @@ -1,7 +1,7 @@ import { Rpc } from "../../../helpers"; import { BinaryReader } from "../../../binary"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryPoolsRequest, QueryPoolsResponse, QueryNumPoolsRequest, QueryNumPoolsResponse, QueryTotalLiquidityRequest, QueryTotalLiquidityResponse, QueryPoolsWithFilterRequest, QueryPoolsWithFilterResponse, QueryPoolRequest, QueryPoolResponse, QueryPoolTypeRequest, QueryPoolTypeResponse, QueryCalcJoinPoolNoSwapSharesRequest, QueryCalcJoinPoolNoSwapSharesResponse, QueryCalcJoinPoolSharesRequest, QueryCalcJoinPoolSharesResponse, QueryCalcExitPoolCoinsFromSharesRequest, QueryCalcExitPoolCoinsFromSharesResponse, QueryPoolParamsRequest, QueryPoolParamsResponse, QueryTotalPoolLiquidityRequest, QueryTotalPoolLiquidityResponse, QueryTotalSharesRequest, QueryTotalSharesResponse, QuerySpotPriceRequest, QuerySpotPriceResponse, QuerySwapExactAmountInRequest, QuerySwapExactAmountInResponse, QuerySwapExactAmountOutRequest, QuerySwapExactAmountOutResponse, QueryConcentratedPoolIdLinkFromCFMMRequest, QueryConcentratedPoolIdLinkFromCFMMResponse } from "./query"; +import { QueryPoolsRequest, QueryPoolsResponse, QueryNumPoolsRequest, QueryNumPoolsResponse, QueryTotalLiquidityRequest, QueryTotalLiquidityResponse, QueryPoolsWithFilterRequest, QueryPoolsWithFilterResponse, QueryPoolRequest, QueryPoolResponse, QueryPoolTypeRequest, QueryPoolTypeResponse, QueryCalcJoinPoolNoSwapSharesRequest, QueryCalcJoinPoolNoSwapSharesResponse, QueryCalcJoinPoolSharesRequest, QueryCalcJoinPoolSharesResponse, QueryCalcExitPoolCoinsFromSharesRequest, QueryCalcExitPoolCoinsFromSharesResponse, QueryPoolParamsRequest, QueryPoolParamsResponse, QueryTotalPoolLiquidityRequest, QueryTotalPoolLiquidityResponse, QueryTotalSharesRequest, QueryTotalSharesResponse, QuerySpotPriceRequest, QuerySpotPriceResponse, QuerySwapExactAmountInRequest, QuerySwapExactAmountInResponse, QuerySwapExactAmountOutRequest, QuerySwapExactAmountOutResponse, QueryConcentratedPoolIdLinkFromCFMMRequest, QueryConcentratedPoolIdLinkFromCFMMResponse, QueryCFMMConcentratedPoolLinksRequest, QueryCFMMConcentratedPoolLinksResponse } from "./query"; export interface Query { pools(request?: QueryPoolsRequest): Promise; /** Deprecated: please use the alternative in x/poolmanager */ @@ -45,6 +45,11 @@ export interface Query { * pool that is linked with the given CFMM pool. */ concentratedPoolIdLinkFromCFMM(request: QueryConcentratedPoolIdLinkFromCFMMRequest): Promise; + /** + * CFMMConcentratedPoolLinks returns migration links between CFMM and + * Concentrated pools. + */ + cFMMConcentratedPoolLinks(request?: QueryCFMMConcentratedPoolLinksRequest): Promise; } export class QueryClientImpl implements Query { private readonly rpc: Rpc; @@ -66,6 +71,7 @@ export class QueryClientImpl implements Query { this.estimateSwapExactAmountIn = this.estimateSwapExactAmountIn.bind(this); this.estimateSwapExactAmountOut = this.estimateSwapExactAmountOut.bind(this); this.concentratedPoolIdLinkFromCFMM = this.concentratedPoolIdLinkFromCFMM.bind(this); + this.cFMMConcentratedPoolLinks = this.cFMMConcentratedPoolLinks.bind(this); } pools(request: QueryPoolsRequest = { pagination: undefined @@ -149,6 +155,11 @@ export class QueryClientImpl implements Query { const promise = this.rpc.request("osmosis.gamm.v1beta1.Query", "ConcentratedPoolIdLinkFromCFMM", data); return promise.then(data => QueryConcentratedPoolIdLinkFromCFMMResponse.decode(new BinaryReader(data))); } + cFMMConcentratedPoolLinks(request: QueryCFMMConcentratedPoolLinksRequest = {}): Promise { + const data = QueryCFMMConcentratedPoolLinksRequest.encode(request).finish(); + const promise = this.rpc.request("osmosis.gamm.v1beta1.Query", "CFMMConcentratedPoolLinks", data); + return promise.then(data => QueryCFMMConcentratedPoolLinksResponse.decode(new BinaryReader(data))); + } } export const createRpcQueryExtension = (base: QueryClient) => { const rpc = createProtobufRpcClient(base); @@ -201,6 +212,9 @@ export const createRpcQueryExtension = (base: QueryClient) => { }, concentratedPoolIdLinkFromCFMM(request: QueryConcentratedPoolIdLinkFromCFMMRequest): Promise { return queryService.concentratedPoolIdLinkFromCFMM(request); + }, + cFMMConcentratedPoolLinks(request?: QueryCFMMConcentratedPoolLinksRequest): Promise { + return queryService.cFMMConcentratedPoolLinks(request); } }; }; \ No newline at end of file diff --git a/packages/protobuf/codegen/osmosis/gamm/v1beta1/query.ts b/packages/protobuf/codegen/osmosis/gamm/v1beta1/query.ts index a6ad4d707..ce33cdc81 100644 --- a/packages/protobuf/codegen/osmosis/gamm/v1beta1/query.ts +++ b/packages/protobuf/codegen/osmosis/gamm/v1beta1/query.ts @@ -3,6 +3,7 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageRe import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { SwapAmountInRoute, SwapAmountInRouteAmino, SwapAmountInRouteSDKType, SwapAmountOutRoute, SwapAmountOutRouteAmino, SwapAmountOutRouteSDKType } from "../../poolmanager/v1beta1/swap_route"; import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; +import { MigrationRecords, MigrationRecordsAmino, MigrationRecordsSDKType } from "./shared"; import { Pool as Pool1 } from "../../concentrated-liquidity/pool"; import { PoolProtoMsg as Pool1ProtoMsg } from "../../concentrated-liquidity/pool"; import { PoolSDKType as Pool1SDKType } from "../../concentrated-liquidity/pool"; @@ -745,6 +746,37 @@ export interface QueryConcentratedPoolIdLinkFromCFMMResponseAminoMsg { export interface QueryConcentratedPoolIdLinkFromCFMMResponseSDKType { concentrated_pool_id: bigint; } +/** =============================== QueryCFMMConcentratedPoolLinks */ +export interface QueryCFMMConcentratedPoolLinksRequest {} +export interface QueryCFMMConcentratedPoolLinksRequestProtoMsg { + typeUrl: "/osmosis.gamm.v1beta1.QueryCFMMConcentratedPoolLinksRequest"; + value: Uint8Array; +} +/** =============================== QueryCFMMConcentratedPoolLinks */ +export interface QueryCFMMConcentratedPoolLinksRequestAmino {} +export interface QueryCFMMConcentratedPoolLinksRequestAminoMsg { + type: "osmosis/gamm/query-cfmm-concentrated-pool-links-request"; + value: QueryCFMMConcentratedPoolLinksRequestAmino; +} +/** =============================== QueryCFMMConcentratedPoolLinks */ +export interface QueryCFMMConcentratedPoolLinksRequestSDKType {} +export interface QueryCFMMConcentratedPoolLinksResponse { + migrationRecords: MigrationRecords | undefined; +} +export interface QueryCFMMConcentratedPoolLinksResponseProtoMsg { + typeUrl: "/osmosis.gamm.v1beta1.QueryCFMMConcentratedPoolLinksResponse"; + value: Uint8Array; +} +export interface QueryCFMMConcentratedPoolLinksResponseAmino { + migration_records?: MigrationRecordsAmino | undefined; +} +export interface QueryCFMMConcentratedPoolLinksResponseAminoMsg { + type: "osmosis/gamm/query-cfmm-concentrated-pool-links-response"; + value: QueryCFMMConcentratedPoolLinksResponseAmino; +} +export interface QueryCFMMConcentratedPoolLinksResponseSDKType { + migration_records: MigrationRecordsSDKType | undefined; +} function createBaseQueryPoolRequest(): QueryPoolRequest { return { poolId: BigInt(0) @@ -3079,6 +3111,128 @@ export const QueryConcentratedPoolIdLinkFromCFMMResponse = { }; } }; +function createBaseQueryCFMMConcentratedPoolLinksRequest(): QueryCFMMConcentratedPoolLinksRequest { + return {}; +} +export const QueryCFMMConcentratedPoolLinksRequest = { + typeUrl: "/osmosis.gamm.v1beta1.QueryCFMMConcentratedPoolLinksRequest", + encode(_: QueryCFMMConcentratedPoolLinksRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): QueryCFMMConcentratedPoolLinksRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseQueryCFMMConcentratedPoolLinksRequest(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(_: Partial): QueryCFMMConcentratedPoolLinksRequest { + const message = createBaseQueryCFMMConcentratedPoolLinksRequest(); + return message; + }, + fromAmino(_: QueryCFMMConcentratedPoolLinksRequestAmino): QueryCFMMConcentratedPoolLinksRequest { + return {}; + }, + toAmino(_: QueryCFMMConcentratedPoolLinksRequest): QueryCFMMConcentratedPoolLinksRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryCFMMConcentratedPoolLinksRequestAminoMsg): QueryCFMMConcentratedPoolLinksRequest { + return QueryCFMMConcentratedPoolLinksRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryCFMMConcentratedPoolLinksRequest): QueryCFMMConcentratedPoolLinksRequestAminoMsg { + return { + type: "osmosis/gamm/query-cfmm-concentrated-pool-links-request", + value: QueryCFMMConcentratedPoolLinksRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCFMMConcentratedPoolLinksRequestProtoMsg): QueryCFMMConcentratedPoolLinksRequest { + return QueryCFMMConcentratedPoolLinksRequest.decode(message.value); + }, + toProto(message: QueryCFMMConcentratedPoolLinksRequest): Uint8Array { + return QueryCFMMConcentratedPoolLinksRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryCFMMConcentratedPoolLinksRequest): QueryCFMMConcentratedPoolLinksRequestProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryCFMMConcentratedPoolLinksRequest", + value: QueryCFMMConcentratedPoolLinksRequest.encode(message).finish() + }; + } +}; +function createBaseQueryCFMMConcentratedPoolLinksResponse(): QueryCFMMConcentratedPoolLinksResponse { + return { + migrationRecords: MigrationRecords.fromPartial({}) + }; +} +export const QueryCFMMConcentratedPoolLinksResponse = { + typeUrl: "/osmosis.gamm.v1beta1.QueryCFMMConcentratedPoolLinksResponse", + encode(message: QueryCFMMConcentratedPoolLinksResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.migrationRecords !== undefined) { + MigrationRecords.encode(message.migrationRecords, writer.uint32(10).fork()).ldelim(); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): QueryCFMMConcentratedPoolLinksResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseQueryCFMMConcentratedPoolLinksResponse(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.migrationRecords = MigrationRecords.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): QueryCFMMConcentratedPoolLinksResponse { + const message = createBaseQueryCFMMConcentratedPoolLinksResponse(); + message.migrationRecords = object.migrationRecords !== undefined && object.migrationRecords !== null ? MigrationRecords.fromPartial(object.migrationRecords) : undefined; + return message; + }, + fromAmino(object: QueryCFMMConcentratedPoolLinksResponseAmino): QueryCFMMConcentratedPoolLinksResponse { + return { + migrationRecords: object?.migration_records ? MigrationRecords.fromAmino(object.migration_records) : undefined + }; + }, + toAmino(message: QueryCFMMConcentratedPoolLinksResponse): QueryCFMMConcentratedPoolLinksResponseAmino { + const obj: any = {}; + obj.migration_records = message.migrationRecords ? MigrationRecords.toAmino(message.migrationRecords) : undefined; + return obj; + }, + fromAminoMsg(object: QueryCFMMConcentratedPoolLinksResponseAminoMsg): QueryCFMMConcentratedPoolLinksResponse { + return QueryCFMMConcentratedPoolLinksResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryCFMMConcentratedPoolLinksResponse): QueryCFMMConcentratedPoolLinksResponseAminoMsg { + return { + type: "osmosis/gamm/query-cfmm-concentrated-pool-links-response", + value: QueryCFMMConcentratedPoolLinksResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCFMMConcentratedPoolLinksResponseProtoMsg): QueryCFMMConcentratedPoolLinksResponse { + return QueryCFMMConcentratedPoolLinksResponse.decode(message.value); + }, + toProto(message: QueryCFMMConcentratedPoolLinksResponse): Uint8Array { + return QueryCFMMConcentratedPoolLinksResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryCFMMConcentratedPoolLinksResponse): QueryCFMMConcentratedPoolLinksResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryCFMMConcentratedPoolLinksResponse", + value: QueryCFMMConcentratedPoolLinksResponse.encode(message).finish() + }; + } +}; export const PoolI_InterfaceDecoder = (input: BinaryReader | Uint8Array): Pool1 | CosmWasmPool | Pool2 | Pool3 | Any => { const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); diff --git a/packages/protobuf/codegen/osmosis/lockup/tx.amino.ts b/packages/protobuf/codegen/osmosis/lockup/tx.amino.ts index 7a272fbe8..3a607539b 100644 --- a/packages/protobuf/codegen/osmosis/lockup/tx.amino.ts +++ b/packages/protobuf/codegen/osmosis/lockup/tx.amino.ts @@ -21,7 +21,7 @@ export const AminoConverter = { fromAmino: MsgExtendLockup.fromAmino }, "/osmosis.lockup.MsgForceUnlock": { - aminoType: "osmosis/lockup/force-unlock", + aminoType: "osmosis/lockup/force-unlock-tokens", toAmino: MsgForceUnlock.toAmino, fromAmino: MsgForceUnlock.fromAmino }, diff --git a/packages/protobuf/codegen/osmosis/lockup/tx.ts b/packages/protobuf/codegen/osmosis/lockup/tx.ts index efdbd3a9c..d2dc13ded 100644 --- a/packages/protobuf/codegen/osmosis/lockup/tx.ts +++ b/packages/protobuf/codegen/osmosis/lockup/tx.ts @@ -207,7 +207,7 @@ export interface MsgForceUnlockAmino { coins: CoinAmino[]; } export interface MsgForceUnlockAminoMsg { - type: "osmosis/lockup/force-unlock"; + type: "osmosis/lockup/force-unlock-tokens"; value: MsgForceUnlockAmino; } /** @@ -968,7 +968,7 @@ export const MsgForceUnlock = { }, toAminoMsg(message: MsgForceUnlock): MsgForceUnlockAminoMsg { return { - type: "osmosis/lockup/force-unlock", + type: "osmosis/lockup/force-unlock-tokens", value: MsgForceUnlock.toAmino(message) }; }, diff --git a/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/genesis.ts b/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/genesis.ts index 1a271df91..a0e6242d1 100644 --- a/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/genesis.ts +++ b/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/genesis.ts @@ -5,6 +5,19 @@ import { BinaryReader, BinaryWriter } from "../../../binary"; /** Params holds parameters for the poolmanager module */ export interface Params { poolCreationFee: Coin[]; + /** taker_fee_params is the container of taker fee parameters. */ + takerFeeParams: TakerFeeParams | undefined; + /** + * authorized_quote_denoms is a list of quote denoms that can be used as + * token1 when creating a concentrated pool. We limit the quote assets to a + * small set for the purposes of having convinient price increments stemming + * from tick to price conversion. These increments are in a human readable + * magnitude only for token1 as a quote. For limit orders in the future, this + * will be a desirable property in terms of UX as to allow users to set limit + * orders at prices in terms of token1 (quote asset) that are easy to reason + * about. + */ + authorizedQuoteDenoms: string[]; } export interface ParamsProtoMsg { typeUrl: "/osmosis.poolmanager.v1beta1.Params"; @@ -13,6 +26,19 @@ export interface ParamsProtoMsg { /** Params holds parameters for the poolmanager module */ export interface ParamsAmino { pool_creation_fee: CoinAmino[]; + /** taker_fee_params is the container of taker fee parameters. */ + taker_fee_params?: TakerFeeParamsAmino | undefined; + /** + * authorized_quote_denoms is a list of quote denoms that can be used as + * token1 when creating a concentrated pool. We limit the quote assets to a + * small set for the purposes of having convinient price increments stemming + * from tick to price conversion. These increments are in a human readable + * magnitude only for token1 as a quote. For limit orders in the future, this + * will be a desirable property in terms of UX as to allow users to set limit + * orders at prices in terms of token1 (quote asset) that are easy to reason + * about. + */ + authorized_quote_denoms: string[]; } export interface ParamsAminoMsg { type: "osmosis/poolmanager/params"; @@ -21,6 +47,8 @@ export interface ParamsAminoMsg { /** Params holds parameters for the poolmanager module */ export interface ParamsSDKType { pool_creation_fee: CoinSDKType[]; + taker_fee_params: TakerFeeParamsSDKType | undefined; + authorized_quote_denoms: string[]; } /** GenesisState defines the poolmanager module's genesis state. */ export interface GenesisState { @@ -54,9 +82,143 @@ export interface GenesisStateSDKType { params: ParamsSDKType | undefined; pool_routes: ModuleRouteSDKType[]; } +/** TakerFeeParams consolidates the taker fee parameters for the poolmanager. */ +export interface TakerFeeParams { + /** + * default_taker_fee is the fee used when creating a new pool that doesn't + * fall under a custom pool taker fee or stableswap taker fee category. + */ + defaultTakerFee: string; + /** + * osmo_taker_fee_distribution defines the distribution of taker fees + * generated in OSMO. As of this writing, it has two catagories: + * - staking_rewards: the percent of the taker fee that gets distributed to + * stakers. + * - community_pool: the percent of the taker fee that gets sent to the + * community pool. + */ + osmoTakerFeeDistribution: TakerFeeDistributionPercentage | undefined; + /** + * non_osmo_taker_fee_distribution defines the distribution of taker fees + * generated in non-OSMO. As of this writing, it has two categories: + * - staking_rewards: the percent of the taker fee that gets swapped to OSMO + * and then distirbuted to stakers. + * - community_pool: the percent of the taker fee that gets sent to the + * community pool. Note: If the non-OSMO asset is an authorized_quote_denom, + * that denom is sent directly to the community pool. Otherwise, it is + * swapped to the community_pool_denom_to_swap_non_whitelisted_assets_to and + * then sent to the community pool as that denom. + */ + nonOsmoTakerFeeDistribution: TakerFeeDistributionPercentage | undefined; + /** + * admin_addresses is a list of addresses that are allowed to set and remove + * custom taker fees for denom pairs. Governance also has the ability to set + * and remove custom taker fees for denom pairs, but with the normal + * governance delay. + */ + adminAddresses: string[]; + /** + * community_pool_denom_to_swap_non_whitelisted_assets_to is the denom that + * non-whitelisted taker fees will be swapped to before being sent to + * the community pool. + */ + communityPoolDenomToSwapNonWhitelistedAssetsTo: string; +} +export interface TakerFeeParamsProtoMsg { + typeUrl: "/osmosis.poolmanager.v1beta1.TakerFeeParams"; + value: Uint8Array; +} +/** TakerFeeParams consolidates the taker fee parameters for the poolmanager. */ +export interface TakerFeeParamsAmino { + /** + * default_taker_fee is the fee used when creating a new pool that doesn't + * fall under a custom pool taker fee or stableswap taker fee category. + */ + default_taker_fee: string; + /** + * osmo_taker_fee_distribution defines the distribution of taker fees + * generated in OSMO. As of this writing, it has two catagories: + * - staking_rewards: the percent of the taker fee that gets distributed to + * stakers. + * - community_pool: the percent of the taker fee that gets sent to the + * community pool. + */ + osmo_taker_fee_distribution?: TakerFeeDistributionPercentageAmino | undefined; + /** + * non_osmo_taker_fee_distribution defines the distribution of taker fees + * generated in non-OSMO. As of this writing, it has two categories: + * - staking_rewards: the percent of the taker fee that gets swapped to OSMO + * and then distirbuted to stakers. + * - community_pool: the percent of the taker fee that gets sent to the + * community pool. Note: If the non-OSMO asset is an authorized_quote_denom, + * that denom is sent directly to the community pool. Otherwise, it is + * swapped to the community_pool_denom_to_swap_non_whitelisted_assets_to and + * then sent to the community pool as that denom. + */ + non_osmo_taker_fee_distribution?: TakerFeeDistributionPercentageAmino | undefined; + /** + * admin_addresses is a list of addresses that are allowed to set and remove + * custom taker fees for denom pairs. Governance also has the ability to set + * and remove custom taker fees for denom pairs, but with the normal + * governance delay. + */ + admin_addresses: string[]; + /** + * community_pool_denom_to_swap_non_whitelisted_assets_to is the denom that + * non-whitelisted taker fees will be swapped to before being sent to + * the community pool. + */ + community_pool_denom_to_swap_non_whitelisted_assets_to: string; +} +export interface TakerFeeParamsAminoMsg { + type: "osmosis/poolmanager/taker-fee-params"; + value: TakerFeeParamsAmino; +} +/** TakerFeeParams consolidates the taker fee parameters for the poolmanager. */ +export interface TakerFeeParamsSDKType { + default_taker_fee: string; + osmo_taker_fee_distribution: TakerFeeDistributionPercentageSDKType | undefined; + non_osmo_taker_fee_distribution: TakerFeeDistributionPercentageSDKType | undefined; + admin_addresses: string[]; + community_pool_denom_to_swap_non_whitelisted_assets_to: string; +} +/** + * TakerFeeDistributionPercentage defines what percent of the taker fee category + * gets distributed to the available categories. + */ +export interface TakerFeeDistributionPercentage { + stakingRewards: string; + communityPool: string; +} +export interface TakerFeeDistributionPercentageProtoMsg { + typeUrl: "/osmosis.poolmanager.v1beta1.TakerFeeDistributionPercentage"; + value: Uint8Array; +} +/** + * TakerFeeDistributionPercentage defines what percent of the taker fee category + * gets distributed to the available categories. + */ +export interface TakerFeeDistributionPercentageAmino { + staking_rewards: string; + community_pool: string; +} +export interface TakerFeeDistributionPercentageAminoMsg { + type: "osmosis/poolmanager/taker-fee-distribution-percentage"; + value: TakerFeeDistributionPercentageAmino; +} +/** + * TakerFeeDistributionPercentage defines what percent of the taker fee category + * gets distributed to the available categories. + */ +export interface TakerFeeDistributionPercentageSDKType { + staking_rewards: string; + community_pool: string; +} function createBaseParams(): Params { return { - poolCreationFee: [] + poolCreationFee: [], + takerFeeParams: TakerFeeParams.fromPartial({}), + authorizedQuoteDenoms: [] }; } export const Params = { @@ -65,6 +227,12 @@ export const Params = { for (const v of message.poolCreationFee) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); } + if (message.takerFeeParams !== undefined) { + TakerFeeParams.encode(message.takerFeeParams, writer.uint32(18).fork()).ldelim(); + } + for (const v of message.authorizedQuoteDenoms) { + writer.uint32(26).string(v!); + } return writer; }, decode(input: BinaryReader | Uint8Array, length?: number): Params { @@ -77,6 +245,12 @@ export const Params = { case 1: message.poolCreationFee.push(Coin.decode(reader, reader.uint32())); break; + case 2: + message.takerFeeParams = TakerFeeParams.decode(reader, reader.uint32()); + break; + case 3: + message.authorizedQuoteDenoms.push(reader.string()); + break; default: reader.skipType(tag & 7); break; @@ -87,11 +261,15 @@ export const Params = { fromPartial(object: Partial): Params { const message = createBaseParams(); message.poolCreationFee = object.poolCreationFee?.map(e => Coin.fromPartial(e)) || []; + message.takerFeeParams = object.takerFeeParams !== undefined && object.takerFeeParams !== null ? TakerFeeParams.fromPartial(object.takerFeeParams) : undefined; + message.authorizedQuoteDenoms = object.authorizedQuoteDenoms?.map(e => e) || []; return message; }, fromAmino(object: ParamsAmino): Params { return { - poolCreationFee: Array.isArray(object?.pool_creation_fee) ? object.pool_creation_fee.map((e: any) => Coin.fromAmino(e)) : [] + poolCreationFee: Array.isArray(object?.pool_creation_fee) ? object.pool_creation_fee.map((e: any) => Coin.fromAmino(e)) : [], + takerFeeParams: object?.taker_fee_params ? TakerFeeParams.fromAmino(object.taker_fee_params) : undefined, + authorizedQuoteDenoms: Array.isArray(object?.authorized_quote_denoms) ? object.authorized_quote_denoms.map((e: any) => e) : [] }; }, toAmino(message: Params): ParamsAmino { @@ -101,6 +279,12 @@ export const Params = { } else { obj.pool_creation_fee = []; } + obj.taker_fee_params = message.takerFeeParams ? TakerFeeParams.toAmino(message.takerFeeParams) : undefined; + if (message.authorizedQuoteDenoms) { + obj.authorized_quote_denoms = message.authorizedQuoteDenoms.map(e => e); + } else { + obj.authorized_quote_denoms = []; + } return obj; }, fromAminoMsg(object: ParamsAminoMsg): Params { @@ -215,4 +399,192 @@ export const GenesisState = { value: GenesisState.encode(message).finish() }; } +}; +function createBaseTakerFeeParams(): TakerFeeParams { + return { + defaultTakerFee: "", + osmoTakerFeeDistribution: TakerFeeDistributionPercentage.fromPartial({}), + nonOsmoTakerFeeDistribution: TakerFeeDistributionPercentage.fromPartial({}), + adminAddresses: [], + communityPoolDenomToSwapNonWhitelistedAssetsTo: "" + }; +} +export const TakerFeeParams = { + typeUrl: "/osmosis.poolmanager.v1beta1.TakerFeeParams", + encode(message: TakerFeeParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.defaultTakerFee !== "") { + writer.uint32(10).string(message.defaultTakerFee); + } + if (message.osmoTakerFeeDistribution !== undefined) { + TakerFeeDistributionPercentage.encode(message.osmoTakerFeeDistribution, writer.uint32(18).fork()).ldelim(); + } + if (message.nonOsmoTakerFeeDistribution !== undefined) { + TakerFeeDistributionPercentage.encode(message.nonOsmoTakerFeeDistribution, writer.uint32(26).fork()).ldelim(); + } + for (const v of message.adminAddresses) { + writer.uint32(34).string(v!); + } + if (message.communityPoolDenomToSwapNonWhitelistedAssetsTo !== "") { + writer.uint32(42).string(message.communityPoolDenomToSwapNonWhitelistedAssetsTo); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): TakerFeeParams { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTakerFeeParams(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.defaultTakerFee = reader.string(); + break; + case 2: + message.osmoTakerFeeDistribution = TakerFeeDistributionPercentage.decode(reader, reader.uint32()); + break; + case 3: + message.nonOsmoTakerFeeDistribution = TakerFeeDistributionPercentage.decode(reader, reader.uint32()); + break; + case 4: + message.adminAddresses.push(reader.string()); + break; + case 5: + message.communityPoolDenomToSwapNonWhitelistedAssetsTo = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): TakerFeeParams { + const message = createBaseTakerFeeParams(); + message.defaultTakerFee = object.defaultTakerFee ?? ""; + message.osmoTakerFeeDistribution = object.osmoTakerFeeDistribution !== undefined && object.osmoTakerFeeDistribution !== null ? TakerFeeDistributionPercentage.fromPartial(object.osmoTakerFeeDistribution) : undefined; + message.nonOsmoTakerFeeDistribution = object.nonOsmoTakerFeeDistribution !== undefined && object.nonOsmoTakerFeeDistribution !== null ? TakerFeeDistributionPercentage.fromPartial(object.nonOsmoTakerFeeDistribution) : undefined; + message.adminAddresses = object.adminAddresses?.map(e => e) || []; + message.communityPoolDenomToSwapNonWhitelistedAssetsTo = object.communityPoolDenomToSwapNonWhitelistedAssetsTo ?? ""; + return message; + }, + fromAmino(object: TakerFeeParamsAmino): TakerFeeParams { + return { + defaultTakerFee: object.default_taker_fee, + osmoTakerFeeDistribution: object?.osmo_taker_fee_distribution ? TakerFeeDistributionPercentage.fromAmino(object.osmo_taker_fee_distribution) : undefined, + nonOsmoTakerFeeDistribution: object?.non_osmo_taker_fee_distribution ? TakerFeeDistributionPercentage.fromAmino(object.non_osmo_taker_fee_distribution) : undefined, + adminAddresses: Array.isArray(object?.admin_addresses) ? object.admin_addresses.map((e: any) => e) : [], + communityPoolDenomToSwapNonWhitelistedAssetsTo: object.community_pool_denom_to_swap_non_whitelisted_assets_to + }; + }, + toAmino(message: TakerFeeParams): TakerFeeParamsAmino { + const obj: any = {}; + obj.default_taker_fee = message.defaultTakerFee; + obj.osmo_taker_fee_distribution = message.osmoTakerFeeDistribution ? TakerFeeDistributionPercentage.toAmino(message.osmoTakerFeeDistribution) : undefined; + obj.non_osmo_taker_fee_distribution = message.nonOsmoTakerFeeDistribution ? TakerFeeDistributionPercentage.toAmino(message.nonOsmoTakerFeeDistribution) : undefined; + if (message.adminAddresses) { + obj.admin_addresses = message.adminAddresses.map(e => e); + } else { + obj.admin_addresses = []; + } + obj.community_pool_denom_to_swap_non_whitelisted_assets_to = message.communityPoolDenomToSwapNonWhitelistedAssetsTo; + return obj; + }, + fromAminoMsg(object: TakerFeeParamsAminoMsg): TakerFeeParams { + return TakerFeeParams.fromAmino(object.value); + }, + toAminoMsg(message: TakerFeeParams): TakerFeeParamsAminoMsg { + return { + type: "osmosis/poolmanager/taker-fee-params", + value: TakerFeeParams.toAmino(message) + }; + }, + fromProtoMsg(message: TakerFeeParamsProtoMsg): TakerFeeParams { + return TakerFeeParams.decode(message.value); + }, + toProto(message: TakerFeeParams): Uint8Array { + return TakerFeeParams.encode(message).finish(); + }, + toProtoMsg(message: TakerFeeParams): TakerFeeParamsProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.TakerFeeParams", + value: TakerFeeParams.encode(message).finish() + }; + } +}; +function createBaseTakerFeeDistributionPercentage(): TakerFeeDistributionPercentage { + return { + stakingRewards: "", + communityPool: "" + }; +} +export const TakerFeeDistributionPercentage = { + typeUrl: "/osmosis.poolmanager.v1beta1.TakerFeeDistributionPercentage", + encode(message: TakerFeeDistributionPercentage, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.stakingRewards !== "") { + writer.uint32(10).string(message.stakingRewards); + } + if (message.communityPool !== "") { + writer.uint32(18).string(message.communityPool); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): TakerFeeDistributionPercentage { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseTakerFeeDistributionPercentage(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.stakingRewards = reader.string(); + break; + case 2: + message.communityPool = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): TakerFeeDistributionPercentage { + const message = createBaseTakerFeeDistributionPercentage(); + message.stakingRewards = object.stakingRewards ?? ""; + message.communityPool = object.communityPool ?? ""; + return message; + }, + fromAmino(object: TakerFeeDistributionPercentageAmino): TakerFeeDistributionPercentage { + return { + stakingRewards: object.staking_rewards, + communityPool: object.community_pool + }; + }, + toAmino(message: TakerFeeDistributionPercentage): TakerFeeDistributionPercentageAmino { + const obj: any = {}; + obj.staking_rewards = message.stakingRewards; + obj.community_pool = message.communityPool; + return obj; + }, + fromAminoMsg(object: TakerFeeDistributionPercentageAminoMsg): TakerFeeDistributionPercentage { + return TakerFeeDistributionPercentage.fromAmino(object.value); + }, + toAminoMsg(message: TakerFeeDistributionPercentage): TakerFeeDistributionPercentageAminoMsg { + return { + type: "osmosis/poolmanager/taker-fee-distribution-percentage", + value: TakerFeeDistributionPercentage.toAmino(message) + }; + }, + fromProtoMsg(message: TakerFeeDistributionPercentageProtoMsg): TakerFeeDistributionPercentage { + return TakerFeeDistributionPercentage.decode(message.value); + }, + toProto(message: TakerFeeDistributionPercentage): Uint8Array { + return TakerFeeDistributionPercentage.encode(message).finish(); + }, + toProtoMsg(message: TakerFeeDistributionPercentage): TakerFeeDistributionPercentageProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.TakerFeeDistributionPercentage", + value: TakerFeeDistributionPercentage.encode(message).finish() + }; + } }; \ No newline at end of file diff --git a/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/gov.ts b/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/gov.ts new file mode 100644 index 000000000..d5f2f2c92 --- /dev/null +++ b/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/gov.ts @@ -0,0 +1,129 @@ +//@ts-nocheck +import { DenomPairTakerFee, DenomPairTakerFeeAmino, DenomPairTakerFeeSDKType } from "./tx"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +/** + * DenomPairTakerFeeProposal is a type for adding/removing a custom taker fee(s) + * for one or more denom pairs. + */ +export interface DenomPairTakerFeeProposal { + title: string; + description: string; + denomPairTakerFee: DenomPairTakerFee[]; +} +export interface DenomPairTakerFeeProposalProtoMsg { + typeUrl: "/osmosis.poolmanager.v1beta1.DenomPairTakerFeeProposal"; + value: Uint8Array; +} +/** + * DenomPairTakerFeeProposal is a type for adding/removing a custom taker fee(s) + * for one or more denom pairs. + */ +export interface DenomPairTakerFeeProposalAmino { + title: string; + description: string; + denom_pair_taker_fee: DenomPairTakerFeeAmino[]; +} +export interface DenomPairTakerFeeProposalAminoMsg { + type: "osmosis/poolmanager/denom-pair-taker-fee-proposal"; + value: DenomPairTakerFeeProposalAmino; +} +/** + * DenomPairTakerFeeProposal is a type for adding/removing a custom taker fee(s) + * for one or more denom pairs. + */ +export interface DenomPairTakerFeeProposalSDKType { + title: string; + description: string; + denom_pair_taker_fee: DenomPairTakerFeeSDKType[]; +} +function createBaseDenomPairTakerFeeProposal(): DenomPairTakerFeeProposal { + return { + title: "", + description: "", + denomPairTakerFee: [] + }; +} +export const DenomPairTakerFeeProposal = { + typeUrl: "/osmosis.poolmanager.v1beta1.DenomPairTakerFeeProposal", + encode(message: DenomPairTakerFeeProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.title !== "") { + writer.uint32(10).string(message.title); + } + if (message.description !== "") { + writer.uint32(18).string(message.description); + } + for (const v of message.denomPairTakerFee) { + DenomPairTakerFee.encode(v!, writer.uint32(26).fork()).ldelim(); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): DenomPairTakerFeeProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseDenomPairTakerFeeProposal(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.title = reader.string(); + break; + case 2: + message.description = reader.string(); + break; + case 3: + message.denomPairTakerFee.push(DenomPairTakerFee.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): DenomPairTakerFeeProposal { + const message = createBaseDenomPairTakerFeeProposal(); + message.title = object.title ?? ""; + message.description = object.description ?? ""; + message.denomPairTakerFee = object.denomPairTakerFee?.map(e => DenomPairTakerFee.fromPartial(e)) || []; + return message; + }, + fromAmino(object: DenomPairTakerFeeProposalAmino): DenomPairTakerFeeProposal { + return { + title: object.title, + description: object.description, + denomPairTakerFee: Array.isArray(object?.denom_pair_taker_fee) ? object.denom_pair_taker_fee.map((e: any) => DenomPairTakerFee.fromAmino(e)) : [] + }; + }, + toAmino(message: DenomPairTakerFeeProposal): DenomPairTakerFeeProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + if (message.denomPairTakerFee) { + obj.denom_pair_taker_fee = message.denomPairTakerFee.map(e => e ? DenomPairTakerFee.toAmino(e) : undefined); + } else { + obj.denom_pair_taker_fee = []; + } + return obj; + }, + fromAminoMsg(object: DenomPairTakerFeeProposalAminoMsg): DenomPairTakerFeeProposal { + return DenomPairTakerFeeProposal.fromAmino(object.value); + }, + toAminoMsg(message: DenomPairTakerFeeProposal): DenomPairTakerFeeProposalAminoMsg { + return { + type: "osmosis/poolmanager/denom-pair-taker-fee-proposal", + value: DenomPairTakerFeeProposal.toAmino(message) + }; + }, + fromProtoMsg(message: DenomPairTakerFeeProposalProtoMsg): DenomPairTakerFeeProposal { + return DenomPairTakerFeeProposal.decode(message.value); + }, + toProto(message: DenomPairTakerFeeProposal): Uint8Array { + return DenomPairTakerFeeProposal.encode(message).finish(); + }, + toProtoMsg(message: DenomPairTakerFeeProposal): DenomPairTakerFeeProposalProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.DenomPairTakerFeeProposal", + value: DenomPairTakerFeeProposal.encode(message).finish() + }; + } +}; \ No newline at end of file diff --git a/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/query.rpc.Query.ts b/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/query.rpc.Query.ts index d310f1aba..7ca704045 100644 --- a/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/query.rpc.Query.ts +++ b/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/query.rpc.Query.ts @@ -1,14 +1,29 @@ import { Rpc } from "../../../helpers"; import { BinaryReader } from "../../../binary"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { ParamsRequest, ParamsResponse, EstimateSwapExactAmountInRequest, EstimateSwapExactAmountInResponse, EstimateSinglePoolSwapExactAmountInRequest, EstimateSwapExactAmountOutRequest, EstimateSwapExactAmountOutResponse, EstimateSinglePoolSwapExactAmountOutRequest, NumPoolsRequest, NumPoolsResponse, PoolRequest, PoolResponse, AllPoolsRequest, AllPoolsResponse, SpotPriceRequest, SpotPriceResponse, TotalPoolLiquidityRequest, TotalPoolLiquidityResponse, TotalLiquidityRequest, TotalLiquidityResponse } from "./query"; +import { ParamsRequest, ParamsResponse, EstimateSwapExactAmountInRequest, EstimateSwapExactAmountInResponse, EstimateSwapExactAmountInWithPrimitiveTypesRequest, EstimateSinglePoolSwapExactAmountInRequest, EstimateSwapExactAmountOutRequest, EstimateSwapExactAmountOutResponse, EstimateSwapExactAmountOutWithPrimitiveTypesRequest, EstimateSinglePoolSwapExactAmountOutRequest, NumPoolsRequest, NumPoolsResponse, PoolRequest, PoolResponse, AllPoolsRequest, AllPoolsResponse, SpotPriceRequest, SpotPriceResponse, TotalPoolLiquidityRequest, TotalPoolLiquidityResponse, TotalLiquidityRequest, TotalLiquidityResponse } from "./query"; export interface Query { params(request?: ParamsRequest): Promise; /** Estimates swap amount out given in. */ estimateSwapExactAmountIn(request: EstimateSwapExactAmountInRequest): Promise; + /** + * EstimateSwapExactAmountInWithPrimitiveTypes is an alternative query for + * EstimateSwapExactAmountIn. Supports query via GRPC-Gateway by using + * primitive types instead of repeated structs. Each index in the + * routes_pool_id field corresponds to the respective routes_token_out_denom + * value, thus they are required to have the same length and are grouped + * together as pairs. + * example usage: + * http://0.0.0.0:1317/osmosis/poolmanager/v1beta1/1/estimate/ + * swap_exact_amount_in_with_primitive_types?token_in=100000stake&routes_token_out_denom=uatom + * &routes_token_out_denom=uion&routes_pool_id=1&routes_pool_id=2 + */ + estimateSwapExactAmountInWithPrimitiveTypes(request: EstimateSwapExactAmountInWithPrimitiveTypesRequest): Promise; estimateSinglePoolSwapExactAmountIn(request: EstimateSinglePoolSwapExactAmountInRequest): Promise; /** Estimates swap amount in given out. */ estimateSwapExactAmountOut(request: EstimateSwapExactAmountOutRequest): Promise; + /** Estimates swap amount in given out. */ + estimateSwapExactAmountOutWithPrimitiveTypes(request: EstimateSwapExactAmountOutWithPrimitiveTypesRequest): Promise; estimateSinglePoolSwapExactAmountOut(request: EstimateSinglePoolSwapExactAmountOutRequest): Promise; /** Returns the total number of pools existing in Osmosis. */ numPools(request?: NumPoolsRequest): Promise; @@ -32,8 +47,10 @@ export class QueryClientImpl implements Query { this.rpc = rpc; this.params = this.params.bind(this); this.estimateSwapExactAmountIn = this.estimateSwapExactAmountIn.bind(this); + this.estimateSwapExactAmountInWithPrimitiveTypes = this.estimateSwapExactAmountInWithPrimitiveTypes.bind(this); this.estimateSinglePoolSwapExactAmountIn = this.estimateSinglePoolSwapExactAmountIn.bind(this); this.estimateSwapExactAmountOut = this.estimateSwapExactAmountOut.bind(this); + this.estimateSwapExactAmountOutWithPrimitiveTypes = this.estimateSwapExactAmountOutWithPrimitiveTypes.bind(this); this.estimateSinglePoolSwapExactAmountOut = this.estimateSinglePoolSwapExactAmountOut.bind(this); this.numPools = this.numPools.bind(this); this.pool = this.pool.bind(this); @@ -52,6 +69,11 @@ export class QueryClientImpl implements Query { const promise = this.rpc.request("osmosis.poolmanager.v1beta1.Query", "EstimateSwapExactAmountIn", data); return promise.then(data => EstimateSwapExactAmountInResponse.decode(new BinaryReader(data))); } + estimateSwapExactAmountInWithPrimitiveTypes(request: EstimateSwapExactAmountInWithPrimitiveTypesRequest): Promise { + const data = EstimateSwapExactAmountInWithPrimitiveTypesRequest.encode(request).finish(); + const promise = this.rpc.request("osmosis.poolmanager.v1beta1.Query", "EstimateSwapExactAmountInWithPrimitiveTypes", data); + return promise.then(data => EstimateSwapExactAmountInResponse.decode(new BinaryReader(data))); + } estimateSinglePoolSwapExactAmountIn(request: EstimateSinglePoolSwapExactAmountInRequest): Promise { const data = EstimateSinglePoolSwapExactAmountInRequest.encode(request).finish(); const promise = this.rpc.request("osmosis.poolmanager.v1beta1.Query", "EstimateSinglePoolSwapExactAmountIn", data); @@ -62,6 +84,11 @@ export class QueryClientImpl implements Query { const promise = this.rpc.request("osmosis.poolmanager.v1beta1.Query", "EstimateSwapExactAmountOut", data); return promise.then(data => EstimateSwapExactAmountOutResponse.decode(new BinaryReader(data))); } + estimateSwapExactAmountOutWithPrimitiveTypes(request: EstimateSwapExactAmountOutWithPrimitiveTypesRequest): Promise { + const data = EstimateSwapExactAmountOutWithPrimitiveTypesRequest.encode(request).finish(); + const promise = this.rpc.request("osmosis.poolmanager.v1beta1.Query", "EstimateSwapExactAmountOutWithPrimitiveTypes", data); + return promise.then(data => EstimateSwapExactAmountOutResponse.decode(new BinaryReader(data))); + } estimateSinglePoolSwapExactAmountOut(request: EstimateSinglePoolSwapExactAmountOutRequest): Promise { const data = EstimateSinglePoolSwapExactAmountOutRequest.encode(request).finish(); const promise = this.rpc.request("osmosis.poolmanager.v1beta1.Query", "EstimateSinglePoolSwapExactAmountOut", data); @@ -108,12 +135,18 @@ export const createRpcQueryExtension = (base: QueryClient) => { estimateSwapExactAmountIn(request: EstimateSwapExactAmountInRequest): Promise { return queryService.estimateSwapExactAmountIn(request); }, + estimateSwapExactAmountInWithPrimitiveTypes(request: EstimateSwapExactAmountInWithPrimitiveTypesRequest): Promise { + return queryService.estimateSwapExactAmountInWithPrimitiveTypes(request); + }, estimateSinglePoolSwapExactAmountIn(request: EstimateSinglePoolSwapExactAmountInRequest): Promise { return queryService.estimateSinglePoolSwapExactAmountIn(request); }, estimateSwapExactAmountOut(request: EstimateSwapExactAmountOutRequest): Promise { return queryService.estimateSwapExactAmountOut(request); }, + estimateSwapExactAmountOutWithPrimitiveTypes(request: EstimateSwapExactAmountOutWithPrimitiveTypesRequest): Promise { + return queryService.estimateSwapExactAmountOutWithPrimitiveTypes(request); + }, estimateSinglePoolSwapExactAmountOut(request: EstimateSinglePoolSwapExactAmountOutRequest): Promise { return queryService.estimateSinglePoolSwapExactAmountOut(request); }, diff --git a/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/query.ts b/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/query.ts index dd2e67f0f..c47367e41 100644 --- a/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/query.ts +++ b/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/query.ts @@ -71,6 +71,32 @@ export interface EstimateSwapExactAmountInRequestSDKType { token_in: string; routes: SwapAmountInRouteSDKType[]; } +export interface EstimateSwapExactAmountInWithPrimitiveTypesRequest { + poolId: bigint; + tokenIn: string; + routesPoolId: bigint[]; + routesTokenOutDenom: string[]; +} +export interface EstimateSwapExactAmountInWithPrimitiveTypesRequestProtoMsg { + typeUrl: "/osmosis.poolmanager.v1beta1.EstimateSwapExactAmountInWithPrimitiveTypesRequest"; + value: Uint8Array; +} +export interface EstimateSwapExactAmountInWithPrimitiveTypesRequestAmino { + pool_id: string; + token_in: string; + routes_pool_id: string[]; + routes_token_out_denom: string[]; +} +export interface EstimateSwapExactAmountInWithPrimitiveTypesRequestAminoMsg { + type: "osmosis/poolmanager/estimate-swap-exact-amount-in-with-primitive-types-request"; + value: EstimateSwapExactAmountInWithPrimitiveTypesRequestAmino; +} +export interface EstimateSwapExactAmountInWithPrimitiveTypesRequestSDKType { + pool_id: bigint; + token_in: string; + routes_pool_id: bigint[]; + routes_token_out_denom: string[]; +} export interface EstimateSinglePoolSwapExactAmountInRequest { poolId: bigint; tokenIn: string; @@ -137,6 +163,32 @@ export interface EstimateSwapExactAmountOutRequestSDKType { routes: SwapAmountOutRouteSDKType[]; token_out: string; } +export interface EstimateSwapExactAmountOutWithPrimitiveTypesRequest { + poolId: bigint; + routesPoolId: bigint[]; + routesTokenInDenom: string[]; + tokenOut: string; +} +export interface EstimateSwapExactAmountOutWithPrimitiveTypesRequestProtoMsg { + typeUrl: "/osmosis.poolmanager.v1beta1.EstimateSwapExactAmountOutWithPrimitiveTypesRequest"; + value: Uint8Array; +} +export interface EstimateSwapExactAmountOutWithPrimitiveTypesRequestAmino { + pool_id: string; + routes_pool_id: string[]; + routes_token_in_denom: string[]; + token_out: string; +} +export interface EstimateSwapExactAmountOutWithPrimitiveTypesRequestAminoMsg { + type: "osmosis/poolmanager/estimate-swap-exact-amount-out-with-primitive-types-request"; + value: EstimateSwapExactAmountOutWithPrimitiveTypesRequestAmino; +} +export interface EstimateSwapExactAmountOutWithPrimitiveTypesRequestSDKType { + pool_id: bigint; + routes_pool_id: bigint[]; + routes_token_in_denom: string[]; + token_out: string; +} export interface EstimateSinglePoolSwapExactAmountOutRequest { poolId: bigint; tokenInDenom: string; @@ -629,6 +681,120 @@ export const EstimateSwapExactAmountInRequest = { }; } }; +function createBaseEstimateSwapExactAmountInWithPrimitiveTypesRequest(): EstimateSwapExactAmountInWithPrimitiveTypesRequest { + return { + poolId: BigInt(0), + tokenIn: "", + routesPoolId: [], + routesTokenOutDenom: [] + }; +} +export const EstimateSwapExactAmountInWithPrimitiveTypesRequest = { + typeUrl: "/osmosis.poolmanager.v1beta1.EstimateSwapExactAmountInWithPrimitiveTypesRequest", + encode(message: EstimateSwapExactAmountInWithPrimitiveTypesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.poolId !== BigInt(0)) { + writer.uint32(8).uint64(message.poolId); + } + if (message.tokenIn !== "") { + writer.uint32(18).string(message.tokenIn); + } + writer.uint32(26).fork(); + for (const v of message.routesPoolId) { + writer.uint64(v); + } + writer.ldelim(); + for (const v of message.routesTokenOutDenom) { + writer.uint32(34).string(v!); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): EstimateSwapExactAmountInWithPrimitiveTypesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseEstimateSwapExactAmountInWithPrimitiveTypesRequest(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.poolId = reader.uint64(); + break; + case 2: + message.tokenIn = reader.string(); + break; + case 3: + if ((tag & 7) === 2) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.routesPoolId.push(reader.uint64()); + } + } else { + message.routesPoolId.push(reader.uint64()); + } + break; + case 4: + message.routesTokenOutDenom.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): EstimateSwapExactAmountInWithPrimitiveTypesRequest { + const message = createBaseEstimateSwapExactAmountInWithPrimitiveTypesRequest(); + message.poolId = object.poolId !== undefined && object.poolId !== null ? BigInt(object.poolId.toString()) : BigInt(0); + message.tokenIn = object.tokenIn ?? ""; + message.routesPoolId = object.routesPoolId?.map(e => BigInt(e.toString())) || []; + message.routesTokenOutDenom = object.routesTokenOutDenom?.map(e => e) || []; + return message; + }, + fromAmino(object: EstimateSwapExactAmountInWithPrimitiveTypesRequestAmino): EstimateSwapExactAmountInWithPrimitiveTypesRequest { + return { + poolId: BigInt(object.pool_id), + tokenIn: object.token_in, + routesPoolId: Array.isArray(object?.routes_pool_id) ? object.routes_pool_id.map((e: any) => BigInt(e)) : [], + routesTokenOutDenom: Array.isArray(object?.routes_token_out_denom) ? object.routes_token_out_denom.map((e: any) => e) : [] + }; + }, + toAmino(message: EstimateSwapExactAmountInWithPrimitiveTypesRequest): EstimateSwapExactAmountInWithPrimitiveTypesRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.token_in = message.tokenIn; + if (message.routesPoolId) { + obj.routes_pool_id = message.routesPoolId.map(e => e.toString()); + } else { + obj.routes_pool_id = []; + } + if (message.routesTokenOutDenom) { + obj.routes_token_out_denom = message.routesTokenOutDenom.map(e => e); + } else { + obj.routes_token_out_denom = []; + } + return obj; + }, + fromAminoMsg(object: EstimateSwapExactAmountInWithPrimitiveTypesRequestAminoMsg): EstimateSwapExactAmountInWithPrimitiveTypesRequest { + return EstimateSwapExactAmountInWithPrimitiveTypesRequest.fromAmino(object.value); + }, + toAminoMsg(message: EstimateSwapExactAmountInWithPrimitiveTypesRequest): EstimateSwapExactAmountInWithPrimitiveTypesRequestAminoMsg { + return { + type: "osmosis/poolmanager/estimate-swap-exact-amount-in-with-primitive-types-request", + value: EstimateSwapExactAmountInWithPrimitiveTypesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: EstimateSwapExactAmountInWithPrimitiveTypesRequestProtoMsg): EstimateSwapExactAmountInWithPrimitiveTypesRequest { + return EstimateSwapExactAmountInWithPrimitiveTypesRequest.decode(message.value); + }, + toProto(message: EstimateSwapExactAmountInWithPrimitiveTypesRequest): Uint8Array { + return EstimateSwapExactAmountInWithPrimitiveTypesRequest.encode(message).finish(); + }, + toProtoMsg(message: EstimateSwapExactAmountInWithPrimitiveTypesRequest): EstimateSwapExactAmountInWithPrimitiveTypesRequestProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.EstimateSwapExactAmountInWithPrimitiveTypesRequest", + value: EstimateSwapExactAmountInWithPrimitiveTypesRequest.encode(message).finish() + }; + } +}; function createBaseEstimateSinglePoolSwapExactAmountInRequest(): EstimateSinglePoolSwapExactAmountInRequest { return { poolId: BigInt(0), @@ -874,6 +1040,120 @@ export const EstimateSwapExactAmountOutRequest = { }; } }; +function createBaseEstimateSwapExactAmountOutWithPrimitiveTypesRequest(): EstimateSwapExactAmountOutWithPrimitiveTypesRequest { + return { + poolId: BigInt(0), + routesPoolId: [], + routesTokenInDenom: [], + tokenOut: "" + }; +} +export const EstimateSwapExactAmountOutWithPrimitiveTypesRequest = { + typeUrl: "/osmosis.poolmanager.v1beta1.EstimateSwapExactAmountOutWithPrimitiveTypesRequest", + encode(message: EstimateSwapExactAmountOutWithPrimitiveTypesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.poolId !== BigInt(0)) { + writer.uint32(8).uint64(message.poolId); + } + writer.uint32(18).fork(); + for (const v of message.routesPoolId) { + writer.uint64(v); + } + writer.ldelim(); + for (const v of message.routesTokenInDenom) { + writer.uint32(26).string(v!); + } + if (message.tokenOut !== "") { + writer.uint32(34).string(message.tokenOut); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): EstimateSwapExactAmountOutWithPrimitiveTypesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseEstimateSwapExactAmountOutWithPrimitiveTypesRequest(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.poolId = reader.uint64(); + break; + case 2: + if ((tag & 7) === 2) { + const end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) { + message.routesPoolId.push(reader.uint64()); + } + } else { + message.routesPoolId.push(reader.uint64()); + } + break; + case 3: + message.routesTokenInDenom.push(reader.string()); + break; + case 4: + message.tokenOut = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): EstimateSwapExactAmountOutWithPrimitiveTypesRequest { + const message = createBaseEstimateSwapExactAmountOutWithPrimitiveTypesRequest(); + message.poolId = object.poolId !== undefined && object.poolId !== null ? BigInt(object.poolId.toString()) : BigInt(0); + message.routesPoolId = object.routesPoolId?.map(e => BigInt(e.toString())) || []; + message.routesTokenInDenom = object.routesTokenInDenom?.map(e => e) || []; + message.tokenOut = object.tokenOut ?? ""; + return message; + }, + fromAmino(object: EstimateSwapExactAmountOutWithPrimitiveTypesRequestAmino): EstimateSwapExactAmountOutWithPrimitiveTypesRequest { + return { + poolId: BigInt(object.pool_id), + routesPoolId: Array.isArray(object?.routes_pool_id) ? object.routes_pool_id.map((e: any) => BigInt(e)) : [], + routesTokenInDenom: Array.isArray(object?.routes_token_in_denom) ? object.routes_token_in_denom.map((e: any) => e) : [], + tokenOut: object.token_out + }; + }, + toAmino(message: EstimateSwapExactAmountOutWithPrimitiveTypesRequest): EstimateSwapExactAmountOutWithPrimitiveTypesRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + if (message.routesPoolId) { + obj.routes_pool_id = message.routesPoolId.map(e => e.toString()); + } else { + obj.routes_pool_id = []; + } + if (message.routesTokenInDenom) { + obj.routes_token_in_denom = message.routesTokenInDenom.map(e => e); + } else { + obj.routes_token_in_denom = []; + } + obj.token_out = message.tokenOut; + return obj; + }, + fromAminoMsg(object: EstimateSwapExactAmountOutWithPrimitiveTypesRequestAminoMsg): EstimateSwapExactAmountOutWithPrimitiveTypesRequest { + return EstimateSwapExactAmountOutWithPrimitiveTypesRequest.fromAmino(object.value); + }, + toAminoMsg(message: EstimateSwapExactAmountOutWithPrimitiveTypesRequest): EstimateSwapExactAmountOutWithPrimitiveTypesRequestAminoMsg { + return { + type: "osmosis/poolmanager/estimate-swap-exact-amount-out-with-primitive-types-request", + value: EstimateSwapExactAmountOutWithPrimitiveTypesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: EstimateSwapExactAmountOutWithPrimitiveTypesRequestProtoMsg): EstimateSwapExactAmountOutWithPrimitiveTypesRequest { + return EstimateSwapExactAmountOutWithPrimitiveTypesRequest.decode(message.value); + }, + toProto(message: EstimateSwapExactAmountOutWithPrimitiveTypesRequest): Uint8Array { + return EstimateSwapExactAmountOutWithPrimitiveTypesRequest.encode(message).finish(); + }, + toProtoMsg(message: EstimateSwapExactAmountOutWithPrimitiveTypesRequest): EstimateSwapExactAmountOutWithPrimitiveTypesRequestProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.EstimateSwapExactAmountOutWithPrimitiveTypesRequest", + value: EstimateSwapExactAmountOutWithPrimitiveTypesRequest.encode(message).finish() + }; + } +}; function createBaseEstimateSinglePoolSwapExactAmountOutRequest(): EstimateSinglePoolSwapExactAmountOutRequest { return { poolId: BigInt(0), diff --git a/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/tx.amino.ts b/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/tx.amino.ts index 1383a6dc0..54ef21c98 100644 --- a/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/tx.amino.ts +++ b/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/tx.amino.ts @@ -1,4 +1,4 @@ -import { MsgSwapExactAmountIn, MsgSwapExactAmountOut, MsgSplitRouteSwapExactAmountIn, MsgSplitRouteSwapExactAmountOut } from "./tx"; +import { MsgSwapExactAmountIn, MsgSwapExactAmountOut, MsgSplitRouteSwapExactAmountIn, MsgSplitRouteSwapExactAmountOut, MsgSetDenomPairTakerFee } from "./tx"; export const AminoConverter = { "/osmosis.poolmanager.v1beta1.MsgSwapExactAmountIn": { aminoType: "osmosis/poolmanager/swap-exact-amount-in", @@ -19,5 +19,10 @@ export const AminoConverter = { aminoType: "osmosis/poolmanager/split-amount-out", toAmino: MsgSplitRouteSwapExactAmountOut.toAmino, fromAmino: MsgSplitRouteSwapExactAmountOut.fromAmino + }, + "/osmosis.poolmanager.v1beta1.MsgSetDenomPairTakerFee": { + aminoType: "osmosis/poolmanager/set-denom-pair-taker-fee", + toAmino: MsgSetDenomPairTakerFee.toAmino, + fromAmino: MsgSetDenomPairTakerFee.fromAmino } }; \ No newline at end of file diff --git a/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/tx.registry.ts b/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/tx.registry.ts index 116db1f7f..fc1b6fcd7 100644 --- a/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/tx.registry.ts +++ b/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/tx.registry.ts @@ -1,7 +1,7 @@ //@ts-nocheck import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgSwapExactAmountIn, MsgSwapExactAmountOut, MsgSplitRouteSwapExactAmountIn, MsgSplitRouteSwapExactAmountOut } from "./tx"; -export const registry: ReadonlyArray<[string, GeneratedType]> = [["/osmosis.poolmanager.v1beta1.MsgSwapExactAmountIn", MsgSwapExactAmountIn], ["/osmosis.poolmanager.v1beta1.MsgSwapExactAmountOut", MsgSwapExactAmountOut], ["/osmosis.poolmanager.v1beta1.MsgSplitRouteSwapExactAmountIn", MsgSplitRouteSwapExactAmountIn], ["/osmosis.poolmanager.v1beta1.MsgSplitRouteSwapExactAmountOut", MsgSplitRouteSwapExactAmountOut]]; +import { MsgSwapExactAmountIn, MsgSwapExactAmountOut, MsgSplitRouteSwapExactAmountIn, MsgSplitRouteSwapExactAmountOut, MsgSetDenomPairTakerFee } from "./tx"; +export const registry: ReadonlyArray<[string, GeneratedType]> = [["/osmosis.poolmanager.v1beta1.MsgSwapExactAmountIn", MsgSwapExactAmountIn], ["/osmosis.poolmanager.v1beta1.MsgSwapExactAmountOut", MsgSwapExactAmountOut], ["/osmosis.poolmanager.v1beta1.MsgSplitRouteSwapExactAmountIn", MsgSplitRouteSwapExactAmountIn], ["/osmosis.poolmanager.v1beta1.MsgSplitRouteSwapExactAmountOut", MsgSplitRouteSwapExactAmountOut], ["/osmosis.poolmanager.v1beta1.MsgSetDenomPairTakerFee", MsgSetDenomPairTakerFee]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { protoRegistry.register(typeUrl, mod); @@ -32,6 +32,12 @@ export const MessageComposer = { typeUrl: "/osmosis.poolmanager.v1beta1.MsgSplitRouteSwapExactAmountOut", value: MsgSplitRouteSwapExactAmountOut.encode(value).finish() }; + }, + setDenomPairTakerFee(value: MsgSetDenomPairTakerFee) { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.MsgSetDenomPairTakerFee", + value: MsgSetDenomPairTakerFee.encode(value).finish() + }; } }, withTypeUrl: { @@ -58,6 +64,12 @@ export const MessageComposer = { typeUrl: "/osmosis.poolmanager.v1beta1.MsgSplitRouteSwapExactAmountOut", value }; + }, + setDenomPairTakerFee(value: MsgSetDenomPairTakerFee) { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.MsgSetDenomPairTakerFee", + value + }; } }, fromPartial: { @@ -84,6 +96,12 @@ export const MessageComposer = { typeUrl: "/osmosis.poolmanager.v1beta1.MsgSplitRouteSwapExactAmountOut", value: MsgSplitRouteSwapExactAmountOut.fromPartial(value) }; + }, + setDenomPairTakerFee(value: MsgSetDenomPairTakerFee) { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.MsgSetDenomPairTakerFee", + value: MsgSetDenomPairTakerFee.fromPartial(value) + }; } } }; \ No newline at end of file diff --git a/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/tx.rpc.msg.ts b/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/tx.rpc.msg.ts index ba18a7f89..04cb38413 100644 --- a/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/tx.rpc.msg.ts +++ b/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/tx.rpc.msg.ts @@ -1,11 +1,12 @@ import { Rpc } from "../../../helpers"; import { BinaryReader } from "../../../binary"; -import { MsgSwapExactAmountIn, MsgSwapExactAmountInResponse, MsgSwapExactAmountOut, MsgSwapExactAmountOutResponse, MsgSplitRouteSwapExactAmountIn, MsgSplitRouteSwapExactAmountInResponse, MsgSplitRouteSwapExactAmountOut, MsgSplitRouteSwapExactAmountOutResponse } from "./tx"; +import { MsgSwapExactAmountIn, MsgSwapExactAmountInResponse, MsgSwapExactAmountOut, MsgSwapExactAmountOutResponse, MsgSplitRouteSwapExactAmountIn, MsgSplitRouteSwapExactAmountInResponse, MsgSplitRouteSwapExactAmountOut, MsgSplitRouteSwapExactAmountOutResponse, MsgSetDenomPairTakerFee, MsgSetDenomPairTakerFeeResponse } from "./tx"; export interface Msg { swapExactAmountIn(request: MsgSwapExactAmountIn): Promise; swapExactAmountOut(request: MsgSwapExactAmountOut): Promise; splitRouteSwapExactAmountIn(request: MsgSplitRouteSwapExactAmountIn): Promise; splitRouteSwapExactAmountOut(request: MsgSplitRouteSwapExactAmountOut): Promise; + setDenomPairTakerFee(request: MsgSetDenomPairTakerFee): Promise; } export class MsgClientImpl implements Msg { private readonly rpc: Rpc; @@ -15,6 +16,7 @@ export class MsgClientImpl implements Msg { this.swapExactAmountOut = this.swapExactAmountOut.bind(this); this.splitRouteSwapExactAmountIn = this.splitRouteSwapExactAmountIn.bind(this); this.splitRouteSwapExactAmountOut = this.splitRouteSwapExactAmountOut.bind(this); + this.setDenomPairTakerFee = this.setDenomPairTakerFee.bind(this); } swapExactAmountIn(request: MsgSwapExactAmountIn): Promise { const data = MsgSwapExactAmountIn.encode(request).finish(); @@ -36,4 +38,9 @@ export class MsgClientImpl implements Msg { const promise = this.rpc.request("osmosis.poolmanager.v1beta1.Msg", "SplitRouteSwapExactAmountOut", data); return promise.then(data => MsgSplitRouteSwapExactAmountOutResponse.decode(new BinaryReader(data))); } + setDenomPairTakerFee(request: MsgSetDenomPairTakerFee): Promise { + const data = MsgSetDenomPairTakerFee.encode(request).finish(); + const promise = this.rpc.request("osmosis.poolmanager.v1beta1.Msg", "SetDenomPairTakerFee", data); + return promise.then(data => MsgSetDenomPairTakerFeeResponse.decode(new BinaryReader(data))); + } } \ No newline at end of file diff --git a/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/tx.ts b/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/tx.ts index 4ae8a76e8..8d7132cda 100644 --- a/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/tx.ts +++ b/packages/protobuf/codegen/osmosis/poolmanager/v1beta1/tx.ts @@ -186,6 +186,77 @@ export interface MsgSplitRouteSwapExactAmountOutResponseAminoMsg { export interface MsgSplitRouteSwapExactAmountOutResponseSDKType { token_in_amount: string; } +/** ===================== MsgSetDenomPairTakerFee */ +export interface MsgSetDenomPairTakerFee { + sender: string; + denomPairTakerFee: DenomPairTakerFee[]; +} +export interface MsgSetDenomPairTakerFeeProtoMsg { + typeUrl: "/osmosis.poolmanager.v1beta1.MsgSetDenomPairTakerFee"; + value: Uint8Array; +} +/** ===================== MsgSetDenomPairTakerFee */ +export interface MsgSetDenomPairTakerFeeAmino { + sender: string; + denom_pair_taker_fee: DenomPairTakerFeeAmino[]; +} +export interface MsgSetDenomPairTakerFeeAminoMsg { + type: "osmosis/poolmanager/set-denom-pair-taker-fee"; + value: MsgSetDenomPairTakerFeeAmino; +} +/** ===================== MsgSetDenomPairTakerFee */ +export interface MsgSetDenomPairTakerFeeSDKType { + sender: string; + denom_pair_taker_fee: DenomPairTakerFeeSDKType[]; +} +export interface MsgSetDenomPairTakerFeeResponse { + success: boolean; +} +export interface MsgSetDenomPairTakerFeeResponseProtoMsg { + typeUrl: "/osmosis.poolmanager.v1beta1.MsgSetDenomPairTakerFeeResponse"; + value: Uint8Array; +} +export interface MsgSetDenomPairTakerFeeResponseAmino { + success: boolean; +} +export interface MsgSetDenomPairTakerFeeResponseAminoMsg { + type: "osmosis/poolmanager/set-denom-pair-taker-fee-response"; + value: MsgSetDenomPairTakerFeeResponseAmino; +} +export interface MsgSetDenomPairTakerFeeResponseSDKType { + success: boolean; +} +export interface DenomPairTakerFee { + /** + * denom0 and denom1 get automatically lexigographically sorted + * when being stored, so the order of input here does not matter. + */ + denom0: string; + denom1: string; + takerFee: string; +} +export interface DenomPairTakerFeeProtoMsg { + typeUrl: "/osmosis.poolmanager.v1beta1.DenomPairTakerFee"; + value: Uint8Array; +} +export interface DenomPairTakerFeeAmino { + /** + * denom0 and denom1 get automatically lexigographically sorted + * when being stored, so the order of input here does not matter. + */ + denom0: string; + denom1: string; + taker_fee: string; +} +export interface DenomPairTakerFeeAminoMsg { + type: "osmosis/poolmanager/denom-pair-taker-fee"; + value: DenomPairTakerFeeAmino; +} +export interface DenomPairTakerFeeSDKType { + denom0: string; + denom1: string; + taker_fee: string; +} function createBaseMsgSwapExactAmountIn(): MsgSwapExactAmountIn { return { sender: "", @@ -857,4 +928,239 @@ export const MsgSplitRouteSwapExactAmountOutResponse = { value: MsgSplitRouteSwapExactAmountOutResponse.encode(message).finish() }; } +}; +function createBaseMsgSetDenomPairTakerFee(): MsgSetDenomPairTakerFee { + return { + sender: "", + denomPairTakerFee: [] + }; +} +export const MsgSetDenomPairTakerFee = { + typeUrl: "/osmosis.poolmanager.v1beta1.MsgSetDenomPairTakerFee", + encode(message: MsgSetDenomPairTakerFee, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.sender !== "") { + writer.uint32(10).string(message.sender); + } + for (const v of message.denomPairTakerFee) { + DenomPairTakerFee.encode(v!, writer.uint32(18).fork()).ldelim(); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): MsgSetDenomPairTakerFee { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseMsgSetDenomPairTakerFee(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.sender = reader.string(); + break; + case 2: + message.denomPairTakerFee.push(DenomPairTakerFee.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): MsgSetDenomPairTakerFee { + const message = createBaseMsgSetDenomPairTakerFee(); + message.sender = object.sender ?? ""; + message.denomPairTakerFee = object.denomPairTakerFee?.map(e => DenomPairTakerFee.fromPartial(e)) || []; + return message; + }, + fromAmino(object: MsgSetDenomPairTakerFeeAmino): MsgSetDenomPairTakerFee { + return { + sender: object.sender, + denomPairTakerFee: Array.isArray(object?.denom_pair_taker_fee) ? object.denom_pair_taker_fee.map((e: any) => DenomPairTakerFee.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgSetDenomPairTakerFee): MsgSetDenomPairTakerFeeAmino { + const obj: any = {}; + obj.sender = message.sender; + if (message.denomPairTakerFee) { + obj.denom_pair_taker_fee = message.denomPairTakerFee.map(e => e ? DenomPairTakerFee.toAmino(e) : undefined); + } else { + obj.denom_pair_taker_fee = []; + } + return obj; + }, + fromAminoMsg(object: MsgSetDenomPairTakerFeeAminoMsg): MsgSetDenomPairTakerFee { + return MsgSetDenomPairTakerFee.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetDenomPairTakerFee): MsgSetDenomPairTakerFeeAminoMsg { + return { + type: "osmosis/poolmanager/set-denom-pair-taker-fee", + value: MsgSetDenomPairTakerFee.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetDenomPairTakerFeeProtoMsg): MsgSetDenomPairTakerFee { + return MsgSetDenomPairTakerFee.decode(message.value); + }, + toProto(message: MsgSetDenomPairTakerFee): Uint8Array { + return MsgSetDenomPairTakerFee.encode(message).finish(); + }, + toProtoMsg(message: MsgSetDenomPairTakerFee): MsgSetDenomPairTakerFeeProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.MsgSetDenomPairTakerFee", + value: MsgSetDenomPairTakerFee.encode(message).finish() + }; + } +}; +function createBaseMsgSetDenomPairTakerFeeResponse(): MsgSetDenomPairTakerFeeResponse { + return { + success: false + }; +} +export const MsgSetDenomPairTakerFeeResponse = { + typeUrl: "/osmosis.poolmanager.v1beta1.MsgSetDenomPairTakerFeeResponse", + encode(message: MsgSetDenomPairTakerFeeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.success === true) { + writer.uint32(8).bool(message.success); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): MsgSetDenomPairTakerFeeResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseMsgSetDenomPairTakerFeeResponse(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.success = reader.bool(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): MsgSetDenomPairTakerFeeResponse { + const message = createBaseMsgSetDenomPairTakerFeeResponse(); + message.success = object.success ?? false; + return message; + }, + fromAmino(object: MsgSetDenomPairTakerFeeResponseAmino): MsgSetDenomPairTakerFeeResponse { + return { + success: object.success + }; + }, + toAmino(message: MsgSetDenomPairTakerFeeResponse): MsgSetDenomPairTakerFeeResponseAmino { + const obj: any = {}; + obj.success = message.success; + return obj; + }, + fromAminoMsg(object: MsgSetDenomPairTakerFeeResponseAminoMsg): MsgSetDenomPairTakerFeeResponse { + return MsgSetDenomPairTakerFeeResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetDenomPairTakerFeeResponse): MsgSetDenomPairTakerFeeResponseAminoMsg { + return { + type: "osmosis/poolmanager/set-denom-pair-taker-fee-response", + value: MsgSetDenomPairTakerFeeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetDenomPairTakerFeeResponseProtoMsg): MsgSetDenomPairTakerFeeResponse { + return MsgSetDenomPairTakerFeeResponse.decode(message.value); + }, + toProto(message: MsgSetDenomPairTakerFeeResponse): Uint8Array { + return MsgSetDenomPairTakerFeeResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSetDenomPairTakerFeeResponse): MsgSetDenomPairTakerFeeResponseProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.MsgSetDenomPairTakerFeeResponse", + value: MsgSetDenomPairTakerFeeResponse.encode(message).finish() + }; + } +}; +function createBaseDenomPairTakerFee(): DenomPairTakerFee { + return { + denom0: "", + denom1: "", + takerFee: "" + }; +} +export const DenomPairTakerFee = { + typeUrl: "/osmosis.poolmanager.v1beta1.DenomPairTakerFee", + encode(message: DenomPairTakerFee, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.denom0 !== "") { + writer.uint32(10).string(message.denom0); + } + if (message.denom1 !== "") { + writer.uint32(18).string(message.denom1); + } + if (message.takerFee !== "") { + writer.uint32(26).string(message.takerFee); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): DenomPairTakerFee { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseDenomPairTakerFee(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.denom0 = reader.string(); + break; + case 2: + message.denom1 = reader.string(); + break; + case 3: + message.takerFee = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): DenomPairTakerFee { + const message = createBaseDenomPairTakerFee(); + message.denom0 = object.denom0 ?? ""; + message.denom1 = object.denom1 ?? ""; + message.takerFee = object.takerFee ?? ""; + return message; + }, + fromAmino(object: DenomPairTakerFeeAmino): DenomPairTakerFee { + return { + denom0: object.denom0, + denom1: object.denom1, + takerFee: object.taker_fee + }; + }, + toAmino(message: DenomPairTakerFee): DenomPairTakerFeeAmino { + const obj: any = {}; + obj.denom0 = message.denom0; + obj.denom1 = message.denom1; + obj.taker_fee = message.takerFee; + return obj; + }, + fromAminoMsg(object: DenomPairTakerFeeAminoMsg): DenomPairTakerFee { + return DenomPairTakerFee.fromAmino(object.value); + }, + toAminoMsg(message: DenomPairTakerFee): DenomPairTakerFeeAminoMsg { + return { + type: "osmosis/poolmanager/denom-pair-taker-fee", + value: DenomPairTakerFee.toAmino(message) + }; + }, + fromProtoMsg(message: DenomPairTakerFeeProtoMsg): DenomPairTakerFee { + return DenomPairTakerFee.decode(message.value); + }, + toProto(message: DenomPairTakerFee): Uint8Array { + return DenomPairTakerFee.encode(message).finish(); + }, + toProtoMsg(message: DenomPairTakerFee): DenomPairTakerFeeProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.DenomPairTakerFee", + value: DenomPairTakerFee.encode(message).finish() + }; + } }; \ No newline at end of file diff --git a/packages/protobuf/codegen/osmosis/protorev/v1beta1/genesis.ts b/packages/protobuf/codegen/osmosis/protorev/v1beta1/genesis.ts index 3273292dc..9a2c2bd0f 100644 --- a/packages/protobuf/codegen/osmosis/protorev/v1beta1/genesis.ts +++ b/packages/protobuf/codegen/osmosis/protorev/v1beta1/genesis.ts @@ -1,6 +1,6 @@ //@ts-nocheck import { Params, ParamsAmino, ParamsSDKType } from "./params"; -import { TokenPairArbRoutes, TokenPairArbRoutesAmino, TokenPairArbRoutesSDKType, BaseDenom, BaseDenomAmino, BaseDenomSDKType, PoolWeights, PoolWeightsAmino, PoolWeightsSDKType } from "./protorev"; +import { TokenPairArbRoutes, TokenPairArbRoutesAmino, TokenPairArbRoutesSDKType, BaseDenom, BaseDenomAmino, BaseDenomSDKType, PoolWeights, PoolWeightsAmino, PoolWeightsSDKType, InfoByPoolType, InfoByPoolTypeAmino, InfoByPoolTypeSDKType } from "./protorev"; import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { BinaryReader, BinaryWriter } from "../../../binary"; /** GenesisState defines the protorev module's genesis state. */ @@ -17,6 +17,9 @@ export interface GenesisState { /** * The pool weights that are being used to calculate the weight (compute cost) * of each route. + * + * DEPRECATED: This field is deprecated and will be removed in the next + * release. It is replaced by the `info_by_pool_type` field. */ poolWeights: PoolWeights | undefined; /** The number of days since module genesis. */ @@ -41,6 +44,11 @@ export interface GenesisState { pointCountForBlock: bigint; /** All of the profits that have been accumulated by the module. */ profits: Coin[]; + /** + * Information that is used to estimate execution time / gas + * consumption of a swap on a given pool type. + */ + infoByPoolType: InfoByPoolType | undefined; } export interface GenesisStateProtoMsg { typeUrl: "/osmosis.protorev.v1beta1.GenesisState"; @@ -60,6 +68,9 @@ export interface GenesisStateAmino { /** * The pool weights that are being used to calculate the weight (compute cost) * of each route. + * + * DEPRECATED: This field is deprecated and will be removed in the next + * release. It is replaced by the `info_by_pool_type` field. */ pool_weights?: PoolWeightsAmino | undefined; /** The number of days since module genesis. */ @@ -84,6 +95,11 @@ export interface GenesisStateAmino { point_count_for_block: string; /** All of the profits that have been accumulated by the module. */ profits: CoinAmino[]; + /** + * Information that is used to estimate execution time / gas + * consumption of a swap on a given pool type. + */ + info_by_pool_type?: InfoByPoolTypeAmino | undefined; } export interface GenesisStateAminoMsg { type: "osmosis/protorev/genesis-state"; @@ -103,6 +119,7 @@ export interface GenesisStateSDKType { max_pool_points_per_tx: bigint; point_count_for_block: bigint; profits: CoinSDKType[]; + info_by_pool_type: InfoByPoolTypeSDKType | undefined; } function createBaseGenesisState(): GenesisState { return { @@ -117,7 +134,8 @@ function createBaseGenesisState(): GenesisState { maxPoolPointsPerBlock: BigInt(0), maxPoolPointsPerTx: BigInt(0), pointCountForBlock: BigInt(0), - profits: [] + profits: [], + infoByPoolType: InfoByPoolType.fromPartial({}) }; } export const GenesisState = { @@ -159,6 +177,9 @@ export const GenesisState = { for (const v of message.profits) { Coin.encode(v!, writer.uint32(98).fork()).ldelim(); } + if (message.infoByPoolType !== undefined) { + InfoByPoolType.encode(message.infoByPoolType, writer.uint32(106).fork()).ldelim(); + } return writer; }, decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { @@ -204,6 +225,9 @@ export const GenesisState = { case 12: message.profits.push(Coin.decode(reader, reader.uint32())); break; + case 13: + message.infoByPoolType = InfoByPoolType.decode(reader, reader.uint32()); + break; default: reader.skipType(tag & 7); break; @@ -225,6 +249,7 @@ export const GenesisState = { message.maxPoolPointsPerTx = object.maxPoolPointsPerTx !== undefined && object.maxPoolPointsPerTx !== null ? BigInt(object.maxPoolPointsPerTx.toString()) : BigInt(0); message.pointCountForBlock = object.pointCountForBlock !== undefined && object.pointCountForBlock !== null ? BigInt(object.pointCountForBlock.toString()) : BigInt(0); message.profits = object.profits?.map(e => Coin.fromPartial(e)) || []; + message.infoByPoolType = object.infoByPoolType !== undefined && object.infoByPoolType !== null ? InfoByPoolType.fromPartial(object.infoByPoolType) : undefined; return message; }, fromAmino(object: GenesisStateAmino): GenesisState { @@ -240,7 +265,8 @@ export const GenesisState = { maxPoolPointsPerBlock: BigInt(object.max_pool_points_per_block), maxPoolPointsPerTx: BigInt(object.max_pool_points_per_tx), pointCountForBlock: BigInt(object.point_count_for_block), - profits: Array.isArray(object?.profits) ? object.profits.map((e: any) => Coin.fromAmino(e)) : [] + profits: Array.isArray(object?.profits) ? object.profits.map((e: any) => Coin.fromAmino(e)) : [], + infoByPoolType: object?.info_by_pool_type ? InfoByPoolType.fromAmino(object.info_by_pool_type) : undefined }; }, toAmino(message: GenesisState): GenesisStateAmino { @@ -273,6 +299,7 @@ export const GenesisState = { } else { obj.profits = []; } + obj.info_by_pool_type = message.infoByPoolType ? InfoByPoolType.toAmino(message.infoByPoolType) : undefined; return obj; }, fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { diff --git a/packages/protobuf/codegen/osmosis/protorev/v1beta1/protorev.ts b/packages/protobuf/codegen/osmosis/protorev/v1beta1/protorev.ts index 75e7f0454..322b5d871 100644 --- a/packages/protobuf/codegen/osmosis/protorev/v1beta1/protorev.ts +++ b/packages/protobuf/codegen/osmosis/protorev/v1beta1/protorev.ts @@ -156,6 +156,9 @@ export interface RouteStatisticsSDKType { * significantly between the different pool types. Each weight roughly * corresponds to the amount of time (in ms) it takes to execute a swap on that * pool type. + * + * DEPRECATED: This field is deprecated and will be removed in the next + * release. It is replaced by the `info_by_pool_type` field. */ export interface PoolWeights { /** The weight of a stableswap pool */ @@ -164,6 +167,8 @@ export interface PoolWeights { balancerWeight: bigint; /** The weight of a concentrated pool */ concentratedWeight: bigint; + /** The weight of a cosmwasm pool */ + cosmwasmWeight: bigint; } export interface PoolWeightsProtoMsg { typeUrl: "/osmosis.protorev.v1beta1.PoolWeights"; @@ -175,6 +180,9 @@ export interface PoolWeightsProtoMsg { * significantly between the different pool types. Each weight roughly * corresponds to the amount of time (in ms) it takes to execute a swap on that * pool type. + * + * DEPRECATED: This field is deprecated and will be removed in the next + * release. It is replaced by the `info_by_pool_type` field. */ export interface PoolWeightsAmino { /** The weight of a stableswap pool */ @@ -183,6 +191,8 @@ export interface PoolWeightsAmino { balancer_weight: string; /** The weight of a concentrated pool */ concentrated_weight: string; + /** The weight of a cosmwasm pool */ + cosmwasm_weight: string; } export interface PoolWeightsAminoMsg { type: "osmosis/protorev/pool-weights"; @@ -194,11 +204,205 @@ export interface PoolWeightsAminoMsg { * significantly between the different pool types. Each weight roughly * corresponds to the amount of time (in ms) it takes to execute a swap on that * pool type. + * + * DEPRECATED: This field is deprecated and will be removed in the next + * release. It is replaced by the `info_by_pool_type` field. */ export interface PoolWeightsSDKType { stable_weight: bigint; balancer_weight: bigint; concentrated_weight: bigint; + cosmwasm_weight: bigint; +} +/** + * InfoByPoolType contains information pertaining to how expensive (in terms of + * gas and time) it is to execute a swap on a given pool type. This distinction + * is made and necessary because the execution time ranges significantly between + * the different pool types. + */ +export interface InfoByPoolType { + /** The stable pool info */ + stable: StablePoolInfo | undefined; + /** The balancer pool info */ + balancer: BalancerPoolInfo | undefined; + /** The concentrated pool info */ + concentrated: ConcentratedPoolInfo | undefined; + /** The cosmwasm pool info */ + cosmwasm: CosmwasmPoolInfo | undefined; +} +export interface InfoByPoolTypeProtoMsg { + typeUrl: "/osmosis.protorev.v1beta1.InfoByPoolType"; + value: Uint8Array; +} +/** + * InfoByPoolType contains information pertaining to how expensive (in terms of + * gas and time) it is to execute a swap on a given pool type. This distinction + * is made and necessary because the execution time ranges significantly between + * the different pool types. + */ +export interface InfoByPoolTypeAmino { + /** The stable pool info */ + stable?: StablePoolInfoAmino | undefined; + /** The balancer pool info */ + balancer?: BalancerPoolInfoAmino | undefined; + /** The concentrated pool info */ + concentrated?: ConcentratedPoolInfoAmino | undefined; + /** The cosmwasm pool info */ + cosmwasm?: CosmwasmPoolInfoAmino | undefined; +} +export interface InfoByPoolTypeAminoMsg { + type: "osmosis/protorev/info-by-pool-type"; + value: InfoByPoolTypeAmino; +} +/** + * InfoByPoolType contains information pertaining to how expensive (in terms of + * gas and time) it is to execute a swap on a given pool type. This distinction + * is made and necessary because the execution time ranges significantly between + * the different pool types. + */ +export interface InfoByPoolTypeSDKType { + stable: StablePoolInfoSDKType | undefined; + balancer: BalancerPoolInfoSDKType | undefined; + concentrated: ConcentratedPoolInfoSDKType | undefined; + cosmwasm: CosmwasmPoolInfoSDKType | undefined; +} +/** StablePoolInfo contains meta data pertaining to a stableswap pool type. */ +export interface StablePoolInfo { + /** The weight of a stableswap pool */ + weight: bigint; +} +export interface StablePoolInfoProtoMsg { + typeUrl: "/osmosis.protorev.v1beta1.StablePoolInfo"; + value: Uint8Array; +} +/** StablePoolInfo contains meta data pertaining to a stableswap pool type. */ +export interface StablePoolInfoAmino { + /** The weight of a stableswap pool */ + weight: string; +} +export interface StablePoolInfoAminoMsg { + type: "osmosis/protorev/stable-pool-info"; + value: StablePoolInfoAmino; +} +/** StablePoolInfo contains meta data pertaining to a stableswap pool type. */ +export interface StablePoolInfoSDKType { + weight: bigint; +} +/** BalancerPoolInfo contains meta data pertaining to a balancer pool type. */ +export interface BalancerPoolInfo { + /** The weight of a balancer pool */ + weight: bigint; +} +export interface BalancerPoolInfoProtoMsg { + typeUrl: "/osmosis.protorev.v1beta1.BalancerPoolInfo"; + value: Uint8Array; +} +/** BalancerPoolInfo contains meta data pertaining to a balancer pool type. */ +export interface BalancerPoolInfoAmino { + /** The weight of a balancer pool */ + weight: string; +} +export interface BalancerPoolInfoAminoMsg { + type: "osmosis/protorev/balancer-pool-info"; + value: BalancerPoolInfoAmino; +} +/** BalancerPoolInfo contains meta data pertaining to a balancer pool type. */ +export interface BalancerPoolInfoSDKType { + weight: bigint; +} +/** + * ConcentratedPoolInfo contains meta data pertaining to a concentrated pool + * type. + */ +export interface ConcentratedPoolInfo { + /** The weight of a concentrated pool */ + weight: bigint; + /** The maximum number of ticks we can move when rebalancing */ + maxTicksCrossed: bigint; +} +export interface ConcentratedPoolInfoProtoMsg { + typeUrl: "/osmosis.protorev.v1beta1.ConcentratedPoolInfo"; + value: Uint8Array; +} +/** + * ConcentratedPoolInfo contains meta data pertaining to a concentrated pool + * type. + */ +export interface ConcentratedPoolInfoAmino { + /** The weight of a concentrated pool */ + weight: string; + /** The maximum number of ticks we can move when rebalancing */ + max_ticks_crossed: string; +} +export interface ConcentratedPoolInfoAminoMsg { + type: "osmosis/protorev/concentrated-pool-info"; + value: ConcentratedPoolInfoAmino; +} +/** + * ConcentratedPoolInfo contains meta data pertaining to a concentrated pool + * type. + */ +export interface ConcentratedPoolInfoSDKType { + weight: bigint; + max_ticks_crossed: bigint; +} +/** CosmwasmPoolInfo contains meta data pertaining to a cosmwasm pool type. */ +export interface CosmwasmPoolInfo { + /** The weight of a cosmwasm pool (by contract address) */ + weightMaps: WeightMap[]; +} +export interface CosmwasmPoolInfoProtoMsg { + typeUrl: "/osmosis.protorev.v1beta1.CosmwasmPoolInfo"; + value: Uint8Array; +} +/** CosmwasmPoolInfo contains meta data pertaining to a cosmwasm pool type. */ +export interface CosmwasmPoolInfoAmino { + /** The weight of a cosmwasm pool (by contract address) */ + weight_maps: WeightMapAmino[]; +} +export interface CosmwasmPoolInfoAminoMsg { + type: "osmosis/protorev/cosmwasm-pool-info"; + value: CosmwasmPoolInfoAmino; +} +/** CosmwasmPoolInfo contains meta data pertaining to a cosmwasm pool type. */ +export interface CosmwasmPoolInfoSDKType { + weight_maps: WeightMapSDKType[]; +} +/** + * WeightMap maps a contract address to a weight. The weight of an address + * corresponds to the amount of ms required to execute a swap on that contract. + */ +export interface WeightMap { + /** The weight of a cosmwasm pool (by contract address) */ + weight: bigint; + /** The contract address */ + contractAddress: string; +} +export interface WeightMapProtoMsg { + typeUrl: "/osmosis.protorev.v1beta1.WeightMap"; + value: Uint8Array; +} +/** + * WeightMap maps a contract address to a weight. The weight of an address + * corresponds to the amount of ms required to execute a swap on that contract. + */ +export interface WeightMapAmino { + /** The weight of a cosmwasm pool (by contract address) */ + weight: string; + /** The contract address */ + contract_address: string; +} +export interface WeightMapAminoMsg { + type: "osmosis/protorev/weight-map"; + value: WeightMapAmino; +} +/** + * WeightMap maps a contract address to a weight. The weight of an address + * corresponds to the amount of ms required to execute a swap on that contract. + */ +export interface WeightMapSDKType { + weight: bigint; + contract_address: string; } /** * BaseDenom represents a single base denom that the module uses for its @@ -612,7 +816,8 @@ function createBasePoolWeights(): PoolWeights { return { stableWeight: BigInt(0), balancerWeight: BigInt(0), - concentratedWeight: BigInt(0) + concentratedWeight: BigInt(0), + cosmwasmWeight: BigInt(0) }; } export const PoolWeights = { @@ -627,6 +832,9 @@ export const PoolWeights = { if (message.concentratedWeight !== BigInt(0)) { writer.uint32(24).uint64(message.concentratedWeight); } + if (message.cosmwasmWeight !== BigInt(0)) { + writer.uint32(32).uint64(message.cosmwasmWeight); + } return writer; }, decode(input: BinaryReader | Uint8Array, length?: number): PoolWeights { @@ -645,6 +853,9 @@ export const PoolWeights = { case 3: message.concentratedWeight = reader.uint64(); break; + case 4: + message.cosmwasmWeight = reader.uint64(); + break; default: reader.skipType(tag & 7); break; @@ -657,13 +868,15 @@ export const PoolWeights = { message.stableWeight = object.stableWeight !== undefined && object.stableWeight !== null ? BigInt(object.stableWeight.toString()) : BigInt(0); message.balancerWeight = object.balancerWeight !== undefined && object.balancerWeight !== null ? BigInt(object.balancerWeight.toString()) : BigInt(0); message.concentratedWeight = object.concentratedWeight !== undefined && object.concentratedWeight !== null ? BigInt(object.concentratedWeight.toString()) : BigInt(0); + message.cosmwasmWeight = object.cosmwasmWeight !== undefined && object.cosmwasmWeight !== null ? BigInt(object.cosmwasmWeight.toString()) : BigInt(0); return message; }, fromAmino(object: PoolWeightsAmino): PoolWeights { return { stableWeight: BigInt(object.stable_weight), balancerWeight: BigInt(object.balancer_weight), - concentratedWeight: BigInt(object.concentrated_weight) + concentratedWeight: BigInt(object.concentrated_weight), + cosmwasmWeight: BigInt(object.cosmwasm_weight) }; }, toAmino(message: PoolWeights): PoolWeightsAmino { @@ -671,6 +884,7 @@ export const PoolWeights = { obj.stable_weight = message.stableWeight ? message.stableWeight.toString() : undefined; obj.balancer_weight = message.balancerWeight ? message.balancerWeight.toString() : undefined; obj.concentrated_weight = message.concentratedWeight ? message.concentratedWeight.toString() : undefined; + obj.cosmwasm_weight = message.cosmwasmWeight ? message.cosmwasmWeight.toString() : undefined; return obj; }, fromAminoMsg(object: PoolWeightsAminoMsg): PoolWeights { @@ -695,6 +909,462 @@ export const PoolWeights = { }; } }; +function createBaseInfoByPoolType(): InfoByPoolType { + return { + stable: StablePoolInfo.fromPartial({}), + balancer: BalancerPoolInfo.fromPartial({}), + concentrated: ConcentratedPoolInfo.fromPartial({}), + cosmwasm: CosmwasmPoolInfo.fromPartial({}) + }; +} +export const InfoByPoolType = { + typeUrl: "/osmosis.protorev.v1beta1.InfoByPoolType", + encode(message: InfoByPoolType, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.stable !== undefined) { + StablePoolInfo.encode(message.stable, writer.uint32(10).fork()).ldelim(); + } + if (message.balancer !== undefined) { + BalancerPoolInfo.encode(message.balancer, writer.uint32(18).fork()).ldelim(); + } + if (message.concentrated !== undefined) { + ConcentratedPoolInfo.encode(message.concentrated, writer.uint32(26).fork()).ldelim(); + } + if (message.cosmwasm !== undefined) { + CosmwasmPoolInfo.encode(message.cosmwasm, writer.uint32(34).fork()).ldelim(); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): InfoByPoolType { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseInfoByPoolType(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.stable = StablePoolInfo.decode(reader, reader.uint32()); + break; + case 2: + message.balancer = BalancerPoolInfo.decode(reader, reader.uint32()); + break; + case 3: + message.concentrated = ConcentratedPoolInfo.decode(reader, reader.uint32()); + break; + case 4: + message.cosmwasm = CosmwasmPoolInfo.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): InfoByPoolType { + const message = createBaseInfoByPoolType(); + message.stable = object.stable !== undefined && object.stable !== null ? StablePoolInfo.fromPartial(object.stable) : undefined; + message.balancer = object.balancer !== undefined && object.balancer !== null ? BalancerPoolInfo.fromPartial(object.balancer) : undefined; + message.concentrated = object.concentrated !== undefined && object.concentrated !== null ? ConcentratedPoolInfo.fromPartial(object.concentrated) : undefined; + message.cosmwasm = object.cosmwasm !== undefined && object.cosmwasm !== null ? CosmwasmPoolInfo.fromPartial(object.cosmwasm) : undefined; + return message; + }, + fromAmino(object: InfoByPoolTypeAmino): InfoByPoolType { + return { + stable: object?.stable ? StablePoolInfo.fromAmino(object.stable) : undefined, + balancer: object?.balancer ? BalancerPoolInfo.fromAmino(object.balancer) : undefined, + concentrated: object?.concentrated ? ConcentratedPoolInfo.fromAmino(object.concentrated) : undefined, + cosmwasm: object?.cosmwasm ? CosmwasmPoolInfo.fromAmino(object.cosmwasm) : undefined + }; + }, + toAmino(message: InfoByPoolType): InfoByPoolTypeAmino { + const obj: any = {}; + obj.stable = message.stable ? StablePoolInfo.toAmino(message.stable) : undefined; + obj.balancer = message.balancer ? BalancerPoolInfo.toAmino(message.balancer) : undefined; + obj.concentrated = message.concentrated ? ConcentratedPoolInfo.toAmino(message.concentrated) : undefined; + obj.cosmwasm = message.cosmwasm ? CosmwasmPoolInfo.toAmino(message.cosmwasm) : undefined; + return obj; + }, + fromAminoMsg(object: InfoByPoolTypeAminoMsg): InfoByPoolType { + return InfoByPoolType.fromAmino(object.value); + }, + toAminoMsg(message: InfoByPoolType): InfoByPoolTypeAminoMsg { + return { + type: "osmosis/protorev/info-by-pool-type", + value: InfoByPoolType.toAmino(message) + }; + }, + fromProtoMsg(message: InfoByPoolTypeProtoMsg): InfoByPoolType { + return InfoByPoolType.decode(message.value); + }, + toProto(message: InfoByPoolType): Uint8Array { + return InfoByPoolType.encode(message).finish(); + }, + toProtoMsg(message: InfoByPoolType): InfoByPoolTypeProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.InfoByPoolType", + value: InfoByPoolType.encode(message).finish() + }; + } +}; +function createBaseStablePoolInfo(): StablePoolInfo { + return { + weight: BigInt(0) + }; +} +export const StablePoolInfo = { + typeUrl: "/osmosis.protorev.v1beta1.StablePoolInfo", + encode(message: StablePoolInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.weight !== BigInt(0)) { + writer.uint32(8).uint64(message.weight); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): StablePoolInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseStablePoolInfo(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.weight = reader.uint64(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): StablePoolInfo { + const message = createBaseStablePoolInfo(); + message.weight = object.weight !== undefined && object.weight !== null ? BigInt(object.weight.toString()) : BigInt(0); + return message; + }, + fromAmino(object: StablePoolInfoAmino): StablePoolInfo { + return { + weight: BigInt(object.weight) + }; + }, + toAmino(message: StablePoolInfo): StablePoolInfoAmino { + const obj: any = {}; + obj.weight = message.weight ? message.weight.toString() : undefined; + return obj; + }, + fromAminoMsg(object: StablePoolInfoAminoMsg): StablePoolInfo { + return StablePoolInfo.fromAmino(object.value); + }, + toAminoMsg(message: StablePoolInfo): StablePoolInfoAminoMsg { + return { + type: "osmosis/protorev/stable-pool-info", + value: StablePoolInfo.toAmino(message) + }; + }, + fromProtoMsg(message: StablePoolInfoProtoMsg): StablePoolInfo { + return StablePoolInfo.decode(message.value); + }, + toProto(message: StablePoolInfo): Uint8Array { + return StablePoolInfo.encode(message).finish(); + }, + toProtoMsg(message: StablePoolInfo): StablePoolInfoProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.StablePoolInfo", + value: StablePoolInfo.encode(message).finish() + }; + } +}; +function createBaseBalancerPoolInfo(): BalancerPoolInfo { + return { + weight: BigInt(0) + }; +} +export const BalancerPoolInfo = { + typeUrl: "/osmosis.protorev.v1beta1.BalancerPoolInfo", + encode(message: BalancerPoolInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.weight !== BigInt(0)) { + writer.uint32(8).uint64(message.weight); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): BalancerPoolInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseBalancerPoolInfo(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.weight = reader.uint64(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): BalancerPoolInfo { + const message = createBaseBalancerPoolInfo(); + message.weight = object.weight !== undefined && object.weight !== null ? BigInt(object.weight.toString()) : BigInt(0); + return message; + }, + fromAmino(object: BalancerPoolInfoAmino): BalancerPoolInfo { + return { + weight: BigInt(object.weight) + }; + }, + toAmino(message: BalancerPoolInfo): BalancerPoolInfoAmino { + const obj: any = {}; + obj.weight = message.weight ? message.weight.toString() : undefined; + return obj; + }, + fromAminoMsg(object: BalancerPoolInfoAminoMsg): BalancerPoolInfo { + return BalancerPoolInfo.fromAmino(object.value); + }, + toAminoMsg(message: BalancerPoolInfo): BalancerPoolInfoAminoMsg { + return { + type: "osmosis/protorev/balancer-pool-info", + value: BalancerPoolInfo.toAmino(message) + }; + }, + fromProtoMsg(message: BalancerPoolInfoProtoMsg): BalancerPoolInfo { + return BalancerPoolInfo.decode(message.value); + }, + toProto(message: BalancerPoolInfo): Uint8Array { + return BalancerPoolInfo.encode(message).finish(); + }, + toProtoMsg(message: BalancerPoolInfo): BalancerPoolInfoProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.BalancerPoolInfo", + value: BalancerPoolInfo.encode(message).finish() + }; + } +}; +function createBaseConcentratedPoolInfo(): ConcentratedPoolInfo { + return { + weight: BigInt(0), + maxTicksCrossed: BigInt(0) + }; +} +export const ConcentratedPoolInfo = { + typeUrl: "/osmosis.protorev.v1beta1.ConcentratedPoolInfo", + encode(message: ConcentratedPoolInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.weight !== BigInt(0)) { + writer.uint32(8).uint64(message.weight); + } + if (message.maxTicksCrossed !== BigInt(0)) { + writer.uint32(16).uint64(message.maxTicksCrossed); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): ConcentratedPoolInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseConcentratedPoolInfo(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.weight = reader.uint64(); + break; + case 2: + message.maxTicksCrossed = reader.uint64(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): ConcentratedPoolInfo { + const message = createBaseConcentratedPoolInfo(); + message.weight = object.weight !== undefined && object.weight !== null ? BigInt(object.weight.toString()) : BigInt(0); + message.maxTicksCrossed = object.maxTicksCrossed !== undefined && object.maxTicksCrossed !== null ? BigInt(object.maxTicksCrossed.toString()) : BigInt(0); + return message; + }, + fromAmino(object: ConcentratedPoolInfoAmino): ConcentratedPoolInfo { + return { + weight: BigInt(object.weight), + maxTicksCrossed: BigInt(object.max_ticks_crossed) + }; + }, + toAmino(message: ConcentratedPoolInfo): ConcentratedPoolInfoAmino { + const obj: any = {}; + obj.weight = message.weight ? message.weight.toString() : undefined; + obj.max_ticks_crossed = message.maxTicksCrossed ? message.maxTicksCrossed.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ConcentratedPoolInfoAminoMsg): ConcentratedPoolInfo { + return ConcentratedPoolInfo.fromAmino(object.value); + }, + toAminoMsg(message: ConcentratedPoolInfo): ConcentratedPoolInfoAminoMsg { + return { + type: "osmosis/protorev/concentrated-pool-info", + value: ConcentratedPoolInfo.toAmino(message) + }; + }, + fromProtoMsg(message: ConcentratedPoolInfoProtoMsg): ConcentratedPoolInfo { + return ConcentratedPoolInfo.decode(message.value); + }, + toProto(message: ConcentratedPoolInfo): Uint8Array { + return ConcentratedPoolInfo.encode(message).finish(); + }, + toProtoMsg(message: ConcentratedPoolInfo): ConcentratedPoolInfoProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.ConcentratedPoolInfo", + value: ConcentratedPoolInfo.encode(message).finish() + }; + } +}; +function createBaseCosmwasmPoolInfo(): CosmwasmPoolInfo { + return { + weightMaps: [] + }; +} +export const CosmwasmPoolInfo = { + typeUrl: "/osmosis.protorev.v1beta1.CosmwasmPoolInfo", + encode(message: CosmwasmPoolInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + for (const v of message.weightMaps) { + WeightMap.encode(v!, writer.uint32(10).fork()).ldelim(); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): CosmwasmPoolInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseCosmwasmPoolInfo(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.weightMaps.push(WeightMap.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): CosmwasmPoolInfo { + const message = createBaseCosmwasmPoolInfo(); + message.weightMaps = object.weightMaps?.map(e => WeightMap.fromPartial(e)) || []; + return message; + }, + fromAmino(object: CosmwasmPoolInfoAmino): CosmwasmPoolInfo { + return { + weightMaps: Array.isArray(object?.weight_maps) ? object.weight_maps.map((e: any) => WeightMap.fromAmino(e)) : [] + }; + }, + toAmino(message: CosmwasmPoolInfo): CosmwasmPoolInfoAmino { + const obj: any = {}; + if (message.weightMaps) { + obj.weight_maps = message.weightMaps.map(e => e ? WeightMap.toAmino(e) : undefined); + } else { + obj.weight_maps = []; + } + return obj; + }, + fromAminoMsg(object: CosmwasmPoolInfoAminoMsg): CosmwasmPoolInfo { + return CosmwasmPoolInfo.fromAmino(object.value); + }, + toAminoMsg(message: CosmwasmPoolInfo): CosmwasmPoolInfoAminoMsg { + return { + type: "osmosis/protorev/cosmwasm-pool-info", + value: CosmwasmPoolInfo.toAmino(message) + }; + }, + fromProtoMsg(message: CosmwasmPoolInfoProtoMsg): CosmwasmPoolInfo { + return CosmwasmPoolInfo.decode(message.value); + }, + toProto(message: CosmwasmPoolInfo): Uint8Array { + return CosmwasmPoolInfo.encode(message).finish(); + }, + toProtoMsg(message: CosmwasmPoolInfo): CosmwasmPoolInfoProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.CosmwasmPoolInfo", + value: CosmwasmPoolInfo.encode(message).finish() + }; + } +}; +function createBaseWeightMap(): WeightMap { + return { + weight: BigInt(0), + contractAddress: "" + }; +} +export const WeightMap = { + typeUrl: "/osmosis.protorev.v1beta1.WeightMap", + encode(message: WeightMap, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.weight !== BigInt(0)) { + writer.uint32(8).uint64(message.weight); + } + if (message.contractAddress !== "") { + writer.uint32(18).string(message.contractAddress); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): WeightMap { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseWeightMap(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.weight = reader.uint64(); + break; + case 2: + message.contractAddress = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): WeightMap { + const message = createBaseWeightMap(); + message.weight = object.weight !== undefined && object.weight !== null ? BigInt(object.weight.toString()) : BigInt(0); + message.contractAddress = object.contractAddress ?? ""; + return message; + }, + fromAmino(object: WeightMapAmino): WeightMap { + return { + weight: BigInt(object.weight), + contractAddress: object.contract_address + }; + }, + toAmino(message: WeightMap): WeightMapAmino { + const obj: any = {}; + obj.weight = message.weight ? message.weight.toString() : undefined; + obj.contract_address = message.contractAddress; + return obj; + }, + fromAminoMsg(object: WeightMapAminoMsg): WeightMap { + return WeightMap.fromAmino(object.value); + }, + toAminoMsg(message: WeightMap): WeightMapAminoMsg { + return { + type: "osmosis/protorev/weight-map", + value: WeightMap.toAmino(message) + }; + }, + fromProtoMsg(message: WeightMapProtoMsg): WeightMap { + return WeightMap.decode(message.value); + }, + toProto(message: WeightMap): Uint8Array { + return WeightMap.encode(message).finish(); + }, + toProtoMsg(message: WeightMap): WeightMapProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.WeightMap", + value: WeightMap.encode(message).finish() + }; + } +}; function createBaseBaseDenom(): BaseDenom { return { denom: "", diff --git a/packages/protobuf/codegen/osmosis/protorev/v1beta1/query.rpc.Query.ts b/packages/protobuf/codegen/osmosis/protorev/v1beta1/query.rpc.Query.ts index af6c21fc5..9434bcd4d 100644 --- a/packages/protobuf/codegen/osmosis/protorev/v1beta1/query.rpc.Query.ts +++ b/packages/protobuf/codegen/osmosis/protorev/v1beta1/query.rpc.Query.ts @@ -1,7 +1,7 @@ import { Rpc } from "../../../helpers"; import { BinaryReader } from "../../../binary"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryParamsRequest, QueryParamsResponse, QueryGetProtoRevNumberOfTradesRequest, QueryGetProtoRevNumberOfTradesResponse, QueryGetProtoRevProfitsByDenomRequest, QueryGetProtoRevProfitsByDenomResponse, QueryGetProtoRevAllProfitsRequest, QueryGetProtoRevAllProfitsResponse, QueryGetProtoRevStatisticsByRouteRequest, QueryGetProtoRevStatisticsByRouteResponse, QueryGetProtoRevAllRouteStatisticsRequest, QueryGetProtoRevAllRouteStatisticsResponse, QueryGetProtoRevTokenPairArbRoutesRequest, QueryGetProtoRevTokenPairArbRoutesResponse, QueryGetProtoRevAdminAccountRequest, QueryGetProtoRevAdminAccountResponse, QueryGetProtoRevDeveloperAccountRequest, QueryGetProtoRevDeveloperAccountResponse, QueryGetProtoRevPoolWeightsRequest, QueryGetProtoRevPoolWeightsResponse, QueryGetProtoRevMaxPoolPointsPerTxRequest, QueryGetProtoRevMaxPoolPointsPerTxResponse, QueryGetProtoRevMaxPoolPointsPerBlockRequest, QueryGetProtoRevMaxPoolPointsPerBlockResponse, QueryGetProtoRevBaseDenomsRequest, QueryGetProtoRevBaseDenomsResponse, QueryGetProtoRevEnabledRequest, QueryGetProtoRevEnabledResponse, QueryGetProtoRevPoolRequest, QueryGetProtoRevPoolResponse } from "./query"; +import { QueryParamsRequest, QueryParamsResponse, QueryGetProtoRevNumberOfTradesRequest, QueryGetProtoRevNumberOfTradesResponse, QueryGetProtoRevProfitsByDenomRequest, QueryGetProtoRevProfitsByDenomResponse, QueryGetProtoRevAllProfitsRequest, QueryGetProtoRevAllProfitsResponse, QueryGetProtoRevStatisticsByRouteRequest, QueryGetProtoRevStatisticsByRouteResponse, QueryGetProtoRevAllRouteStatisticsRequest, QueryGetProtoRevAllRouteStatisticsResponse, QueryGetProtoRevTokenPairArbRoutesRequest, QueryGetProtoRevTokenPairArbRoutesResponse, QueryGetProtoRevAdminAccountRequest, QueryGetProtoRevAdminAccountResponse, QueryGetProtoRevDeveloperAccountRequest, QueryGetProtoRevDeveloperAccountResponse, QueryGetProtoRevInfoByPoolTypeRequest, QueryGetProtoRevInfoByPoolTypeResponse, QueryGetProtoRevMaxPoolPointsPerTxRequest, QueryGetProtoRevMaxPoolPointsPerTxResponse, QueryGetProtoRevMaxPoolPointsPerBlockRequest, QueryGetProtoRevMaxPoolPointsPerBlockResponse, QueryGetProtoRevBaseDenomsRequest, QueryGetProtoRevBaseDenomsResponse, QueryGetProtoRevEnabledRequest, QueryGetProtoRevEnabledResponse, QueryGetProtoRevPoolRequest, QueryGetProtoRevPoolResponse } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { /** Params queries the parameters of the module. */ @@ -36,10 +36,10 @@ export interface Query { /** GetProtoRevDeveloperAccount queries the developer account of the module */ getProtoRevDeveloperAccount(request?: QueryGetProtoRevDeveloperAccountRequest): Promise; /** - * GetProtoRevPoolWeights queries the weights of each pool type currently - * being used by the module + * GetProtoRevInfoByPoolType queries pool type information that is currently + * being utilized by the module */ - getProtoRevPoolWeights(request?: QueryGetProtoRevPoolWeightsRequest): Promise; + getProtoRevInfoByPoolType(request?: QueryGetProtoRevInfoByPoolTypeRequest): Promise; /** * GetProtoRevMaxPoolPointsPerTx queries the maximum number of pool points * that can be consumed per transaction @@ -76,7 +76,7 @@ export class QueryClientImpl implements Query { this.getProtoRevTokenPairArbRoutes = this.getProtoRevTokenPairArbRoutes.bind(this); this.getProtoRevAdminAccount = this.getProtoRevAdminAccount.bind(this); this.getProtoRevDeveloperAccount = this.getProtoRevDeveloperAccount.bind(this); - this.getProtoRevPoolWeights = this.getProtoRevPoolWeights.bind(this); + this.getProtoRevInfoByPoolType = this.getProtoRevInfoByPoolType.bind(this); this.getProtoRevMaxPoolPointsPerTx = this.getProtoRevMaxPoolPointsPerTx.bind(this); this.getProtoRevMaxPoolPointsPerBlock = this.getProtoRevMaxPoolPointsPerBlock.bind(this); this.getProtoRevBaseDenoms = this.getProtoRevBaseDenoms.bind(this); @@ -128,10 +128,10 @@ export class QueryClientImpl implements Query { const promise = this.rpc.request("osmosis.protorev.v1beta1.Query", "GetProtoRevDeveloperAccount", data); return promise.then(data => QueryGetProtoRevDeveloperAccountResponse.decode(new BinaryReader(data))); } - getProtoRevPoolWeights(request: QueryGetProtoRevPoolWeightsRequest = {}): Promise { - const data = QueryGetProtoRevPoolWeightsRequest.encode(request).finish(); - const promise = this.rpc.request("osmosis.protorev.v1beta1.Query", "GetProtoRevPoolWeights", data); - return promise.then(data => QueryGetProtoRevPoolWeightsResponse.decode(new BinaryReader(data))); + getProtoRevInfoByPoolType(request: QueryGetProtoRevInfoByPoolTypeRequest = {}): Promise { + const data = QueryGetProtoRevInfoByPoolTypeRequest.encode(request).finish(); + const promise = this.rpc.request("osmosis.protorev.v1beta1.Query", "GetProtoRevInfoByPoolType", data); + return promise.then(data => QueryGetProtoRevInfoByPoolTypeResponse.decode(new BinaryReader(data))); } getProtoRevMaxPoolPointsPerTx(request: QueryGetProtoRevMaxPoolPointsPerTxRequest = {}): Promise { const data = QueryGetProtoRevMaxPoolPointsPerTxRequest.encode(request).finish(); @@ -190,8 +190,8 @@ export const createRpcQueryExtension = (base: QueryClient) => { getProtoRevDeveloperAccount(request?: QueryGetProtoRevDeveloperAccountRequest): Promise { return queryService.getProtoRevDeveloperAccount(request); }, - getProtoRevPoolWeights(request?: QueryGetProtoRevPoolWeightsRequest): Promise { - return queryService.getProtoRevPoolWeights(request); + getProtoRevInfoByPoolType(request?: QueryGetProtoRevInfoByPoolTypeRequest): Promise { + return queryService.getProtoRevInfoByPoolType(request); }, getProtoRevMaxPoolPointsPerTx(request?: QueryGetProtoRevMaxPoolPointsPerTxRequest): Promise { return queryService.getProtoRevMaxPoolPointsPerTx(request); diff --git a/packages/protobuf/codegen/osmosis/protorev/v1beta1/query.ts b/packages/protobuf/codegen/osmosis/protorev/v1beta1/query.ts index 515db52a9..c0dc045f3 100644 --- a/packages/protobuf/codegen/osmosis/protorev/v1beta1/query.ts +++ b/packages/protobuf/codegen/osmosis/protorev/v1beta1/query.ts @@ -1,7 +1,7 @@ //@ts-nocheck import { Params, ParamsAmino, ParamsSDKType } from "./params"; import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { RouteStatistics, RouteStatisticsAmino, RouteStatisticsSDKType, TokenPairArbRoutes, TokenPairArbRoutesAmino, TokenPairArbRoutesSDKType, PoolWeights, PoolWeightsAmino, PoolWeightsSDKType, BaseDenom, BaseDenomAmino, BaseDenomSDKType } from "./protorev"; +import { RouteStatistics, RouteStatisticsAmino, RouteStatisticsSDKType, TokenPairArbRoutes, TokenPairArbRoutesAmino, TokenPairArbRoutesSDKType, InfoByPoolType, InfoByPoolTypeAmino, InfoByPoolTypeSDKType, BaseDenom, BaseDenomAmino, BaseDenomSDKType } from "./protorev"; import { BinaryReader, BinaryWriter } from "../../../binary"; /** QueryParamsRequest is request type for the Query/Params RPC method. */ export interface QueryParamsRequest {} @@ -506,58 +506,64 @@ export interface QueryGetProtoRevDeveloperAccountResponseSDKType { developer_account: string; } /** - * QueryGetProtoRevPoolWeightsRequest is request type for the - * Query/GetProtoRevPoolWeights RPC method. + * QueryGetProtoRevInfoByPoolTypeRequest is request type for the + * Query/GetProtoRevInfoByPoolType RPC method. */ -export interface QueryGetProtoRevPoolWeightsRequest {} -export interface QueryGetProtoRevPoolWeightsRequestProtoMsg { - typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevPoolWeightsRequest"; +export interface QueryGetProtoRevInfoByPoolTypeRequest {} +export interface QueryGetProtoRevInfoByPoolTypeRequestProtoMsg { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevInfoByPoolTypeRequest"; value: Uint8Array; } /** - * QueryGetProtoRevPoolWeightsRequest is request type for the - * Query/GetProtoRevPoolWeights RPC method. + * QueryGetProtoRevInfoByPoolTypeRequest is request type for the + * Query/GetProtoRevInfoByPoolType RPC method. */ -export interface QueryGetProtoRevPoolWeightsRequestAmino {} -export interface QueryGetProtoRevPoolWeightsRequestAminoMsg { - type: "osmosis/protorev/query-get-proto-rev-pool-weights-request"; - value: QueryGetProtoRevPoolWeightsRequestAmino; +export interface QueryGetProtoRevInfoByPoolTypeRequestAmino {} +export interface QueryGetProtoRevInfoByPoolTypeRequestAminoMsg { + type: "osmosis/protorev/query-get-proto-rev-info-by-pool-type-request"; + value: QueryGetProtoRevInfoByPoolTypeRequestAmino; } /** - * QueryGetProtoRevPoolWeightsRequest is request type for the - * Query/GetProtoRevPoolWeights RPC method. + * QueryGetProtoRevInfoByPoolTypeRequest is request type for the + * Query/GetProtoRevInfoByPoolType RPC method. */ -export interface QueryGetProtoRevPoolWeightsRequestSDKType {} +export interface QueryGetProtoRevInfoByPoolTypeRequestSDKType {} /** - * QueryGetProtoRevPoolWeightsResponse is response type for the - * Query/GetProtoRevPoolWeights RPC method. + * QueryGetProtoRevInfoByPoolTypeResponse is response type for the + * Query/GetProtoRevInfoByPoolType RPC method. */ -export interface QueryGetProtoRevPoolWeightsResponse { - /** pool_weights is a list of all of the pool weights */ - poolWeights: PoolWeights | undefined; +export interface QueryGetProtoRevInfoByPoolTypeResponse { + /** + * InfoByPoolType contains all information pertaining to how different + * pool types are handled by the module. + */ + infoByPoolType: InfoByPoolType | undefined; } -export interface QueryGetProtoRevPoolWeightsResponseProtoMsg { - typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevPoolWeightsResponse"; +export interface QueryGetProtoRevInfoByPoolTypeResponseProtoMsg { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevInfoByPoolTypeResponse"; value: Uint8Array; } /** - * QueryGetProtoRevPoolWeightsResponse is response type for the - * Query/GetProtoRevPoolWeights RPC method. + * QueryGetProtoRevInfoByPoolTypeResponse is response type for the + * Query/GetProtoRevInfoByPoolType RPC method. */ -export interface QueryGetProtoRevPoolWeightsResponseAmino { - /** pool_weights is a list of all of the pool weights */ - pool_weights?: PoolWeightsAmino | undefined; +export interface QueryGetProtoRevInfoByPoolTypeResponseAmino { + /** + * InfoByPoolType contains all information pertaining to how different + * pool types are handled by the module. + */ + info_by_pool_type?: InfoByPoolTypeAmino | undefined; } -export interface QueryGetProtoRevPoolWeightsResponseAminoMsg { - type: "osmosis/protorev/query-get-proto-rev-pool-weights-response"; - value: QueryGetProtoRevPoolWeightsResponseAmino; +export interface QueryGetProtoRevInfoByPoolTypeResponseAminoMsg { + type: "osmosis/protorev/query-get-proto-rev-info-by-pool-type-response"; + value: QueryGetProtoRevInfoByPoolTypeResponseAmino; } /** - * QueryGetProtoRevPoolWeightsResponse is response type for the - * Query/GetProtoRevPoolWeights RPC method. + * QueryGetProtoRevInfoByPoolTypeResponse is response type for the + * Query/GetProtoRevInfoByPoolType RPC method. */ -export interface QueryGetProtoRevPoolWeightsResponseSDKType { - pool_weights: PoolWeightsSDKType | undefined; +export interface QueryGetProtoRevInfoByPoolTypeResponseSDKType { + info_by_pool_type: InfoByPoolTypeSDKType | undefined; } /** * QueryGetProtoRevMaxPoolPointsPerBlockRequest is request type for the @@ -2007,18 +2013,18 @@ export const QueryGetProtoRevDeveloperAccountResponse = { }; } }; -function createBaseQueryGetProtoRevPoolWeightsRequest(): QueryGetProtoRevPoolWeightsRequest { +function createBaseQueryGetProtoRevInfoByPoolTypeRequest(): QueryGetProtoRevInfoByPoolTypeRequest { return {}; } -export const QueryGetProtoRevPoolWeightsRequest = { - typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevPoolWeightsRequest", - encode(_: QueryGetProtoRevPoolWeightsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { +export const QueryGetProtoRevInfoByPoolTypeRequest = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevInfoByPoolTypeRequest", + encode(_: QueryGetProtoRevInfoByPoolTypeRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: BinaryReader | Uint8Array, length?: number): QueryGetProtoRevPoolWeightsRequest { + decode(input: BinaryReader | Uint8Array, length?: number): QueryGetProtoRevInfoByPoolTypeRequest { const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseQueryGetProtoRevPoolWeightsRequest(); + const message = createBaseQueryGetProtoRevInfoByPoolTypeRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { @@ -2029,61 +2035,61 @@ export const QueryGetProtoRevPoolWeightsRequest = { } return message; }, - fromPartial(_: Partial): QueryGetProtoRevPoolWeightsRequest { - const message = createBaseQueryGetProtoRevPoolWeightsRequest(); + fromPartial(_: Partial): QueryGetProtoRevInfoByPoolTypeRequest { + const message = createBaseQueryGetProtoRevInfoByPoolTypeRequest(); return message; }, - fromAmino(_: QueryGetProtoRevPoolWeightsRequestAmino): QueryGetProtoRevPoolWeightsRequest { + fromAmino(_: QueryGetProtoRevInfoByPoolTypeRequestAmino): QueryGetProtoRevInfoByPoolTypeRequest { return {}; }, - toAmino(_: QueryGetProtoRevPoolWeightsRequest): QueryGetProtoRevPoolWeightsRequestAmino { + toAmino(_: QueryGetProtoRevInfoByPoolTypeRequest): QueryGetProtoRevInfoByPoolTypeRequestAmino { const obj: any = {}; return obj; }, - fromAminoMsg(object: QueryGetProtoRevPoolWeightsRequestAminoMsg): QueryGetProtoRevPoolWeightsRequest { - return QueryGetProtoRevPoolWeightsRequest.fromAmino(object.value); + fromAminoMsg(object: QueryGetProtoRevInfoByPoolTypeRequestAminoMsg): QueryGetProtoRevInfoByPoolTypeRequest { + return QueryGetProtoRevInfoByPoolTypeRequest.fromAmino(object.value); }, - toAminoMsg(message: QueryGetProtoRevPoolWeightsRequest): QueryGetProtoRevPoolWeightsRequestAminoMsg { + toAminoMsg(message: QueryGetProtoRevInfoByPoolTypeRequest): QueryGetProtoRevInfoByPoolTypeRequestAminoMsg { return { - type: "osmosis/protorev/query-get-proto-rev-pool-weights-request", - value: QueryGetProtoRevPoolWeightsRequest.toAmino(message) + type: "osmosis/protorev/query-get-proto-rev-info-by-pool-type-request", + value: QueryGetProtoRevInfoByPoolTypeRequest.toAmino(message) }; }, - fromProtoMsg(message: QueryGetProtoRevPoolWeightsRequestProtoMsg): QueryGetProtoRevPoolWeightsRequest { - return QueryGetProtoRevPoolWeightsRequest.decode(message.value); + fromProtoMsg(message: QueryGetProtoRevInfoByPoolTypeRequestProtoMsg): QueryGetProtoRevInfoByPoolTypeRequest { + return QueryGetProtoRevInfoByPoolTypeRequest.decode(message.value); }, - toProto(message: QueryGetProtoRevPoolWeightsRequest): Uint8Array { - return QueryGetProtoRevPoolWeightsRequest.encode(message).finish(); + toProto(message: QueryGetProtoRevInfoByPoolTypeRequest): Uint8Array { + return QueryGetProtoRevInfoByPoolTypeRequest.encode(message).finish(); }, - toProtoMsg(message: QueryGetProtoRevPoolWeightsRequest): QueryGetProtoRevPoolWeightsRequestProtoMsg { + toProtoMsg(message: QueryGetProtoRevInfoByPoolTypeRequest): QueryGetProtoRevInfoByPoolTypeRequestProtoMsg { return { - typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevPoolWeightsRequest", - value: QueryGetProtoRevPoolWeightsRequest.encode(message).finish() + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevInfoByPoolTypeRequest", + value: QueryGetProtoRevInfoByPoolTypeRequest.encode(message).finish() }; } }; -function createBaseQueryGetProtoRevPoolWeightsResponse(): QueryGetProtoRevPoolWeightsResponse { +function createBaseQueryGetProtoRevInfoByPoolTypeResponse(): QueryGetProtoRevInfoByPoolTypeResponse { return { - poolWeights: PoolWeights.fromPartial({}) + infoByPoolType: InfoByPoolType.fromPartial({}) }; } -export const QueryGetProtoRevPoolWeightsResponse = { - typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevPoolWeightsResponse", - encode(message: QueryGetProtoRevPoolWeightsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.poolWeights !== undefined) { - PoolWeights.encode(message.poolWeights, writer.uint32(10).fork()).ldelim(); +export const QueryGetProtoRevInfoByPoolTypeResponse = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevInfoByPoolTypeResponse", + encode(message: QueryGetProtoRevInfoByPoolTypeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.infoByPoolType !== undefined) { + InfoByPoolType.encode(message.infoByPoolType, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: BinaryReader | Uint8Array, length?: number): QueryGetProtoRevPoolWeightsResponse { + decode(input: BinaryReader | Uint8Array, length?: number): QueryGetProtoRevInfoByPoolTypeResponse { const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseQueryGetProtoRevPoolWeightsResponse(); + const message = createBaseQueryGetProtoRevInfoByPoolTypeResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.poolWeights = PoolWeights.decode(reader, reader.uint32()); + message.infoByPoolType = InfoByPoolType.decode(reader, reader.uint32()); break; default: reader.skipType(tag & 7); @@ -2092,40 +2098,40 @@ export const QueryGetProtoRevPoolWeightsResponse = { } return message; }, - fromPartial(object: Partial): QueryGetProtoRevPoolWeightsResponse { - const message = createBaseQueryGetProtoRevPoolWeightsResponse(); - message.poolWeights = object.poolWeights !== undefined && object.poolWeights !== null ? PoolWeights.fromPartial(object.poolWeights) : undefined; + fromPartial(object: Partial): QueryGetProtoRevInfoByPoolTypeResponse { + const message = createBaseQueryGetProtoRevInfoByPoolTypeResponse(); + message.infoByPoolType = object.infoByPoolType !== undefined && object.infoByPoolType !== null ? InfoByPoolType.fromPartial(object.infoByPoolType) : undefined; return message; }, - fromAmino(object: QueryGetProtoRevPoolWeightsResponseAmino): QueryGetProtoRevPoolWeightsResponse { + fromAmino(object: QueryGetProtoRevInfoByPoolTypeResponseAmino): QueryGetProtoRevInfoByPoolTypeResponse { return { - poolWeights: object?.pool_weights ? PoolWeights.fromAmino(object.pool_weights) : undefined + infoByPoolType: object?.info_by_pool_type ? InfoByPoolType.fromAmino(object.info_by_pool_type) : undefined }; }, - toAmino(message: QueryGetProtoRevPoolWeightsResponse): QueryGetProtoRevPoolWeightsResponseAmino { + toAmino(message: QueryGetProtoRevInfoByPoolTypeResponse): QueryGetProtoRevInfoByPoolTypeResponseAmino { const obj: any = {}; - obj.pool_weights = message.poolWeights ? PoolWeights.toAmino(message.poolWeights) : undefined; + obj.info_by_pool_type = message.infoByPoolType ? InfoByPoolType.toAmino(message.infoByPoolType) : undefined; return obj; }, - fromAminoMsg(object: QueryGetProtoRevPoolWeightsResponseAminoMsg): QueryGetProtoRevPoolWeightsResponse { - return QueryGetProtoRevPoolWeightsResponse.fromAmino(object.value); + fromAminoMsg(object: QueryGetProtoRevInfoByPoolTypeResponseAminoMsg): QueryGetProtoRevInfoByPoolTypeResponse { + return QueryGetProtoRevInfoByPoolTypeResponse.fromAmino(object.value); }, - toAminoMsg(message: QueryGetProtoRevPoolWeightsResponse): QueryGetProtoRevPoolWeightsResponseAminoMsg { + toAminoMsg(message: QueryGetProtoRevInfoByPoolTypeResponse): QueryGetProtoRevInfoByPoolTypeResponseAminoMsg { return { - type: "osmosis/protorev/query-get-proto-rev-pool-weights-response", - value: QueryGetProtoRevPoolWeightsResponse.toAmino(message) + type: "osmosis/protorev/query-get-proto-rev-info-by-pool-type-response", + value: QueryGetProtoRevInfoByPoolTypeResponse.toAmino(message) }; }, - fromProtoMsg(message: QueryGetProtoRevPoolWeightsResponseProtoMsg): QueryGetProtoRevPoolWeightsResponse { - return QueryGetProtoRevPoolWeightsResponse.decode(message.value); + fromProtoMsg(message: QueryGetProtoRevInfoByPoolTypeResponseProtoMsg): QueryGetProtoRevInfoByPoolTypeResponse { + return QueryGetProtoRevInfoByPoolTypeResponse.decode(message.value); }, - toProto(message: QueryGetProtoRevPoolWeightsResponse): Uint8Array { - return QueryGetProtoRevPoolWeightsResponse.encode(message).finish(); + toProto(message: QueryGetProtoRevInfoByPoolTypeResponse): Uint8Array { + return QueryGetProtoRevInfoByPoolTypeResponse.encode(message).finish(); }, - toProtoMsg(message: QueryGetProtoRevPoolWeightsResponse): QueryGetProtoRevPoolWeightsResponseProtoMsg { + toProtoMsg(message: QueryGetProtoRevInfoByPoolTypeResponse): QueryGetProtoRevInfoByPoolTypeResponseProtoMsg { return { - typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevPoolWeightsResponse", - value: QueryGetProtoRevPoolWeightsResponse.encode(message).finish() + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevInfoByPoolTypeResponse", + value: QueryGetProtoRevInfoByPoolTypeResponse.encode(message).finish() }; } }; diff --git a/packages/protobuf/codegen/osmosis/protorev/v1beta1/tx.amino.ts b/packages/protobuf/codegen/osmosis/protorev/v1beta1/tx.amino.ts index e7fb659e4..5b4717c78 100644 --- a/packages/protobuf/codegen/osmosis/protorev/v1beta1/tx.amino.ts +++ b/packages/protobuf/codegen/osmosis/protorev/v1beta1/tx.amino.ts @@ -1,4 +1,4 @@ -import { MsgSetHotRoutes, MsgSetDeveloperAccount, MsgSetMaxPoolPointsPerTx, MsgSetMaxPoolPointsPerBlock, MsgSetPoolWeights, MsgSetBaseDenoms } from "./tx"; +import { MsgSetHotRoutes, MsgSetDeveloperAccount, MsgSetMaxPoolPointsPerTx, MsgSetMaxPoolPointsPerBlock, MsgSetInfoByPoolType, MsgSetBaseDenoms } from "./tx"; export const AminoConverter = { "/osmosis.protorev.v1beta1.MsgSetHotRoutes": { aminoType: "osmosis/MsgSetHotRoutes", @@ -20,10 +20,10 @@ export const AminoConverter = { toAmino: MsgSetMaxPoolPointsPerBlock.toAmino, fromAmino: MsgSetMaxPoolPointsPerBlock.fromAmino }, - "/osmosis.protorev.v1beta1.MsgSetPoolWeights": { - aminoType: "osmosis/MsgSetPoolWeights", - toAmino: MsgSetPoolWeights.toAmino, - fromAmino: MsgSetPoolWeights.fromAmino + "/osmosis.protorev.v1beta1.MsgSetInfoByPoolType": { + aminoType: "osmosis/MsgSetInfoByPoolType", + toAmino: MsgSetInfoByPoolType.toAmino, + fromAmino: MsgSetInfoByPoolType.fromAmino }, "/osmosis.protorev.v1beta1.MsgSetBaseDenoms": { aminoType: "osmosis/MsgSetBaseDenoms", diff --git a/packages/protobuf/codegen/osmosis/protorev/v1beta1/tx.registry.ts b/packages/protobuf/codegen/osmosis/protorev/v1beta1/tx.registry.ts index 7d2966ea5..f35bdd42a 100644 --- a/packages/protobuf/codegen/osmosis/protorev/v1beta1/tx.registry.ts +++ b/packages/protobuf/codegen/osmosis/protorev/v1beta1/tx.registry.ts @@ -1,7 +1,7 @@ //@ts-nocheck import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgSetHotRoutes, MsgSetDeveloperAccount, MsgSetMaxPoolPointsPerTx, MsgSetMaxPoolPointsPerBlock, MsgSetPoolWeights, MsgSetBaseDenoms } from "./tx"; -export const registry: ReadonlyArray<[string, GeneratedType]> = [["/osmosis.protorev.v1beta1.MsgSetHotRoutes", MsgSetHotRoutes], ["/osmosis.protorev.v1beta1.MsgSetDeveloperAccount", MsgSetDeveloperAccount], ["/osmosis.protorev.v1beta1.MsgSetMaxPoolPointsPerTx", MsgSetMaxPoolPointsPerTx], ["/osmosis.protorev.v1beta1.MsgSetMaxPoolPointsPerBlock", MsgSetMaxPoolPointsPerBlock], ["/osmosis.protorev.v1beta1.MsgSetPoolWeights", MsgSetPoolWeights], ["/osmosis.protorev.v1beta1.MsgSetBaseDenoms", MsgSetBaseDenoms]]; +import { MsgSetHotRoutes, MsgSetDeveloperAccount, MsgSetMaxPoolPointsPerTx, MsgSetMaxPoolPointsPerBlock, MsgSetInfoByPoolType, MsgSetBaseDenoms } from "./tx"; +export const registry: ReadonlyArray<[string, GeneratedType]> = [["/osmosis.protorev.v1beta1.MsgSetHotRoutes", MsgSetHotRoutes], ["/osmosis.protorev.v1beta1.MsgSetDeveloperAccount", MsgSetDeveloperAccount], ["/osmosis.protorev.v1beta1.MsgSetMaxPoolPointsPerTx", MsgSetMaxPoolPointsPerTx], ["/osmosis.protorev.v1beta1.MsgSetMaxPoolPointsPerBlock", MsgSetMaxPoolPointsPerBlock], ["/osmosis.protorev.v1beta1.MsgSetInfoByPoolType", MsgSetInfoByPoolType], ["/osmosis.protorev.v1beta1.MsgSetBaseDenoms", MsgSetBaseDenoms]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { protoRegistry.register(typeUrl, mod); @@ -33,10 +33,10 @@ export const MessageComposer = { value: MsgSetMaxPoolPointsPerBlock.encode(value).finish() }; }, - setPoolWeights(value: MsgSetPoolWeights) { + setInfoByPoolType(value: MsgSetInfoByPoolType) { return { - typeUrl: "/osmosis.protorev.v1beta1.MsgSetPoolWeights", - value: MsgSetPoolWeights.encode(value).finish() + typeUrl: "/osmosis.protorev.v1beta1.MsgSetInfoByPoolType", + value: MsgSetInfoByPoolType.encode(value).finish() }; }, setBaseDenoms(value: MsgSetBaseDenoms) { @@ -71,9 +71,9 @@ export const MessageComposer = { value }; }, - setPoolWeights(value: MsgSetPoolWeights) { + setInfoByPoolType(value: MsgSetInfoByPoolType) { return { - typeUrl: "/osmosis.protorev.v1beta1.MsgSetPoolWeights", + typeUrl: "/osmosis.protorev.v1beta1.MsgSetInfoByPoolType", value }; }, @@ -109,10 +109,10 @@ export const MessageComposer = { value: MsgSetMaxPoolPointsPerBlock.fromPartial(value) }; }, - setPoolWeights(value: MsgSetPoolWeights) { + setInfoByPoolType(value: MsgSetInfoByPoolType) { return { - typeUrl: "/osmosis.protorev.v1beta1.MsgSetPoolWeights", - value: MsgSetPoolWeights.fromPartial(value) + typeUrl: "/osmosis.protorev.v1beta1.MsgSetInfoByPoolType", + value: MsgSetInfoByPoolType.fromPartial(value) }; }, setBaseDenoms(value: MsgSetBaseDenoms) { diff --git a/packages/protobuf/codegen/osmosis/protorev/v1beta1/tx.rpc.msg.ts b/packages/protobuf/codegen/osmosis/protorev/v1beta1/tx.rpc.msg.ts index 2b1409f5e..9ab6fa67d 100644 --- a/packages/protobuf/codegen/osmosis/protorev/v1beta1/tx.rpc.msg.ts +++ b/packages/protobuf/codegen/osmosis/protorev/v1beta1/tx.rpc.msg.ts @@ -1,6 +1,6 @@ import { Rpc } from "../../../helpers"; import { BinaryReader } from "../../../binary"; -import { MsgSetHotRoutes, MsgSetHotRoutesResponse, MsgSetDeveloperAccount, MsgSetDeveloperAccountResponse, MsgSetMaxPoolPointsPerTx, MsgSetMaxPoolPointsPerTxResponse, MsgSetMaxPoolPointsPerBlock, MsgSetMaxPoolPointsPerBlockResponse, MsgSetPoolWeights, MsgSetPoolWeightsResponse, MsgSetBaseDenoms, MsgSetBaseDenomsResponse } from "./tx"; +import { MsgSetHotRoutes, MsgSetHotRoutesResponse, MsgSetDeveloperAccount, MsgSetDeveloperAccountResponse, MsgSetMaxPoolPointsPerTx, MsgSetMaxPoolPointsPerTxResponse, MsgSetMaxPoolPointsPerBlock, MsgSetMaxPoolPointsPerBlockResponse, MsgSetInfoByPoolType, MsgSetInfoByPoolTypeResponse, MsgSetBaseDenoms, MsgSetBaseDenomsResponse } from "./tx"; export interface Msg { /** * SetHotRoutes sets the hot routes that will be explored when creating @@ -23,10 +23,10 @@ export interface Msg { */ setMaxPoolPointsPerBlock(request: MsgSetMaxPoolPointsPerBlock): Promise; /** - * SetPoolWeights sets the weights of each pool type in the store. Can only be - * called by the admin account. + * SetInfoByPoolType sets the pool type information needed to make smart + * assumptions about swapping on different pool types */ - setPoolWeights(request: MsgSetPoolWeights): Promise; + setInfoByPoolType(request: MsgSetInfoByPoolType): Promise; /** * SetBaseDenoms sets the base denoms that will be used to create cyclic * arbitrage routes. Can only be called by the admin account. @@ -41,7 +41,7 @@ export class MsgClientImpl implements Msg { this.setDeveloperAccount = this.setDeveloperAccount.bind(this); this.setMaxPoolPointsPerTx = this.setMaxPoolPointsPerTx.bind(this); this.setMaxPoolPointsPerBlock = this.setMaxPoolPointsPerBlock.bind(this); - this.setPoolWeights = this.setPoolWeights.bind(this); + this.setInfoByPoolType = this.setInfoByPoolType.bind(this); this.setBaseDenoms = this.setBaseDenoms.bind(this); } setHotRoutes(request: MsgSetHotRoutes): Promise { @@ -64,10 +64,10 @@ export class MsgClientImpl implements Msg { const promise = this.rpc.request("osmosis.protorev.v1beta1.Msg", "SetMaxPoolPointsPerBlock", data); return promise.then(data => MsgSetMaxPoolPointsPerBlockResponse.decode(new BinaryReader(data))); } - setPoolWeights(request: MsgSetPoolWeights): Promise { - const data = MsgSetPoolWeights.encode(request).finish(); - const promise = this.rpc.request("osmosis.protorev.v1beta1.Msg", "SetPoolWeights", data); - return promise.then(data => MsgSetPoolWeightsResponse.decode(new BinaryReader(data))); + setInfoByPoolType(request: MsgSetInfoByPoolType): Promise { + const data = MsgSetInfoByPoolType.encode(request).finish(); + const promise = this.rpc.request("osmosis.protorev.v1beta1.Msg", "SetInfoByPoolType", data); + return promise.then(data => MsgSetInfoByPoolTypeResponse.decode(new BinaryReader(data))); } setBaseDenoms(request: MsgSetBaseDenoms): Promise { const data = MsgSetBaseDenoms.encode(request).finish(); diff --git a/packages/protobuf/codegen/osmosis/protorev/v1beta1/tx.ts b/packages/protobuf/codegen/osmosis/protorev/v1beta1/tx.ts index dc7548831..96e515fa1 100644 --- a/packages/protobuf/codegen/osmosis/protorev/v1beta1/tx.ts +++ b/packages/protobuf/codegen/osmosis/protorev/v1beta1/tx.ts @@ -1,5 +1,5 @@ //@ts-nocheck -import { TokenPairArbRoutes, TokenPairArbRoutesAmino, TokenPairArbRoutesSDKType, PoolWeights, PoolWeightsAmino, PoolWeightsSDKType, BaseDenom, BaseDenomAmino, BaseDenomSDKType } from "./protorev"; +import { TokenPairArbRoutes, TokenPairArbRoutesAmino, TokenPairArbRoutesSDKType, InfoByPoolType, InfoByPoolTypeAmino, InfoByPoolTypeSDKType, BaseDenom, BaseDenomAmino, BaseDenomSDKType } from "./protorev"; import { BinaryReader, BinaryWriter } from "../../../binary"; /** MsgSetHotRoutes defines the Msg/SetHotRoutes request type. */ export interface MsgSetHotRoutes { @@ -98,47 +98,47 @@ export interface MsgSetDeveloperAccountResponseAminoMsg { * type. */ export interface MsgSetDeveloperAccountResponseSDKType {} -/** MsgSetPoolWeights defines the Msg/SetPoolWeights request type. */ -export interface MsgSetPoolWeights { +/** MsgSetInfoByPoolType defines the Msg/SetInfoByPoolType request type. */ +export interface MsgSetInfoByPoolType { /** admin is the account that is authorized to set the pool weights. */ admin: string; - /** pool_weights is the list of pool weights to set. */ - poolWeights: PoolWeights | undefined; + /** info_by_pool_type contains information about the pool types. */ + infoByPoolType: InfoByPoolType | undefined; } -export interface MsgSetPoolWeightsProtoMsg { - typeUrl: "/osmosis.protorev.v1beta1.MsgSetPoolWeights"; +export interface MsgSetInfoByPoolTypeProtoMsg { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetInfoByPoolType"; value: Uint8Array; } -/** MsgSetPoolWeights defines the Msg/SetPoolWeights request type. */ -export interface MsgSetPoolWeightsAmino { +/** MsgSetInfoByPoolType defines the Msg/SetInfoByPoolType request type. */ +export interface MsgSetInfoByPoolTypeAmino { /** admin is the account that is authorized to set the pool weights. */ admin: string; - /** pool_weights is the list of pool weights to set. */ - pool_weights?: PoolWeightsAmino | undefined; + /** info_by_pool_type contains information about the pool types. */ + info_by_pool_type?: InfoByPoolTypeAmino | undefined; } -export interface MsgSetPoolWeightsAminoMsg { - type: "osmosis/MsgSetPoolWeights"; - value: MsgSetPoolWeightsAmino; +export interface MsgSetInfoByPoolTypeAminoMsg { + type: "osmosis/MsgSetInfoByPoolType"; + value: MsgSetInfoByPoolTypeAmino; } -/** MsgSetPoolWeights defines the Msg/SetPoolWeights request type. */ -export interface MsgSetPoolWeightsSDKType { +/** MsgSetInfoByPoolType defines the Msg/SetInfoByPoolType request type. */ +export interface MsgSetInfoByPoolTypeSDKType { admin: string; - pool_weights: PoolWeightsSDKType | undefined; + info_by_pool_type: InfoByPoolTypeSDKType | undefined; } -/** MsgSetPoolWeightsResponse defines the Msg/SetPoolWeights response type. */ -export interface MsgSetPoolWeightsResponse {} -export interface MsgSetPoolWeightsResponseProtoMsg { - typeUrl: "/osmosis.protorev.v1beta1.MsgSetPoolWeightsResponse"; +/** MsgSetInfoByPoolTypeResponse defines the Msg/SetInfoByPoolType response type. */ +export interface MsgSetInfoByPoolTypeResponse {} +export interface MsgSetInfoByPoolTypeResponseProtoMsg { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetInfoByPoolTypeResponse"; value: Uint8Array; } -/** MsgSetPoolWeightsResponse defines the Msg/SetPoolWeights response type. */ -export interface MsgSetPoolWeightsResponseAmino {} -export interface MsgSetPoolWeightsResponseAminoMsg { - type: "osmosis/protorev/set-pool-weights-response"; - value: MsgSetPoolWeightsResponseAmino; +/** MsgSetInfoByPoolTypeResponse defines the Msg/SetInfoByPoolType response type. */ +export interface MsgSetInfoByPoolTypeResponseAmino {} +export interface MsgSetInfoByPoolTypeResponseAminoMsg { + type: "osmosis/protorev/set-info-by-pool-type-response"; + value: MsgSetInfoByPoolTypeResponseAmino; } -/** MsgSetPoolWeightsResponse defines the Msg/SetPoolWeights response type. */ -export interface MsgSetPoolWeightsResponseSDKType {} +/** MsgSetInfoByPoolTypeResponse defines the Msg/SetInfoByPoolType response type. */ +export interface MsgSetInfoByPoolTypeResponseSDKType {} /** MsgSetMaxPoolPointsPerTx defines the Msg/SetMaxPoolPointsPerTx request type. */ export interface MsgSetMaxPoolPointsPerTx { /** admin is the account that is authorized to set the max pool points per tx. */ @@ -575,27 +575,27 @@ export const MsgSetDeveloperAccountResponse = { }; } }; -function createBaseMsgSetPoolWeights(): MsgSetPoolWeights { +function createBaseMsgSetInfoByPoolType(): MsgSetInfoByPoolType { return { admin: "", - poolWeights: PoolWeights.fromPartial({}) + infoByPoolType: InfoByPoolType.fromPartial({}) }; } -export const MsgSetPoolWeights = { - typeUrl: "/osmosis.protorev.v1beta1.MsgSetPoolWeights", - encode(message: MsgSetPoolWeights, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { +export const MsgSetInfoByPoolType = { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetInfoByPoolType", + encode(message: MsgSetInfoByPoolType, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); } - if (message.poolWeights !== undefined) { - PoolWeights.encode(message.poolWeights, writer.uint32(18).fork()).ldelim(); + if (message.infoByPoolType !== undefined) { + InfoByPoolType.encode(message.infoByPoolType, writer.uint32(18).fork()).ldelim(); } return writer; }, - decode(input: BinaryReader | Uint8Array, length?: number): MsgSetPoolWeights { + decode(input: BinaryReader | Uint8Array, length?: number): MsgSetInfoByPoolType { const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseMsgSetPoolWeights(); + const message = createBaseMsgSetInfoByPoolType(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { @@ -603,7 +603,7 @@ export const MsgSetPoolWeights = { message.admin = reader.string(); break; case 2: - message.poolWeights = PoolWeights.decode(reader, reader.uint32()); + message.infoByPoolType = InfoByPoolType.decode(reader, reader.uint32()); break; default: reader.skipType(tag & 7); @@ -612,58 +612,58 @@ export const MsgSetPoolWeights = { } return message; }, - fromPartial(object: Partial): MsgSetPoolWeights { - const message = createBaseMsgSetPoolWeights(); + fromPartial(object: Partial): MsgSetInfoByPoolType { + const message = createBaseMsgSetInfoByPoolType(); message.admin = object.admin ?? ""; - message.poolWeights = object.poolWeights !== undefined && object.poolWeights !== null ? PoolWeights.fromPartial(object.poolWeights) : undefined; + message.infoByPoolType = object.infoByPoolType !== undefined && object.infoByPoolType !== null ? InfoByPoolType.fromPartial(object.infoByPoolType) : undefined; return message; }, - fromAmino(object: MsgSetPoolWeightsAmino): MsgSetPoolWeights { + fromAmino(object: MsgSetInfoByPoolTypeAmino): MsgSetInfoByPoolType { return { admin: object.admin, - poolWeights: object?.pool_weights ? PoolWeights.fromAmino(object.pool_weights) : undefined + infoByPoolType: object?.info_by_pool_type ? InfoByPoolType.fromAmino(object.info_by_pool_type) : undefined }; }, - toAmino(message: MsgSetPoolWeights): MsgSetPoolWeightsAmino { + toAmino(message: MsgSetInfoByPoolType): MsgSetInfoByPoolTypeAmino { const obj: any = {}; obj.admin = message.admin; - obj.pool_weights = message.poolWeights ? PoolWeights.toAmino(message.poolWeights) : undefined; + obj.info_by_pool_type = message.infoByPoolType ? InfoByPoolType.toAmino(message.infoByPoolType) : undefined; return obj; }, - fromAminoMsg(object: MsgSetPoolWeightsAminoMsg): MsgSetPoolWeights { - return MsgSetPoolWeights.fromAmino(object.value); + fromAminoMsg(object: MsgSetInfoByPoolTypeAminoMsg): MsgSetInfoByPoolType { + return MsgSetInfoByPoolType.fromAmino(object.value); }, - toAminoMsg(message: MsgSetPoolWeights): MsgSetPoolWeightsAminoMsg { + toAminoMsg(message: MsgSetInfoByPoolType): MsgSetInfoByPoolTypeAminoMsg { return { - type: "osmosis/MsgSetPoolWeights", - value: MsgSetPoolWeights.toAmino(message) + type: "osmosis/MsgSetInfoByPoolType", + value: MsgSetInfoByPoolType.toAmino(message) }; }, - fromProtoMsg(message: MsgSetPoolWeightsProtoMsg): MsgSetPoolWeights { - return MsgSetPoolWeights.decode(message.value); + fromProtoMsg(message: MsgSetInfoByPoolTypeProtoMsg): MsgSetInfoByPoolType { + return MsgSetInfoByPoolType.decode(message.value); }, - toProto(message: MsgSetPoolWeights): Uint8Array { - return MsgSetPoolWeights.encode(message).finish(); + toProto(message: MsgSetInfoByPoolType): Uint8Array { + return MsgSetInfoByPoolType.encode(message).finish(); }, - toProtoMsg(message: MsgSetPoolWeights): MsgSetPoolWeightsProtoMsg { + toProtoMsg(message: MsgSetInfoByPoolType): MsgSetInfoByPoolTypeProtoMsg { return { - typeUrl: "/osmosis.protorev.v1beta1.MsgSetPoolWeights", - value: MsgSetPoolWeights.encode(message).finish() + typeUrl: "/osmosis.protorev.v1beta1.MsgSetInfoByPoolType", + value: MsgSetInfoByPoolType.encode(message).finish() }; } }; -function createBaseMsgSetPoolWeightsResponse(): MsgSetPoolWeightsResponse { +function createBaseMsgSetInfoByPoolTypeResponse(): MsgSetInfoByPoolTypeResponse { return {}; } -export const MsgSetPoolWeightsResponse = { - typeUrl: "/osmosis.protorev.v1beta1.MsgSetPoolWeightsResponse", - encode(_: MsgSetPoolWeightsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { +export const MsgSetInfoByPoolTypeResponse = { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetInfoByPoolTypeResponse", + encode(_: MsgSetInfoByPoolTypeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: BinaryReader | Uint8Array, length?: number): MsgSetPoolWeightsResponse { + decode(input: BinaryReader | Uint8Array, length?: number): MsgSetInfoByPoolTypeResponse { const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseMsgSetPoolWeightsResponse(); + const message = createBaseMsgSetInfoByPoolTypeResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { @@ -674,36 +674,36 @@ export const MsgSetPoolWeightsResponse = { } return message; }, - fromPartial(_: Partial): MsgSetPoolWeightsResponse { - const message = createBaseMsgSetPoolWeightsResponse(); + fromPartial(_: Partial): MsgSetInfoByPoolTypeResponse { + const message = createBaseMsgSetInfoByPoolTypeResponse(); return message; }, - fromAmino(_: MsgSetPoolWeightsResponseAmino): MsgSetPoolWeightsResponse { + fromAmino(_: MsgSetInfoByPoolTypeResponseAmino): MsgSetInfoByPoolTypeResponse { return {}; }, - toAmino(_: MsgSetPoolWeightsResponse): MsgSetPoolWeightsResponseAmino { + toAmino(_: MsgSetInfoByPoolTypeResponse): MsgSetInfoByPoolTypeResponseAmino { const obj: any = {}; return obj; }, - fromAminoMsg(object: MsgSetPoolWeightsResponseAminoMsg): MsgSetPoolWeightsResponse { - return MsgSetPoolWeightsResponse.fromAmino(object.value); + fromAminoMsg(object: MsgSetInfoByPoolTypeResponseAminoMsg): MsgSetInfoByPoolTypeResponse { + return MsgSetInfoByPoolTypeResponse.fromAmino(object.value); }, - toAminoMsg(message: MsgSetPoolWeightsResponse): MsgSetPoolWeightsResponseAminoMsg { + toAminoMsg(message: MsgSetInfoByPoolTypeResponse): MsgSetInfoByPoolTypeResponseAminoMsg { return { - type: "osmosis/protorev/set-pool-weights-response", - value: MsgSetPoolWeightsResponse.toAmino(message) + type: "osmosis/protorev/set-info-by-pool-type-response", + value: MsgSetInfoByPoolTypeResponse.toAmino(message) }; }, - fromProtoMsg(message: MsgSetPoolWeightsResponseProtoMsg): MsgSetPoolWeightsResponse { - return MsgSetPoolWeightsResponse.decode(message.value); + fromProtoMsg(message: MsgSetInfoByPoolTypeResponseProtoMsg): MsgSetInfoByPoolTypeResponse { + return MsgSetInfoByPoolTypeResponse.decode(message.value); }, - toProto(message: MsgSetPoolWeightsResponse): Uint8Array { - return MsgSetPoolWeightsResponse.encode(message).finish(); + toProto(message: MsgSetInfoByPoolTypeResponse): Uint8Array { + return MsgSetInfoByPoolTypeResponse.encode(message).finish(); }, - toProtoMsg(message: MsgSetPoolWeightsResponse): MsgSetPoolWeightsResponseProtoMsg { + toProtoMsg(message: MsgSetInfoByPoolTypeResponse): MsgSetInfoByPoolTypeResponseProtoMsg { return { - typeUrl: "/osmosis.protorev.v1beta1.MsgSetPoolWeightsResponse", - value: MsgSetPoolWeightsResponse.encode(message).finish() + typeUrl: "/osmosis.protorev.v1beta1.MsgSetInfoByPoolTypeResponse", + value: MsgSetInfoByPoolTypeResponse.encode(message).finish() }; } }; diff --git a/packages/protobuf/codegen/osmosis/superfluid/params.ts b/packages/protobuf/codegen/osmosis/superfluid/params.ts index 19e861b27..9731d0053 100644 --- a/packages/protobuf/codegen/osmosis/superfluid/params.ts +++ b/packages/protobuf/codegen/osmosis/superfluid/params.ts @@ -1,5 +1,4 @@ import { BinaryReader, BinaryWriter } from "../../binary"; -import { Decimal } from "@cosmjs/math"; /** Params holds parameters for the superfluid module */ export interface Params { /** @@ -41,7 +40,7 @@ export const Params = { typeUrl: "/osmosis.superfluid.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.minimumRiskFactor !== "") { - writer.uint32(10).string(Decimal.fromUserInput(message.minimumRiskFactor, 18).atomics); + writer.uint32(10).string(message.minimumRiskFactor); } return writer; }, @@ -53,7 +52,7 @@ export const Params = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.minimumRiskFactor = Decimal.fromAtomics(reader.string(), 18).toString(); + message.minimumRiskFactor = reader.string(); break; default: reader.skipType(tag & 7); diff --git a/packages/protobuf/codegen/osmosis/superfluid/query.rpc.Query.ts b/packages/protobuf/codegen/osmosis/superfluid/query.rpc.Query.ts index 093294a6d..73086c56f 100644 --- a/packages/protobuf/codegen/osmosis/superfluid/query.rpc.Query.ts +++ b/packages/protobuf/codegen/osmosis/superfluid/query.rpc.Query.ts @@ -50,6 +50,7 @@ export interface Query { totalDelegationByDelegator(request: QueryTotalDelegationByDelegatorRequest): Promise; /** Returns a list of whitelisted pool ids to unpool. */ unpoolWhitelist(request?: QueryUnpoolWhitelistRequest): Promise; + /** Returns all of a user's full range CL positions that are superfluid staked. */ userConcentratedSuperfluidPositionsDelegated(request: UserConcentratedSuperfluidPositionsDelegatedRequest): Promise; userConcentratedSuperfluidPositionsUndelegating(request: UserConcentratedSuperfluidPositionsUndelegatingRequest): Promise; } diff --git a/packages/protobuf/codegen/osmosis/superfluid/superfluid.ts b/packages/protobuf/codegen/osmosis/superfluid/superfluid.ts index eb10751e9..83f9def4f 100644 --- a/packages/protobuf/codegen/osmosis/superfluid/superfluid.ts +++ b/packages/protobuf/codegen/osmosis/superfluid/superfluid.ts @@ -2,7 +2,6 @@ import { Coin, CoinAmino, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; import { SyntheticLock, SyntheticLockAmino, SyntheticLockSDKType } from "../lockup/lock"; import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet } from "../../helpers"; -import { Decimal } from "@cosmjs/math"; /** * SuperfluidAssetType indicates whether the superfluid asset is * a native token, lp share of a pool, or concentrated share of a pool @@ -473,7 +472,7 @@ export const OsmoEquivalentMultiplierRecord = { writer.uint32(18).string(message.denom); } if (message.multiplier !== "") { - writer.uint32(26).string(Decimal.fromUserInput(message.multiplier, 18).atomics); + writer.uint32(26).string(message.multiplier); } return writer; }, @@ -491,7 +490,7 @@ export const OsmoEquivalentMultiplierRecord = { message.denom = reader.string(); break; case 3: - message.multiplier = Decimal.fromAtomics(reader.string(), 18).toString(); + message.multiplier = reader.string(); break; default: reader.skipType(tag & 7); diff --git a/packages/protobuf/codegen/osmosis/superfluid/tx.amino.ts b/packages/protobuf/codegen/osmosis/superfluid/tx.amino.ts index 0adf49960..52b2f22a8 100644 --- a/packages/protobuf/codegen/osmosis/superfluid/tx.amino.ts +++ b/packages/protobuf/codegen/osmosis/superfluid/tx.amino.ts @@ -1,4 +1,4 @@ -import { MsgSuperfluidDelegate, MsgSuperfluidUndelegate, MsgSuperfluidUnbondLock, MsgSuperfluidUndelegateAndUnbondLock, MsgLockAndSuperfluidDelegate, MsgCreateFullRangePositionAndSuperfluidDelegate, MsgUnPoolWhitelistedPool, MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition, MsgAddToConcentratedLiquiditySuperfluidPosition } from "./tx"; +import { MsgSuperfluidDelegate, MsgSuperfluidUndelegate, MsgSuperfluidUnbondLock, MsgSuperfluidUndelegateAndUnbondLock, MsgLockAndSuperfluidDelegate, MsgCreateFullRangePositionAndSuperfluidDelegate, MsgUnPoolWhitelistedPool, MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition, MsgAddToConcentratedLiquiditySuperfluidPosition, MsgUnbondConvertAndStake } from "./tx"; export const AminoConverter = { "/osmosis.superfluid.MsgSuperfluidDelegate": { aminoType: "osmosis/superfluid-delegate", @@ -44,5 +44,10 @@ export const AminoConverter = { aminoType: "osmosis/add-to-cl-superfluid-position", toAmino: MsgAddToConcentratedLiquiditySuperfluidPosition.toAmino, fromAmino: MsgAddToConcentratedLiquiditySuperfluidPosition.fromAmino + }, + "/osmosis.superfluid.MsgUnbondConvertAndStake": { + aminoType: "osmosis/unbond-convert-and-stake", + toAmino: MsgUnbondConvertAndStake.toAmino, + fromAmino: MsgUnbondConvertAndStake.fromAmino } }; \ No newline at end of file diff --git a/packages/protobuf/codegen/osmosis/superfluid/tx.registry.ts b/packages/protobuf/codegen/osmosis/superfluid/tx.registry.ts index fe3b6c01b..f9338bc4a 100644 --- a/packages/protobuf/codegen/osmosis/superfluid/tx.registry.ts +++ b/packages/protobuf/codegen/osmosis/superfluid/tx.registry.ts @@ -1,7 +1,7 @@ //@ts-nocheck import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgSuperfluidDelegate, MsgSuperfluidUndelegate, MsgSuperfluidUnbondLock, MsgSuperfluidUndelegateAndUnbondLock, MsgLockAndSuperfluidDelegate, MsgCreateFullRangePositionAndSuperfluidDelegate, MsgUnPoolWhitelistedPool, MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition, MsgAddToConcentratedLiquiditySuperfluidPosition } from "./tx"; -export const registry: ReadonlyArray<[string, GeneratedType]> = [["/osmosis.superfluid.MsgSuperfluidDelegate", MsgSuperfluidDelegate], ["/osmosis.superfluid.MsgSuperfluidUndelegate", MsgSuperfluidUndelegate], ["/osmosis.superfluid.MsgSuperfluidUnbondLock", MsgSuperfluidUnbondLock], ["/osmosis.superfluid.MsgSuperfluidUndelegateAndUnbondLock", MsgSuperfluidUndelegateAndUnbondLock], ["/osmosis.superfluid.MsgLockAndSuperfluidDelegate", MsgLockAndSuperfluidDelegate], ["/osmosis.superfluid.MsgCreateFullRangePositionAndSuperfluidDelegate", MsgCreateFullRangePositionAndSuperfluidDelegate], ["/osmosis.superfluid.MsgUnPoolWhitelistedPool", MsgUnPoolWhitelistedPool], ["/osmosis.superfluid.MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition", MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition], ["/osmosis.superfluid.MsgAddToConcentratedLiquiditySuperfluidPosition", MsgAddToConcentratedLiquiditySuperfluidPosition]]; +import { MsgSuperfluidDelegate, MsgSuperfluidUndelegate, MsgSuperfluidUnbondLock, MsgSuperfluidUndelegateAndUnbondLock, MsgLockAndSuperfluidDelegate, MsgCreateFullRangePositionAndSuperfluidDelegate, MsgUnPoolWhitelistedPool, MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition, MsgAddToConcentratedLiquiditySuperfluidPosition, MsgUnbondConvertAndStake } from "./tx"; +export const registry: ReadonlyArray<[string, GeneratedType]> = [["/osmosis.superfluid.MsgSuperfluidDelegate", MsgSuperfluidDelegate], ["/osmosis.superfluid.MsgSuperfluidUndelegate", MsgSuperfluidUndelegate], ["/osmosis.superfluid.MsgSuperfluidUnbondLock", MsgSuperfluidUnbondLock], ["/osmosis.superfluid.MsgSuperfluidUndelegateAndUnbondLock", MsgSuperfluidUndelegateAndUnbondLock], ["/osmosis.superfluid.MsgLockAndSuperfluidDelegate", MsgLockAndSuperfluidDelegate], ["/osmosis.superfluid.MsgCreateFullRangePositionAndSuperfluidDelegate", MsgCreateFullRangePositionAndSuperfluidDelegate], ["/osmosis.superfluid.MsgUnPoolWhitelistedPool", MsgUnPoolWhitelistedPool], ["/osmosis.superfluid.MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition", MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition], ["/osmosis.superfluid.MsgAddToConcentratedLiquiditySuperfluidPosition", MsgAddToConcentratedLiquiditySuperfluidPosition], ["/osmosis.superfluid.MsgUnbondConvertAndStake", MsgUnbondConvertAndStake]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { protoRegistry.register(typeUrl, mod); @@ -62,6 +62,12 @@ export const MessageComposer = { typeUrl: "/osmosis.superfluid.MsgAddToConcentratedLiquiditySuperfluidPosition", value: MsgAddToConcentratedLiquiditySuperfluidPosition.encode(value).finish() }; + }, + unbondConvertAndStake(value: MsgUnbondConvertAndStake) { + return { + typeUrl: "/osmosis.superfluid.MsgUnbondConvertAndStake", + value: MsgUnbondConvertAndStake.encode(value).finish() + }; } }, withTypeUrl: { @@ -118,6 +124,12 @@ export const MessageComposer = { typeUrl: "/osmosis.superfluid.MsgAddToConcentratedLiquiditySuperfluidPosition", value }; + }, + unbondConvertAndStake(value: MsgUnbondConvertAndStake) { + return { + typeUrl: "/osmosis.superfluid.MsgUnbondConvertAndStake", + value + }; } }, fromPartial: { @@ -174,6 +186,12 @@ export const MessageComposer = { typeUrl: "/osmosis.superfluid.MsgAddToConcentratedLiquiditySuperfluidPosition", value: MsgAddToConcentratedLiquiditySuperfluidPosition.fromPartial(value) }; + }, + unbondConvertAndStake(value: MsgUnbondConvertAndStake) { + return { + typeUrl: "/osmosis.superfluid.MsgUnbondConvertAndStake", + value: MsgUnbondConvertAndStake.fromPartial(value) + }; } } }; \ No newline at end of file diff --git a/packages/protobuf/codegen/osmosis/superfluid/tx.rpc.msg.ts b/packages/protobuf/codegen/osmosis/superfluid/tx.rpc.msg.ts index e4f591bc2..fb9ca4d5c 100644 --- a/packages/protobuf/codegen/osmosis/superfluid/tx.rpc.msg.ts +++ b/packages/protobuf/codegen/osmosis/superfluid/tx.rpc.msg.ts @@ -1,6 +1,6 @@ import { Rpc } from "../../helpers"; import { BinaryReader } from "../../binary"; -import { MsgSuperfluidDelegate, MsgSuperfluidDelegateResponse, MsgSuperfluidUndelegate, MsgSuperfluidUndelegateResponse, MsgSuperfluidUnbondLock, MsgSuperfluidUnbondLockResponse, MsgSuperfluidUndelegateAndUnbondLock, MsgSuperfluidUndelegateAndUnbondLockResponse, MsgLockAndSuperfluidDelegate, MsgLockAndSuperfluidDelegateResponse, MsgCreateFullRangePositionAndSuperfluidDelegate, MsgCreateFullRangePositionAndSuperfluidDelegateResponse, MsgUnPoolWhitelistedPool, MsgUnPoolWhitelistedPoolResponse, MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition, MsgUnlockAndMigrateSharesToFullRangeConcentratedPositionResponse, MsgAddToConcentratedLiquiditySuperfluidPosition, MsgAddToConcentratedLiquiditySuperfluidPositionResponse } from "./tx"; +import { MsgSuperfluidDelegate, MsgSuperfluidDelegateResponse, MsgSuperfluidUndelegate, MsgSuperfluidUndelegateResponse, MsgSuperfluidUnbondLock, MsgSuperfluidUnbondLockResponse, MsgSuperfluidUndelegateAndUnbondLock, MsgSuperfluidUndelegateAndUnbondLockResponse, MsgLockAndSuperfluidDelegate, MsgLockAndSuperfluidDelegateResponse, MsgCreateFullRangePositionAndSuperfluidDelegate, MsgCreateFullRangePositionAndSuperfluidDelegateResponse, MsgUnPoolWhitelistedPool, MsgUnPoolWhitelistedPoolResponse, MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition, MsgUnlockAndMigrateSharesToFullRangeConcentratedPositionResponse, MsgAddToConcentratedLiquiditySuperfluidPosition, MsgAddToConcentratedLiquiditySuperfluidPositionResponse, MsgUnbondConvertAndStake, MsgUnbondConvertAndStakeResponse } from "./tx"; /** Msg defines the Msg service. */ export interface Msg { /** Execute superfluid delegation for a lockup */ @@ -20,6 +20,11 @@ export interface Msg { unPoolWhitelistedPool(request: MsgUnPoolWhitelistedPool): Promise; unlockAndMigrateSharesToFullRangeConcentratedPosition(request: MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition): Promise; addToConcentratedLiquiditySuperfluidPosition(request: MsgAddToConcentratedLiquiditySuperfluidPosition): Promise; + /** + * UnbondConvertAndStake breaks all locks / superfluid staked assets, + * converts them to osmo then stakes the osmo to the designated validator. + */ + unbondConvertAndStake(request: MsgUnbondConvertAndStake): Promise; } export class MsgClientImpl implements Msg { private readonly rpc: Rpc; @@ -34,6 +39,7 @@ export class MsgClientImpl implements Msg { this.unPoolWhitelistedPool = this.unPoolWhitelistedPool.bind(this); this.unlockAndMigrateSharesToFullRangeConcentratedPosition = this.unlockAndMigrateSharesToFullRangeConcentratedPosition.bind(this); this.addToConcentratedLiquiditySuperfluidPosition = this.addToConcentratedLiquiditySuperfluidPosition.bind(this); + this.unbondConvertAndStake = this.unbondConvertAndStake.bind(this); } superfluidDelegate(request: MsgSuperfluidDelegate): Promise { const data = MsgSuperfluidDelegate.encode(request).finish(); @@ -80,4 +86,9 @@ export class MsgClientImpl implements Msg { const promise = this.rpc.request("osmosis.superfluid.Msg", "AddToConcentratedLiquiditySuperfluidPosition", data); return promise.then(data => MsgAddToConcentratedLiquiditySuperfluidPositionResponse.decode(new BinaryReader(data))); } + unbondConvertAndStake(request: MsgUnbondConvertAndStake): Promise { + const data = MsgUnbondConvertAndStake.encode(request).finish(); + const promise = this.rpc.request("osmosis.superfluid.Msg", "UnbondConvertAndStake", data); + return promise.then(data => MsgUnbondConvertAndStakeResponse.decode(new BinaryReader(data))); + } } \ No newline at end of file diff --git a/packages/protobuf/codegen/osmosis/superfluid/tx.ts b/packages/protobuf/codegen/osmosis/superfluid/tx.ts index 397b0c389..8a0d605cd 100644 --- a/packages/protobuf/codegen/osmosis/superfluid/tx.ts +++ b/packages/protobuf/codegen/osmosis/superfluid/tx.ts @@ -2,7 +2,6 @@ import { Coin, CoinAmino, CoinSDKType } from "../../cosmos/base/v1beta1/coin"; import { Timestamp } from "../../google/protobuf/timestamp"; import { BinaryReader, BinaryWriter } from "../../binary"; -import { Decimal } from "@cosmjs/math"; import { toTimestamp, fromTimestamp } from "../../helpers"; export interface MsgSuperfluidDelegate { sender: string; @@ -466,6 +465,85 @@ export interface MsgAddToConcentratedLiquiditySuperfluidPositionResponseSDKType new_liquidity: string; lock_id: bigint; } +/** ===================== MsgUnbondConvertAndStake */ +export interface MsgUnbondConvertAndStake { + /** + * lock ID to convert and stake. + * lock id with 0 should be provided if converting liquid gamm shares to stake + */ + lockId: bigint; + sender: string; + /** + * validator address to delegate to. + * If provided empty string, we use the validators returned from + * valset-preference module. + */ + valAddr: string; + /** min_amt_to_stake indicates the minimum amount to stake after conversion */ + minAmtToStake: string; + /** + * shares_to_convert indicates shares wanted to stake. + * Note that this field is only used for liquid(unlocked) gamm shares. + * For all other cases, this field would be disregarded. + */ + sharesToConvert: Coin | undefined; +} +export interface MsgUnbondConvertAndStakeProtoMsg { + typeUrl: "/osmosis.superfluid.MsgUnbondConvertAndStake"; + value: Uint8Array; +} +/** ===================== MsgUnbondConvertAndStake */ +export interface MsgUnbondConvertAndStakeAmino { + /** + * lock ID to convert and stake. + * lock id with 0 should be provided if converting liquid gamm shares to stake + */ + lock_id: string; + sender: string; + /** + * validator address to delegate to. + * If provided empty string, we use the validators returned from + * valset-preference module. + */ + val_addr: string; + /** min_amt_to_stake indicates the minimum amount to stake after conversion */ + min_amt_to_stake: string; + /** + * shares_to_convert indicates shares wanted to stake. + * Note that this field is only used for liquid(unlocked) gamm shares. + * For all other cases, this field would be disregarded. + */ + shares_to_convert?: CoinAmino | undefined; +} +export interface MsgUnbondConvertAndStakeAminoMsg { + type: "osmosis/unbond-convert-and-stake"; + value: MsgUnbondConvertAndStakeAmino; +} +/** ===================== MsgUnbondConvertAndStake */ +export interface MsgUnbondConvertAndStakeSDKType { + lock_id: bigint; + sender: string; + val_addr: string; + min_amt_to_stake: string; + shares_to_convert: CoinSDKType | undefined; +} +export interface MsgUnbondConvertAndStakeResponse { + totalAmtStaked: string; +} +export interface MsgUnbondConvertAndStakeResponseProtoMsg { + typeUrl: "/osmosis.superfluid.MsgUnbondConvertAndStakeResponse"; + value: Uint8Array; +} +export interface MsgUnbondConvertAndStakeResponseAmino { + total_amt_staked: string; +} +export interface MsgUnbondConvertAndStakeResponseAminoMsg { + type: "osmosis/unbond-convert-and-stake-response"; + value: MsgUnbondConvertAndStakeResponseAmino; +} +export interface MsgUnbondConvertAndStakeResponseSDKType { + total_amt_staked: string; +} function createBaseMsgSuperfluidDelegate(): MsgSuperfluidDelegate { return { sender: "", @@ -1638,7 +1716,7 @@ export const MsgUnlockAndMigrateSharesToFullRangeConcentratedPositionResponse = writer.uint32(18).string(message.amount1); } if (message.liquidityCreated !== "") { - writer.uint32(26).string(Decimal.fromUserInput(message.liquidityCreated, 18).atomics); + writer.uint32(26).string(message.liquidityCreated); } if (message.joinTime !== undefined) { Timestamp.encode(toTimestamp(message.joinTime), writer.uint32(34).fork()).ldelim(); @@ -1659,7 +1737,7 @@ export const MsgUnlockAndMigrateSharesToFullRangeConcentratedPositionResponse = message.amount1 = reader.string(); break; case 3: - message.liquidityCreated = Decimal.fromAtomics(reader.string(), 18).toString(); + message.liquidityCreated = reader.string(); break; case 4: message.joinTime = fromTimestamp(Timestamp.decode(reader, reader.uint32())); @@ -1836,7 +1914,7 @@ export const MsgAddToConcentratedLiquiditySuperfluidPositionResponse = { writer.uint32(26).string(message.amount1); } if (message.newLiquidity !== "") { - writer.uint32(42).string(Decimal.fromUserInput(message.newLiquidity, 18).atomics); + writer.uint32(42).string(message.newLiquidity); } if (message.lockId !== BigInt(0)) { writer.uint32(32).uint64(message.lockId); @@ -1860,7 +1938,7 @@ export const MsgAddToConcentratedLiquiditySuperfluidPositionResponse = { message.amount1 = reader.string(); break; case 5: - message.newLiquidity = Decimal.fromAtomics(reader.string(), 18).toString(); + message.newLiquidity = reader.string(); break; case 4: message.lockId = reader.uint64(); @@ -1920,4 +1998,178 @@ export const MsgAddToConcentratedLiquiditySuperfluidPositionResponse = { value: MsgAddToConcentratedLiquiditySuperfluidPositionResponse.encode(message).finish() }; } +}; +function createBaseMsgUnbondConvertAndStake(): MsgUnbondConvertAndStake { + return { + lockId: BigInt(0), + sender: "", + valAddr: "", + minAmtToStake: "", + sharesToConvert: Coin.fromPartial({}) + }; +} +export const MsgUnbondConvertAndStake = { + typeUrl: "/osmosis.superfluid.MsgUnbondConvertAndStake", + encode(message: MsgUnbondConvertAndStake, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.lockId !== BigInt(0)) { + writer.uint32(8).uint64(message.lockId); + } + if (message.sender !== "") { + writer.uint32(18).string(message.sender); + } + if (message.valAddr !== "") { + writer.uint32(26).string(message.valAddr); + } + if (message.minAmtToStake !== "") { + writer.uint32(34).string(message.minAmtToStake); + } + if (message.sharesToConvert !== undefined) { + Coin.encode(message.sharesToConvert, writer.uint32(42).fork()).ldelim(); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): MsgUnbondConvertAndStake { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseMsgUnbondConvertAndStake(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.lockId = reader.uint64(); + break; + case 2: + message.sender = reader.string(); + break; + case 3: + message.valAddr = reader.string(); + break; + case 4: + message.minAmtToStake = reader.string(); + break; + case 5: + message.sharesToConvert = Coin.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): MsgUnbondConvertAndStake { + const message = createBaseMsgUnbondConvertAndStake(); + message.lockId = object.lockId !== undefined && object.lockId !== null ? BigInt(object.lockId.toString()) : BigInt(0); + message.sender = object.sender ?? ""; + message.valAddr = object.valAddr ?? ""; + message.minAmtToStake = object.minAmtToStake ?? ""; + message.sharesToConvert = object.sharesToConvert !== undefined && object.sharesToConvert !== null ? Coin.fromPartial(object.sharesToConvert) : undefined; + return message; + }, + fromAmino(object: MsgUnbondConvertAndStakeAmino): MsgUnbondConvertAndStake { + return { + lockId: BigInt(object.lock_id), + sender: object.sender, + valAddr: object.val_addr, + minAmtToStake: object.min_amt_to_stake, + sharesToConvert: object?.shares_to_convert ? Coin.fromAmino(object.shares_to_convert) : undefined + }; + }, + toAmino(message: MsgUnbondConvertAndStake): MsgUnbondConvertAndStakeAmino { + const obj: any = {}; + obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.sender = message.sender; + obj.val_addr = message.valAddr; + obj.min_amt_to_stake = message.minAmtToStake; + obj.shares_to_convert = message.sharesToConvert ? Coin.toAmino(message.sharesToConvert) : undefined; + return obj; + }, + fromAminoMsg(object: MsgUnbondConvertAndStakeAminoMsg): MsgUnbondConvertAndStake { + return MsgUnbondConvertAndStake.fromAmino(object.value); + }, + toAminoMsg(message: MsgUnbondConvertAndStake): MsgUnbondConvertAndStakeAminoMsg { + return { + type: "osmosis/unbond-convert-and-stake", + value: MsgUnbondConvertAndStake.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUnbondConvertAndStakeProtoMsg): MsgUnbondConvertAndStake { + return MsgUnbondConvertAndStake.decode(message.value); + }, + toProto(message: MsgUnbondConvertAndStake): Uint8Array { + return MsgUnbondConvertAndStake.encode(message).finish(); + }, + toProtoMsg(message: MsgUnbondConvertAndStake): MsgUnbondConvertAndStakeProtoMsg { + return { + typeUrl: "/osmosis.superfluid.MsgUnbondConvertAndStake", + value: MsgUnbondConvertAndStake.encode(message).finish() + }; + } +}; +function createBaseMsgUnbondConvertAndStakeResponse(): MsgUnbondConvertAndStakeResponse { + return { + totalAmtStaked: "" + }; +} +export const MsgUnbondConvertAndStakeResponse = { + typeUrl: "/osmosis.superfluid.MsgUnbondConvertAndStakeResponse", + encode(message: MsgUnbondConvertAndStakeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.totalAmtStaked !== "") { + writer.uint32(10).string(message.totalAmtStaked); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): MsgUnbondConvertAndStakeResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseMsgUnbondConvertAndStakeResponse(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.totalAmtStaked = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): MsgUnbondConvertAndStakeResponse { + const message = createBaseMsgUnbondConvertAndStakeResponse(); + message.totalAmtStaked = object.totalAmtStaked ?? ""; + return message; + }, + fromAmino(object: MsgUnbondConvertAndStakeResponseAmino): MsgUnbondConvertAndStakeResponse { + return { + totalAmtStaked: object.total_amt_staked + }; + }, + toAmino(message: MsgUnbondConvertAndStakeResponse): MsgUnbondConvertAndStakeResponseAmino { + const obj: any = {}; + obj.total_amt_staked = message.totalAmtStaked; + return obj; + }, + fromAminoMsg(object: MsgUnbondConvertAndStakeResponseAminoMsg): MsgUnbondConvertAndStakeResponse { + return MsgUnbondConvertAndStakeResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgUnbondConvertAndStakeResponse): MsgUnbondConvertAndStakeResponseAminoMsg { + return { + type: "osmosis/unbond-convert-and-stake-response", + value: MsgUnbondConvertAndStakeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUnbondConvertAndStakeResponseProtoMsg): MsgUnbondConvertAndStakeResponse { + return MsgUnbondConvertAndStakeResponse.decode(message.value); + }, + toProto(message: MsgUnbondConvertAndStakeResponse): Uint8Array { + return MsgUnbondConvertAndStakeResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgUnbondConvertAndStakeResponse): MsgUnbondConvertAndStakeResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.MsgUnbondConvertAndStakeResponse", + value: MsgUnbondConvertAndStakeResponse.encode(message).finish() + }; + } }; \ No newline at end of file diff --git a/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/query.rpc.Query.ts b/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/query.rpc.Query.ts index 26a7ecd0f..2d908dbf7 100644 --- a/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/query.rpc.Query.ts +++ b/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/query.rpc.Query.ts @@ -1,7 +1,7 @@ import { Rpc } from "../../../helpers"; import { BinaryReader } from "../../../binary"; import { QueryClient, createProtobufRpcClient } from "@cosmjs/stargate"; -import { QueryParamsRequest, QueryParamsResponse, QueryDenomAuthorityMetadataRequest, QueryDenomAuthorityMetadataResponse, QueryDenomsFromCreatorRequest, QueryDenomsFromCreatorResponse } from "./query"; +import { QueryParamsRequest, QueryParamsResponse, QueryDenomAuthorityMetadataRequest, QueryDenomAuthorityMetadataResponse, QueryDenomsFromCreatorRequest, QueryDenomsFromCreatorResponse, QueryBeforeSendHookAddressRequest, QueryBeforeSendHookAddressResponse } from "./query"; /** Query defines the gRPC querier service. */ export interface Query { /** @@ -19,6 +19,11 @@ export interface Query { * denominations created by a specific admin/creator. */ denomsFromCreator(request: QueryDenomsFromCreatorRequest): Promise; + /** + * BeforeSendHookAddress defines a gRPC query method for + * getting the address registered for the before send hook. + */ + beforeSendHookAddress(request: QueryBeforeSendHookAddressRequest): Promise; } export class QueryClientImpl implements Query { private readonly rpc: Rpc; @@ -27,6 +32,7 @@ export class QueryClientImpl implements Query { this.params = this.params.bind(this); this.denomAuthorityMetadata = this.denomAuthorityMetadata.bind(this); this.denomsFromCreator = this.denomsFromCreator.bind(this); + this.beforeSendHookAddress = this.beforeSendHookAddress.bind(this); } params(request: QueryParamsRequest = {}): Promise { const data = QueryParamsRequest.encode(request).finish(); @@ -43,6 +49,11 @@ export class QueryClientImpl implements Query { const promise = this.rpc.request("osmosis.tokenfactory.v1beta1.Query", "DenomsFromCreator", data); return promise.then(data => QueryDenomsFromCreatorResponse.decode(new BinaryReader(data))); } + beforeSendHookAddress(request: QueryBeforeSendHookAddressRequest): Promise { + const data = QueryBeforeSendHookAddressRequest.encode(request).finish(); + const promise = this.rpc.request("osmosis.tokenfactory.v1beta1.Query", "BeforeSendHookAddress", data); + return promise.then(data => QueryBeforeSendHookAddressResponse.decode(new BinaryReader(data))); + } } export const createRpcQueryExtension = (base: QueryClient) => { const rpc = createProtobufRpcClient(base); @@ -56,6 +67,9 @@ export const createRpcQueryExtension = (base: QueryClient) => { }, denomsFromCreator(request: QueryDenomsFromCreatorRequest): Promise { return queryService.denomsFromCreator(request); + }, + beforeSendHookAddress(request: QueryBeforeSendHookAddressRequest): Promise { + return queryService.beforeSendHookAddress(request); } }; }; \ No newline at end of file diff --git a/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/query.ts b/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/query.ts index 48d0b3947..a3691cffd 100644 --- a/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/query.ts +++ b/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/query.ts @@ -154,6 +154,52 @@ export interface QueryDenomsFromCreatorResponseAminoMsg { export interface QueryDenomsFromCreatorResponseSDKType { denoms: string[]; } +export interface QueryBeforeSendHookAddressRequest { + denom: string; +} +export interface QueryBeforeSendHookAddressRequestProtoMsg { + typeUrl: "/osmosis.tokenfactory.v1beta1.QueryBeforeSendHookAddressRequest"; + value: Uint8Array; +} +export interface QueryBeforeSendHookAddressRequestAmino { + denom: string; +} +export interface QueryBeforeSendHookAddressRequestAminoMsg { + type: "osmosis/tokenfactory/query-before-send-hook-address-request"; + value: QueryBeforeSendHookAddressRequestAmino; +} +export interface QueryBeforeSendHookAddressRequestSDKType { + denom: string; +} +/** + * QueryBeforeSendHookAddressResponse defines the response structure for the + * DenomBeforeSendHook gRPC query. + */ +export interface QueryBeforeSendHookAddressResponse { + cosmwasmAddress: string; +} +export interface QueryBeforeSendHookAddressResponseProtoMsg { + typeUrl: "/osmosis.tokenfactory.v1beta1.QueryBeforeSendHookAddressResponse"; + value: Uint8Array; +} +/** + * QueryBeforeSendHookAddressResponse defines the response structure for the + * DenomBeforeSendHook gRPC query. + */ +export interface QueryBeforeSendHookAddressResponseAmino { + cosmwasm_address: string; +} +export interface QueryBeforeSendHookAddressResponseAminoMsg { + type: "osmosis/tokenfactory/query-before-send-hook-address-response"; + value: QueryBeforeSendHookAddressResponseAmino; +} +/** + * QueryBeforeSendHookAddressResponse defines the response structure for the + * DenomBeforeSendHook gRPC query. + */ +export interface QueryBeforeSendHookAddressResponseSDKType { + cosmwasm_address: string; +} function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } @@ -547,4 +593,138 @@ export const QueryDenomsFromCreatorResponse = { value: QueryDenomsFromCreatorResponse.encode(message).finish() }; } +}; +function createBaseQueryBeforeSendHookAddressRequest(): QueryBeforeSendHookAddressRequest { + return { + denom: "" + }; +} +export const QueryBeforeSendHookAddressRequest = { + typeUrl: "/osmosis.tokenfactory.v1beta1.QueryBeforeSendHookAddressRequest", + encode(message: QueryBeforeSendHookAddressRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.denom !== "") { + writer.uint32(10).string(message.denom); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): QueryBeforeSendHookAddressRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseQueryBeforeSendHookAddressRequest(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.denom = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): QueryBeforeSendHookAddressRequest { + const message = createBaseQueryBeforeSendHookAddressRequest(); + message.denom = object.denom ?? ""; + return message; + }, + fromAmino(object: QueryBeforeSendHookAddressRequestAmino): QueryBeforeSendHookAddressRequest { + return { + denom: object.denom + }; + }, + toAmino(message: QueryBeforeSendHookAddressRequest): QueryBeforeSendHookAddressRequestAmino { + const obj: any = {}; + obj.denom = message.denom; + return obj; + }, + fromAminoMsg(object: QueryBeforeSendHookAddressRequestAminoMsg): QueryBeforeSendHookAddressRequest { + return QueryBeforeSendHookAddressRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryBeforeSendHookAddressRequest): QueryBeforeSendHookAddressRequestAminoMsg { + return { + type: "osmosis/tokenfactory/query-before-send-hook-address-request", + value: QueryBeforeSendHookAddressRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryBeforeSendHookAddressRequestProtoMsg): QueryBeforeSendHookAddressRequest { + return QueryBeforeSendHookAddressRequest.decode(message.value); + }, + toProto(message: QueryBeforeSendHookAddressRequest): Uint8Array { + return QueryBeforeSendHookAddressRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryBeforeSendHookAddressRequest): QueryBeforeSendHookAddressRequestProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.QueryBeforeSendHookAddressRequest", + value: QueryBeforeSendHookAddressRequest.encode(message).finish() + }; + } +}; +function createBaseQueryBeforeSendHookAddressResponse(): QueryBeforeSendHookAddressResponse { + return { + cosmwasmAddress: "" + }; +} +export const QueryBeforeSendHookAddressResponse = { + typeUrl: "/osmosis.tokenfactory.v1beta1.QueryBeforeSendHookAddressResponse", + encode(message: QueryBeforeSendHookAddressResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.cosmwasmAddress !== "") { + writer.uint32(10).string(message.cosmwasmAddress); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): QueryBeforeSendHookAddressResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseQueryBeforeSendHookAddressResponse(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.cosmwasmAddress = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): QueryBeforeSendHookAddressResponse { + const message = createBaseQueryBeforeSendHookAddressResponse(); + message.cosmwasmAddress = object.cosmwasmAddress ?? ""; + return message; + }, + fromAmino(object: QueryBeforeSendHookAddressResponseAmino): QueryBeforeSendHookAddressResponse { + return { + cosmwasmAddress: object.cosmwasm_address + }; + }, + toAmino(message: QueryBeforeSendHookAddressResponse): QueryBeforeSendHookAddressResponseAmino { + const obj: any = {}; + obj.cosmwasm_address = message.cosmwasmAddress; + return obj; + }, + fromAminoMsg(object: QueryBeforeSendHookAddressResponseAminoMsg): QueryBeforeSendHookAddressResponse { + return QueryBeforeSendHookAddressResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryBeforeSendHookAddressResponse): QueryBeforeSendHookAddressResponseAminoMsg { + return { + type: "osmosis/tokenfactory/query-before-send-hook-address-response", + value: QueryBeforeSendHookAddressResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryBeforeSendHookAddressResponseProtoMsg): QueryBeforeSendHookAddressResponse { + return QueryBeforeSendHookAddressResponse.decode(message.value); + }, + toProto(message: QueryBeforeSendHookAddressResponse): Uint8Array { + return QueryBeforeSendHookAddressResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryBeforeSendHookAddressResponse): QueryBeforeSendHookAddressResponseProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.QueryBeforeSendHookAddressResponse", + value: QueryBeforeSendHookAddressResponse.encode(message).finish() + }; + } }; \ No newline at end of file diff --git a/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/tx.amino.ts b/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/tx.amino.ts index 4415eb4db..f4a41b36a 100644 --- a/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/tx.amino.ts +++ b/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/tx.amino.ts @@ -1,4 +1,4 @@ -import { MsgCreateDenom, MsgMint, MsgBurn, MsgChangeAdmin, MsgSetDenomMetadata, MsgForceTransfer } from "./tx"; +import { MsgCreateDenom, MsgMint, MsgBurn, MsgChangeAdmin, MsgSetDenomMetadata, MsgSetBeforeSendHook, MsgForceTransfer } from "./tx"; export const AminoConverter = { "/osmosis.tokenfactory.v1beta1.MsgCreateDenom": { aminoType: "osmosis/tokenfactory/create-denom", @@ -25,6 +25,11 @@ export const AminoConverter = { toAmino: MsgSetDenomMetadata.toAmino, fromAmino: MsgSetDenomMetadata.fromAmino }, + "/osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHook": { + aminoType: "osmosis/tokenfactory/set-beforesend-hook", + toAmino: MsgSetBeforeSendHook.toAmino, + fromAmino: MsgSetBeforeSendHook.fromAmino + }, "/osmosis.tokenfactory.v1beta1.MsgForceTransfer": { aminoType: "osmosis/tokenfactory/force-transfer", toAmino: MsgForceTransfer.toAmino, diff --git a/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/tx.registry.ts b/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/tx.registry.ts index b5338c034..9da606aeb 100644 --- a/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/tx.registry.ts +++ b/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/tx.registry.ts @@ -1,7 +1,7 @@ //@ts-nocheck import { GeneratedType, Registry } from "@cosmjs/proto-signing"; -import { MsgCreateDenom, MsgMint, MsgBurn, MsgChangeAdmin, MsgSetDenomMetadata, MsgForceTransfer } 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], ["/osmosis.tokenfactory.v1beta1.MsgForceTransfer", MsgForceTransfer]]; +import { MsgCreateDenom, MsgMint, MsgBurn, MsgChangeAdmin, MsgSetDenomMetadata, MsgSetBeforeSendHook, MsgForceTransfer } 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], ["/osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHook", MsgSetBeforeSendHook], ["/osmosis.tokenfactory.v1beta1.MsgForceTransfer", MsgForceTransfer]]; export const load = (protoRegistry: Registry) => { registry.forEach(([typeUrl, mod]) => { protoRegistry.register(typeUrl, mod); @@ -39,6 +39,12 @@ export const MessageComposer = { value: MsgSetDenomMetadata.encode(value).finish() }; }, + setBeforeSendHook(value: MsgSetBeforeSendHook) { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHook", + value: MsgSetBeforeSendHook.encode(value).finish() + }; + }, forceTransfer(value: MsgForceTransfer) { return { typeUrl: "/osmosis.tokenfactory.v1beta1.MsgForceTransfer", @@ -77,6 +83,12 @@ export const MessageComposer = { value }; }, + setBeforeSendHook(value: MsgSetBeforeSendHook) { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHook", + value + }; + }, forceTransfer(value: MsgForceTransfer) { return { typeUrl: "/osmosis.tokenfactory.v1beta1.MsgForceTransfer", @@ -115,6 +127,12 @@ export const MessageComposer = { value: MsgSetDenomMetadata.fromPartial(value) }; }, + setBeforeSendHook(value: MsgSetBeforeSendHook) { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHook", + value: MsgSetBeforeSendHook.fromPartial(value) + }; + }, forceTransfer(value: MsgForceTransfer) { return { typeUrl: "/osmosis.tokenfactory.v1beta1.MsgForceTransfer", diff --git a/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/tx.rpc.msg.ts b/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/tx.rpc.msg.ts index 2e3eb27f2..ccf13d751 100644 --- a/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/tx.rpc.msg.ts +++ b/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/tx.rpc.msg.ts @@ -1,6 +1,6 @@ import { Rpc } from "../../../helpers"; import { BinaryReader } from "../../../binary"; -import { MsgCreateDenom, MsgCreateDenomResponse, MsgMint, MsgMintResponse, MsgBurn, MsgBurnResponse, MsgChangeAdmin, MsgChangeAdminResponse, MsgSetDenomMetadata, MsgSetDenomMetadataResponse, MsgForceTransfer, MsgForceTransferResponse } from "./tx"; +import { MsgCreateDenom, MsgCreateDenomResponse, MsgMint, MsgMintResponse, MsgBurn, MsgBurnResponse, MsgChangeAdmin, MsgChangeAdminResponse, MsgSetDenomMetadata, MsgSetDenomMetadataResponse, MsgSetBeforeSendHook, MsgSetBeforeSendHookResponse, MsgForceTransfer, MsgForceTransferResponse } from "./tx"; /** Msg defines the tokefactory module's gRPC message service. */ export interface Msg { createDenom(request: MsgCreateDenom): Promise; @@ -8,6 +8,7 @@ export interface Msg { burn(request: MsgBurn): Promise; changeAdmin(request: MsgChangeAdmin): Promise; setDenomMetadata(request: MsgSetDenomMetadata): Promise; + setBeforeSendHook(request: MsgSetBeforeSendHook): Promise; forceTransfer(request: MsgForceTransfer): Promise; } export class MsgClientImpl implements Msg { @@ -19,6 +20,7 @@ export class MsgClientImpl implements Msg { this.burn = this.burn.bind(this); this.changeAdmin = this.changeAdmin.bind(this); this.setDenomMetadata = this.setDenomMetadata.bind(this); + this.setBeforeSendHook = this.setBeforeSendHook.bind(this); this.forceTransfer = this.forceTransfer.bind(this); } createDenom(request: MsgCreateDenom): Promise { @@ -46,6 +48,11 @@ export class MsgClientImpl implements Msg { const promise = this.rpc.request("osmosis.tokenfactory.v1beta1.Msg", "SetDenomMetadata", data); return promise.then(data => MsgSetDenomMetadataResponse.decode(new BinaryReader(data))); } + setBeforeSendHook(request: MsgSetBeforeSendHook): Promise { + const data = MsgSetBeforeSendHook.encode(request).finish(); + const promise = this.rpc.request("osmosis.tokenfactory.v1beta1.Msg", "SetBeforeSendHook", data); + return promise.then(data => MsgSetBeforeSendHookResponse.decode(new BinaryReader(data))); + } forceTransfer(request: MsgForceTransfer): Promise { const data = MsgForceTransfer.encode(request).finish(); const promise = this.rpc.request("osmosis.tokenfactory.v1beta1.Msg", "ForceTransfer", data); diff --git a/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/tx.ts b/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/tx.ts index 8393a8279..154483e6d 100644 --- a/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/tx.ts +++ b/packages/protobuf/codegen/osmosis/tokenfactory/v1beta1/tx.ts @@ -88,7 +88,9 @@ export interface MsgCreateDenomResponseSDKType { } /** * MsgMint is the sdk.Msg type for allowing an admin account to mint - * more of a token. For now, we only support minting to the sender account + * more of a token. + * Only the admin of the token factory denom has permission to mint unless + * the denom does not have any admin. */ export interface MsgMint { sender: string; @@ -101,7 +103,9 @@ export interface MsgMintProtoMsg { } /** * MsgMint is the sdk.Msg type for allowing an admin account to mint - * more of a token. For now, we only support minting to the sender account + * more of a token. + * Only the admin of the token factory denom has permission to mint unless + * the denom does not have any admin. */ export interface MsgMintAmino { sender: string; @@ -114,7 +118,9 @@ export interface MsgMintAminoMsg { } /** * MsgMint is the sdk.Msg type for allowing an admin account to mint - * more of a token. For now, we only support minting to the sender account + * more of a token. + * Only the admin of the token factory denom has permission to mint unless + * the denom does not have any admin. */ export interface MsgMintSDKType { sender: string; @@ -134,7 +140,9 @@ export interface MsgMintResponseAminoMsg { export interface MsgMintResponseSDKType {} /** * MsgBurn is the sdk.Msg type for allowing an admin account to burn - * a token. For now, we only support burning from the sender account. + * a token. + * Only the admin of the token factory denom has permission to burn unless + * the denom does not have any admin. */ export interface MsgBurn { sender: string; @@ -147,7 +155,9 @@ export interface MsgBurnProtoMsg { } /** * MsgBurn is the sdk.Msg type for allowing an admin account to burn - * a token. For now, we only support burning from the sender account. + * a token. + * Only the admin of the token factory denom has permission to burn unless + * the denom does not have any admin. */ export interface MsgBurnAmino { sender: string; @@ -160,7 +170,9 @@ export interface MsgBurnAminoMsg { } /** * MsgBurn is the sdk.Msg type for allowing an admin account to burn - * a token. For now, we only support burning from the sender account. + * a token. + * Only the admin of the token factory denom has permission to burn unless + * the denom does not have any admin. */ export interface MsgBurnSDKType { sender: string; @@ -236,6 +248,64 @@ export interface MsgChangeAdminResponseAminoMsg { * MsgChangeAdmin message. */ export interface MsgChangeAdminResponseSDKType {} +/** + * MsgSetBeforeSendHook is the sdk.Msg type for allowing an admin account to + * assign a CosmWasm contract to call with a BeforeSend hook + */ +export interface MsgSetBeforeSendHook { + sender: string; + denom: string; + cosmwasmAddress: string; +} +export interface MsgSetBeforeSendHookProtoMsg { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHook"; + value: Uint8Array; +} +/** + * MsgSetBeforeSendHook is the sdk.Msg type for allowing an admin account to + * assign a CosmWasm contract to call with a BeforeSend hook + */ +export interface MsgSetBeforeSendHookAmino { + sender: string; + denom: string; + cosmwasm_address: string; +} +export interface MsgSetBeforeSendHookAminoMsg { + type: "osmosis/tokenfactory/set-beforesend-hook"; + value: MsgSetBeforeSendHookAmino; +} +/** + * MsgSetBeforeSendHook is the sdk.Msg type for allowing an admin account to + * assign a CosmWasm contract to call with a BeforeSend hook + */ +export interface MsgSetBeforeSendHookSDKType { + sender: string; + denom: string; + cosmwasm_address: string; +} +/** + * MsgSetBeforeSendHookResponse defines the response structure for an executed + * MsgSetBeforeSendHook message. + */ +export interface MsgSetBeforeSendHookResponse {} +export interface MsgSetBeforeSendHookResponseProtoMsg { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHookResponse"; + value: Uint8Array; +} +/** + * MsgSetBeforeSendHookResponse defines the response structure for an executed + * MsgSetBeforeSendHook message. + */ +export interface MsgSetBeforeSendHookResponseAmino {} +export interface MsgSetBeforeSendHookResponseAminoMsg { + type: "osmosis/tokenfactory/set-before-send-hook-response"; + value: MsgSetBeforeSendHookResponseAmino; +} +/** + * MsgSetBeforeSendHookResponse defines the response structure for an executed + * MsgSetBeforeSendHook message. + */ +export interface MsgSetBeforeSendHookResponseSDKType {} /** * MsgSetDenomMetadata is the sdk.Msg type for allowing an admin account to set * the denom's bank metadata @@ -898,6 +968,148 @@ export const MsgChangeAdminResponse = { }; } }; +function createBaseMsgSetBeforeSendHook(): MsgSetBeforeSendHook { + return { + sender: "", + denom: "", + cosmwasmAddress: "" + }; +} +export const MsgSetBeforeSendHook = { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHook", + encode(message: MsgSetBeforeSendHook, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.sender !== "") { + writer.uint32(10).string(message.sender); + } + if (message.denom !== "") { + writer.uint32(18).string(message.denom); + } + if (message.cosmwasmAddress !== "") { + writer.uint32(26).string(message.cosmwasmAddress); + } + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): MsgSetBeforeSendHook { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseMsgSetBeforeSendHook(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.sender = reader.string(); + break; + case 2: + message.denom = reader.string(); + break; + case 3: + message.cosmwasmAddress = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(object: Partial): MsgSetBeforeSendHook { + const message = createBaseMsgSetBeforeSendHook(); + message.sender = object.sender ?? ""; + message.denom = object.denom ?? ""; + message.cosmwasmAddress = object.cosmwasmAddress ?? ""; + return message; + }, + fromAmino(object: MsgSetBeforeSendHookAmino): MsgSetBeforeSendHook { + return { + sender: object.sender, + denom: object.denom, + cosmwasmAddress: object.cosmwasm_address + }; + }, + toAmino(message: MsgSetBeforeSendHook): MsgSetBeforeSendHookAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.denom = message.denom; + obj.cosmwasm_address = message.cosmwasmAddress; + return obj; + }, + fromAminoMsg(object: MsgSetBeforeSendHookAminoMsg): MsgSetBeforeSendHook { + return MsgSetBeforeSendHook.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetBeforeSendHook): MsgSetBeforeSendHookAminoMsg { + return { + type: "osmosis/tokenfactory/set-beforesend-hook", + value: MsgSetBeforeSendHook.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetBeforeSendHookProtoMsg): MsgSetBeforeSendHook { + return MsgSetBeforeSendHook.decode(message.value); + }, + toProto(message: MsgSetBeforeSendHook): Uint8Array { + return MsgSetBeforeSendHook.encode(message).finish(); + }, + toProtoMsg(message: MsgSetBeforeSendHook): MsgSetBeforeSendHookProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHook", + value: MsgSetBeforeSendHook.encode(message).finish() + }; + } +}; +function createBaseMsgSetBeforeSendHookResponse(): MsgSetBeforeSendHookResponse { + return {}; +} +export const MsgSetBeforeSendHookResponse = { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHookResponse", + encode(_: MsgSetBeforeSendHookResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + return writer; + }, + decode(input: BinaryReader | Uint8Array, length?: number): MsgSetBeforeSendHookResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseMsgSetBeforeSendHookResponse(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + fromPartial(_: Partial): MsgSetBeforeSendHookResponse { + const message = createBaseMsgSetBeforeSendHookResponse(); + return message; + }, + fromAmino(_: MsgSetBeforeSendHookResponseAmino): MsgSetBeforeSendHookResponse { + return {}; + }, + toAmino(_: MsgSetBeforeSendHookResponse): MsgSetBeforeSendHookResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgSetBeforeSendHookResponseAminoMsg): MsgSetBeforeSendHookResponse { + return MsgSetBeforeSendHookResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetBeforeSendHookResponse): MsgSetBeforeSendHookResponseAminoMsg { + return { + type: "osmosis/tokenfactory/set-before-send-hook-response", + value: MsgSetBeforeSendHookResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetBeforeSendHookResponseProtoMsg): MsgSetBeforeSendHookResponse { + return MsgSetBeforeSendHookResponse.decode(message.value); + }, + toProto(message: MsgSetBeforeSendHookResponse): Uint8Array { + return MsgSetBeforeSendHookResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSetBeforeSendHookResponse): MsgSetBeforeSendHookResponseProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHookResponse", + value: MsgSetBeforeSendHookResponse.encode(message).finish() + }; + } +}; function createBaseMsgSetDenomMetadata(): MsgSetDenomMetadata { return { sender: "", diff --git a/packages/protobuf/codegen/osmosis/txfees/v1beta1/query.ts b/packages/protobuf/codegen/osmosis/txfees/v1beta1/query.ts index 8a55bd8d7..873dd7fdd 100644 --- a/packages/protobuf/codegen/osmosis/txfees/v1beta1/query.ts +++ b/packages/protobuf/codegen/osmosis/txfees/v1beta1/query.ts @@ -1,7 +1,6 @@ //@ts-nocheck import { FeeToken, FeeTokenAmino, FeeTokenSDKType } from "./feetoken"; import { BinaryReader, BinaryWriter } from "../../../binary"; -import { Decimal } from "@cosmjs/math"; export interface QueryFeeTokensRequest {} export interface QueryFeeTokensRequestProtoMsg { typeUrl: "/osmosis.txfees.v1beta1.QueryFeeTokensRequest"; @@ -359,7 +358,7 @@ export const QueryDenomSpotPriceResponse = { writer.uint32(8).uint64(message.poolID); } if (message.spotPrice !== "") { - writer.uint32(18).string(Decimal.fromUserInput(message.spotPrice, 18).atomics); + writer.uint32(18).string(message.spotPrice); } return writer; }, @@ -374,7 +373,7 @@ export const QueryDenomSpotPriceResponse = { message.poolID = reader.uint64(); break; case 2: - message.spotPrice = Decimal.fromAtomics(reader.string(), 18).toString(); + message.spotPrice = reader.string(); break; default: reader.skipType(tag & 7); diff --git a/packages/protobuf/codegen/osmosis/valset-pref/v1beta1/state.ts b/packages/protobuf/codegen/osmosis/valset-pref/v1beta1/state.ts index e993ba247..f5c409d09 100644 --- a/packages/protobuf/codegen/osmosis/valset-pref/v1beta1/state.ts +++ b/packages/protobuf/codegen/osmosis/valset-pref/v1beta1/state.ts @@ -1,5 +1,4 @@ import { BinaryReader, BinaryWriter } from "../../../binary"; -import { Decimal } from "@cosmjs/math"; /** * ValidatorPreference defines the message structure for * CreateValidatorSetPreference. It allows a user to set {val_addr, weight} in @@ -101,7 +100,7 @@ export const ValidatorPreference = { writer.uint32(10).string(message.valOperAddress); } if (message.weight !== "") { - writer.uint32(18).string(Decimal.fromUserInput(message.weight, 18).atomics); + writer.uint32(18).string(message.weight); } return writer; }, @@ -116,7 +115,7 @@ export const ValidatorPreference = { message.valOperAddress = reader.string(); break; case 2: - message.weight = Decimal.fromAtomics(reader.string(), 18).toString(); + message.weight = reader.string(); break; default: reader.skipType(tag & 7); diff --git a/packages/protobuf/codegen/osmosis/valset-pref/v1beta1/tx.amino.ts b/packages/protobuf/codegen/osmosis/valset-pref/v1beta1/tx.amino.ts index af2260383..248f445a0 100644 --- a/packages/protobuf/codegen/osmosis/valset-pref/v1beta1/tx.amino.ts +++ b/packages/protobuf/codegen/osmosis/valset-pref/v1beta1/tx.amino.ts @@ -1,27 +1,27 @@ import { MsgSetValidatorSetPreference, MsgDelegateToValidatorSet, MsgUndelegateFromValidatorSet, MsgRedelegateValidatorSet, MsgWithdrawDelegationRewards, MsgDelegateBondedTokens } from "./tx"; export const AminoConverter = { "/osmosis.valsetpref.v1beta1.MsgSetValidatorSetPreference": { - aminoType: "osmosis/valset-pref/MsgSetValidatorSetPreference", + aminoType: "osmosis/MsgSetValidatorSetPreference", toAmino: MsgSetValidatorSetPreference.toAmino, fromAmino: MsgSetValidatorSetPreference.fromAmino }, "/osmosis.valsetpref.v1beta1.MsgDelegateToValidatorSet": { - aminoType: "osmosis/valset-pref/MsgDelegateToValidatorSet", + aminoType: "osmosis/MsgDelegateToValidatorSet", toAmino: MsgDelegateToValidatorSet.toAmino, fromAmino: MsgDelegateToValidatorSet.fromAmino }, "/osmosis.valsetpref.v1beta1.MsgUndelegateFromValidatorSet": { - aminoType: "osmosis/valset-pref/MsgUndelegateFromValidatorSet", + aminoType: "osmosis/MsgUndelegateFromValidatorSet", toAmino: MsgUndelegateFromValidatorSet.toAmino, fromAmino: MsgUndelegateFromValidatorSet.fromAmino }, "/osmosis.valsetpref.v1beta1.MsgRedelegateValidatorSet": { - aminoType: "osmosis/valsetpref/redelegate-validator-set", + aminoType: "osmosis/MsgRedelegateValidatorSet", toAmino: MsgRedelegateValidatorSet.toAmino, fromAmino: MsgRedelegateValidatorSet.fromAmino }, "/osmosis.valsetpref.v1beta1.MsgWithdrawDelegationRewards": { - aminoType: "osmosis/valset-pref/MsgWithdrawDelegationRewards", + aminoType: "osmosis/MsgWithdrawDelegationRewards", toAmino: MsgWithdrawDelegationRewards.toAmino, fromAmino: MsgWithdrawDelegationRewards.fromAmino }, diff --git a/packages/protobuf/codegen/osmosis/valset-pref/v1beta1/tx.ts b/packages/protobuf/codegen/osmosis/valset-pref/v1beta1/tx.ts index df722d4f8..ad735e03d 100644 --- a/packages/protobuf/codegen/osmosis/valset-pref/v1beta1/tx.ts +++ b/packages/protobuf/codegen/osmosis/valset-pref/v1beta1/tx.ts @@ -21,7 +21,7 @@ export interface MsgSetValidatorSetPreferenceAmino { preferences: ValidatorPreferenceAmino[]; } export interface MsgSetValidatorSetPreferenceAminoMsg { - type: "osmosis/valset-pref/MsgSetValidatorSetPreference"; + type: "osmosis/MsgSetValidatorSetPreference"; value: MsgSetValidatorSetPreferenceAmino; } /** MsgCreateValidatorSetPreference is a list that holds validator-set. */ @@ -75,7 +75,7 @@ export interface MsgDelegateToValidatorSetAmino { coin?: CoinAmino | undefined; } export interface MsgDelegateToValidatorSetAminoMsg { - type: "osmosis/valset-pref/MsgDelegateToValidatorSet"; + type: "osmosis/MsgDelegateToValidatorSet"; value: MsgDelegateToValidatorSetAmino; } /** @@ -126,7 +126,7 @@ export interface MsgUndelegateFromValidatorSetAmino { coin?: CoinAmino | undefined; } export interface MsgUndelegateFromValidatorSetAminoMsg { - type: "osmosis/valset-pref/MsgUndelegateFromValidatorSet"; + type: "osmosis/MsgUndelegateFromValidatorSet"; value: MsgUndelegateFromValidatorSetAmino; } export interface MsgUndelegateFromValidatorSetSDKType { @@ -161,7 +161,7 @@ export interface MsgRedelegateValidatorSetAmino { preferences: ValidatorPreferenceAmino[]; } export interface MsgRedelegateValidatorSetAminoMsg { - type: "osmosis/valsetpref/redelegate-validator-set"; + type: "osmosis/MsgRedelegateValidatorSet"; value: MsgRedelegateValidatorSetAmino; } export interface MsgRedelegateValidatorSetSDKType { @@ -200,7 +200,7 @@ export interface MsgWithdrawDelegationRewardsAmino { delegator: string; } export interface MsgWithdrawDelegationRewardsAminoMsg { - type: "osmosis/valset-pref/MsgWithdrawDelegationRewards"; + type: "osmosis/MsgWithdrawDelegationRewards"; value: MsgWithdrawDelegationRewardsAmino; } /** @@ -335,7 +335,7 @@ export const MsgSetValidatorSetPreference = { }, toAminoMsg(message: MsgSetValidatorSetPreference): MsgSetValidatorSetPreferenceAminoMsg { return { - type: "osmosis/valset-pref/MsgSetValidatorSetPreference", + type: "osmosis/MsgSetValidatorSetPreference", value: MsgSetValidatorSetPreference.toAmino(message) }; }, @@ -467,7 +467,7 @@ export const MsgDelegateToValidatorSet = { }, toAminoMsg(message: MsgDelegateToValidatorSet): MsgDelegateToValidatorSetAminoMsg { return { - type: "osmosis/valset-pref/MsgDelegateToValidatorSet", + type: "osmosis/MsgDelegateToValidatorSet", value: MsgDelegateToValidatorSet.toAmino(message) }; }, @@ -599,7 +599,7 @@ export const MsgUndelegateFromValidatorSet = { }, toAminoMsg(message: MsgUndelegateFromValidatorSet): MsgUndelegateFromValidatorSetAminoMsg { return { - type: "osmosis/valset-pref/MsgUndelegateFromValidatorSet", + type: "osmosis/MsgUndelegateFromValidatorSet", value: MsgUndelegateFromValidatorSet.toAmino(message) }; }, @@ -735,7 +735,7 @@ export const MsgRedelegateValidatorSet = { }, toAminoMsg(message: MsgRedelegateValidatorSet): MsgRedelegateValidatorSetAminoMsg { return { - type: "osmosis/valsetpref/redelegate-validator-set", + type: "osmosis/MsgRedelegateValidatorSet", value: MsgRedelegateValidatorSet.toAmino(message) }; }, @@ -857,7 +857,7 @@ export const MsgWithdrawDelegationRewards = { }, toAminoMsg(message: MsgWithdrawDelegationRewards): MsgWithdrawDelegationRewardsAminoMsg { return { - type: "osmosis/valset-pref/MsgWithdrawDelegationRewards", + type: "osmosis/MsgWithdrawDelegationRewards", value: MsgWithdrawDelegationRewards.toAmino(message) }; }, diff --git a/packages/protobuf/codegen/tendermint/bundle.ts b/packages/protobuf/codegen/tendermint/bundle.ts index 26efeb066..e385d00bb 100644 --- a/packages/protobuf/codegen/tendermint/bundle.ts +++ b/packages/protobuf/codegen/tendermint/bundle.ts @@ -1,32 +1,32 @@ -import * as _157 from "./abci/types"; -import * as _158 from "./crypto/keys"; -import * as _159 from "./crypto/proof"; -import * as _160 from "./p2p/types"; -import * as _161 from "./types/block"; -import * as _162 from "./types/evidence"; -import * as _163 from "./types/params"; -import * as _164 from "./types/types"; -import * as _165 from "./types/validator"; -import * as _166 from "./version/types"; +import * as _158 from "./abci/types"; +import * as _159 from "./crypto/keys"; +import * as _160 from "./crypto/proof"; +import * as _161 from "./p2p/types"; +import * as _162 from "./types/block"; +import * as _163 from "./types/evidence"; +import * as _164 from "./types/params"; +import * as _165 from "./types/types"; +import * as _166 from "./types/validator"; +import * as _167 from "./version/types"; export namespace tendermint { export const abci = { - ..._157 + ..._158 }; export const crypto = { - ..._158, - ..._159 + ..._159, + ..._160 }; export const p2p = { - ..._160 + ..._161 }; export const types = { - ..._161, ..._162, ..._163, ..._164, - ..._165 + ..._165, + ..._166 }; export const version = { - ..._166 + ..._167 }; } \ No newline at end of file diff --git a/packages/protobuf/proto/osmosis/accum/v1beta1/accum.proto b/packages/protobuf/proto/osmosis/accum/v1beta1/accum.proto index 9ba71d424..c99f32b60 100644 --- a/packages/protobuf/proto/osmosis/accum/v1beta1/accum.proto +++ b/packages/protobuf/proto/osmosis/accum/v1beta1/accum.proto @@ -15,7 +15,7 @@ message AccumulatorContent { (gogoproto.nullable) = false ]; string total_shares = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } @@ -28,7 +28,7 @@ message Record { // num_shares is the number of shares belonging to the position associated // with this record. string num_shares = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; // accum_value_per_share is the subset of coins per shar of the global diff --git a/packages/protobuf/proto/osmosis/concentrated-liquidity/genesis.proto b/packages/protobuf/proto/osmosis/concentrated-liquidity/genesis.proto index 448e3d15a..18e98afb8 100644 --- a/packages/protobuf/proto/osmosis/concentrated-liquidity/genesis.proto +++ b/packages/protobuf/proto/osmosis/concentrated-liquidity/genesis.proto @@ -11,7 +11,7 @@ import "osmosis/concentrated-liquidity/position.proto"; import "osmosis/concentrated-liquidity/tickInfo.proto"; import "osmosis/concentrated-liquidity/incentive_record.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types/genesis"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/concentrated-liquidity/types/genesis"; // FullTick contains tick index and pool id along with other tick model // information. diff --git a/packages/protobuf/proto/osmosis/concentrated-liquidity/gov.proto b/packages/protobuf/proto/osmosis/concentrated-liquidity/gov.proto index a86ebd1e1..5ba2294cb 100644 --- a/packages/protobuf/proto/osmosis/concentrated-liquidity/gov.proto +++ b/packages/protobuf/proto/osmosis/concentrated-liquidity/gov.proto @@ -3,7 +3,7 @@ package osmosis.concentratedliquidity.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/concentrated-liquidity/types"; // CreateConcentratedLiquidityPoolsProposal is a gov Content type for creating // concentrated liquidity pools. If a CreateConcentratedLiquidityPoolsProposal @@ -51,13 +51,9 @@ message PoolRecord { string denom0 = 1 [ (gogoproto.moretags) = "yaml:\"denom0\"" ]; string denom1 = 2 [ (gogoproto.moretags) = "yaml:\"denom1\"" ]; uint64 tick_spacing = 3 [ (gogoproto.moretags) = "yaml:\"tick_spacing\"" ]; - string exponent_at_price_one = 4 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", - (gogoproto.moretags) = "yaml:\"exponent_at_price_one\"", - (gogoproto.nullable) = false - ]; + reserved 4; string spread_factor = 5 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"spread_factor\"", (gogoproto.nullable) = false ]; diff --git a/packages/protobuf/proto/osmosis/concentrated-liquidity/incentive_record.proto b/packages/protobuf/proto/osmosis/concentrated-liquidity/incentive_record.proto index a3d5e3641..c1248bee7 100644 --- a/packages/protobuf/proto/osmosis/concentrated-liquidity/incentive_record.proto +++ b/packages/protobuf/proto/osmosis/concentrated-liquidity/incentive_record.proto @@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto"; import "google/protobuf/duration.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/concentrated-liquidity/types"; // IncentiveRecord is the high-level struct we use to deal with an independent // incentive being distributed on a pool. Note that PoolId, Denom, and MinUptime @@ -45,7 +45,7 @@ message IncentiveRecordBody { // emission_rate is the incentive emission rate per second string emission_rate = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"emission_rate\"", (gogoproto.nullable) = false ]; diff --git a/packages/protobuf/proto/osmosis/concentrated-liquidity/params.proto b/packages/protobuf/proto/osmosis/concentrated-liquidity/params.proto index 8668cd5aa..093fa441e 100644 --- a/packages/protobuf/proto/osmosis/concentrated-liquidity/params.proto +++ b/packages/protobuf/proto/osmosis/concentrated-liquidity/params.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "cosmos_proto/cosmos.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/concentrated-liquidity/types"; message Params { // authorized_tick_spacing is an array of uint64s that represents the tick @@ -15,7 +15,7 @@ message Params { repeated uint64 authorized_tick_spacing = 1 [ (gogoproto.moretags) = "yaml:\"authorized_tick_spacing\"" ]; repeated string authorized_spread_factors = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"authorized_spread_factors\"", (gogoproto.nullable) = false ]; @@ -26,7 +26,7 @@ message Params { // This field can range from (0,1]. If set to 1, it indicates that all // incentives stay at cl pool. string balancer_shares_reward_discount = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"balancer_shares_reward_discount\"", (gogoproto.nullable) = false ]; diff --git a/packages/protobuf/proto/osmosis/concentrated-liquidity/pool-model/concentrated/tx.proto b/packages/protobuf/proto/osmosis/concentrated-liquidity/pool-model/concentrated/tx.proto index 92f82294c..e676db8e7 100644 --- a/packages/protobuf/proto/osmosis/concentrated-liquidity/pool-model/concentrated/tx.proto +++ b/packages/protobuf/proto/osmosis/concentrated-liquidity/pool-model/concentrated/tx.proto @@ -4,7 +4,7 @@ package osmosis.concentratedliquidity.poolmodel.concentrated.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/concentrated-liquidity/model"; service Msg { rpc CreateConcentratedPool(MsgCreateConcentratedPool) @@ -18,7 +18,7 @@ message MsgCreateConcentratedPool { string denom1 = 3 [ (gogoproto.moretags) = "yaml:\"denom1\"" ]; uint64 tick_spacing = 4 [ (gogoproto.moretags) = "yaml:\"tick_spacing\"" ]; string spread_factor = 5 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"spread_factor\"", (gogoproto.nullable) = false ]; diff --git a/packages/protobuf/proto/osmosis/concentrated-liquidity/pool.proto b/packages/protobuf/proto/osmosis/concentrated-liquidity/pool.proto index d2052424d..b9d78d945 100644 --- a/packages/protobuf/proto/osmosis/concentrated-liquidity/pool.proto +++ b/packages/protobuf/proto/osmosis/concentrated-liquidity/pool.proto @@ -9,7 +9,7 @@ import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/concentrated-liquidity/model"; message Pool { option (gogoproto.goproto_getters) = false; @@ -31,7 +31,7 @@ message Pool { // Amount of total liquidity string current_tick_liquidity = 5 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"current_tick_liquidity\"", (gogoproto.nullable) = false ]; @@ -53,7 +53,7 @@ message Pool { // spread_factor is the ratio that is charged on the amount of token in. string spread_factor = 12 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"spread_factor\"", (gogoproto.nullable) = false ]; diff --git a/packages/protobuf/proto/osmosis/concentrated-liquidity/position.proto b/packages/protobuf/proto/osmosis/concentrated-liquidity/position.proto index 545482edd..e71792c71 100644 --- a/packages/protobuf/proto/osmosis/concentrated-liquidity/position.proto +++ b/packages/protobuf/proto/osmosis/concentrated-liquidity/position.proto @@ -12,7 +12,7 @@ import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/concentrated-liquidity/model"; // Position contains position's id, address, pool id, lower tick, upper tick // join time, and liquidity. @@ -28,7 +28,7 @@ message Position { (gogoproto.moretags) = "yaml:\"join_time\"" ]; string liquidity = 7 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"liquidity\"", (gogoproto.nullable) = false ]; diff --git a/packages/protobuf/proto/osmosis/concentrated-liquidity/query.proto b/packages/protobuf/proto/osmosis/concentrated-liquidity/query.proto index 58d4cbf14..99953d39e 100644 --- a/packages/protobuf/proto/osmosis/concentrated-liquidity/query.proto +++ b/packages/protobuf/proto/osmosis/concentrated-liquidity/query.proto @@ -16,7 +16,7 @@ import "google/protobuf/duration.proto"; import "osmosis/concentrated-liquidity/position.proto"; import "osmosis/concentrated-liquidity/incentive_record.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/client/queryproto"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/concentrated-liquidity/client/queryproto"; service Query { // Pools returns all concentrated liquidity pools @@ -124,6 +124,14 @@ service Query { option (google.api.http).get = "/osmosis/concentratedliquidity/v1beta1/get_total_liquidity"; } + + // NumNextInitializedTicks returns the provided number of next initialized + // ticks in the direction of swapping the token in denom. + rpc NumNextInitializedTicks(NumNextInitializedTicksRequest) + returns (NumNextInitializedTicksResponse) { + option (google.api.http).get = "/osmosis/concentratedliquidity/v1beta1/" + "num_next_initialized_ticks"; + } } //=============================== UserPositions @@ -166,7 +174,7 @@ message ParamsResponse { Params params = 1 [ (gogoproto.nullable) = false ]; } message TickLiquidityNet { string liquidity_net = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"liquidity_net\"", (gogoproto.nullable) = false ]; @@ -175,7 +183,7 @@ message TickLiquidityNet { message LiquidityDepthWithRange { string liquidity_amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"liquidity_net\"", (gogoproto.nullable) = false ]; @@ -197,7 +205,7 @@ message LiquidityNetInDirectionResponse { [ (gogoproto.nullable) = false ]; int64 current_tick = 2; string current_liquidity = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"current_liquidity\"", (gogoproto.nullable) = false ]; @@ -315,3 +323,23 @@ message GetTotalLiquidityResponse { (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; } + +//=============================== NumNextInitializedTicks +message NumNextInitializedTicksRequest { + uint64 pool_id = 1 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ]; + string token_in_denom = 2 + [ (gogoproto.moretags) = "yaml:\"token_in_denom\"" ]; + uint64 num_next_initialized_ticks = 3 + [ (gogoproto.moretags) = "yaml:\"num_next_initialized_ticks\"" ]; +} +message NumNextInitializedTicksResponse { + repeated TickLiquidityNet liquidity_depths = 1 + [ (gogoproto.nullable) = false ]; + int64 current_tick = 2; + string current_liquidity = 3 [ + + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.moretags) = "yaml:\"current_liquidity\"", + (gogoproto.nullable) = false + ]; +} \ No newline at end of file diff --git a/packages/protobuf/proto/osmosis/concentrated-liquidity/query.yml b/packages/protobuf/proto/osmosis/concentrated-liquidity/query.yml index 81b6e50d4..6dd7e708f 100644 --- a/packages/protobuf/proto/osmosis/concentrated-liquidity/query.yml +++ b/packages/protobuf/proto/osmosis/concentrated-liquidity/query.yml @@ -1,7 +1,7 @@ keeper: - path: "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity" + path: "github.com/osmosis-labs/osmosis/v19/x/concentrated-liquidity" struct: "Keeper" -client_path: "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/client" +client_path: "github.com/osmosis-labs/osmosis/v19/x/concentrated-liquidity/client" queries: Pools: proto_wrapper: @@ -69,3 +69,8 @@ queries: query_func: "k.GetTotalLiquidity" cli: cmd: "GetTotalLiquidity" + NumNextInitializedTicks: + proto_wrapper: + query_func: "k.NumNextInitializedTicks" + cli: + cmd: "NumNextInitializedTicks" diff --git a/packages/protobuf/proto/osmosis/concentrated-liquidity/tickInfo.proto b/packages/protobuf/proto/osmosis/concentrated-liquidity/tickInfo.proto index 8d86ce28a..9fbfce8d2 100644 --- a/packages/protobuf/proto/osmosis/concentrated-liquidity/tickInfo.proto +++ b/packages/protobuf/proto/osmosis/concentrated-liquidity/tickInfo.proto @@ -9,16 +9,16 @@ import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/concentrated-liquidity/model"; message TickInfo { string liquidity_gross = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"liquidity_gross\"", (gogoproto.nullable) = false ]; string liquidity_net = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"liquidity_net\"", (gogoproto.nullable) = false ]; diff --git a/packages/protobuf/proto/osmosis/concentrated-liquidity/tx.proto b/packages/protobuf/proto/osmosis/concentrated-liquidity/tx.proto index e044fa44c..3e9e5ae6c 100644 --- a/packages/protobuf/proto/osmosis/concentrated-liquidity/tx.proto +++ b/packages/protobuf/proto/osmosis/concentrated-liquidity/tx.proto @@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto"; import "google/protobuf/duration.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/concentrated-liquidity/types"; service Msg { rpc CreatePosition(MsgCreatePosition) returns (MsgCreatePositionResponse); @@ -42,12 +42,12 @@ message MsgCreatePosition { (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; string token_min_amount0 = 6 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_min_amount0\"", (gogoproto.nullable) = false ]; string token_min_amount1 = 7 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_min_amount1\"", (gogoproto.nullable) = false ]; @@ -56,17 +56,17 @@ message MsgCreatePosition { message MsgCreatePositionResponse { uint64 position_id = 1 [ (gogoproto.moretags) = "yaml:\"position_id\"" ]; string amount0 = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"amount0\"", (gogoproto.nullable) = false ]; string amount1 = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"amount1\"", (gogoproto.nullable) = false ]; string liquidity_created = 5 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"liquidity_created\"", (gogoproto.nullable) = false ]; @@ -86,13 +86,13 @@ message MsgAddToPosition { string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; // amount0 represents the amount of token0 willing to put in. string amount0 = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"amount_0\"", (gogoproto.nullable) = false ]; // amount1 represents the amount of token1 willing to put in. string amount1 = 4 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"amount_1\"", (gogoproto.nullable) = false ]; @@ -101,7 +101,7 @@ message MsgAddToPosition { // corresponding to the liquidity that is being added, not the total // liquidity of the position. string token_min_amount0 = 5 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_min_amount0\"", (gogoproto.nullable) = false ]; @@ -110,7 +110,7 @@ message MsgAddToPosition { // corresponding to the liquidity that is being added, not the total // liquidity of the position. string token_min_amount1 = 6 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_min_amount1\"", (gogoproto.nullable) = false ]; @@ -119,12 +119,12 @@ message MsgAddToPosition { message MsgAddToPositionResponse { uint64 position_id = 1 [ (gogoproto.moretags) = "yaml:\"position_id\"" ]; string amount0 = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"amount0\"", (gogoproto.nullable) = false ]; string amount1 = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"amount1\"", (gogoproto.nullable) = false ]; @@ -137,7 +137,7 @@ message MsgWithdrawPosition { uint64 position_id = 1 [ (gogoproto.moretags) = "yaml:\"position_id\"" ]; string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; string liquidity_amount = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"liquidity_amount\"", (gogoproto.nullable) = false ]; @@ -145,12 +145,12 @@ message MsgWithdrawPosition { message MsgWithdrawPositionResponse { string amount0 = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"amount0\"", (gogoproto.nullable) = false ]; string amount1 = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"amount1\"", (gogoproto.nullable) = false ]; diff --git a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/genesis.proto b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/genesis.proto index 6bc575263..2c3e7c1d9 100644 --- a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/genesis.proto +++ b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/genesis.proto @@ -9,7 +9,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "osmosis/cosmwasmpool/v1beta1/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/cosmwasmpool/types"; // GenesisState defines the cosmwasmpool module's genesis state. message GenesisState { diff --git a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/gov.proto b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/gov.proto index f2c8183f3..6fbeb3adf 100644 --- a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/gov.proto +++ b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/gov.proto @@ -3,7 +3,7 @@ package osmosis.cosmwasmpool.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/cosmwasmpool/types"; // UploadCosmWasmPoolCodeAndWhiteListProposal is a gov Content type for // uploading coswasm pool code and adding it to internal whitelist. Only the diff --git a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/instantiate_msg.proto b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/instantiate_msg.proto index 6e4e584d2..71bd5d1c9 100644 --- a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/instantiate_msg.proto +++ b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/instantiate_msg.proto @@ -4,7 +4,7 @@ package osmosis.cosmwasmpool.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/cosmwasm/msg"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/cosmwasmpool/cosmwasm/msg"; // ===================== InstantiateMsg message InstantiateMsg { diff --git a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.proto b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.proto index 8b06bf51b..ff455dd81 100644 --- a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.proto +++ b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.proto @@ -4,7 +4,7 @@ package osmosis.cosmwasmpool.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/cosmwasm/msg"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/cosmwasmpool/cosmwasm/msg"; // ===================== CalcOutAmtGivenIn message CalcOutAmtGivenIn { @@ -16,7 +16,7 @@ message CalcOutAmtGivenIn { // swap_fee is the swap fee for this swap estimate. string swap_fee = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } @@ -42,7 +42,7 @@ message CalcInAmtGivenOut { // swap_fee is the swap fee for this swap estimate. string swap_fee = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } diff --git a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.proto b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.proto index 06c047975..f7bc0bf59 100644 --- a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.proto +++ b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.proto @@ -4,7 +4,7 @@ package osmosis.cosmwasmpool.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/cosmwasm/msg"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/cosmwasmpool/cosmwasm/msg"; // ===================== SwapExactAmountIn message SwapExactAmountIn { @@ -18,13 +18,13 @@ message SwapExactAmountIn { // token_out_min_amount is the minimum amount of token_out to be received from // the pool. string token_out_min_amount = 4 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false ]; // swap_fee is the swap fee for this swap estimate. string swap_fee = 5 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } @@ -38,7 +38,7 @@ message SwapExactAmountInSudoMsg { message SwapExactAmountInSudoMsgResponse { // token_out_amount is the token out computed from this swap estimate call. string token_out_amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false ]; } @@ -55,13 +55,13 @@ message SwapExactAmountOut { // token_in_max_amount is the maximum amount of token_in to be sent to the // pool. string token_in_max_amount = 4 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false ]; // swap_fee is the swap fee for this swap estimate. string swap_fee = 5 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } @@ -75,7 +75,7 @@ message SwapExactAmountOutSudoMsg { message SwapExactAmountOutSudoMsgResponse { // token_in_amount is the token in computed from this swap estimate call. string token_in_amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false ]; } diff --git a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/pool.proto b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/pool.proto index c9e432ae9..fc2bc638a 100644 --- a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/pool.proto +++ b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/pool.proto @@ -6,7 +6,7 @@ import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/model"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/cosmwasmpool/model"; message CosmWasmPool { option (gogoproto.goproto_getters) = false; diff --git a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.proto b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.proto index 08ada2820..f14dc72dd 100644 --- a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.proto +++ b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.proto @@ -4,7 +4,7 @@ package osmosis.cosmwasmpool.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/cosmwasm/msg"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/cosmwasmpool/cosmwasm/msg"; // ===================== GetSwapFeeQueryMsg message GetSwapFeeQueryMsg { @@ -15,7 +15,7 @@ message GetSwapFeeQueryMsg { message GetSwapFeeQueryMsgResponse { // swap_fee is the swap fee for this swap estimate. string swap_fee = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } diff --git a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/transmuter_msgs.proto b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/transmuter_msgs.proto index 9ac12ae88..c412ac39e 100644 --- a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/transmuter_msgs.proto +++ b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/transmuter_msgs.proto @@ -4,7 +4,7 @@ package osmosis.cosmwasmpool.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/cosmwasm/msg/transmuter"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/cosmwasmpool/cosmwasm/msg/transmuter"; // ===================== JoinPoolExecuteMsg message EmptyRequest {} diff --git a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/tx.proto b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/tx.proto index afe25c255..4803547c8 100644 --- a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/tx.proto +++ b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/model/tx.proto @@ -4,7 +4,7 @@ package osmosis.cosmwasmpool.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/model"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/cosmwasmpool/model"; service MsgCreator { rpc CreateCosmWasmPool(MsgCreateCosmWasmPool) diff --git a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/params.proto b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/params.proto index 8daf6c1d6..d9fb9dca0 100644 --- a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/params.proto +++ b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/params.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "cosmos_proto/cosmos.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/cosmwasmpool/types"; message Params { // code_ide_whitelist contains the list of code ids that are allowed to be diff --git a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/query.proto b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/query.proto index 50eb31052..5b3e625d2 100644 --- a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/query.proto +++ b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/query.proto @@ -12,7 +12,7 @@ import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/client/queryproto"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/cosmwasmpool/client/queryproto"; service Query { // Pools returns all cosmwasm pools diff --git a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/query.yml b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/query.yml index 98ef40bc2..62cb563cd 100644 --- a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/query.yml +++ b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/query.yml @@ -1,7 +1,7 @@ keeper: - path: "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool" + path: "github.com/osmosis-labs/osmosis/v19/x/cosmwasmpool" struct: "Keeper" -client_path: "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/client" +client_path: "github.com/osmosis-labs/osmosis/v19/x/cosmwasmpool/client" queries: Params: proto_wrapper: diff --git a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/tx.proto b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/tx.proto index 62926ba3a..46c105976 100644 --- a/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/tx.proto +++ b/packages/protobuf/proto/osmosis/cosmwasmpool/v1beta1/tx.proto @@ -4,6 +4,6 @@ package osmosis.cosmwasmpool.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/cosmwasmpool/types"; service Msg {} diff --git a/packages/protobuf/proto/osmosis/downtime-detector/v1beta1/downtime_duration.proto b/packages/protobuf/proto/osmosis/downtime-detector/v1beta1/downtime_duration.proto index 9574e1c56..6728c3ac4 100644 --- a/packages/protobuf/proto/osmosis/downtime-detector/v1beta1/downtime_duration.proto +++ b/packages/protobuf/proto/osmosis/downtime-detector/v1beta1/downtime_duration.proto @@ -7,7 +7,7 @@ import "cosmos_proto/cosmos.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/downtime-detector/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/downtime-detector/types"; enum Downtime { DURATION_30S = 0; diff --git a/packages/protobuf/proto/osmosis/downtime-detector/v1beta1/genesis.proto b/packages/protobuf/proto/osmosis/downtime-detector/v1beta1/genesis.proto index cd196c4e6..beca5413f 100644 --- a/packages/protobuf/proto/osmosis/downtime-detector/v1beta1/genesis.proto +++ b/packages/protobuf/proto/osmosis/downtime-detector/v1beta1/genesis.proto @@ -8,7 +8,7 @@ import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; import "osmosis/downtime-detector/v1beta1/downtime_duration.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/downtime-detector/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/downtime-detector/types"; message GenesisDowntimeEntry { Downtime duration = 1 [ (gogoproto.moretags) = "yaml:\"duration\"" ]; diff --git a/packages/protobuf/proto/osmosis/downtime-detector/v1beta1/query.proto b/packages/protobuf/proto/osmosis/downtime-detector/v1beta1/query.proto index e15f0c318..562103dc8 100644 --- a/packages/protobuf/proto/osmosis/downtime-detector/v1beta1/query.proto +++ b/packages/protobuf/proto/osmosis/downtime-detector/v1beta1/query.proto @@ -13,7 +13,7 @@ import "cosmos_proto/cosmos.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/downtime-detector/client/queryproto"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/downtime-detector/client/queryproto"; service Query { rpc RecoveredSinceDowntimeOfLength(RecoveredSinceDowntimeOfLengthRequest) diff --git a/packages/protobuf/proto/osmosis/downtime-detector/v1beta1/query.yml b/packages/protobuf/proto/osmosis/downtime-detector/v1beta1/query.yml index a26a5c22a..1893c5681 100644 --- a/packages/protobuf/proto/osmosis/downtime-detector/v1beta1/query.yml +++ b/packages/protobuf/proto/osmosis/downtime-detector/v1beta1/query.yml @@ -1,7 +1,7 @@ keeper: - path: "github.com/osmosis-labs/osmosis/v16/x/downtime-detector" + path: "github.com/osmosis-labs/osmosis/v19/x/downtime-detector" struct: "Keeper" -client_path: "github.com/osmosis-labs/osmosis/v16/x/downtime-detector/client" +client_path: "github.com/osmosis-labs/osmosis/v19/x/downtime-detector/client" queries: RecoveredSinceDowntimeOfLength: proto_wrapper: diff --git a/packages/protobuf/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto b/packages/protobuf/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto index f8d187588..4a61803ba 100644 --- a/packages/protobuf/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto +++ b/packages/protobuf/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto @@ -15,7 +15,7 @@ import "google/protobuf/timestamp.proto"; import "cosmos/auth/v1beta1/auth.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/gamm/pool-models/balancer"; // Parameters for changing the weights in a balancer pool smoothly from // a start weight and end weight over a period of time. @@ -78,7 +78,7 @@ message PoolParams { option (amino.name) = "osmosis/gamm/BalancerPoolParams"; string swap_fee = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"swap_fee\"", (gogoproto.nullable) = false ]; @@ -86,7 +86,7 @@ message PoolParams { // pools can maintain a non-zero fee. No new pool can be created with non-zero // fee anymore string exit_fee = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"exit_fee\"", (gogoproto.nullable) = false ]; @@ -107,7 +107,7 @@ message PoolAsset { [ (gogoproto.moretags) = "yaml:\"token\"", (gogoproto.nullable) = false ]; // Weight that is not normalized. This weight must be less than 2^50 string weight = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"weight\"", (gogoproto.nullable) = false ]; @@ -151,7 +151,7 @@ message Pool { ]; // sum of all non-normalized pool weights string total_weight = 7 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"total_weight\"", (gogoproto.nullable) = false ]; diff --git a/packages/protobuf/proto/osmosis/gamm/pool-models/balancer/tx/tx.proto b/packages/protobuf/proto/osmosis/gamm/pool-models/balancer/tx/tx.proto index 1cf094e59..665a67d9e 100644 --- a/packages/protobuf/proto/osmosis/gamm/pool-models/balancer/tx/tx.proto +++ b/packages/protobuf/proto/osmosis/gamm/pool-models/balancer/tx/tx.proto @@ -7,7 +7,7 @@ import "osmosis/gamm/pool-models/balancer/balancerPool.proto"; import "cosmos/base/v1beta1/coin.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/gamm/pool-models/balancer"; service Msg { rpc CreateBalancerPool(MsgCreateBalancerPool) diff --git a/packages/protobuf/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto b/packages/protobuf/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto index 701abb67b..457961ebf 100644 --- a/packages/protobuf/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto +++ b/packages/protobuf/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto @@ -11,7 +11,7 @@ import "google/protobuf/timestamp.proto"; import "cosmos/auth/v1beta1/auth.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/gamm/pool-models/stableswap"; // PoolParams defined the parameters that will be managed by the pool // governance in the future. This params are not managed by the chain @@ -21,7 +21,7 @@ message PoolParams { option (amino.name) = "osmosis/gamm/StableswapPoolParams"; string swap_fee = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"swap_fee\"", (gogoproto.nullable) = false ]; @@ -29,7 +29,7 @@ message PoolParams { // pools can maintain a non-zero fee. No new pool can be created with non-zero // fee anymore string exit_fee = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"exit_fee\"", (gogoproto.nullable) = false ]; diff --git a/packages/protobuf/proto/osmosis/gamm/pool-models/stableswap/tx.proto b/packages/protobuf/proto/osmosis/gamm/pool-models/stableswap/tx.proto index 162660edd..763ecb077 100644 --- a/packages/protobuf/proto/osmosis/gamm/pool-models/stableswap/tx.proto +++ b/packages/protobuf/proto/osmosis/gamm/pool-models/stableswap/tx.proto @@ -6,7 +6,7 @@ import "gogoproto/gogo.proto"; import "amino/amino.proto"; import "osmosis/gamm/pool-models/stableswap/stableswap_pool.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/gamm/pool-models/stableswap"; service Msg { rpc CreateStableswapPool(MsgCreateStableswapPool) diff --git a/packages/protobuf/proto/osmosis/gamm/v1beta1/genesis.proto b/packages/protobuf/proto/osmosis/gamm/v1beta1/genesis.proto index 39a4f9789..9ec79860f 100644 --- a/packages/protobuf/proto/osmosis/gamm/v1beta1/genesis.proto +++ b/packages/protobuf/proto/osmosis/gamm/v1beta1/genesis.proto @@ -16,7 +16,7 @@ message Params { ]; } -option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/gamm/types"; // GenesisState defines the gamm module's genesis state. message GenesisState { diff --git a/packages/protobuf/proto/osmosis/gamm/v1beta1/gov.proto b/packages/protobuf/proto/osmosis/gamm/v1beta1/gov.proto index b66d63c16..403b5a967 100644 --- a/packages/protobuf/proto/osmosis/gamm/v1beta1/gov.proto +++ b/packages/protobuf/proto/osmosis/gamm/v1beta1/gov.proto @@ -7,7 +7,7 @@ import "osmosis/gamm/v1beta1/shared.proto"; import "cosmos_proto/cosmos.proto"; import "amino/amino.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/gamm/types"; // ReplaceMigrationRecordsProposal is a gov Content type for updating the // migration records. If a ReplaceMigrationRecordsProposal passes, the @@ -58,3 +58,56 @@ message UpdateMigrationRecordsProposal { repeated BalancerToConcentratedPoolLink records = 3 [ (gogoproto.nullable) = false ]; } +message PoolRecordWithCFMMLink { + option (gogoproto.equal) = true; + + string denom0 = 1 [ (gogoproto.moretags) = "yaml:\"denom0\"" ]; + string denom1 = 2 [ (gogoproto.moretags) = "yaml:\"denom1\"" ]; + uint64 tick_spacing = 3 [ (gogoproto.moretags) = "yaml:\"tick_spacing\"" ]; + string exponent_at_price_one = 4 [ + (gogoproto.customtype) = "cosmossdk.io/math.Int", + (gogoproto.moretags) = "yaml:\"exponent_at_price_one\"", + (gogoproto.nullable) = false + ]; + string spread_factor = 5 [ + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", + (gogoproto.moretags) = "yaml:\"spread_factor\"", + (gogoproto.nullable) = false + ]; + uint64 balancer_pool_id = 6 + [ (gogoproto.moretags) = "yaml:\"balancer_pool_id\"" ]; +} + +// CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal is a gov Content type +// for creating concentrated liquidity pools and linking it to a CFMM pool. +message CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal { + option (gogoproto.equal) = true; + option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_stringer) = false; + option (amino.name) = + "osmosis/CreateConcentratedLiquidityPoolsAndLinktoCFMMProposal"; + option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content"; + + string title = 1; + string description = 2; + + repeated PoolRecordWithCFMMLink pool_records_with_cfmm_link = 3 [ + (gogoproto.moretags) = "yaml:\"create_cl_pool_and_link_to_cfmm\"", + (gogoproto.nullable) = false + ]; +} + +// SetScalingFactorControllerProposal is a gov Content type for updating the +// scaling factor controller address of a stableswap pool +message SetScalingFactorControllerProposal { + option (gogoproto.equal) = true; + option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_stringer) = false; + option (amino.name) = "osmosis/SetScalingFactorControllerProposal"; + option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content"; + + string title = 1; + string description = 2; + uint64 pool_id = 3; + string controller_address = 4; +} \ No newline at end of file diff --git a/packages/protobuf/proto/osmosis/gamm/v1beta1/query.proto b/packages/protobuf/proto/osmosis/gamm/v1beta1/query.proto index ad9e6124a..9360814f7 100644 --- a/packages/protobuf/proto/osmosis/gamm/v1beta1/query.proto +++ b/packages/protobuf/proto/osmosis/gamm/v1beta1/query.proto @@ -10,8 +10,9 @@ import "cosmos/base/query/v1beta1/pagination.proto"; import "google/api/annotations.proto"; import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; +import "osmosis/gamm/v1beta1/shared.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/gamm/types"; service Query { rpc Pools(QueryPoolsRequest) returns (QueryPoolsResponse) { @@ -115,6 +116,14 @@ service Query { "/osmosis/gamm/v1beta1/concentrated_pool_id_link_from_cfmm/" "{cfmm_pool_id}"; } + + // CFMMConcentratedPoolLinks returns migration links between CFMM and + // Concentrated pools. + rpc CFMMConcentratedPoolLinks(QueryCFMMConcentratedPoolLinksRequest) + returns (QueryCFMMConcentratedPoolLinksResponse) { + option (google.api.http).get = + "/osmosis/gamm/v1beta1/cfmm_concentrated_pool_links"; + } } //=============================== Pool @@ -167,7 +176,7 @@ message QueryCalcJoinPoolSharesRequest { } message QueryCalcJoinPoolSharesResponse { string share_out_amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"share_out_amount\"", (gogoproto.nullable) = false ]; @@ -181,7 +190,7 @@ message QueryCalcJoinPoolSharesResponse { message QueryCalcExitPoolCoinsFromSharesRequest { uint64 pool_id = 1; string share_in_amount = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false ]; } @@ -240,7 +249,7 @@ message QueryCalcJoinPoolNoSwapSharesResponse { (gogoproto.nullable) = false ]; string shares_out = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false ]; } @@ -297,7 +306,7 @@ message QuerySwapExactAmountInRequest { message QuerySwapExactAmountInResponse { option deprecated = true; string token_out_amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_out_amount\"", (gogoproto.nullable) = false ]; @@ -318,7 +327,7 @@ message QuerySwapExactAmountOutRequest { message QuerySwapExactAmountOutResponse { option deprecated = true; string token_in_amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_in_amount\"", (gogoproto.nullable) = false ]; @@ -342,3 +351,10 @@ message QueryConcentratedPoolIdLinkFromCFMMRequest { message QueryConcentratedPoolIdLinkFromCFMMResponse { uint64 concentrated_pool_id = 1; } + +//=============================== QueryCFMMConcentratedPoolLinks +message QueryCFMMConcentratedPoolLinksRequest {} + +message QueryCFMMConcentratedPoolLinksResponse { + MigrationRecords migration_records = 1; +} diff --git a/packages/protobuf/proto/osmosis/gamm/v1beta1/shared.proto b/packages/protobuf/proto/osmosis/gamm/v1beta1/shared.proto index e05944b77..faf3884c2 100644 --- a/packages/protobuf/proto/osmosis/gamm/v1beta1/shared.proto +++ b/packages/protobuf/proto/osmosis/gamm/v1beta1/shared.proto @@ -6,7 +6,7 @@ import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/types/migration"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/gamm/types/migration"; // MigrationRecords contains all the links between balancer and concentrated // pools diff --git a/packages/protobuf/proto/osmosis/gamm/v1beta1/tx.proto b/packages/protobuf/proto/osmosis/gamm/v1beta1/tx.proto index 8ccb0b30d..e36d1ec97 100644 --- a/packages/protobuf/proto/osmosis/gamm/v1beta1/tx.proto +++ b/packages/protobuf/proto/osmosis/gamm/v1beta1/tx.proto @@ -6,7 +6,7 @@ import "amino/amino.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/poolmanager/v1beta1/swap_route.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/gamm/types"; service Msg { rpc JoinPool(MsgJoinPool) returns (MsgJoinPoolResponse); @@ -33,7 +33,7 @@ message MsgJoinPool { string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; uint64 pool_id = 2 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ]; string share_out_amount = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"pool_amount_out\"", (gogoproto.nullable) = false ]; @@ -45,7 +45,7 @@ message MsgJoinPool { message MsgJoinPoolResponse { string share_out_amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"share_out_amount\"", (gogoproto.nullable) = false ]; @@ -62,7 +62,7 @@ message MsgExitPool { string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; uint64 pool_id = 2 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ]; string share_in_amount = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"share_in_amount\"", (gogoproto.nullable) = false ]; @@ -92,7 +92,7 @@ message MsgSwapExactAmountIn { (gogoproto.nullable) = false ]; string token_out_min_amount = 4 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_out_min_amount\"", (gogoproto.nullable) = false ]; @@ -100,7 +100,7 @@ message MsgSwapExactAmountIn { message MsgSwapExactAmountInResponse { string token_out_amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_out_amount\"", (gogoproto.nullable) = false ]; @@ -113,7 +113,7 @@ message MsgSwapExactAmountOut { repeated osmosis.poolmanager.v1beta1.SwapAmountOutRoute routes = 2 [ (gogoproto.nullable) = false ]; string token_in_max_amount = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_in_max_amount\"", (gogoproto.nullable) = false ]; @@ -125,7 +125,7 @@ message MsgSwapExactAmountOut { message MsgSwapExactAmountOutResponse { string token_in_amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_in_amount\"", (gogoproto.nullable) = false ]; @@ -143,7 +143,7 @@ message MsgJoinSwapExternAmountIn { (gogoproto.nullable) = false ]; string share_out_min_amount = 4 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"share_out_min_amount\"", (gogoproto.nullable) = false ]; @@ -155,7 +155,7 @@ message MsgJoinSwapExternAmountIn { message MsgJoinSwapExternAmountInResponse { string share_out_amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"share_out_amount\"", (gogoproto.nullable) = false ]; @@ -170,12 +170,12 @@ message MsgJoinSwapShareAmountOut { string token_in_denom = 3 [ (gogoproto.moretags) = "yaml:\"token_in_denom\"" ]; string share_out_amount = 4 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"share_out_amount\"", (gogoproto.nullable) = false ]; string token_in_max_amount = 5 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_in_max_amount\"", (gogoproto.nullable) = false ]; @@ -183,7 +183,7 @@ message MsgJoinSwapShareAmountOut { message MsgJoinSwapShareAmountOutResponse { string token_in_amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_in_amount\"", (gogoproto.nullable) = false ]; @@ -198,12 +198,12 @@ message MsgExitSwapShareAmountIn { string token_out_denom = 3 [ (gogoproto.moretags) = "yaml:\"token_out_denom\"" ]; string share_in_amount = 4 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"share_in_amount\"", (gogoproto.nullable) = false ]; string token_out_min_amount = 5 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_out_min_amount\"", (gogoproto.nullable) = false ]; @@ -211,7 +211,7 @@ message MsgExitSwapShareAmountIn { message MsgExitSwapShareAmountInResponse { string token_out_amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_out_amount\"", (gogoproto.nullable) = false ]; @@ -228,7 +228,7 @@ message MsgExitSwapExternAmountOut { (gogoproto.nullable) = false ]; string share_in_max_amount = 4 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"share_in_max_amount\"", (gogoproto.nullable) = false ]; @@ -236,7 +236,7 @@ message MsgExitSwapExternAmountOut { message MsgExitSwapExternAmountOutResponse { string share_in_amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"share_in_amount\"", (gogoproto.nullable) = false ]; diff --git a/packages/protobuf/proto/osmosis/gamm/v2/query.proto b/packages/protobuf/proto/osmosis/gamm/v2/query.proto index 81549332b..ef38b9276 100644 --- a/packages/protobuf/proto/osmosis/gamm/v2/query.proto +++ b/packages/protobuf/proto/osmosis/gamm/v2/query.proto @@ -10,7 +10,7 @@ import "google/api/annotations.proto"; import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/v2types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/gamm/v2types"; service Query { // Deprecated: please use alternate in x/poolmanager diff --git a/packages/protobuf/proto/osmosis/ibc-hooks/genesis.proto b/packages/protobuf/proto/osmosis/ibc-hooks/genesis.proto new file mode 100644 index 000000000..46baa411f --- /dev/null +++ b/packages/protobuf/proto/osmosis/ibc-hooks/genesis.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; +package osmosis.ibchooks; + +import "gogoproto/gogo.proto"; +import "cosmos_proto/cosmos.proto"; +import "osmosis/ibc-hooks/params.proto"; + +option go_package = "github.com/osmosis-labs/osmosis/v19/x/ibc-hooks/types"; + +message GenesisState { Params params = 1 [ (gogoproto.nullable) = false ]; } diff --git a/packages/protobuf/proto/osmosis/ibc-hooks/params.proto b/packages/protobuf/proto/osmosis/ibc-hooks/params.proto new file mode 100644 index 000000000..bd59b68e0 --- /dev/null +++ b/packages/protobuf/proto/osmosis/ibc-hooks/params.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; +package osmosis.ibchooks; + +import "gogoproto/gogo.proto"; +import "cosmos_proto/cosmos.proto"; +import "google/protobuf/duration.proto"; + +option go_package = "github.com/osmosis-labs/osmosis/v19/x/ibc-hooks/types"; + +message Params { + repeated string allowed_async_ack_contracts = 1 + [ (gogoproto.moretags) = "yaml:\"allowed_async_ack_contracts\"" ]; +} diff --git a/packages/protobuf/proto/osmosis/ibc-hooks/tx.proto b/packages/protobuf/proto/osmosis/ibc-hooks/tx.proto new file mode 100644 index 000000000..09058b2fa --- /dev/null +++ b/packages/protobuf/proto/osmosis/ibc-hooks/tx.proto @@ -0,0 +1,25 @@ +syntax = "proto3"; +package osmosis.ibchooks; + +import "gogoproto/gogo.proto"; + +option go_package = "github.com/osmosis-labs/osmosis/v19/x/ibc-hooks/types"; + +// Msg defines the Msg service. +service Msg { + // EmitIBCAck checks the sender can emit the ack and writes the IBC + // acknowledgement + rpc EmitIBCAck(MsgEmitIBCAck) returns (MsgEmitIBCAckResponse); +} + +message MsgEmitIBCAck { + string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; + uint64 packet_sequence = 2 + [ (gogoproto.moretags) = "yaml:\"packet_sequence\"" ]; + string channel = 3 [ (gogoproto.moretags) = "yaml:\"channel\"" ]; +} +message MsgEmitIBCAckResponse { + string contract_result = 1 + [ (gogoproto.moretags) = "yaml:\"contract_result\"" ]; + string ibc_ack = 2 [ (gogoproto.moretags) = "yaml:\"ibc_ack\"" ]; +} diff --git a/packages/protobuf/proto/osmosis/ibc-rate-limit/v1beta1/genesis.proto b/packages/protobuf/proto/osmosis/ibc-rate-limit/v1beta1/genesis.proto index 2fb6b8b41..9382072e3 100644 --- a/packages/protobuf/proto/osmosis/ibc-rate-limit/v1beta1/genesis.proto +++ b/packages/protobuf/proto/osmosis/ibc-rate-limit/v1beta1/genesis.proto @@ -6,7 +6,7 @@ import "cosmos_proto/cosmos.proto"; import "google/protobuf/any.proto"; import "osmosis/ibc-rate-limit/v1beta1/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/ibc-rate-limit/types"; // GenesisState defines the ibc-rate-limit module's genesis state. message GenesisState { diff --git a/packages/protobuf/proto/osmosis/ibc-rate-limit/v1beta1/params.proto b/packages/protobuf/proto/osmosis/ibc-rate-limit/v1beta1/params.proto index 11c507e7b..71b8cae2f 100644 --- a/packages/protobuf/proto/osmosis/ibc-rate-limit/v1beta1/params.proto +++ b/packages/protobuf/proto/osmosis/ibc-rate-limit/v1beta1/params.proto @@ -3,7 +3,7 @@ package osmosis.ibcratelimit.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/ibc-rate-limit/types"; // Params defines the parameters for the ibc-rate-limit module. message Params { diff --git a/packages/protobuf/proto/osmosis/ibc-rate-limit/v1beta1/query.proto b/packages/protobuf/proto/osmosis/ibc-rate-limit/v1beta1/query.proto index 49651f9be..301e58d78 100644 --- a/packages/protobuf/proto/osmosis/ibc-rate-limit/v1beta1/query.proto +++ b/packages/protobuf/proto/osmosis/ibc-rate-limit/v1beta1/query.proto @@ -6,7 +6,7 @@ import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; import "osmosis/ibc-rate-limit/v1beta1/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/client/queryproto"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/ibc-rate-limit/client/queryproto"; // Query defines the gRPC querier service. service Query { diff --git a/packages/protobuf/proto/osmosis/ibc-rate-limit/v1beta1/query.yml b/packages/protobuf/proto/osmosis/ibc-rate-limit/v1beta1/query.yml index c8251b578..5a90d4710 100644 --- a/packages/protobuf/proto/osmosis/ibc-rate-limit/v1beta1/query.yml +++ b/packages/protobuf/proto/osmosis/ibc-rate-limit/v1beta1/query.yml @@ -1,7 +1,7 @@ keeper: - path: "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit" + path: "github.com/osmosis-labs/osmosis/v19/x/ibc-rate-limit" struct: "Keeper" -client_path: "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/client" +client_path: "github.com/osmosis-labs/osmosis/v19/x/ibc-rate-limit/client" queries: Params: proto_wrapper: diff --git a/packages/protobuf/proto/osmosis/incentives/gauge.proto b/packages/protobuf/proto/osmosis/incentives/gauge.proto index 99daeaf33..28bc478a5 100644 --- a/packages/protobuf/proto/osmosis/incentives/gauge.proto +++ b/packages/protobuf/proto/osmosis/incentives/gauge.proto @@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/incentives/types"; // Gauge is an object that stores and distributes yields to recipients who // satisfy certain conditions. Currently gauges support conditions around the diff --git a/packages/protobuf/proto/osmosis/incentives/genesis.proto b/packages/protobuf/proto/osmosis/incentives/genesis.proto index fa3b7b697..37cf27700 100644 --- a/packages/protobuf/proto/osmosis/incentives/genesis.proto +++ b/packages/protobuf/proto/osmosis/incentives/genesis.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "osmosis/incentives/params.proto"; import "osmosis/incentives/gauge.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/incentives/types"; // GenesisState defines the incentives module's various parameters when first // initialized diff --git a/packages/protobuf/proto/osmosis/incentives/params.proto b/packages/protobuf/proto/osmosis/incentives/params.proto index f487632b9..77f5b756f 100644 --- a/packages/protobuf/proto/osmosis/incentives/params.proto +++ b/packages/protobuf/proto/osmosis/incentives/params.proto @@ -3,7 +3,7 @@ package osmosis.incentives; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/incentives/types"; // Params holds parameters for the incentives module message Params { diff --git a/packages/protobuf/proto/osmosis/incentives/query.proto b/packages/protobuf/proto/osmosis/incentives/query.proto index c8866de88..ad9e94433 100644 --- a/packages/protobuf/proto/osmosis/incentives/query.proto +++ b/packages/protobuf/proto/osmosis/incentives/query.proto @@ -9,7 +9,7 @@ import "cosmos/base/query/v1beta1/pagination.proto"; import "osmosis/incentives/gauge.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/incentives/types"; // Query defines the gRPC querier service service Query { diff --git a/packages/protobuf/proto/osmosis/incentives/tx.proto b/packages/protobuf/proto/osmosis/incentives/tx.proto index 4f724fde8..612cddc4a 100644 --- a/packages/protobuf/proto/osmosis/incentives/tx.proto +++ b/packages/protobuf/proto/osmosis/incentives/tx.proto @@ -8,7 +8,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "osmosis/incentives/gauge.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/incentives/types"; service Msg { rpc CreateGauge(MsgCreateGauge) returns (MsgCreateGaugeResponse); diff --git a/packages/protobuf/proto/osmosis/lockup/genesis.proto b/packages/protobuf/proto/osmosis/lockup/genesis.proto index dcceda847..60628c149 100644 --- a/packages/protobuf/proto/osmosis/lockup/genesis.proto +++ b/packages/protobuf/proto/osmosis/lockup/genesis.proto @@ -4,7 +4,7 @@ package osmosis.lockup; import "gogoproto/gogo.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/lockup/types"; // GenesisState defines the lockup module's genesis state. message GenesisState { diff --git a/packages/protobuf/proto/osmosis/lockup/lock.proto b/packages/protobuf/proto/osmosis/lockup/lock.proto index 322428288..c7609760a 100644 --- a/packages/protobuf/proto/osmosis/lockup/lock.proto +++ b/packages/protobuf/proto/osmosis/lockup/lock.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/lockup/types"; // PeriodLock is a single lock unit by period defined by the x/lockup module. // It's a record of a locked coin at a specific time. It stores owner, duration, diff --git a/packages/protobuf/proto/osmosis/lockup/params.proto b/packages/protobuf/proto/osmosis/lockup/params.proto index 1f2c6f283..232b4c5cd 100644 --- a/packages/protobuf/proto/osmosis/lockup/params.proto +++ b/packages/protobuf/proto/osmosis/lockup/params.proto @@ -3,7 +3,7 @@ package osmosis.lockup; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/lockup/types"; message Params { repeated string force_unlock_allowed_addresses = 1 diff --git a/packages/protobuf/proto/osmosis/lockup/query.proto b/packages/protobuf/proto/osmosis/lockup/query.proto index afb29ffd6..29ab30444 100644 --- a/packages/protobuf/proto/osmosis/lockup/query.proto +++ b/packages/protobuf/proto/osmosis/lockup/query.proto @@ -9,7 +9,7 @@ import "google/protobuf/duration.proto"; import "osmosis/lockup/lock.proto"; import "osmosis/lockup/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/lockup/types"; // Query defines the gRPC querier service. service Query { @@ -251,7 +251,7 @@ message LockedDenomRequest { } message LockedDenomResponse { string amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"amount\"", (gogoproto.nullable) = false ]; diff --git a/packages/protobuf/proto/osmosis/lockup/tx.proto b/packages/protobuf/proto/osmosis/lockup/tx.proto index 79c23d4be..399f4d013 100644 --- a/packages/protobuf/proto/osmosis/lockup/tx.proto +++ b/packages/protobuf/proto/osmosis/lockup/tx.proto @@ -7,7 +7,7 @@ import "google/protobuf/duration.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/lockup/types"; // Msg defines the Msg service. service Msg { @@ -69,6 +69,8 @@ message MsgBeginUnlockingResponse { // MsgExtendLockup extends the existing lockup's duration. // The new duration is longer than the original. message MsgExtendLockup { + option (amino.name) = "osmosis/lockup/extend-lockup"; + string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; uint64 ID = 2; @@ -89,6 +91,8 @@ message MsgExtendLockupResponse { bool success = 1; } // MsgForceUnlock unlocks locks immediately for // addresses registered via governance. message MsgForceUnlock { + option (amino.name) = "osmosis/lockup/force-unlock-tokens"; + string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; uint64 ID = 2; // Amount of unlocking coins. Unlock all if not set. @@ -101,6 +105,8 @@ message MsgForceUnlock { message MsgForceUnlockResponse { bool success = 1; } message MsgSetRewardReceiverAddress { + option (amino.name) = "osmosis/lockup/set-reward-receiver-address"; + string owner = 1 [ (gogoproto.moretags) = "yaml:\"owner\"" ]; uint64 lockID = 2; string reward_receiver = 3 diff --git a/packages/protobuf/proto/osmosis/mint/v1beta1/genesis.proto b/packages/protobuf/proto/osmosis/mint/v1beta1/genesis.proto index 483f74bed..393e68b4f 100644 --- a/packages/protobuf/proto/osmosis/mint/v1beta1/genesis.proto +++ b/packages/protobuf/proto/osmosis/mint/v1beta1/genesis.proto @@ -4,7 +4,7 @@ package osmosis.mint.v1beta1; import "gogoproto/gogo.proto"; import "osmosis/mint/v1beta1/mint.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/mint/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/mint/types"; // GenesisState defines the mint module's genesis state. message GenesisState { diff --git a/packages/protobuf/proto/osmosis/mint/v1beta1/mint.proto b/packages/protobuf/proto/osmosis/mint/v1beta1/mint.proto index 9c167ad65..3c05c2df6 100644 --- a/packages/protobuf/proto/osmosis/mint/v1beta1/mint.proto +++ b/packages/protobuf/proto/osmosis/mint/v1beta1/mint.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package osmosis.mint.v1beta1; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/mint/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/mint/types"; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; @@ -13,7 +13,7 @@ message Minter { // epoch_provisions represent rewards for the current epoch. string epoch_provisions = 1 [ (gogoproto.moretags) = "yaml:\"epoch_provisions\"", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } @@ -25,7 +25,7 @@ message WeightedAddress { string address = 1 [ (gogoproto.moretags) = "yaml:\"address\"" ]; string weight = 2 [ (gogoproto.moretags) = "yaml:\"weight\"", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } @@ -37,28 +37,28 @@ message DistributionProportions { // staking defines the proportion of the minted mint_denom that is to be // allocated as staking rewards. string staking = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"staking\"", (gogoproto.nullable) = false ]; // pool_incentives defines the proportion of the minted mint_denom that is // to be allocated as pool incentives. string pool_incentives = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"pool_incentives\"", (gogoproto.nullable) = false ]; // developer_rewards defines the proportion of the minted mint_denom that is // to be allocated to developer rewards address. string developer_rewards = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"developer_rewards\"", (gogoproto.nullable) = false ]; // community_pool defines the proportion of the minted mint_denom that is // to be allocated to the community pool. string community_pool = 4 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"community_pool\"", (gogoproto.nullable) = false ]; @@ -73,7 +73,7 @@ message Params { // genesis_epoch_provisions epoch provisions from the first epoch. string genesis_epoch_provisions = 2 [ (gogoproto.moretags) = "yaml:\"genesis_epoch_provisions\"", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; // epoch_identifier mint epoch identifier e.g. (day, week). @@ -87,7 +87,7 @@ message Params { // at the end of each period set by reduction_period_in_epochs. string reduction_factor = 5 [ (gogoproto.moretags) = "yaml:\"reduction_factor\"", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; // distribution_proportions defines the distribution proportions of the minted diff --git a/packages/protobuf/proto/osmosis/mint/v1beta1/query.proto b/packages/protobuf/proto/osmosis/mint/v1beta1/query.proto index 7ca61eaed..6a077b26e 100644 --- a/packages/protobuf/proto/osmosis/mint/v1beta1/query.proto +++ b/packages/protobuf/proto/osmosis/mint/v1beta1/query.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "osmosis/mint/v1beta1/mint.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/mint/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/mint/types"; // Query provides defines the gRPC querier service. service Query { @@ -39,7 +39,7 @@ message QueryEpochProvisionsRequest {} message QueryEpochProvisionsResponse { // epoch_provisions is the current minting per epoch provisions value. bytes epoch_provisions = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } diff --git a/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/genesis.proto b/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/genesis.proto index 94628c7f9..3a7d4a354 100644 --- a/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/genesis.proto +++ b/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; import "osmosis/pool-incentives/v1beta1/incentives.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/pool-incentives/types"; // GenesisState defines the pool incentives module's genesis state. message GenesisState { diff --git a/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/gov.proto b/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/gov.proto index 4379def1c..b4c27626c 100644 --- a/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/gov.proto +++ b/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/gov.proto @@ -6,7 +6,7 @@ import "amino/amino.proto"; import "gogoproto/gogo.proto"; import "osmosis/pool-incentives/v1beta1/incentives.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/pool-incentives/types"; // ReplacePoolIncentivesProposal is a gov Content type for updating the pool // incentives. If a ReplacePoolIncentivesProposal passes, the proposal’s records diff --git a/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/incentives.proto b/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/incentives.proto index df0fbb8a1..ee3dd3118 100644 --- a/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/incentives.proto +++ b/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/incentives.proto @@ -4,7 +4,7 @@ package osmosis.poolincentives.v1beta1; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/pool-incentives/types"; message Params { option (gogoproto.goproto_stringer) = false; @@ -26,7 +26,7 @@ message LockableDurationsInfo { message DistrInfo { string total_weight = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"total_weight\"", (gogoproto.nullable) = false ]; @@ -38,7 +38,7 @@ message DistrRecord { uint64 gauge_id = 1 [ (gogoproto.moretags) = "yaml:\"gauge_id\"" ]; string weight = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false ]; } diff --git a/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/query.proto b/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/query.proto index 56c2da491..4f95bc058 100644 --- a/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/query.proto +++ b/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/query.proto @@ -7,7 +7,7 @@ import "google/protobuf/duration.proto"; import "osmosis/incentives/gauge.proto"; import "osmosis/pool-incentives/v1beta1/incentives.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/pool-incentives/types"; service Query { // GaugeIds takes the pool id and returns the matching gauge ids and durations diff --git a/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/shared.proto b/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/shared.proto index ecd6d8ea8..6fecf9b76 100644 --- a/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/shared.proto +++ b/packages/protobuf/proto/osmosis/pool-incentives/v1beta1/shared.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; import "osmosis/pool-incentives/v1beta1/incentives.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/pool-incentives/types"; // MigrationRecords contains all the links between balancer and concentrated // pools. diff --git a/packages/protobuf/proto/osmosis/poolmanager/v1beta1/genesis.proto b/packages/protobuf/proto/osmosis/poolmanager/v1beta1/genesis.proto index 23bc3f292..6c58c8e12 100644 --- a/packages/protobuf/proto/osmosis/poolmanager/v1beta1/genesis.proto +++ b/packages/protobuf/proto/osmosis/poolmanager/v1beta1/genesis.proto @@ -8,7 +8,7 @@ import "google/protobuf/duration.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/poolmanager/v1beta1/module_route.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/poolmanager/types"; // Params holds parameters for the poolmanager module message Params { @@ -17,6 +17,21 @@ message Params { (gogoproto.moretags) = "yaml:\"pool_creation_fee\"", (gogoproto.nullable) = false ]; + // taker_fee_params is the container of taker fee parameters. + TakerFeeParams taker_fee_params = 2 [ + (gogoproto.moretags) = "yaml:\"taker_fee_params\"", + (gogoproto.nullable) = false + ]; + // authorized_quote_denoms is a list of quote denoms that can be used as + // token1 when creating a concentrated pool. We limit the quote assets to a + // small set for the purposes of having convinient price increments stemming + // from tick to price conversion. These increments are in a human readable + // magnitude only for token1 as a quote. For limit orders in the future, this + // will be a desirable property in terms of UX as to allow users to set limit + // orders at prices in terms of token1 (quote asset) that are easy to reason + // about. + repeated string authorized_quote_denoms = 3 + [ (gogoproto.moretags) = "yaml:\"authorized_quote_denoms\"" ]; } // GenesisState defines the poolmanager module's genesis state. @@ -28,3 +43,64 @@ message GenesisState { // pool_routes is the container of the mappings from pool id to pool type. repeated ModuleRoute pool_routes = 3 [ (gogoproto.nullable) = false ]; } + +// TakerFeeParams consolidates the taker fee parameters for the poolmanager. +message TakerFeeParams { + // default_taker_fee is the fee used when creating a new pool that doesn't + // fall under a custom pool taker fee or stableswap taker fee category. + string default_taker_fee = 1 [ + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", + (gogoproto.customname) = "DefaultTakerFee", + (gogoproto.nullable) = false + ]; + // osmo_taker_fee_distribution defines the distribution of taker fees + // generated in OSMO. As of this writing, it has two catagories: + // - staking_rewards: the percent of the taker fee that gets distributed to + // stakers. + // - community_pool: the percent of the taker fee that gets sent to the + // community pool. + TakerFeeDistributionPercentage osmo_taker_fee_distribution = 2 [ + (gogoproto.customname) = "OsmoTakerFeeDistribution", + (gogoproto.nullable) = false + ]; + // non_osmo_taker_fee_distribution defines the distribution of taker fees + // generated in non-OSMO. As of this writing, it has two categories: + // - staking_rewards: the percent of the taker fee that gets swapped to OSMO + // and then distirbuted to stakers. + // - community_pool: the percent of the taker fee that gets sent to the + // community pool. Note: If the non-OSMO asset is an authorized_quote_denom, + // that denom is sent directly to the community pool. Otherwise, it is + // swapped to the community_pool_denom_to_swap_non_whitelisted_assets_to and + // then sent to the community pool as that denom. + TakerFeeDistributionPercentage non_osmo_taker_fee_distribution = 3 [ + (gogoproto.customname) = "NonOsmoTakerFeeDistribution", + (gogoproto.nullable) = false + ]; + // admin_addresses is a list of addresses that are allowed to set and remove + // custom taker fees for denom pairs. Governance also has the ability to set + // and remove custom taker fees for denom pairs, but with the normal + // governance delay. + repeated string admin_addresses = 4 + [ (gogoproto.moretags) = "yaml:\"admin_addresses\"" ]; + // community_pool_denom_to_swap_non_whitelisted_assets_to is the denom that + // non-whitelisted taker fees will be swapped to before being sent to + // the community pool. + string community_pool_denom_to_swap_non_whitelisted_assets_to = 5 + [ (gogoproto.moretags) = + "yaml:\"community_pool_denom_to_swap_non_whitelisted_assets_to\"" ]; +} + +// TakerFeeDistributionPercentage defines what percent of the taker fee category +// gets distributed to the available categories. +message TakerFeeDistributionPercentage { + string staking_rewards = 1 [ + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", + (gogoproto.moretags) = "yaml:\"staking_rewards\"", + (gogoproto.nullable) = false + ]; + string community_pool = 2 [ + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", + (gogoproto.moretags) = "yaml:\"community_pool\"", + (gogoproto.nullable) = false + ]; +} diff --git a/packages/protobuf/proto/osmosis/poolmanager/v1beta1/gov.proto b/packages/protobuf/proto/osmosis/poolmanager/v1beta1/gov.proto new file mode 100644 index 000000000..1a6ebcbb2 --- /dev/null +++ b/packages/protobuf/proto/osmosis/poolmanager/v1beta1/gov.proto @@ -0,0 +1,20 @@ +syntax = "proto3"; +package osmosis.poolmanager.v1beta1; + +import "gogoproto/gogo.proto"; +import "osmosis/poolmanager/v1beta1/tx.proto"; + +option go_package = "github.com/osmosis-labs/osmosis/v19/x/poolmanager/types"; + +// DenomPairTakerFeeProposal is a type for adding/removing a custom taker fee(s) +// for one or more denom pairs. +message DenomPairTakerFeeProposal { + option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_stringer) = false; + + string title = 1; + string description = 2; + + repeated osmosis.poolmanager.v1beta1.DenomPairTakerFee denom_pair_taker_fee = + 3 [ (gogoproto.nullable) = false ]; +} diff --git a/packages/protobuf/proto/osmosis/poolmanager/v1beta1/module_route.proto b/packages/protobuf/proto/osmosis/poolmanager/v1beta1/module_route.proto index 8f10ef785..b67facd8d 100644 --- a/packages/protobuf/proto/osmosis/poolmanager/v1beta1/module_route.proto +++ b/packages/protobuf/proto/osmosis/poolmanager/v1beta1/module_route.proto @@ -3,7 +3,7 @@ package osmosis.poolmanager.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/poolmanager/types"; // PoolType is an enumeration of all supported pool types. enum PoolType { diff --git a/packages/protobuf/proto/osmosis/poolmanager/v1beta1/query.proto b/packages/protobuf/proto/osmosis/poolmanager/v1beta1/query.proto index 5d17eb788..b60d53ad0 100644 --- a/packages/protobuf/proto/osmosis/poolmanager/v1beta1/query.proto +++ b/packages/protobuf/proto/osmosis/poolmanager/v1beta1/query.proto @@ -13,7 +13,7 @@ import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/poolmanager/client/queryproto"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/poolmanager/client/queryproto"; service Query { rpc Params(ParamsRequest) returns (ParamsResponse) { @@ -27,6 +27,24 @@ service Query { "/osmosis/poolmanager/v1beta1/{pool_id}/estimate/swap_exact_amount_in"; } + // EstimateSwapExactAmountInWithPrimitiveTypes is an alternative query for + // EstimateSwapExactAmountIn. Supports query via GRPC-Gateway by using + // primitive types instead of repeated structs. Each index in the + // routes_pool_id field corresponds to the respective routes_token_out_denom + // value, thus they are required to have the same length and are grouped + // together as pairs. + // example usage: + // http://0.0.0.0:1317/osmosis/poolmanager/v1beta1/1/estimate/ + // swap_exact_amount_in_with_primitive_types?token_in=100000stake&routes_token_out_denom=uatom + // &routes_token_out_denom=uion&routes_pool_id=1&routes_pool_id=2 + rpc EstimateSwapExactAmountInWithPrimitiveTypes( + EstimateSwapExactAmountInWithPrimitiveTypesRequest) + returns (EstimateSwapExactAmountInResponse) { + option (google.api.http).get = + "/osmosis/poolmanager/v1beta1/{pool_id}/estimate/" + "swap_exact_amount_in_with_primitive_types"; + } + rpc EstimateSinglePoolSwapExactAmountIn( EstimateSinglePoolSwapExactAmountInRequest) returns (EstimateSwapExactAmountInResponse) { @@ -41,6 +59,15 @@ service Query { "/osmosis/poolmanager/v1beta1/{pool_id}/estimate/swap_exact_amount_out"; } + // Estimates swap amount in given out. + rpc EstimateSwapExactAmountOutWithPrimitiveTypes( + EstimateSwapExactAmountOutWithPrimitiveTypesRequest) + returns (EstimateSwapExactAmountOutResponse) { + option (google.api.http).get = + "/osmosis/poolmanager/v1beta1/{pool_id}/estimate/" + "swap_exact_amount_out_with_primitive_types"; + } + rpc EstimateSinglePoolSwapExactAmountOut( EstimateSinglePoolSwapExactAmountOutRequest) returns (EstimateSwapExactAmountOutResponse) { @@ -101,6 +128,14 @@ message EstimateSwapExactAmountInRequest { (gogoproto.nullable) = false ]; } +message EstimateSwapExactAmountInWithPrimitiveTypesRequest { + uint64 pool_id = 1 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ]; + string token_in = 2 [ (gogoproto.moretags) = "yaml:\"token_in\"" ]; + repeated uint64 routes_pool_id = 3 + [ (gogoproto.moretags) = "yaml:\"routes_pool_id\"" ]; + repeated string routes_token_out_denom = 4 + [ (gogoproto.moretags) = "yaml:\"routes_token_out_denom\"" ]; +} message EstimateSinglePoolSwapExactAmountInRequest { uint64 pool_id = 1 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ]; @@ -111,7 +146,7 @@ message EstimateSinglePoolSwapExactAmountInRequest { message EstimateSwapExactAmountInResponse { string token_out_amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_out_amount\"", (gogoproto.nullable) = false ]; @@ -129,6 +164,15 @@ message EstimateSwapExactAmountOutRequest { string token_out = 4 [ (gogoproto.moretags) = "yaml:\"token_out\"" ]; } +message EstimateSwapExactAmountOutWithPrimitiveTypesRequest { + uint64 pool_id = 1 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ]; + repeated uint64 routes_pool_id = 2 + [ (gogoproto.moretags) = "yaml:\"routes_pool_id\"" ]; + repeated string routes_token_in_denom = 3 + [ (gogoproto.moretags) = "yaml:\"routes_token_in_denom\"" ]; + string token_out = 4 [ (gogoproto.moretags) = "yaml:\"token_out\"" ]; +} + message EstimateSinglePoolSwapExactAmountOutRequest { uint64 pool_id = 1 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ]; string token_in_denom = 2 @@ -138,7 +182,7 @@ message EstimateSinglePoolSwapExactAmountOutRequest { message EstimateSwapExactAmountOutResponse { string token_in_amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_in_amount\"", (gogoproto.nullable) = false ]; diff --git a/packages/protobuf/proto/osmosis/poolmanager/v1beta1/query.yml b/packages/protobuf/proto/osmosis/poolmanager/v1beta1/query.yml index 96a69e84a..7a0893e07 100644 --- a/packages/protobuf/proto/osmosis/poolmanager/v1beta1/query.yml +++ b/packages/protobuf/proto/osmosis/poolmanager/v1beta1/query.yml @@ -1,7 +1,7 @@ keeper: - path: "github.com/osmosis-labs/osmosis/v16/x/poolmanager" + path: "github.com/osmosis-labs/osmosis/v19/x/poolmanager" struct: "Keeper" -client_path: "github.com/osmosis-labs/osmosis/v16/x/poolmanager/client" +client_path: "github.com/osmosis-labs/osmosis/v19/x/poolmanager/client" queries: Params: proto_wrapper: @@ -13,11 +13,23 @@ queries: query_func: "k.EstimateSwapExactAmountIn" cli: cmd: "EstimateSwapExactAmountIn" + EstimateSwapExactAmountInWithPrimitiveTypes: + proto_wrapper: + query_func: "k.EstimateSwapExactAmountInWithPrimitiveTypes" + response: "*queryproto.EstimateSwapExactAmountInResponse" + cli: + cmd: "EstimateSwapExactAmountInWithPrimitiveTypes" EstimateSwapExactAmountOut: proto_wrapper: query_func: "k.EstimateSwapExactAmountOut" cli: cmd: "EstimateSwapExactAmountOut" + EstimateSwapExactAmountOutWithPrimitiveTypes: + proto_wrapper: + query_func: "k.EstimateSwapExactAmountOutWithPrimitiveTypes" + response: "*queryproto.EstimateSwapExactAmountOutResponse" + cli: + cmd: "EstimateSwapExactAmountOutWithPrimitiveTypes" EstimateSinglePoolSwapExactAmountIn: proto_wrapper: query_func: "k.EstimateSinglePoolSwapExactAmountIn" diff --git a/packages/protobuf/proto/osmosis/poolmanager/v1beta1/swap_route.proto b/packages/protobuf/proto/osmosis/poolmanager/v1beta1/swap_route.proto index 8f0c54228..36a4e9b87 100644 --- a/packages/protobuf/proto/osmosis/poolmanager/v1beta1/swap_route.proto +++ b/packages/protobuf/proto/osmosis/poolmanager/v1beta1/swap_route.proto @@ -3,7 +3,7 @@ package osmosis.poolmanager.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/poolmanager/types"; message SwapAmountInRoute { uint64 pool_id = 1 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ]; @@ -21,7 +21,7 @@ message SwapAmountInSplitRoute { repeated SwapAmountInRoute pools = 1 [ (gogoproto.moretags) = "yaml:\"pools\"", (gogoproto.nullable) = false ]; string token_in_amount = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_in_amount\"", (gogoproto.nullable) = false ]; @@ -31,7 +31,7 @@ message SwapAmountOutSplitRoute { repeated SwapAmountOutRoute pools = 1 [ (gogoproto.moretags) = "yaml:\"pools\"", (gogoproto.nullable) = false ]; string token_out_amount = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_out_amount\"", (gogoproto.nullable) = false ]; diff --git a/packages/protobuf/proto/osmosis/poolmanager/v1beta1/tx.proto b/packages/protobuf/proto/osmosis/poolmanager/v1beta1/tx.proto index b2c369531..16fc86e7e 100644 --- a/packages/protobuf/proto/osmosis/poolmanager/v1beta1/tx.proto +++ b/packages/protobuf/proto/osmosis/poolmanager/v1beta1/tx.proto @@ -6,7 +6,7 @@ import "amino/amino.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/poolmanager/v1beta1/swap_route.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/poolmanager/types"; service Msg { rpc SwapExactAmountIn(MsgSwapExactAmountIn) @@ -17,6 +17,8 @@ service Msg { returns (MsgSplitRouteSwapExactAmountInResponse); rpc SplitRouteSwapExactAmountOut(MsgSplitRouteSwapExactAmountOut) returns (MsgSplitRouteSwapExactAmountOutResponse); + rpc SetDenomPairTakerFee(MsgSetDenomPairTakerFee) + returns (MsgSetDenomPairTakerFeeResponse); } // ===================== MsgSwapExactAmountIn @@ -30,7 +32,7 @@ message MsgSwapExactAmountIn { (gogoproto.nullable) = false ]; string token_out_min_amount = 4 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_out_min_amount\"", (gogoproto.nullable) = false ]; @@ -38,7 +40,7 @@ message MsgSwapExactAmountIn { message MsgSwapExactAmountInResponse { string token_out_amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_out_amount\"", (gogoproto.nullable) = false ]; @@ -53,7 +55,7 @@ message MsgSplitRouteSwapExactAmountIn { string token_in_denom = 3 [ (gogoproto.moretags) = "yaml:\"token_in_denom\"" ]; string token_out_min_amount = 4 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_out_min_amount\"", (gogoproto.nullable) = false ]; @@ -61,7 +63,7 @@ message MsgSplitRouteSwapExactAmountIn { message MsgSplitRouteSwapExactAmountInResponse { string token_out_amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_out_amount\"", (gogoproto.nullable) = false ]; @@ -74,7 +76,7 @@ message MsgSwapExactAmountOut { string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; repeated SwapAmountOutRoute routes = 2 [ (gogoproto.nullable) = false ]; string token_in_max_amount = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_in_max_amount\"", (gogoproto.nullable) = false ]; @@ -86,7 +88,7 @@ message MsgSwapExactAmountOut { message MsgSwapExactAmountOutResponse { string token_in_amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_in_amount\"", (gogoproto.nullable) = false ]; @@ -101,7 +103,7 @@ message MsgSplitRouteSwapExactAmountOut { string token_out_denom = 3 [ (gogoproto.moretags) = "yaml:\"token_out_denom\"" ]; string token_in_max_amount = 4 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_in_max_amount\"", (gogoproto.nullable) = false ]; @@ -109,8 +111,33 @@ message MsgSplitRouteSwapExactAmountOut { message MsgSplitRouteSwapExactAmountOutResponse { string token_in_amount = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"token_in_amount\"", (gogoproto.nullable) = false ]; } + +// ===================== MsgSetDenomPairTakerFee +message MsgSetDenomPairTakerFee { + option (amino.name) = "osmosis/poolmanager/set-denom-pair-taker-fee"; + + string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; + repeated DenomPairTakerFee denom_pair_taker_fee = 2 [ + (gogoproto.moretags) = "yaml:\"denom_pair_taker_fee\"", + (gogoproto.nullable) = false + ]; +} + +message MsgSetDenomPairTakerFeeResponse { bool success = 1; } + +message DenomPairTakerFee { + // denom0 and denom1 get automatically lexigographically sorted + // when being stored, so the order of input here does not matter. + string denom0 = 1 [ (gogoproto.moretags) = "yaml:\"denom0\"" ]; + string denom1 = 2 [ (gogoproto.moretags) = "yaml:\"denom1\"" ]; + string taker_fee = 3 [ + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", + (gogoproto.moretags) = "yaml:\"taker_fee\"", + (gogoproto.nullable) = false + ]; +} diff --git a/packages/protobuf/proto/osmosis/protorev/v1beta1/genesis.proto b/packages/protobuf/proto/osmosis/protorev/v1beta1/genesis.proto index fca25d00f..acbc2dd58 100644 --- a/packages/protobuf/proto/osmosis/protorev/v1beta1/genesis.proto +++ b/packages/protobuf/proto/osmosis/protorev/v1beta1/genesis.proto @@ -8,7 +8,7 @@ import "cosmos_proto/cosmos.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/protorev/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/protorev/types"; // GenesisState defines the protorev module's genesis state. message GenesisState { @@ -27,6 +27,9 @@ message GenesisState { ]; // The pool weights that are being used to calculate the weight (compute cost) // of each route. + // + // DEPRECATED: This field is deprecated and will be removed in the next + // release. It is replaced by the `info_by_pool_type` field. PoolWeights pool_weights = 4 [ (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"pool_weights\"" @@ -63,4 +66,10 @@ message GenesisState { (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"profits\"" ]; + // Information that is used to estimate execution time / gas + // consumption of a swap on a given pool type. + InfoByPoolType info_by_pool_type = 13 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"info_by_pool_type\"" + ]; } \ No newline at end of file diff --git a/packages/protobuf/proto/osmosis/protorev/v1beta1/gov.proto b/packages/protobuf/proto/osmosis/protorev/v1beta1/gov.proto index d46b5fa6d..d84ab154e 100644 --- a/packages/protobuf/proto/osmosis/protorev/v1beta1/gov.proto +++ b/packages/protobuf/proto/osmosis/protorev/v1beta1/gov.proto @@ -6,7 +6,7 @@ import "gogoproto/gogo.proto"; import "cosmos_proto/cosmos.proto"; import "osmosis/protorev/v1beta1/protorev.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/protorev/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/protorev/types"; // SetProtoRevEnabledProposal is a gov Content type to update whether the // protorev module is enabled diff --git a/packages/protobuf/proto/osmosis/protorev/v1beta1/params.proto b/packages/protobuf/proto/osmosis/protorev/v1beta1/params.proto index 23dd2d384..e5b6c181d 100644 --- a/packages/protobuf/proto/osmosis/protorev/v1beta1/params.proto +++ b/packages/protobuf/proto/osmosis/protorev/v1beta1/params.proto @@ -4,7 +4,7 @@ package osmosis.protorev.v1beta1; import "gogoproto/gogo.proto"; import "cosmos_proto/cosmos.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/protorev/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/protorev/types"; // Params defines the parameters for the module. message Params { diff --git a/packages/protobuf/proto/osmosis/protorev/v1beta1/protorev.proto b/packages/protobuf/proto/osmosis/protorev/v1beta1/protorev.proto index 9969e03b7..63ee29cf3 100644 --- a/packages/protobuf/proto/osmosis/protorev/v1beta1/protorev.proto +++ b/packages/protobuf/proto/osmosis/protorev/v1beta1/protorev.proto @@ -6,7 +6,7 @@ import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/protorev/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/protorev/types"; // TokenPairArbRoutes tracks all of the hot routes for a given pair of tokens message TokenPairArbRoutes { @@ -36,7 +36,7 @@ message Route { // The step size that will be used to find the optimal swap amount in the // binary search string step_size = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"step_size\"" ]; @@ -65,7 +65,7 @@ message RouteStatistics { // number_of_trades is the number of trades the module has executed using this // route string number_of_trades = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"number_of_trades\"" ]; @@ -78,6 +78,9 @@ message RouteStatistics { // significantly between the different pool types. Each weight roughly // corresponds to the amount of time (in ms) it takes to execute a swap on that // pool type. +// +// DEPRECATED: This field is deprecated and will be removed in the next +// release. It is replaced by the `info_by_pool_type` field. message PoolWeights { // The weight of a stableswap pool uint64 stable_weight = 1 [ (gogoproto.moretags) = "yaml:\"stable_weight\"" ]; @@ -87,6 +90,77 @@ message PoolWeights { // The weight of a concentrated pool uint64 concentrated_weight = 3 [ (gogoproto.moretags) = "yaml:\"concentrated_weight\"" ]; + // The weight of a cosmwasm pool + uint64 cosmwasm_weight = 4 + [ (gogoproto.moretags) = "yaml:\"cosmwasm_weight\"" ]; +} + +// InfoByPoolType contains information pertaining to how expensive (in terms of +// gas and time) it is to execute a swap on a given pool type. This distinction +// is made and necessary because the execution time ranges significantly between +// the different pool types. +message InfoByPoolType { + // The stable pool info + StablePoolInfo stable = 1 [ + (gogoproto.moretags) = "yaml:\"stable\"", + (gogoproto.nullable) = false + ]; + // The balancer pool info + BalancerPoolInfo balancer = 2 [ + (gogoproto.moretags) = "yaml:\"balancer\"", + (gogoproto.nullable) = false + ]; + // The concentrated pool info + ConcentratedPoolInfo concentrated = 3 [ + (gogoproto.moretags) = "yaml:\"concentrated\"", + (gogoproto.nullable) = false + ]; + // The cosmwasm pool info + CosmwasmPoolInfo cosmwasm = 4 [ + (gogoproto.moretags) = "yaml:\"cosmwasm\"", + (gogoproto.nullable) = false + ]; +} + +// StablePoolInfo contains meta data pertaining to a stableswap pool type. +message StablePoolInfo { + // The weight of a stableswap pool + uint64 weight = 1 [ (gogoproto.moretags) = "yaml:\"weight\"" ]; +} + +// BalancerPoolInfo contains meta data pertaining to a balancer pool type. +message BalancerPoolInfo { + // The weight of a balancer pool + uint64 weight = 1 [ (gogoproto.moretags) = "yaml:\"weight\"" ]; +} + +// ConcentratedPoolInfo contains meta data pertaining to a concentrated pool +// type. +message ConcentratedPoolInfo { + // The weight of a concentrated pool + uint64 weight = 1 [ (gogoproto.moretags) = "yaml:\"weight\"" ]; + // The maximum number of ticks we can move when rebalancing + uint64 max_ticks_crossed = 2 + [ (gogoproto.moretags) = "yaml:\"max_ticks_crossed\"" ]; +} + +// CosmwasmPoolInfo contains meta data pertaining to a cosmwasm pool type. +message CosmwasmPoolInfo { + // The weight of a cosmwasm pool (by contract address) + repeated WeightMap weight_maps = 1 [ + (gogoproto.moretags) = "yaml:\"weight_maps\"", + (gogoproto.nullable) = false + ]; +} + +// WeightMap maps a contract address to a weight. The weight of an address +// corresponds to the amount of ms required to execute a swap on that contract. +message WeightMap { + // The weight of a cosmwasm pool (by contract address) + uint64 weight = 1 [ (gogoproto.moretags) = "yaml:\"weight\"" ]; + // The contract address + string contract_address = 2 + [ (gogoproto.moretags) = "yaml:\"contract_address\"" ]; } // BaseDenom represents a single base denom that the module uses for its @@ -98,7 +172,7 @@ message BaseDenom { // The step size of the binary search that is used to find the optimal swap // amount string step_size = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"step_size\"" ]; diff --git a/packages/protobuf/proto/osmosis/protorev/v1beta1/query.proto b/packages/protobuf/proto/osmosis/protorev/v1beta1/query.proto index af94e73a2..f7d714713 100644 --- a/packages/protobuf/proto/osmosis/protorev/v1beta1/query.proto +++ b/packages/protobuf/proto/osmosis/protorev/v1beta1/query.proto @@ -9,39 +9,39 @@ import "osmosis/protorev/v1beta1/protorev.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/protorev/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/protorev/types"; // Query defines the gRPC querier service. service Query { // Params queries the parameters of the module. rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { - option (google.api.http).get = "/osmosis/v14/protorev/params"; + option (google.api.http).get = "/osmosis/protorev/params"; } // GetProtoRevNumberOfTrades queries the number of arbitrage trades the module // has executed rpc GetProtoRevNumberOfTrades(QueryGetProtoRevNumberOfTradesRequest) returns (QueryGetProtoRevNumberOfTradesResponse) { - option (google.api.http).get = "/osmosis/v14/protorev/number_of_trades"; + option (google.api.http).get = "/osmosis/protorev/number_of_trades"; } // GetProtoRevProfitsByDenom queries the profits of the module by denom rpc GetProtoRevProfitsByDenom(QueryGetProtoRevProfitsByDenomRequest) returns (QueryGetProtoRevProfitsByDenomResponse) { - option (google.api.http).get = "/osmosis/v14/protorev/profits_by_denom"; + option (google.api.http).get = "/osmosis/protorev/profits_by_denom"; } // GetProtoRevAllProfits queries all of the profits from the module rpc GetProtoRevAllProfits(QueryGetProtoRevAllProfitsRequest) returns (QueryGetProtoRevAllProfitsResponse) { - option (google.api.http).get = "/osmosis/v14/protorev/all_profits"; + option (google.api.http).get = "/osmosis/protorev/all_profits"; } // GetProtoRevStatisticsByRoute queries the number of arbitrages and profits // that have been executed for a given route rpc GetProtoRevStatisticsByRoute(QueryGetProtoRevStatisticsByRouteRequest) returns (QueryGetProtoRevStatisticsByRouteResponse) { - option (google.api.http).get = "/osmosis/v14/protorev/statistics_by_route"; + option (google.api.http).get = "/osmosis/protorev/statistics_by_route"; } // GetProtoRevAllRouteStatistics queries all of routes that the module has @@ -49,42 +49,40 @@ service Query { // accumulated for each route rpc GetProtoRevAllRouteStatistics(QueryGetProtoRevAllRouteStatisticsRequest) returns (QueryGetProtoRevAllRouteStatisticsResponse) { - option (google.api.http).get = "/osmosis/v14/protorev/all_route_statistics"; + option (google.api.http).get = "/osmosis/protorev/all_route_statistics"; } // GetProtoRevTokenPairArbRoutes queries all of the hot routes that the module // is currently arbitraging rpc GetProtoRevTokenPairArbRoutes(QueryGetProtoRevTokenPairArbRoutesRequest) returns (QueryGetProtoRevTokenPairArbRoutesResponse) { - option (google.api.http).get = - "/osmosis/v14/protorev/token_pair_arb_routes"; + option (google.api.http).get = "/osmosis/protorev/token_pair_arb_routes"; } // GetProtoRevAdminAccount queries the admin account of the module rpc GetProtoRevAdminAccount(QueryGetProtoRevAdminAccountRequest) returns (QueryGetProtoRevAdminAccountResponse) { - option (google.api.http).get = "/osmosis/v14/protorev/admin_account"; + option (google.api.http).get = "/osmosis/protorev/admin_account"; } // GetProtoRevDeveloperAccount queries the developer account of the module rpc GetProtoRevDeveloperAccount(QueryGetProtoRevDeveloperAccountRequest) returns (QueryGetProtoRevDeveloperAccountResponse) { - option (google.api.http).get = "/osmosis/v14/protorev/developer_account"; + option (google.api.http).get = "/osmosis/protorev/developer_account"; } - // GetProtoRevPoolWeights queries the weights of each pool type currently - // being used by the module - rpc GetProtoRevPoolWeights(QueryGetProtoRevPoolWeightsRequest) - returns (QueryGetProtoRevPoolWeightsResponse) { - option (google.api.http).get = "/osmosis/v14/protorev/pool_weights"; + // GetProtoRevInfoByPoolType queries pool type information that is currently + // being utilized by the module + rpc GetProtoRevInfoByPoolType(QueryGetProtoRevInfoByPoolTypeRequest) + returns (QueryGetProtoRevInfoByPoolTypeResponse) { + option (google.api.http).get = "/osmosis/protorev/info_by_pool_type"; } // GetProtoRevMaxPoolPointsPerTx queries the maximum number of pool points // that can be consumed per transaction rpc GetProtoRevMaxPoolPointsPerTx(QueryGetProtoRevMaxPoolPointsPerTxRequest) returns (QueryGetProtoRevMaxPoolPointsPerTxResponse) { - option (google.api.http).get = - "/osmosis/v14/protorev/max_pool_points_per_tx"; + option (google.api.http).get = "/osmosis/protorev/max_pool_points_per_tx"; } // GetProtoRevMaxPoolPointsPerBlock queries the maximum number of pool points @@ -93,27 +91,27 @@ service Query { QueryGetProtoRevMaxPoolPointsPerBlockRequest) returns (QueryGetProtoRevMaxPoolPointsPerBlockResponse) { option (google.api.http).get = - "/osmosis/v14/protorev/max_pool_points_per_block"; + "/osmosis/protorev/max_pool_points_per_block"; } // GetProtoRevBaseDenoms queries the base denoms that the module is currently // utilizing for arbitrage rpc GetProtoRevBaseDenoms(QueryGetProtoRevBaseDenomsRequest) returns (QueryGetProtoRevBaseDenomsResponse) { - option (google.api.http).get = "/osmosis/v14/protorev/base_denoms"; + option (google.api.http).get = "/osmosis/protorev/base_denoms"; } // GetProtoRevEnabled queries whether the module is enabled or not rpc GetProtoRevEnabled(QueryGetProtoRevEnabledRequest) returns (QueryGetProtoRevEnabledResponse) { - option (google.api.http).get = "/osmosis/v14/protorev/enabled"; + option (google.api.http).get = "/osmosis/protorev/enabled"; } // GetProtoRevPool queries the pool id used via the highest liquidity method // for arbitrage route building given a pair of denominations rpc GetProtoRevPool(QueryGetProtoRevPoolRequest) returns (QueryGetProtoRevPoolResponse) { - option (google.api.http).get = "/osmosis/v14/protorev/pool"; + option (google.api.http).get = "/osmosis/protorev/pool"; } } @@ -138,7 +136,7 @@ message QueryGetProtoRevNumberOfTradesRequest {} message QueryGetProtoRevNumberOfTradesResponse { // number_of_trades is the number of trades the module has executed string number_of_trades = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"number_of_trades\"" ]; @@ -244,16 +242,17 @@ message QueryGetProtoRevDeveloperAccountResponse { [ (gogoproto.moretags) = "yaml:\"developer_account\"" ]; } -// QueryGetProtoRevPoolWeightsRequest is request type for the -// Query/GetProtoRevPoolWeights RPC method. -message QueryGetProtoRevPoolWeightsRequest {} - -// QueryGetProtoRevPoolWeightsResponse is response type for the -// Query/GetProtoRevPoolWeights RPC method. -message QueryGetProtoRevPoolWeightsResponse { - // pool_weights is a list of all of the pool weights - PoolWeights pool_weights = 1 [ - (gogoproto.moretags) = "yaml:\"pool_weights\"", +// QueryGetProtoRevInfoByPoolTypeRequest is request type for the +// Query/GetProtoRevInfoByPoolType RPC method. +message QueryGetProtoRevInfoByPoolTypeRequest {} + +// QueryGetProtoRevInfoByPoolTypeResponse is response type for the +// Query/GetProtoRevInfoByPoolType RPC method. +message QueryGetProtoRevInfoByPoolTypeResponse { + // InfoByPoolType contains all information pertaining to how different + // pool types are handled by the module. + InfoByPoolType info_by_pool_type = 1 [ + (gogoproto.moretags) = "yaml:\"info_by_pool_type\"", (gogoproto.nullable) = false ]; } diff --git a/packages/protobuf/proto/osmosis/protorev/v1beta1/tx.proto b/packages/protobuf/proto/osmosis/protorev/v1beta1/tx.proto index 1ecb47b42..2aee0053f 100644 --- a/packages/protobuf/proto/osmosis/protorev/v1beta1/tx.proto +++ b/packages/protobuf/proto/osmosis/protorev/v1beta1/tx.proto @@ -7,21 +7,20 @@ import "google/api/annotations.proto"; import "osmosis/protorev/v1beta1/protorev.proto"; import "cosmos_proto/cosmos.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/protorev/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/protorev/types"; service Msg { // SetHotRoutes sets the hot routes that will be explored when creating // cyclic arbitrage routes. Can only be called by the admin account. rpc SetHotRoutes(MsgSetHotRoutes) returns (MsgSetHotRoutesResponse) { - option (google.api.http).post = "/osmosis/v14/protorev/set_hot_routes"; + option (google.api.http).post = "/osmosis/protorev/set_hot_routes"; }; // SetDeveloperAccount sets the account that can withdraw a portion of the // profits from the protorev module. This will be Skip's address. rpc SetDeveloperAccount(MsgSetDeveloperAccount) returns (MsgSetDeveloperAccountResponse) { - option (google.api.http).post = - "/osmosis/v14/protorev/set_developer_account"; + option (google.api.http).post = "/osmosis/protorev/set_developer_account"; }; // SetMaxPoolPointsPerTx sets the maximum number of pool points that can be @@ -29,7 +28,7 @@ service Msg { rpc SetMaxPoolPointsPerTx(MsgSetMaxPoolPointsPerTx) returns (MsgSetMaxPoolPointsPerTxResponse) { option (google.api.http).post = - "/osmosis/v14/protorev/set_max_pool_points_per_tx"; + "/osmosis/protorev/set_max_pool_points_per_tx"; }; // SetMaxPoolPointsPerBlock sets the maximum number of pool points that can be @@ -37,19 +36,20 @@ service Msg { rpc SetMaxPoolPointsPerBlock(MsgSetMaxPoolPointsPerBlock) returns (MsgSetMaxPoolPointsPerBlockResponse) { option (google.api.http).post = - "/osmosis/v14/protorev/set_max_pool_points_per_block"; + "/osmosis/protorev/set_max_pool_points_per_block"; }; - // SetPoolWeights sets the weights of each pool type in the store. Can only be - // called by the admin account. - rpc SetPoolWeights(MsgSetPoolWeights) returns (MsgSetPoolWeightsResponse) { - option (google.api.http).post = "/osmosis/v14/protorev/set_pool_weights"; + // SetInfoByPoolType sets the pool type information needed to make smart + // assumptions about swapping on different pool types + rpc SetInfoByPoolType(MsgSetInfoByPoolType) + returns (MsgSetInfoByPoolTypeResponse) { + option (google.api.http).post = "/osmosis/protorev/set_info_by_pool_type"; }; // SetBaseDenoms sets the base denoms that will be used to create cyclic // arbitrage routes. Can only be called by the admin account. rpc SetBaseDenoms(MsgSetBaseDenoms) returns (MsgSetBaseDenomsResponse) { - option (google.api.http).post = "/osmosis/v14/protorev/set_base_denoms"; + option (google.api.http).post = "/osmosis/protorev/set_base_denoms"; }; } @@ -91,24 +91,24 @@ message MsgSetDeveloperAccount { // type. message MsgSetDeveloperAccountResponse {} -// MsgSetPoolWeights defines the Msg/SetPoolWeights request type. -message MsgSetPoolWeights { - option (amino.name) = "osmosis/MsgSetPoolWeights"; +// MsgSetInfoByPoolType defines the Msg/SetInfoByPoolType request type. +message MsgSetInfoByPoolType { + option (amino.name) = "osmosis/MsgSetInfoByPoolType"; // admin is the account that is authorized to set the pool weights. string admin = 1 [ (gogoproto.moretags) = "yaml:\"admin\"", (cosmos_proto.scalar) = "cosmos.AddressString" ]; - // pool_weights is the list of pool weights to set. - PoolWeights pool_weights = 2 [ - (gogoproto.moretags) = "yaml:\"pool_weights\"", + // info_by_pool_type contains information about the pool types. + InfoByPoolType info_by_pool_type = 2 [ + (gogoproto.moretags) = "yaml:\"info_by_pool_type\"", (gogoproto.nullable) = false ]; } -// MsgSetPoolWeightsResponse defines the Msg/SetPoolWeights response type. -message MsgSetPoolWeightsResponse {} +// MsgSetInfoByPoolTypeResponse defines the Msg/SetInfoByPoolType response type. +message MsgSetInfoByPoolTypeResponse {} // MsgSetMaxPoolPointsPerTx defines the Msg/SetMaxPoolPointsPerTx request type. message MsgSetMaxPoolPointsPerTx { diff --git a/packages/protobuf/proto/osmosis/sumtree/v1beta1/tree.proto b/packages/protobuf/proto/osmosis/sumtree/v1beta1/tree.proto index 02f54011f..1a408c0f8 100644 --- a/packages/protobuf/proto/osmosis/sumtree/v1beta1/tree.proto +++ b/packages/protobuf/proto/osmosis/sumtree/v1beta1/tree.proto @@ -11,7 +11,7 @@ message Node { repeated Child children = 1; } message Child { bytes index = 1; string accumulation = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false ]; } diff --git a/packages/protobuf/proto/osmosis/superfluid/genesis.proto b/packages/protobuf/proto/osmosis/superfluid/genesis.proto index effb1b4c6..f30dc4026 100644 --- a/packages/protobuf/proto/osmosis/superfluid/genesis.proto +++ b/packages/protobuf/proto/osmosis/superfluid/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "osmosis/superfluid/superfluid.proto"; import "osmosis/superfluid/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/superfluid/types"; // GenesisState defines the module's genesis state. message GenesisState { diff --git a/packages/protobuf/proto/osmosis/superfluid/params.proto b/packages/protobuf/proto/osmosis/superfluid/params.proto index a52e8b392..b3292530e 100644 --- a/packages/protobuf/proto/osmosis/superfluid/params.proto +++ b/packages/protobuf/proto/osmosis/superfluid/params.proto @@ -4,7 +4,7 @@ package osmosis.superfluid; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/superfluid/types"; // Params holds parameters for the superfluid module message Params { @@ -14,7 +14,7 @@ message Params { // volatilities, and have base staking be 'resistant' to volatility. string minimum_risk_factor = 1 [ (gogoproto.moretags) = "yaml:\"minimum_risk_factor\"", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } diff --git a/packages/protobuf/proto/osmosis/superfluid/query.proto b/packages/protobuf/proto/osmosis/superfluid/query.proto index b7ce13bdd..fa76b5750 100644 --- a/packages/protobuf/proto/osmosis/superfluid/query.proto +++ b/packages/protobuf/proto/osmosis/superfluid/query.proto @@ -12,7 +12,7 @@ import "osmosis/lockup/lock.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; import "cosmos/staking/v1beta1/staking.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/superfluid/types"; // Query defines the gRPC querier service. service Query { @@ -125,6 +125,7 @@ service Query { "unpool_whitelist"; } + // Returns all of a user's full range CL positions that are superfluid staked. rpc UserConcentratedSuperfluidPositionsDelegated( UserConcentratedSuperfluidPositionsDelegatedRequest) returns (UserConcentratedSuperfluidPositionsDelegatedResponse) { @@ -189,12 +190,12 @@ message QueryTotalDelegationByValidatorForDenomResponse { message Delegations { string val_addr = 1; string amount_sfsd = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"amount_sfsd\"", (gogoproto.nullable) = false ]; string osmo_equivalent = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"osmo_equivalent\"", (gogoproto.nullable) = false ]; @@ -203,7 +204,7 @@ message TotalSuperfluidDelegationsRequest {} message TotalSuperfluidDelegationsResponse { string total_delegations = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"total_superfluid_delegations\"", (gogoproto.nullable) = false ]; diff --git a/packages/protobuf/proto/osmosis/superfluid/superfluid.proto b/packages/protobuf/proto/osmosis/superfluid/superfluid.proto index 51a37fb65..094124ae9 100644 --- a/packages/protobuf/proto/osmosis/superfluid/superfluid.proto +++ b/packages/protobuf/proto/osmosis/superfluid/superfluid.proto @@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/superfluid/types"; // SuperfluidAssetType indicates whether the superfluid asset is // a native token, lp share of a pool, or concentrated share of a pool @@ -55,7 +55,7 @@ message OsmoEquivalentMultiplierRecord { string denom = 2; string multiplier = 3 [ (gogoproto.moretags) = "yaml:\"multiplier\"", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } diff --git a/packages/protobuf/proto/osmosis/superfluid/tx.proto b/packages/protobuf/proto/osmosis/superfluid/tx.proto index 41149d7f0..5026c73e5 100644 --- a/packages/protobuf/proto/osmosis/superfluid/tx.proto +++ b/packages/protobuf/proto/osmosis/superfluid/tx.proto @@ -8,7 +8,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "google/protobuf/timestamp.proto"; import "osmosis/superfluid/superfluid.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/superfluid/types"; // Msg defines the Msg service. service Msg { @@ -52,6 +52,11 @@ service Msg { rpc AddToConcentratedLiquiditySuperfluidPosition( MsgAddToConcentratedLiquiditySuperfluidPosition) returns (MsgAddToConcentratedLiquiditySuperfluidPositionResponse); + + // UnbondConvertAndStake breaks all locks / superfluid staked assets, + // converts them to osmo then stakes the osmo to the designated validator. + rpc UnbondConvertAndStake(MsgUnbondConvertAndStake) + returns (MsgUnbondConvertAndStakeResponse); } message MsgSuperfluidDelegate { @@ -173,17 +178,17 @@ message MsgUnlockAndMigrateSharesToFullRangeConcentratedPosition { message MsgUnlockAndMigrateSharesToFullRangeConcentratedPositionResponse { string amount0 = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"amount0\"", (gogoproto.nullable) = false ]; string amount1 = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"amount1\"", (gogoproto.nullable) = false ]; string liquidity_created = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"liquidity_created\"", (gogoproto.nullable) = false ]; @@ -213,12 +218,12 @@ message MsgAddToConcentratedLiquiditySuperfluidPosition { message MsgAddToConcentratedLiquiditySuperfluidPositionResponse { uint64 position_id = 1 [ (gogoproto.moretags) = "yaml:\"position_id\"" ]; string amount0 = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"amount0\"", (gogoproto.nullable) = false ]; string amount1 = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.moretags) = "yaml:\"amount1\"", (gogoproto.nullable) = false ]; @@ -226,9 +231,45 @@ message MsgAddToConcentratedLiquiditySuperfluidPositionResponse { // It includes the liquidity that existed before in the position // and the new liquidity that was added to the position. string new_liquidity = 5 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"new_liquidity\"", (gogoproto.nullable) = false ]; uint64 lock_id = 4 [ (gogoproto.moretags) = "yaml:\"lock_id\"" ]; +} + +// ===================== MsgUnbondConvertAndStake +message MsgUnbondConvertAndStake { + option (amino.name) = "osmosis/unbond-convert-and-stake"; + + // lock ID to convert and stake. + // lock id with 0 should be provided if converting liquid gamm shares to stake + uint64 lock_id = 1 [ (gogoproto.moretags) = "yaml:\"lock_id\"" ]; + string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; + // validator address to delegate to. + // If provided empty string, we use the validators returned from + // valset-preference module. + string val_addr = 3; + // min_amt_to_stake indicates the minimum amount to stake after conversion + string min_amt_to_stake = 4 [ + (gogoproto.customtype) = "cosmossdk.io/math.Int", + (gogoproto.moretags) = "yaml:\"min_amt_to_stake\"", + (gogoproto.nullable) = false + ]; + // shares_to_convert indicates shares wanted to stake. + // Note that this field is only used for liquid(unlocked) gamm shares. + // For all other cases, this field would be disregarded. + cosmos.base.v1beta1.Coin shares_to_convert = 5 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"shares_to_convert\"", + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coin" + ]; +} + +message MsgUnbondConvertAndStakeResponse { + string total_amt_staked = 1 [ + (gogoproto.customtype) = "cosmossdk.io/math.Int", + (gogoproto.moretags) = "yaml:\"total_amt_staked\"", + (gogoproto.nullable) = false + ]; } \ No newline at end of file diff --git a/packages/protobuf/proto/osmosis/superfluid/v1beta1/gov.proto b/packages/protobuf/proto/osmosis/superfluid/v1beta1/gov.proto index 6bbde7e22..1bd82c15b 100644 --- a/packages/protobuf/proto/osmosis/superfluid/v1beta1/gov.proto +++ b/packages/protobuf/proto/osmosis/superfluid/v1beta1/gov.proto @@ -6,7 +6,7 @@ import "amino/amino.proto"; import "cosmos_proto/cosmos.proto"; import "osmosis/superfluid/superfluid.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/superfluid/types"; // SetSuperfluidAssetsProposal is a gov Content type to update the superfluid // assets diff --git a/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto b/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto index 4fdd68b7b..7c7b965c4 100644 --- a/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto +++ b/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto @@ -4,7 +4,7 @@ package osmosis.tokenfactory.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/tokenfactory/types"; // DenomAuthorityMetadata specifies metadata for addresses that have specific // capabilities over a token factory denom. Right now there is only one Admin diff --git a/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/genesis.proto b/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/genesis.proto index 827ebb318..781e768c3 100644 --- a/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/genesis.proto +++ b/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "osmosis/tokenfactory/v1beta1/authorityMetadata.proto"; import "osmosis/tokenfactory/v1beta1/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/tokenfactory/types"; // GenesisState defines the tokenfactory module's genesis state. message GenesisState { diff --git a/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/params.proto b/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/params.proto index 734e21892..6d35848e1 100644 --- a/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/params.proto +++ b/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/params.proto @@ -6,7 +6,7 @@ import "osmosis/tokenfactory/v1beta1/authorityMetadata.proto"; import "cosmos_proto/cosmos.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/tokenfactory/types"; // Params defines the parameters for the tokenfactory module. message Params { diff --git a/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/query.proto b/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/query.proto index afc9f7f3c..ec2af1419 100644 --- a/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/query.proto +++ b/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/query.proto @@ -7,7 +7,7 @@ import "cosmos/base/query/v1beta1/pagination.proto"; import "osmosis/tokenfactory/v1beta1/authorityMetadata.proto"; import "osmosis/tokenfactory/v1beta1/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/tokenfactory/types"; // Query defines the gRPC querier service. service Query { @@ -32,6 +32,14 @@ service Query { option (google.api.http).get = "/osmosis/tokenfactory/v1beta1/denoms_from_creator/{creator}"; } + + // BeforeSendHookAddress defines a gRPC query method for + // getting the address registered for the before send hook. + rpc BeforeSendHookAddress(QueryBeforeSendHookAddressRequest) + returns (QueryBeforeSendHookAddressResponse) { + option (google.api.http).get = + "/osmosis/tokenfactory/v1beta1/denoms/{denom}/before_send_hook"; + } } // QueryParamsRequest is the request type for the Query/Params RPC method. @@ -69,3 +77,14 @@ message QueryDenomsFromCreatorRequest { message QueryDenomsFromCreatorResponse { repeated string denoms = 1 [ (gogoproto.moretags) = "yaml:\"denoms\"" ]; } + +message QueryBeforeSendHookAddressRequest { + string denom = 1 [ (gogoproto.moretags) = "yaml:\"denom\"" ]; +} + +// QueryBeforeSendHookAddressResponse defines the response structure for the +// DenomBeforeSendHook gRPC query. +message QueryBeforeSendHookAddressResponse { + string cosmwasm_address = 1 + [ (gogoproto.moretags) = "yaml:\"cosmwasm_address\"" ]; +} \ No newline at end of file diff --git a/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/tx.proto b/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/tx.proto index 643acc23f..daf407391 100644 --- a/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/tx.proto +++ b/packages/protobuf/proto/osmosis/tokenfactory/v1beta1/tx.proto @@ -6,7 +6,7 @@ import "amino/amino.proto"; import "cosmos/base/v1beta1/coin.proto"; import "cosmos/bank/v1beta1/bank.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/tokenfactory/types"; // Msg defines the tokefactory module's gRPC message service. service Msg { @@ -16,6 +16,8 @@ service Msg { rpc ChangeAdmin(MsgChangeAdmin) returns (MsgChangeAdminResponse); rpc SetDenomMetadata(MsgSetDenomMetadata) returns (MsgSetDenomMetadataResponse); + rpc SetBeforeSendHook(MsgSetBeforeSendHook) + returns (MsgSetBeforeSendHookResponse); rpc ForceTransfer(MsgForceTransfer) returns (MsgForceTransferResponse); } @@ -44,7 +46,9 @@ message MsgCreateDenomResponse { } // MsgMint is the sdk.Msg type for allowing an admin account to mint -// more of a token. For now, we only support minting to the sender account +// more of a token. +// Only the admin of the token factory denom has permission to mint unless +// the denom does not have any admin. message MsgMint { option (amino.name) = "osmosis/tokenfactory/mint"; @@ -60,7 +64,9 @@ message MsgMint { message MsgMintResponse {} // MsgBurn is the sdk.Msg type for allowing an admin account to burn -// a token. For now, we only support burning from the sender account. +// a token. +// Only the admin of the token factory denom has permission to burn unless +// the denom does not have any admin. message MsgBurn { option (amino.name) = "osmosis/tokenfactory/burn"; @@ -89,19 +95,20 @@ message MsgChangeAdmin { // MsgChangeAdmin message. message MsgChangeAdminResponse {} -// // MsgSetBeforeSendHook is the sdk.Msg type for allowing an admin account to -// // assign a CosmWasm contract to call with a BeforeSend hook -// message MsgSetBeforeSendHook { -// string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; -// string denom = 2 [ (gogoproto.moretags) = "yaml:\"denom\"" ]; -// string cosmwasm_address = 3 -// [ (gogoproto.moretags) = "yaml:\"cosmwasm_address\"" ]; -// } - -// // MsgSetBeforeSendHookResponse defines the response structure for an -// executed -// // MsgSetBeforeSendHook message. -// message MsgSetBeforeSendHookResponse {} +// MsgSetBeforeSendHook is the sdk.Msg type for allowing an admin account to +// assign a CosmWasm contract to call with a BeforeSend hook +message MsgSetBeforeSendHook { + option (amino.name) = "osmosis/tokenfactory/set-beforesend-hook"; + + string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; + string denom = 2 [ (gogoproto.moretags) = "yaml:\"denom\"" ]; + string cosmwasm_address = 3 + [ (gogoproto.moretags) = "yaml:\"cosmwasm_address\"" ]; +} + +// MsgSetBeforeSendHookResponse defines the response structure for an executed +// MsgSetBeforeSendHook message. +message MsgSetBeforeSendHookResponse {} // MsgSetDenomMetadata is the sdk.Msg type for allowing an admin account to set // the denom's bank metadata diff --git a/packages/protobuf/proto/osmosis/twap/v1beta1/genesis.proto b/packages/protobuf/proto/osmosis/twap/v1beta1/genesis.proto index c00b830d2..73ed2368e 100644 --- a/packages/protobuf/proto/osmosis/twap/v1beta1/genesis.proto +++ b/packages/protobuf/proto/osmosis/twap/v1beta1/genesis.proto @@ -7,7 +7,7 @@ import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/twap/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/twap/types"; // Params holds parameters for the twap module message Params { diff --git a/packages/protobuf/proto/osmosis/twap/v1beta1/query.proto b/packages/protobuf/proto/osmosis/twap/v1beta1/query.proto index 735da5264..4b0883f71 100644 --- a/packages/protobuf/proto/osmosis/twap/v1beta1/query.proto +++ b/packages/protobuf/proto/osmosis/twap/v1beta1/query.proto @@ -12,7 +12,7 @@ import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/twap/client/queryproto"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/twap/client/queryproto"; service Query { rpc Params(ParamsRequest) returns (ParamsResponse) { @@ -51,7 +51,7 @@ message ArithmeticTwapRequest { } message ArithmeticTwapResponse { string arithmetic_twap = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"arithmetic_twap\"", (gogoproto.nullable) = false ]; @@ -69,7 +69,7 @@ message ArithmeticTwapToNowRequest { } message ArithmeticTwapToNowResponse { string arithmetic_twap = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"arithmetic_twap\"", (gogoproto.nullable) = false ]; @@ -92,7 +92,7 @@ message GeometricTwapRequest { } message GeometricTwapResponse { string geometric_twap = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"geometric_twap\"", (gogoproto.nullable) = false ]; @@ -110,7 +110,7 @@ message GeometricTwapToNowRequest { } message GeometricTwapToNowResponse { string geometric_twap = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.moretags) = "yaml:\"geometric_twap\"", (gogoproto.nullable) = false ]; diff --git a/packages/protobuf/proto/osmosis/twap/v1beta1/query.yml b/packages/protobuf/proto/osmosis/twap/v1beta1/query.yml index aad12c175..72f517c93 100644 --- a/packages/protobuf/proto/osmosis/twap/v1beta1/query.yml +++ b/packages/protobuf/proto/osmosis/twap/v1beta1/query.yml @@ -1,7 +1,7 @@ keeper: - path: "github.com/osmosis-labs/osmosis/v16/x/twap" + path: "github.com/osmosis-labs/osmosis/v19/x/twap" struct: "Keeper" -client_path: "github.com/osmosis-labs/osmosis/v16/x/twap/client" +client_path: "github.com/osmosis-labs/osmosis/v19/x/twap/client" queries: ArithmeticTwap: proto_wrapper: diff --git a/packages/protobuf/proto/osmosis/twap/v1beta1/twap_record.proto b/packages/protobuf/proto/osmosis/twap/v1beta1/twap_record.proto index 7a01af346..c124b8d82 100644 --- a/packages/protobuf/proto/osmosis/twap/v1beta1/twap_record.proto +++ b/packages/protobuf/proto/osmosis/twap/v1beta1/twap_record.proto @@ -7,7 +7,7 @@ import "cosmos_proto/cosmos.proto"; import "cosmos/base/v1beta1/coin.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/twap/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/twap/types"; // A TWAP record should be indexed in state by pool_id, (asset pair), timestamp // The asset pair assets should be lexicographically sorted. @@ -38,25 +38,25 @@ message TwapRecord { // We store the last spot prices in the struct, so that we can interpolate // accumulator values for times between when accumulator records are stored. string p0_last_spot_price = 6 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; string p1_last_spot_price = 7 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; string p0_arithmetic_twap_accumulator = 8 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; string p1_arithmetic_twap_accumulator = 9 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; string geometric_twap_accumulator = 10 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; diff --git a/packages/protobuf/proto/osmosis/txfees/v1beta1/feetoken.proto b/packages/protobuf/proto/osmosis/txfees/v1beta1/feetoken.proto index da15061e9..b3be388a9 100644 --- a/packages/protobuf/proto/osmosis/txfees/v1beta1/feetoken.proto +++ b/packages/protobuf/proto/osmosis/txfees/v1beta1/feetoken.proto @@ -3,7 +3,7 @@ package osmosis.txfees.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/txfees/types"; // FeeToken is a struct that specifies a coin denom, and pool ID pair. // This marks the token as eligible for use as a tx fee asset in Osmosis. diff --git a/packages/protobuf/proto/osmosis/txfees/v1beta1/genesis.proto b/packages/protobuf/proto/osmosis/txfees/v1beta1/genesis.proto index b52d76d7f..43e06a6a0 100644 --- a/packages/protobuf/proto/osmosis/txfees/v1beta1/genesis.proto +++ b/packages/protobuf/proto/osmosis/txfees/v1beta1/genesis.proto @@ -4,7 +4,7 @@ package osmosis.txfees.v1beta1; import "gogoproto/gogo.proto"; import "osmosis/txfees/v1beta1/feetoken.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/txfees/types"; // GenesisState defines the txfees module's genesis state. message GenesisState { diff --git a/packages/protobuf/proto/osmosis/txfees/v1beta1/gov.proto b/packages/protobuf/proto/osmosis/txfees/v1beta1/gov.proto index bc4048648..f97b8643b 100644 --- a/packages/protobuf/proto/osmosis/txfees/v1beta1/gov.proto +++ b/packages/protobuf/proto/osmosis/txfees/v1beta1/gov.proto @@ -6,7 +6,7 @@ import "cosmos_proto/cosmos.proto"; import "amino/amino.proto"; import "osmosis/txfees/v1beta1/feetoken.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/txfees/types"; // UpdateFeeTokenProposal is a gov Content type for adding new whitelisted fee // token(s). It must specify a denom along with gamm pool ID to use as a spot diff --git a/packages/protobuf/proto/osmosis/txfees/v1beta1/query.proto b/packages/protobuf/proto/osmosis/txfees/v1beta1/query.proto index 516c6d440..e37f58d6b 100644 --- a/packages/protobuf/proto/osmosis/txfees/v1beta1/query.proto +++ b/packages/protobuf/proto/osmosis/txfees/v1beta1/query.proto @@ -7,7 +7,7 @@ import "google/protobuf/duration.proto"; import "osmosis/txfees/v1beta1/feetoken.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/txfees/types"; service Query { // FeeTokens returns a list of all the whitelisted fee tokens and their @@ -56,7 +56,7 @@ message QueryDenomSpotPriceResponse { uint64 poolID = 1 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ]; string spot_price = 2 [ (gogoproto.moretags) = "yaml:\"spot_price\"", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } diff --git a/packages/protobuf/proto/osmosis/valset-pref/v1beta1/query.proto b/packages/protobuf/proto/osmosis/valset-pref/v1beta1/query.proto index f20f3ca89..8581166f0 100644 --- a/packages/protobuf/proto/osmosis/valset-pref/v1beta1/query.proto +++ b/packages/protobuf/proto/osmosis/valset-pref/v1beta1/query.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "osmosis/valset-pref/v1beta1/state.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/valset-pref/client/queryproto"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/valset-pref/client/queryproto"; option (gogoproto.goproto_getters_all) = false; // Query defines the gRPC querier service. diff --git a/packages/protobuf/proto/osmosis/valset-pref/v1beta1/query.yml b/packages/protobuf/proto/osmosis/valset-pref/v1beta1/query.yml index d880e0ec2..d0ffe22b2 100644 --- a/packages/protobuf/proto/osmosis/valset-pref/v1beta1/query.yml +++ b/packages/protobuf/proto/osmosis/valset-pref/v1beta1/query.yml @@ -1,7 +1,7 @@ keeper: - path: "github.com/osmosis-labs/osmosis/v16/x/valset-pref" + path: "github.com/osmosis-labs/osmosis/v19/x/valset-pref" struct: "Keeper" -client_path: "github.com/osmosis-labs/osmosis/v16/x/valset-pref/client" +client_path: "github.com/osmosis-labs/osmosis/v19/x/valset-pref/client" queries: UserValidatorPreferences: proto_wrapper: diff --git a/packages/protobuf/proto/osmosis/valset-pref/v1beta1/state.proto b/packages/protobuf/proto/osmosis/valset-pref/v1beta1/state.proto index 7d6c62057..2beab5339 100644 --- a/packages/protobuf/proto/osmosis/valset-pref/v1beta1/state.proto +++ b/packages/protobuf/proto/osmosis/valset-pref/v1beta1/state.proto @@ -4,7 +4,7 @@ package osmosis.valsetpref.v1beta1; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/valset-pref/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/valset-pref/types"; option (gogoproto.goproto_getters_all) = false; // ValidatorPreference defines the message structure for @@ -19,7 +19,7 @@ message ValidatorPreference { [ (gogoproto.moretags) = "yaml:\"val_oper_address\"" ]; // weight is decimal between 0 and 1, and they all sum to 1. string weight = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } diff --git a/packages/protobuf/proto/osmosis/valset-pref/v1beta1/tx.proto b/packages/protobuf/proto/osmosis/valset-pref/v1beta1/tx.proto index 5a4b8a10f..126949e14 100644 --- a/packages/protobuf/proto/osmosis/valset-pref/v1beta1/tx.proto +++ b/packages/protobuf/proto/osmosis/valset-pref/v1beta1/tx.proto @@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/valset-pref/v1beta1/state.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v16/x/valset-pref/types"; +option go_package = "github.com/osmosis-labs/osmosis/v19/x/valset-pref/types"; // Msg defines the valset-pref modules's gRPC message service. service Msg { @@ -45,7 +45,7 @@ service Msg { // MsgCreateValidatorSetPreference is a list that holds validator-set. message MsgSetValidatorSetPreference { - option (amino.name) = "osmosis/valset-pref/MsgSetValidatorSetPreference"; + option (amino.name) = "osmosis/MsgSetValidatorSetPreference"; // delegator is the user who is trying to create a validator-set. string delegator = 1 [ (gogoproto.moretags) = "yaml:\"delegator\"" ]; @@ -62,7 +62,7 @@ message MsgSetValidatorSetPreferenceResponse {} // MsgDelegateToValidatorSet allows users to delegate to an existing // validator-set message MsgDelegateToValidatorSet { - option (amino.name) = "osmosis/valset-pref/MsgDelegateToValidatorSet"; + option (amino.name) = "osmosis/MsgDelegateToValidatorSet"; // delegator is the user who is trying to delegate. string delegator = 1 [ (gogoproto.moretags) = "yaml:\"delegator\"" ]; @@ -80,7 +80,7 @@ message MsgDelegateToValidatorSet { message MsgDelegateToValidatorSetResponse {} message MsgUndelegateFromValidatorSet { - option (amino.name) = "osmosis/valset-pref/MsgUndelegateFromValidatorSet"; + option (amino.name) = "osmosis/MsgUndelegateFromValidatorSet"; // delegator is the user who is trying to undelegate. string delegator = 1 [ (gogoproto.moretags) = "yaml:\"delegator\"" ]; @@ -99,6 +99,8 @@ message MsgUndelegateFromValidatorSet { message MsgUndelegateFromValidatorSetResponse {} message MsgRedelegateValidatorSet { + option (amino.name) = "osmosis/MsgRedelegateValidatorSet"; + // delegator is the user who is trying to create a validator-set. string delegator = 1 [ (gogoproto.moretags) = "yaml:\"delegator\"" ]; @@ -114,7 +116,7 @@ message MsgRedelegateValidatorSetResponse {} // MsgWithdrawDelegationRewards allows user to claim staking rewards from the // validator set. message MsgWithdrawDelegationRewards { - option (amino.name) = "osmosis/valset-pref/MsgWithdrawDelegationRewards"; + option (amino.name) = "osmosis/MsgWithdrawDelegationRewards"; // delegator is the user who is trying to claim staking rewards. string delegator = 1 [ (gogoproto.moretags) = "yaml:\"delegator\"" ];