diff --git a/src/codec/btcx/denom_cross_chain_info.ts b/src/codec/btcx/denom_cross_chain_info.ts index 7c6da5e2..0d9d82e5 100644 --- a/src/codec/btcx/denom_cross_chain_info.ts +++ b/src/codec/btcx/denom_cross_chain_info.ts @@ -3,7 +3,7 @@ import Long from "long"; import _m0 from "protobufjs/minimal"; import { DenomInfo } from "../btcx/denom_info"; -export const protobufPackage = "Switcheo.polynetworkcosmos.btcx"; +export const protobufPackage = "Switcheo.carbon.btcx"; export interface DenomCrossChainInfo { denomInfo?: DenomInfo; diff --git a/src/codec/btcx/denom_info.ts b/src/codec/btcx/denom_info.ts index a7fc6d03..5afff93b 100644 --- a/src/codec/btcx/denom_info.ts +++ b/src/codec/btcx/denom_info.ts @@ -2,7 +2,7 @@ import Long from "long"; import _m0 from "protobufjs/minimal"; -export const protobufPackage = "Switcheo.polynetworkcosmos.btcx"; +export const protobufPackage = "Switcheo.carbon.btcx"; export interface DenomInfo { creator: string; diff --git a/src/codec/btcx/genesis.ts b/src/codec/btcx/genesis.ts index 6bedb235..09bfb3cc 100644 --- a/src/codec/btcx/genesis.ts +++ b/src/codec/btcx/genesis.ts @@ -2,7 +2,7 @@ import Long from "long"; import _m0 from "protobufjs/minimal"; -export const protobufPackage = "Switcheo.polynetworkcosmos.btcx"; +export const protobufPackage = "Switcheo.carbon.btcx"; /** GenesisState defines the btcx module's genesis state. */ export interface GenesisState {} diff --git a/src/codec/btcx/query.ts b/src/codec/btcx/query.ts index 0119eba8..58d88842 100644 --- a/src/codec/btcx/query.ts +++ b/src/codec/btcx/query.ts @@ -3,7 +3,7 @@ import Long from "long"; import _m0 from "protobufjs/minimal"; import { DenomInfo } from "../btcx/denom_info"; -export const protobufPackage = "Switcheo.polynetworkcosmos.btcx"; +export const protobufPackage = "Switcheo.carbon.btcx"; /** this line is used by starport scaffolding # 3 */ export interface QueryGetDenomInfoRequest { @@ -367,7 +367,7 @@ export class QueryClientImpl implements Query { ): Promise { const data = QueryGetDenomInfoRequest.encode(request).finish(); const promise = this.rpc.request( - "Switcheo.polynetworkcosmos.btcx.Query", + "Switcheo.carbon.btcx.Query", "DenomInfo", data ); @@ -381,7 +381,7 @@ export class QueryClientImpl implements Query { ): Promise { const data = QueryGetDenomCrossChainInfoRequest.encode(request).finish(); const promise = this.rpc.request( - "Switcheo.polynetworkcosmos.btcx.Query", + "Switcheo.carbon.btcx.Query", "DenomCrossChainInfo", data ); diff --git a/src/codec/btcx/tx.ts b/src/codec/btcx/tx.ts index 63712d25..22a558d0 100644 --- a/src/codec/btcx/tx.ts +++ b/src/codec/btcx/tx.ts @@ -2,7 +2,7 @@ import Long from "long"; import _m0 from "protobufjs/minimal"; -export const protobufPackage = "Switcheo.polynetworkcosmos.btcx"; +export const protobufPackage = "Switcheo.carbon.btcx"; /** this line is used by starport scaffolding # proto/tx/message */ export interface MsgCreate { @@ -474,7 +474,7 @@ export class MsgClientImpl implements Msg { Create(request: MsgCreate): Promise { const data = MsgCreate.encode(request).finish(); const promise = this.rpc.request( - "Switcheo.polynetworkcosmos.btcx.Msg", + "Switcheo.carbon.btcx.Msg", "Create", data ); @@ -485,21 +485,13 @@ export class MsgClientImpl implements Msg { Bind(request: MsgBind): Promise { const data = MsgBind.encode(request).finish(); - const promise = this.rpc.request( - "Switcheo.polynetworkcosmos.btcx.Msg", - "Bind", - data - ); + const promise = this.rpc.request("Switcheo.carbon.btcx.Msg", "Bind", data); return promise.then((data) => MsgBindResponse.decode(new _m0.Reader(data))); } Lock(request: MsgLock): Promise { const data = MsgLock.encode(request).finish(); - const promise = this.rpc.request( - "Switcheo.polynetworkcosmos.btcx.Msg", - "Lock", - data - ); + const promise = this.rpc.request("Switcheo.carbon.btcx.Msg", "Lock", data); return promise.then((data) => MsgLockResponse.decode(new _m0.Reader(data))); } } diff --git a/src/codec/ccm/genesis.ts b/src/codec/ccm/genesis.ts index 4d685ec9..67238209 100644 --- a/src/codec/ccm/genesis.ts +++ b/src/codec/ccm/genesis.ts @@ -2,7 +2,7 @@ import Long from "long"; import _m0 from "protobufjs/minimal"; -export const protobufPackage = "Switcheo.polynetworkcosmos.ccm"; +export const protobufPackage = "Switcheo.carbon.ccm"; /** GenesisState defines the ccm module's genesis state. */ export interface GenesisState { diff --git a/src/codec/ccm/query.ts b/src/codec/ccm/query.ts index 34fa834d..f65e1300 100644 --- a/src/codec/ccm/query.ts +++ b/src/codec/ccm/query.ts @@ -2,7 +2,7 @@ import Long from "long"; import _m0 from "protobufjs/minimal"; -export const protobufPackage = "Switcheo.polynetworkcosmos.ccm"; +export const protobufPackage = "Switcheo.carbon.ccm"; /** this line is used by starport scaffolding # 3 */ export interface QueryCheckModuleContractRequest { @@ -216,7 +216,7 @@ export class QueryClientImpl implements Query { ): Promise { const data = QueryCheckModuleContractRequest.encode(request).finish(); const promise = this.rpc.request( - "Switcheo.polynetworkcosmos.ccm.Query", + "Switcheo.carbon.ccm.Query", "CheckModuleContract", data ); diff --git a/src/codec/ccm/tx.ts b/src/codec/ccm/tx.ts index eff84b60..73223997 100644 --- a/src/codec/ccm/tx.ts +++ b/src/codec/ccm/tx.ts @@ -2,7 +2,7 @@ import Long from "long"; import _m0 from "protobufjs/minimal"; -export const protobufPackage = "Switcheo.polynetworkcosmos.ccm"; +export const protobufPackage = "Switcheo.carbon.ccm"; /** this line is used by starport scaffolding # proto/tx/message */ export interface MsgProcessCrossChainTx { @@ -218,7 +218,7 @@ export class MsgClientImpl implements Msg { ): Promise { const data = MsgProcessCrossChainTx.encode(request).finish(); const promise = this.rpc.request( - "Switcheo.polynetworkcosmos.ccm.Msg", + "Switcheo.carbon.ccm.Msg", "Process", data ); diff --git a/src/codec/coin/tx.ts b/src/codec/coin/tx.ts index 52bed9b4..d1011a98 100644 --- a/src/codec/coin/tx.ts +++ b/src/codec/coin/tx.ts @@ -2,6 +2,11 @@ import Long from "long"; import _m0 from "protobufjs/minimal"; import { Bridge } from "../coin/bridge"; +import { + BoolValue, + StringValue, + Int64Value, +} from "../google/protobuf/wrappers"; export const protobufPackage = "Switcheo.carbon.coin"; @@ -119,6 +124,22 @@ export interface MsgRemoveBridge { export interface MsgRemoveBridgeResponse {} +export interface MsgUpdateToken { + updater: string; + denom: string; + updateTokenParams?: UpdateTokenParams; +} + +export interface UpdateTokenParams { + isActive?: boolean; + isCollateral?: boolean; + name?: string; + symbol?: string; + decimals?: Long; +} + +export interface MsgUpdateTokenResponse {} + const baseMsgCreateToken: object = { creator: "" }; export const MsgCreateToken = { @@ -1848,6 +1869,264 @@ export const MsgRemoveBridgeResponse = { }, }; +const baseMsgUpdateToken: object = { updater: "", denom: "" }; + +export const MsgUpdateToken = { + encode( + message: MsgUpdateToken, + writer: _m0.Writer = _m0.Writer.create() + ): _m0.Writer { + if (message.updater !== "") { + writer.uint32(10).string(message.updater); + } + if (message.denom !== "") { + writer.uint32(18).string(message.denom); + } + if (message.updateTokenParams !== undefined) { + UpdateTokenParams.encode( + message.updateTokenParams, + writer.uint32(26).fork() + ).ldelim(); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateToken { + const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = { ...baseMsgUpdateToken } as MsgUpdateToken; + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.updater = reader.string(); + break; + case 2: + message.denom = reader.string(); + break; + case 3: + message.updateTokenParams = UpdateTokenParams.decode( + reader, + reader.uint32() + ); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + + fromJSON(object: any): MsgUpdateToken { + const message = { ...baseMsgUpdateToken } as MsgUpdateToken; + message.updater = + object.updater !== undefined && object.updater !== null + ? String(object.updater) + : ""; + message.denom = + object.denom !== undefined && object.denom !== null + ? String(object.denom) + : ""; + message.updateTokenParams = + object.updateTokenParams !== undefined && + object.updateTokenParams !== null + ? UpdateTokenParams.fromJSON(object.updateTokenParams) + : undefined; + return message; + }, + + toJSON(message: MsgUpdateToken): unknown { + const obj: any = {}; + message.updater !== undefined && (obj.updater = message.updater); + message.denom !== undefined && (obj.denom = message.denom); + message.updateTokenParams !== undefined && + (obj.updateTokenParams = message.updateTokenParams + ? UpdateTokenParams.toJSON(message.updateTokenParams) + : undefined); + return obj; + }, + + fromPartial(object: DeepPartial): MsgUpdateToken { + const message = { ...baseMsgUpdateToken } as MsgUpdateToken; + message.updater = object.updater ?? ""; + message.denom = object.denom ?? ""; + message.updateTokenParams = + object.updateTokenParams !== undefined && + object.updateTokenParams !== null + ? UpdateTokenParams.fromPartial(object.updateTokenParams) + : undefined; + return message; + }, +}; + +const baseUpdateTokenParams: object = {}; + +export const UpdateTokenParams = { + encode( + message: UpdateTokenParams, + writer: _m0.Writer = _m0.Writer.create() + ): _m0.Writer { + if (message.isActive !== undefined) { + BoolValue.encode( + { value: message.isActive! }, + writer.uint32(10).fork() + ).ldelim(); + } + if (message.isCollateral !== undefined) { + BoolValue.encode( + { value: message.isCollateral! }, + writer.uint32(18).fork() + ).ldelim(); + } + if (message.name !== undefined) { + StringValue.encode( + { value: message.name! }, + writer.uint32(26).fork() + ).ldelim(); + } + if (message.symbol !== undefined) { + StringValue.encode( + { value: message.symbol! }, + writer.uint32(34).fork() + ).ldelim(); + } + if (message.decimals !== undefined) { + Int64Value.encode( + { value: message.decimals! }, + writer.uint32(42).fork() + ).ldelim(); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): UpdateTokenParams { + const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = { ...baseUpdateTokenParams } as UpdateTokenParams; + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.isActive = BoolValue.decode(reader, reader.uint32()).value; + break; + case 2: + message.isCollateral = BoolValue.decode( + reader, + reader.uint32() + ).value; + break; + case 3: + message.name = StringValue.decode(reader, reader.uint32()).value; + break; + case 4: + message.symbol = StringValue.decode(reader, reader.uint32()).value; + break; + case 5: + message.decimals = Int64Value.decode(reader, reader.uint32()).value; + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + + fromJSON(object: any): UpdateTokenParams { + const message = { ...baseUpdateTokenParams } as UpdateTokenParams; + message.isActive = + object.isActive !== undefined && object.isActive !== null + ? Boolean(object.isActive) + : undefined; + message.isCollateral = + object.isCollateral !== undefined && object.isCollateral !== null + ? Boolean(object.isCollateral) + : undefined; + message.name = + object.name !== undefined && object.name !== null + ? String(object.name) + : undefined; + message.symbol = + object.symbol !== undefined && object.symbol !== null + ? String(object.symbol) + : undefined; + message.decimals = + object.decimals !== undefined && object.decimals !== null + ? Long.fromValue(object.decimals) + : undefined; + return message; + }, + + toJSON(message: UpdateTokenParams): unknown { + const obj: any = {}; + message.isActive !== undefined && (obj.isActive = message.isActive); + message.isCollateral !== undefined && + (obj.isCollateral = message.isCollateral); + message.name !== undefined && (obj.name = message.name); + message.symbol !== undefined && (obj.symbol = message.symbol); + message.decimals !== undefined && (obj.decimals = message.decimals); + return obj; + }, + + fromPartial(object: DeepPartial): UpdateTokenParams { + const message = { ...baseUpdateTokenParams } as UpdateTokenParams; + message.isActive = object.isActive ?? undefined; + message.isCollateral = object.isCollateral ?? undefined; + message.name = object.name ?? undefined; + message.symbol = object.symbol ?? undefined; + message.decimals = + object.decimals !== undefined && object.decimals !== null + ? Long.fromValue(object.decimals) + : undefined; + return message; + }, +}; + +const baseMsgUpdateTokenResponse: object = {}; + +export const MsgUpdateTokenResponse = { + encode( + _: MsgUpdateTokenResponse, + writer: _m0.Writer = _m0.Writer.create() + ): _m0.Writer { + return writer; + }, + + decode( + input: _m0.Reader | Uint8Array, + length?: number + ): MsgUpdateTokenResponse { + const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = { ...baseMsgUpdateTokenResponse } as MsgUpdateTokenResponse; + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + + fromJSON(_: any): MsgUpdateTokenResponse { + const message = { ...baseMsgUpdateTokenResponse } as MsgUpdateTokenResponse; + return message; + }, + + toJSON(_: MsgUpdateTokenResponse): unknown { + const obj: any = {}; + return obj; + }, + + fromPartial(_: DeepPartial): MsgUpdateTokenResponse { + const message = { ...baseMsgUpdateTokenResponse } as MsgUpdateTokenResponse; + return message; + }, +}; + /** Msg defines the Msg service. */ export interface Msg { /** this line is used by starport scaffolding # proto/tx/rpc */ @@ -1868,6 +2147,7 @@ export interface Msg { request: MsgEditBridgeName ): Promise; RemoveBridge(request: MsgRemoveBridge): Promise; + UpdateToken(request: MsgUpdateToken): Promise; } export class MsgClientImpl implements Msg { @@ -1885,6 +2165,7 @@ export class MsgClientImpl implements Msg { this.DeauthorizeBridge = this.DeauthorizeBridge.bind(this); this.EditBridgeName = this.EditBridgeName.bind(this); this.RemoveBridge = this.RemoveBridge.bind(this); + this.UpdateToken = this.UpdateToken.bind(this); } CreateToken(request: MsgCreateToken): Promise { const data = MsgCreateToken.encode(request).finish(); @@ -2023,6 +2304,18 @@ export class MsgClientImpl implements Msg { MsgRemoveBridgeResponse.decode(new _m0.Reader(data)) ); } + + UpdateToken(request: MsgUpdateToken): Promise { + const data = MsgUpdateToken.encode(request).finish(); + const promise = this.rpc.request( + "Switcheo.carbon.coin.Msg", + "UpdateToken", + data + ); + return promise.then((data) => + MsgUpdateTokenResponse.decode(new _m0.Reader(data)) + ); + } } interface Rpc { diff --git a/src/codec/cosmos/base/query/v1beta1/pagination.ts b/src/codec/cosmos/base/query/v1beta1/pagination.ts index 9b33eba4..62912f50 100644 --- a/src/codec/cosmos/base/query/v1beta1/pagination.ts +++ b/src/codec/cosmos/base/query/v1beta1/pagination.ts @@ -38,12 +38,6 @@ export interface PageRequest { * is set. */ countTotal: boolean; - /** - * reverse is set to true if results are to be returned in the descending order. - * - * Since: cosmos-sdk 0.43 - */ - reverse: boolean; } /** @@ -72,7 +66,6 @@ const basePageRequest: object = { offset: Long.UZERO, limit: Long.UZERO, countTotal: false, - reverse: false, }; export const PageRequest = { @@ -92,9 +85,6 @@ export const PageRequest = { if (message.countTotal === true) { writer.uint32(32).bool(message.countTotal); } - if (message.reverse === true) { - writer.uint32(40).bool(message.reverse); - } return writer; }, @@ -118,9 +108,6 @@ export const PageRequest = { case 4: message.countTotal = reader.bool(); break; - case 5: - message.reverse = reader.bool(); - break; default: reader.skipType(tag & 7); break; @@ -147,10 +134,6 @@ export const PageRequest = { object.countTotal !== undefined && object.countTotal !== null ? Boolean(object.countTotal) : false; - message.reverse = - object.reverse !== undefined && object.reverse !== null - ? Boolean(object.reverse) - : false; return message; }, @@ -165,7 +148,6 @@ export const PageRequest = { message.limit !== undefined && (obj.limit = (message.limit || Long.UZERO).toString()); message.countTotal !== undefined && (obj.countTotal = message.countTotal); - message.reverse !== undefined && (obj.reverse = message.reverse); return obj; }, @@ -181,7 +163,6 @@ export const PageRequest = { ? Long.fromValue(object.limit) : Long.UZERO; message.countTotal = object.countTotal ?? false; - message.reverse = object.reverse ?? false; return message; }, }; diff --git a/src/codec/cosmos/upgrade/v1beta1/upgrade.ts b/src/codec/cosmos/upgrade/v1beta1/upgrade.ts index 9d79e9d8..efbca355 100644 --- a/src/codec/cosmos/upgrade/v1beta1/upgrade.ts +++ b/src/codec/cosmos/upgrade/v1beta1/upgrade.ts @@ -1,7 +1,6 @@ /* eslint-disable */ import Long from "long"; import _m0 from "protobufjs/minimal"; -import { Any } from "../../../google/protobuf/any"; import { Timestamp } from "../../../google/protobuf/timestamp"; export const protobufPackage = "cosmos.upgrade.v1beta1"; @@ -19,11 +18,8 @@ export interface Plan { */ name: string; /** - * Deprecated: Time based upgrades have been deprecated. Time based upgrade logic - * has been removed from the SDK. - * If this field is not empty, an error will be thrown. - * - * @deprecated + * The time after which the upgrade must be performed. + * Leave set to its zero value to use a pre-defined Height instead. */ time?: Date; /** @@ -36,14 +32,6 @@ export interface Plan { * such as a git commit that validators could automatically upgrade to */ info: string; - /** - * Deprecated: UpgradedClientState field has been deprecated. IBC upgrade logic has been - * moved to the IBC module in the sub module 02-client. - * If this field is not empty, an error will be thrown. - * - * @deprecated - */ - upgradedClientState?: Any; } /** @@ -65,18 +53,6 @@ export interface CancelSoftwareUpgradeProposal { description: string; } -/** - * ModuleVersion specifies a module and its consensus version. - * - * Since: cosmos-sdk 0.43 - */ -export interface ModuleVersion { - /** name of the app module */ - name: string; - /** consensus version of the app module */ - version: Long; -} - const basePlan: object = { name: "", height: Long.ZERO, info: "" }; export const Plan = { @@ -96,12 +72,6 @@ export const Plan = { if (message.info !== "") { writer.uint32(34).string(message.info); } - if (message.upgradedClientState !== undefined) { - Any.encode( - message.upgradedClientState, - writer.uint32(42).fork() - ).ldelim(); - } return writer; }, @@ -126,9 +96,6 @@ export const Plan = { case 4: message.info = reader.string(); break; - case 5: - message.upgradedClientState = Any.decode(reader, reader.uint32()); - break; default: reader.skipType(tag & 7); break; @@ -155,11 +122,6 @@ export const Plan = { object.info !== undefined && object.info !== null ? String(object.info) : ""; - message.upgradedClientState = - object.upgradedClientState !== undefined && - object.upgradedClientState !== null - ? Any.fromJSON(object.upgradedClientState) - : undefined; return message; }, @@ -170,10 +132,6 @@ export const Plan = { message.height !== undefined && (obj.height = (message.height || Long.ZERO).toString()); message.info !== undefined && (obj.info = message.info); - message.upgradedClientState !== undefined && - (obj.upgradedClientState = message.upgradedClientState - ? Any.toJSON(message.upgradedClientState) - : undefined); return obj; }, @@ -186,11 +144,6 @@ export const Plan = { ? Long.fromValue(object.height) : Long.ZERO; message.info = object.info ?? ""; - message.upgradedClientState = - object.upgradedClientState !== undefined && - object.upgradedClientState !== null - ? Any.fromPartial(object.upgradedClientState) - : undefined; return message; }, }; @@ -368,75 +321,6 @@ export const CancelSoftwareUpgradeProposal = { }, }; -const baseModuleVersion: object = { name: "", version: Long.UZERO }; - -export const ModuleVersion = { - encode( - message: ModuleVersion, - writer: _m0.Writer = _m0.Writer.create() - ): _m0.Writer { - if (message.name !== "") { - writer.uint32(10).string(message.name); - } - if (!message.version.isZero()) { - writer.uint32(16).uint64(message.version); - } - return writer; - }, - - decode(input: _m0.Reader | Uint8Array, length?: number): ModuleVersion { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); - let end = length === undefined ? reader.len : reader.pos + length; - const message = { ...baseModuleVersion } as ModuleVersion; - while (reader.pos < end) { - const tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.version = reader.uint64() as Long; - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }, - - fromJSON(object: any): ModuleVersion { - const message = { ...baseModuleVersion } as ModuleVersion; - message.name = - object.name !== undefined && object.name !== null - ? String(object.name) - : ""; - message.version = - object.version !== undefined && object.version !== null - ? Long.fromString(object.version) - : Long.UZERO; - return message; - }, - - toJSON(message: ModuleVersion): unknown { - const obj: any = {}; - message.name !== undefined && (obj.name = message.name); - message.version !== undefined && - (obj.version = (message.version || Long.UZERO).toString()); - return obj; - }, - - fromPartial(object: DeepPartial): ModuleVersion { - const message = { ...baseModuleVersion } as ModuleVersion; - message.name = object.name ?? ""; - message.version = - object.version !== undefined && object.version !== null - ? Long.fromValue(object.version) - : Long.UZERO; - return message; - }, -}; - type Builtin = | Date | Function diff --git a/src/codec/headersync/consensus_peers.ts b/src/codec/headersync/consensus_peers.ts index 3dca05e6..9413df79 100644 --- a/src/codec/headersync/consensus_peers.ts +++ b/src/codec/headersync/consensus_peers.ts @@ -2,7 +2,7 @@ import Long from "long"; import _m0 from "protobufjs/minimal"; -export const protobufPackage = "Switcheo.polynetworkcosmos.headersync"; +export const protobufPackage = "Switcheo.carbon.headersync"; export interface Peer { index: number; diff --git a/src/codec/headersync/genesis.ts b/src/codec/headersync/genesis.ts index 17d715b2..c6ca90f1 100644 --- a/src/codec/headersync/genesis.ts +++ b/src/codec/headersync/genesis.ts @@ -3,7 +3,7 @@ import Long from "long"; import _m0 from "protobufjs/minimal"; import { ConsensusPeers } from "../headersync/consensus_peers"; -export const protobufPackage = "Switcheo.polynetworkcosmos.headersync"; +export const protobufPackage = "Switcheo.carbon.headersync"; /** GenesisState defines the headersync module's genesis state. */ export interface GenesisState { diff --git a/src/codec/headersync/query.ts b/src/codec/headersync/query.ts index 12b1a65a..e633443b 100644 --- a/src/codec/headersync/query.ts +++ b/src/codec/headersync/query.ts @@ -3,7 +3,7 @@ import Long from "long"; import _m0 from "protobufjs/minimal"; import { ConsensusPeers } from "../headersync/consensus_peers"; -export const protobufPackage = "Switcheo.polynetworkcosmos.headersync"; +export const protobufPackage = "Switcheo.carbon.headersync"; export interface QueryGetConsensusPeersRequest { chainId: Long; @@ -176,7 +176,7 @@ export class QueryClientImpl implements Query { ): Promise { const data = QueryGetConsensusPeersRequest.encode(request).finish(); const promise = this.rpc.request( - "Switcheo.polynetworkcosmos.headersync.Query", + "Switcheo.carbon.headersync.Query", "ConsensusPeers", data ); diff --git a/src/codec/headersync/tx.ts b/src/codec/headersync/tx.ts index e2946f11..877cf4ed 100644 --- a/src/codec/headersync/tx.ts +++ b/src/codec/headersync/tx.ts @@ -2,7 +2,7 @@ import Long from "long"; import _m0 from "protobufjs/minimal"; -export const protobufPackage = "Switcheo.polynetworkcosmos.headersync"; +export const protobufPackage = "Switcheo.carbon.headersync"; /** this line is used by starport scaffolding # proto/tx/message */ export interface MsgSyncGenesis { @@ -257,7 +257,7 @@ export class MsgClientImpl implements Msg { SyncGenesis(request: MsgSyncGenesis): Promise { const data = MsgSyncGenesis.encode(request).finish(); const promise = this.rpc.request( - "Switcheo.polynetworkcosmos.headersync.Msg", + "Switcheo.carbon.headersync.Msg", "SyncGenesis", data ); @@ -269,7 +269,7 @@ export class MsgClientImpl implements Msg { SyncHeaders(request: MsgSyncHeaders): Promise { const data = MsgSyncHeaders.encode(request).finish(); const promise = this.rpc.request( - "Switcheo.polynetworkcosmos.headersync.Msg", + "Switcheo.carbon.headersync.Msg", "SyncHeaders", data ); diff --git a/src/codec/ibc/core/channel/v1/export.ts b/src/codec/ibc/core/channel/v1/export.ts index bb5fe59b..6a4eea9c 100644 --- a/src/codec/ibc/core/channel/v1/export.ts +++ b/src/codec/ibc/core/channel/v1/export.ts @@ -1,4 +1,4 @@ export { State, stateFromJSON, stateToJSON, Order, orderFromJSON, orderToJSON, Channel, IdentifiedChannel, Counterparty, Packet, PacketState, Acknowledgement } from "./channel"; export { PacketSequence } from "./genesis"; export { QueryChannelRequest, QueryChannelResponse, QueryChannelsRequest, QueryChannelsResponse, QueryConnectionChannelsRequest, QueryConnectionChannelsResponse, QueryChannelClientStateRequest, QueryChannelClientStateResponse, QueryChannelConsensusStateRequest, QueryChannelConsensusStateResponse, QueryPacketCommitmentRequest, QueryPacketCommitmentResponse, QueryPacketCommitmentsRequest, QueryPacketCommitmentsResponse, QueryPacketReceiptRequest, QueryPacketReceiptResponse, QueryPacketAcknowledgementRequest, QueryPacketAcknowledgementResponse, QueryPacketAcknowledgementsRequest, QueryPacketAcknowledgementsResponse, QueryUnreceivedPacketsRequest, QueryUnreceivedPacketsResponse, QueryUnreceivedAcksRequest, QueryUnreceivedAcksResponse, QueryNextSequenceReceiveRequest, QueryNextSequenceReceiveResponse } from "./query"; -export { MsgChannelOpenInit, MsgChannelOpenInitResponse, MsgChannelOpenTry, MsgChannelOpenTryResponse, MsgChannelOpenAck, MsgChannelOpenAckResponse, MsgChannelOpenConfirm, MsgChannelOpenConfirmResponse, MsgChannelCloseInit, MsgChannelCloseInitResponse, MsgChannelCloseConfirm, MsgChannelCloseConfirmResponse, MsgRecvPacket, MsgRecvPacketResponse, MsgTimeout, MsgTimeoutResponse, MsgTimeoutOnClose, MsgTimeoutOnCloseResponse, MsgAcknowledgement, MsgAcknowledgementResponse } from "./tx"; +export { ResponseResultType, responseResultTypeFromJSON, responseResultTypeToJSON, MsgChannelOpenInit, MsgChannelOpenInitResponse, MsgChannelOpenTry, MsgChannelOpenTryResponse, MsgChannelOpenAck, MsgChannelOpenAckResponse, MsgChannelOpenConfirm, MsgChannelOpenConfirmResponse, MsgChannelCloseInit, MsgChannelCloseInitResponse, MsgChannelCloseConfirm, MsgChannelCloseConfirmResponse, MsgRecvPacket, MsgRecvPacketResponse, MsgTimeout, MsgTimeoutResponse, MsgTimeoutOnClose, MsgTimeoutOnCloseResponse, MsgAcknowledgement, MsgAcknowledgementResponse } from "./tx"; diff --git a/src/codec/ibc/core/channel/v1/tx.ts b/src/codec/ibc/core/channel/v1/tx.ts index 88bc8cda..f17a8d95 100644 --- a/src/codec/ibc/core/channel/v1/tx.ts +++ b/src/codec/ibc/core/channel/v1/tx.ts @@ -6,6 +6,48 @@ import { Height } from "../../../../ibc/core/client/v1/client"; export const protobufPackage = "ibc.core.channel.v1"; +/** ResponseResultType defines the possible outcomes of the execution of a message */ +export enum ResponseResultType { + /** RESPONSE_RESULT_UNSPECIFIED - Default zero value enumeration */ + RESPONSE_RESULT_UNSPECIFIED = 0, + /** RESPONSE_RESULT_NOOP - The message did not call the IBC application callbacks (because, for example, the packet had already been relayed) */ + RESPONSE_RESULT_NOOP = 1, + /** RESPONSE_RESULT_SUCCESS - The message was executed successfully */ + RESPONSE_RESULT_SUCCESS = 2, + UNRECOGNIZED = -1, +} + +export function responseResultTypeFromJSON(object: any): ResponseResultType { + switch (object) { + case 0: + case "RESPONSE_RESULT_UNSPECIFIED": + return ResponseResultType.RESPONSE_RESULT_UNSPECIFIED; + case 1: + case "RESPONSE_RESULT_NOOP": + return ResponseResultType.RESPONSE_RESULT_NOOP; + case 2: + case "RESPONSE_RESULT_SUCCESS": + return ResponseResultType.RESPONSE_RESULT_SUCCESS; + case -1: + case "UNRECOGNIZED": + default: + return ResponseResultType.UNRECOGNIZED; + } +} + +export function responseResultTypeToJSON(object: ResponseResultType): string { + switch (object) { + case ResponseResultType.RESPONSE_RESULT_UNSPECIFIED: + return "RESPONSE_RESULT_UNSPECIFIED"; + case ResponseResultType.RESPONSE_RESULT_NOOP: + return "RESPONSE_RESULT_NOOP"; + case ResponseResultType.RESPONSE_RESULT_SUCCESS: + return "RESPONSE_RESULT_SUCCESS"; + default: + return "UNKNOWN"; + } +} + /** * MsgChannelOpenInit defines an sdk.Msg to initialize a channel handshake. It * is called by a relayer on Chain A. @@ -119,7 +161,9 @@ export interface MsgRecvPacket { } /** MsgRecvPacketResponse defines the Msg/RecvPacket response type. */ -export interface MsgRecvPacketResponse {} +export interface MsgRecvPacketResponse { + result: ResponseResultType; +} /** MsgTimeout receives timed-out packet */ export interface MsgTimeout { @@ -131,7 +175,9 @@ export interface MsgTimeout { } /** MsgTimeoutResponse defines the Msg/Timeout response type. */ -export interface MsgTimeoutResponse {} +export interface MsgTimeoutResponse { + result: ResponseResultType; +} /** MsgTimeoutOnClose timed-out packet upon counterparty channel closure. */ export interface MsgTimeoutOnClose { @@ -144,7 +190,9 @@ export interface MsgTimeoutOnClose { } /** MsgTimeoutOnCloseResponse defines the Msg/TimeoutOnClose response type. */ -export interface MsgTimeoutOnCloseResponse {} +export interface MsgTimeoutOnCloseResponse { + result: ResponseResultType; +} /** MsgAcknowledgement receives incoming IBC acknowledgement */ export interface MsgAcknowledgement { @@ -156,7 +204,9 @@ export interface MsgAcknowledgement { } /** MsgAcknowledgementResponse defines the Msg/Acknowledgement response type. */ -export interface MsgAcknowledgementResponse {} +export interface MsgAcknowledgementResponse { + result: ResponseResultType; +} const baseMsgChannelOpenInit: object = { portId: "", signer: "" }; @@ -1286,13 +1336,16 @@ export const MsgRecvPacket = { }, }; -const baseMsgRecvPacketResponse: object = {}; +const baseMsgRecvPacketResponse: object = { result: 0 }; export const MsgRecvPacketResponse = { encode( - _: MsgRecvPacketResponse, + message: MsgRecvPacketResponse, writer: _m0.Writer = _m0.Writer.create() ): _m0.Writer { + if (message.result !== 0) { + writer.uint32(8).int32(message.result); + } return writer; }, @@ -1306,6 +1359,9 @@ export const MsgRecvPacketResponse = { while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { + case 1: + message.result = reader.int32() as any; + break; default: reader.skipType(tag & 7); break; @@ -1314,18 +1370,27 @@ export const MsgRecvPacketResponse = { return message; }, - fromJSON(_: any): MsgRecvPacketResponse { + fromJSON(object: any): MsgRecvPacketResponse { const message = { ...baseMsgRecvPacketResponse } as MsgRecvPacketResponse; + message.result = + object.result !== undefined && object.result !== null + ? responseResultTypeFromJSON(object.result) + : 0; return message; }, - toJSON(_: MsgRecvPacketResponse): unknown { + toJSON(message: MsgRecvPacketResponse): unknown { const obj: any = {}; + message.result !== undefined && + (obj.result = responseResultTypeToJSON(message.result)); return obj; }, - fromPartial(_: DeepPartial): MsgRecvPacketResponse { + fromPartial( + object: DeepPartial + ): MsgRecvPacketResponse { const message = { ...baseMsgRecvPacketResponse } as MsgRecvPacketResponse; + message.result = object.result ?? 0; return message; }, }; @@ -1453,13 +1518,16 @@ export const MsgTimeout = { }, }; -const baseMsgTimeoutResponse: object = {}; +const baseMsgTimeoutResponse: object = { result: 0 }; export const MsgTimeoutResponse = { encode( - _: MsgTimeoutResponse, + message: MsgTimeoutResponse, writer: _m0.Writer = _m0.Writer.create() ): _m0.Writer { + if (message.result !== 0) { + writer.uint32(8).int32(message.result); + } return writer; }, @@ -1470,6 +1538,9 @@ export const MsgTimeoutResponse = { while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { + case 1: + message.result = reader.int32() as any; + break; default: reader.skipType(tag & 7); break; @@ -1478,18 +1549,25 @@ export const MsgTimeoutResponse = { return message; }, - fromJSON(_: any): MsgTimeoutResponse { + fromJSON(object: any): MsgTimeoutResponse { const message = { ...baseMsgTimeoutResponse } as MsgTimeoutResponse; + message.result = + object.result !== undefined && object.result !== null + ? responseResultTypeFromJSON(object.result) + : 0; return message; }, - toJSON(_: MsgTimeoutResponse): unknown { + toJSON(message: MsgTimeoutResponse): unknown { const obj: any = {}; + message.result !== undefined && + (obj.result = responseResultTypeToJSON(message.result)); return obj; }, - fromPartial(_: DeepPartial): MsgTimeoutResponse { + fromPartial(object: DeepPartial): MsgTimeoutResponse { const message = { ...baseMsgTimeoutResponse } as MsgTimeoutResponse; + message.result = object.result ?? 0; return message; }, }; @@ -1636,13 +1714,16 @@ export const MsgTimeoutOnClose = { }, }; -const baseMsgTimeoutOnCloseResponse: object = {}; +const baseMsgTimeoutOnCloseResponse: object = { result: 0 }; export const MsgTimeoutOnCloseResponse = { encode( - _: MsgTimeoutOnCloseResponse, + message: MsgTimeoutOnCloseResponse, writer: _m0.Writer = _m0.Writer.create() ): _m0.Writer { + if (message.result !== 0) { + writer.uint32(8).int32(message.result); + } return writer; }, @@ -1658,6 +1739,9 @@ export const MsgTimeoutOnCloseResponse = { while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { + case 1: + message.result = reader.int32() as any; + break; default: reader.skipType(tag & 7); break; @@ -1666,24 +1750,31 @@ export const MsgTimeoutOnCloseResponse = { return message; }, - fromJSON(_: any): MsgTimeoutOnCloseResponse { + fromJSON(object: any): MsgTimeoutOnCloseResponse { const message = { ...baseMsgTimeoutOnCloseResponse, } as MsgTimeoutOnCloseResponse; + message.result = + object.result !== undefined && object.result !== null + ? responseResultTypeFromJSON(object.result) + : 0; return message; }, - toJSON(_: MsgTimeoutOnCloseResponse): unknown { + toJSON(message: MsgTimeoutOnCloseResponse): unknown { const obj: any = {}; + message.result !== undefined && + (obj.result = responseResultTypeToJSON(message.result)); return obj; }, fromPartial( - _: DeepPartial + object: DeepPartial ): MsgTimeoutOnCloseResponse { const message = { ...baseMsgTimeoutOnCloseResponse, } as MsgTimeoutOnCloseResponse; + message.result = object.result ?? 0; return message; }, }; @@ -1809,13 +1900,16 @@ export const MsgAcknowledgement = { }, }; -const baseMsgAcknowledgementResponse: object = {}; +const baseMsgAcknowledgementResponse: object = { result: 0 }; export const MsgAcknowledgementResponse = { encode( - _: MsgAcknowledgementResponse, + message: MsgAcknowledgementResponse, writer: _m0.Writer = _m0.Writer.create() ): _m0.Writer { + if (message.result !== 0) { + writer.uint32(8).int32(message.result); + } return writer; }, @@ -1831,6 +1925,9 @@ export const MsgAcknowledgementResponse = { while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { + case 1: + message.result = reader.int32() as any; + break; default: reader.skipType(tag & 7); break; @@ -1839,24 +1936,31 @@ export const MsgAcknowledgementResponse = { return message; }, - fromJSON(_: any): MsgAcknowledgementResponse { + fromJSON(object: any): MsgAcknowledgementResponse { const message = { ...baseMsgAcknowledgementResponse, } as MsgAcknowledgementResponse; + message.result = + object.result !== undefined && object.result !== null + ? responseResultTypeFromJSON(object.result) + : 0; return message; }, - toJSON(_: MsgAcknowledgementResponse): unknown { + toJSON(message: MsgAcknowledgementResponse): unknown { const obj: any = {}; + message.result !== undefined && + (obj.result = responseResultTypeToJSON(message.result)); return obj; }, fromPartial( - _: DeepPartial + object: DeepPartial ): MsgAcknowledgementResponse { const message = { ...baseMsgAcknowledgementResponse, } as MsgAcknowledgementResponse; + message.result = object.result ?? 0; return message; }, }; diff --git a/src/codec/index.ts b/src/codec/index.ts index 584c1d0d..a97c11e9 100644 --- a/src/codec/index.ts +++ b/src/codec/index.ts @@ -6,7 +6,7 @@ import { MsgInitiateLiquidation, MsgInitiateLiquidationResponse } from "./broker import { MsgSetFee, MsgSetFeeResponse } from "./fee/tx"; import { SetMsgFeeProposal } from "./fee/proposal"; import { MsgSetMargin, MsgSetMarginResponse } from "./position/tx"; -import { MsgCreateOracle, MsgCreateOracleResponse, MsgCreateVote, MsgCreateVoteResponse } from "./oracle/tx"; +import { MsgCreateOracle, MsgCreateOracleResponse, MsgCreateVote, MsgCreateVoteResponse, MsgUpdateOracle, MsgUpdateOracleResponse, MsgRemoveOracle, MsgRemoveOracleResponse } from "./oracle/tx"; import { CreateOracleProposal } from "./oracle/proposal"; import { SoftwareUpgradeProposal, CancelSoftwareUpgradeProposal } from "./cosmos/upgrade/v1beta1/upgrade"; import { MsgGrantAllowance, MsgGrantAllowanceResponse, MsgRevokeAllowance, MsgRevokeAllowanceResponse } from "./cosmos/feegrant/v1beta1/tx"; @@ -26,13 +26,13 @@ import { MsgChannelOpenInit, MsgChannelOpenInitResponse, MsgChannelOpenTry, MsgC import { MsgCreateClient, MsgCreateClientResponse, MsgUpdateClient, MsgUpdateClientResponse, MsgUpgradeClient, MsgUpgradeClientResponse, MsgSubmitMisbehaviour, MsgSubmitMisbehaviourResponse } from "./ibc/core/client/v1/tx"; import { Header } from "./ibc/lightclients/tendermint/v1/tendermint"; import { MsgTransfer, MsgTransferResponse } from "./ibc/applications/transfer/v1/tx"; -import { MsgCreateToken, MsgCreateTokenResponse, MsgSyncToken, MsgSyncTokenResponse, MsgMintToken, MsgMintTokenResponse, MsgBindToken, MsgBindTokenResponse, MsgUnbindToken, MsgUnbindTokenResponse, MsgLinkToken, MsgLinkTokenResponse, MsgWithdraw, MsgWithdrawResponse, MsgAuthorizeBridge, MsgAuthorizeBridgeResponse, MsgDeauthorizeBridge, MsgDeauthorizeBridgeResponse, MsgEditBridgeName, MsgEditBridgeNameResponse, MsgRemoveBridge, MsgRemoveBridgeResponse } from "./coin/tx"; +import { MsgCreateToken, MsgCreateTokenResponse, MsgSyncToken, MsgSyncTokenResponse, MsgMintToken, MsgMintTokenResponse, MsgBindToken, MsgBindTokenResponse, MsgUnbindToken, MsgUnbindTokenResponse, MsgLinkToken, MsgLinkTokenResponse, MsgWithdraw, MsgWithdrawResponse, MsgAuthorizeBridge, MsgAuthorizeBridgeResponse, MsgDeauthorizeBridge, MsgDeauthorizeBridgeResponse, MsgEditBridgeName, MsgEditBridgeNameResponse, MsgRemoveBridge, MsgRemoveBridgeResponse, MsgUpdateToken, MsgUpdateTokenResponse } from "./coin/tx"; import { CreateTokenProposal } from "./coin/proposal"; import { MsgSetLeverage, MsgSetLeverageResponse } from "./leverage/tx"; import { MsgUpdateProfile, MsgUpdateProfileResponse } from "./profile/tx"; import { MsgCreateSubAccount, MsgCreateSubAccountResponse, MsgActivateSubAccount, MsgActivateSubAccountResponse, MsgRemoveSubAccount, MsgRemoveSubAccountResponse } from "./subaccount/tx"; import { MsgCreateMarket, MsgCreateMarketResponse, MsgUpdateMarket, MsgUpdateMarketResponse } from "./market/tx"; -import { CreateMarketProposal, UpdateMarketProposal } from "./market/proposal"; +import { UpdateMarketProposal } from "./market/proposal"; import { MsgCreatePool, MsgCreatePoolResponse, MsgCreatePoolWithLiquidity, MsgCreatePoolWithLiquidityResponse, MsgAddLiquidity, MsgAddLiquidityResponse, MsgRemoveLiquidity, MsgRemoveLiquidityResponse, MsgLinkPool, MsgLinkPoolResponse, MsgUnlinkPool, MsgUnlinkPoolResponse, MsgSetRewardsWeights, MsgSetRewardsWeightsResponse, MsgStakePoolToken, MsgStakePoolTokenResponse, MsgUnstakePoolToken, MsgUnstakePoolTokenResponse, MsgClaimPoolRewards, MsgClaimPoolRewardsResponse, MsgSetRewardCurve, MsgSetRewardCurveResponse, MsgSetCommitmentCurve, MsgSetCommitmentCurveResponse, MsgUpdatePool, MsgUpdatePoolResponse } from "./liquiditypool/tx"; import { LinkPoolProposal, UnlinkPoolProposal, SetRewardCurveProposal, SetCommitmentCurveProposal, SetRewardsWeightsProposal, UpdatePoolProposal } from "./liquiditypool/proposal"; import { SettlementPriceProposal } from "./pricing/proposal"; @@ -68,10 +68,10 @@ registry.register("/Switcheo.carbon.cdp.MsgRemoveDebtResponse", MsgRemoveDebtRes registry.register("/Switcheo.carbon.cdp.MsgCreateVaultType", MsgCreateVaultType); registry.register("/Switcheo.carbon.cdp.MsgCreateVaultTypeResponse", MsgCreateVaultTypeResponse); -registry.register("/Switcheo.polynetworkcosmos.headersync.MsgSyncGenesis", PolyNetwork.Headersync.MsgSyncGenesis); -registry.register("/Switcheo.polynetworkcosmos.headersync.MsgSyncGenesisResponse", PolyNetwork.Headersync.MsgSyncGenesisResponse); -registry.register("/Switcheo.polynetworkcosmos.headersync.MsgSyncHeaders", PolyNetwork.Headersync.MsgSyncHeaders); -registry.register("/Switcheo.polynetworkcosmos.headersync.MsgSyncHeadersResponse", PolyNetwork.Headersync.MsgSyncHeadersResponse); +registry.register("/Switcheo.carbon.headersync.MsgSyncGenesis", PolyNetwork.Headersync.MsgSyncGenesis); +registry.register("/Switcheo.carbon.headersync.MsgSyncGenesisResponse", PolyNetwork.Headersync.MsgSyncGenesisResponse); +registry.register("/Switcheo.carbon.headersync.MsgSyncHeaders", PolyNetwork.Headersync.MsgSyncHeaders); +registry.register("/Switcheo.carbon.headersync.MsgSyncHeadersResponse", PolyNetwork.Headersync.MsgSyncHeadersResponse); registry.register("/Switcheo.carbon.broker.MsgInitiateLiquidation", MsgInitiateLiquidation); registry.register("/Switcheo.carbon.broker.MsgInitiateLiquidationResponse", MsgInitiateLiquidationResponse); @@ -80,12 +80,12 @@ registry.register("/Switcheo.carbon.fee.MsgSetFee", MsgSetFee); registry.register("/Switcheo.carbon.fee.MsgSetFeeResponse", MsgSetFeeResponse); registry.register("/Switcheo.carbon.fee.SetMsgFeeProposal", SetMsgFeeProposal); -registry.register("/Switcheo.polynetworkcosmos.btcx.MsgCreate", PolyNetwork.Btcx.MsgCreate); -registry.register("/Switcheo.polynetworkcosmos.btcx.MsgCreateResponse", PolyNetwork.Btcx.MsgCreateResponse); -registry.register("/Switcheo.polynetworkcosmos.btcx.MsgBind", PolyNetwork.Btcx.MsgBind); -registry.register("/Switcheo.polynetworkcosmos.btcx.MsgBindResponse", PolyNetwork.Btcx.MsgBindResponse); -registry.register("/Switcheo.polynetworkcosmos.btcx.MsgLock", PolyNetwork.Btcx.MsgLock); -registry.register("/Switcheo.polynetworkcosmos.btcx.MsgLockResponse", PolyNetwork.Btcx.MsgLockResponse); +registry.register("/Switcheo.carbon.btcx.MsgCreate", PolyNetwork.Btcx.MsgCreate); +registry.register("/Switcheo.carbon.btcx.MsgCreateResponse", PolyNetwork.Btcx.MsgCreateResponse); +registry.register("/Switcheo.carbon.btcx.MsgBind", PolyNetwork.Btcx.MsgBind); +registry.register("/Switcheo.carbon.btcx.MsgBindResponse", PolyNetwork.Btcx.MsgBindResponse); +registry.register("/Switcheo.carbon.btcx.MsgLock", PolyNetwork.Btcx.MsgLock); +registry.register("/Switcheo.carbon.btcx.MsgLockResponse", PolyNetwork.Btcx.MsgLockResponse); registry.register("/Switcheo.carbon.position.MsgSetMargin", MsgSetMargin); registry.register("/Switcheo.carbon.position.MsgSetMarginResponse", MsgSetMarginResponse); @@ -94,6 +94,10 @@ registry.register("/Switcheo.carbon.oracle.MsgCreateOracle", MsgCreateOracle); registry.register("/Switcheo.carbon.oracle.MsgCreateOracleResponse", MsgCreateOracleResponse); registry.register("/Switcheo.carbon.oracle.MsgCreateVote", MsgCreateVote); registry.register("/Switcheo.carbon.oracle.MsgCreateVoteResponse", MsgCreateVoteResponse); +registry.register("/Switcheo.carbon.oracle.MsgUpdateOracle", MsgUpdateOracle); +registry.register("/Switcheo.carbon.oracle.MsgUpdateOracleResponse", MsgUpdateOracleResponse); +registry.register("/Switcheo.carbon.oracle.MsgRemoveOracle", MsgRemoveOracle); +registry.register("/Switcheo.carbon.oracle.MsgRemoveOracleResponse", MsgRemoveOracleResponse); registry.register("/Switcheo.carbon.oracle.CreateOracleProposal", CreateOracleProposal); registry.register("/cosmos.upgrade.v1beta1.SoftwareUpgradeProposal", SoftwareUpgradeProposal); @@ -160,8 +164,8 @@ registry.register("/cosmos.gov.v1beta1.MsgVoteWeightedResponse", MsgVoteWeighted registry.register("/cosmos.gov.v1beta1.MsgDeposit", MsgDeposit); registry.register("/cosmos.gov.v1beta1.MsgDepositResponse", MsgDepositResponse); -registry.register("/Switcheo.polynetworkcosmos.ccm.MsgProcessCrossChainTx", PolyNetwork.Ccm.MsgProcessCrossChainTx); -registry.register("/Switcheo.polynetworkcosmos.ccm.MsgProcessCrossChainTxResponse", PolyNetwork.Ccm.MsgProcessCrossChainTxResponse); +registry.register("/Switcheo.carbon.ccm.MsgProcessCrossChainTx", PolyNetwork.Ccm.MsgProcessCrossChainTx); +registry.register("/Switcheo.carbon.ccm.MsgProcessCrossChainTxResponse", PolyNetwork.Ccm.MsgProcessCrossChainTxResponse); registry.register("/ibc.core.connection.v1.MsgConnectionOpenInit", MsgConnectionOpenInit); registry.register("/ibc.core.connection.v1.MsgConnectionOpenInitResponse", MsgConnectionOpenInitResponse); @@ -229,6 +233,8 @@ registry.register("/Switcheo.carbon.coin.MsgEditBridgeName", MsgEditBridgeName); registry.register("/Switcheo.carbon.coin.MsgEditBridgeNameResponse", MsgEditBridgeNameResponse); registry.register("/Switcheo.carbon.coin.MsgRemoveBridge", MsgRemoveBridge); registry.register("/Switcheo.carbon.coin.MsgRemoveBridgeResponse", MsgRemoveBridgeResponse); +registry.register("/Switcheo.carbon.coin.MsgUpdateToken", MsgUpdateToken); +registry.register("/Switcheo.carbon.coin.MsgUpdateTokenResponse", MsgUpdateTokenResponse); registry.register("/Switcheo.carbon.coin.CreateTokenProposal", CreateTokenProposal); registry.register("/Switcheo.carbon.leverage.MsgSetLeverage", MsgSetLeverage); @@ -248,7 +254,6 @@ registry.register("/Switcheo.carbon.market.MsgCreateMarket", MsgCreateMarket); registry.register("/Switcheo.carbon.market.MsgCreateMarketResponse", MsgCreateMarketResponse); registry.register("/Switcheo.carbon.market.MsgUpdateMarket", MsgUpdateMarket); registry.register("/Switcheo.carbon.market.MsgUpdateMarketResponse", MsgUpdateMarketResponse); -registry.register("/Switcheo.carbon.market.CreateMarketProposal", CreateMarketProposal); registry.register("/Switcheo.carbon.market.UpdateMarketProposal", UpdateMarketProposal); registry.register("/Switcheo.carbon.liquiditypool.MsgCreatePool", MsgCreatePool); @@ -286,12 +291,12 @@ registry.register("/Switcheo.carbon.liquiditypool.UpdatePoolProposal", UpdatePoo registry.register("/Switcheo.carbon.pricing.SettlementPriceProposal", SettlementPriceProposal); -registry.register("/Switcheo.polynetworkcosmos.lockproxy.MsgCreate", PolyNetwork.Lockproxy.MsgCreate); -registry.register("/Switcheo.polynetworkcosmos.lockproxy.MsgCreateResponse", PolyNetwork.Lockproxy.MsgCreateResponse); -registry.register("/Switcheo.polynetworkcosmos.lockproxy.MsgBind", PolyNetwork.Lockproxy.MsgBind); -registry.register("/Switcheo.polynetworkcosmos.lockproxy.MsgBindResponse", PolyNetwork.Lockproxy.MsgBindResponse); -registry.register("/Switcheo.polynetworkcosmos.lockproxy.MsgLock", PolyNetwork.Lockproxy.MsgLock); -registry.register("/Switcheo.polynetworkcosmos.lockproxy.MsgLockResponse", PolyNetwork.Lockproxy.MsgLockResponse); +registry.register("/Switcheo.carbon.lockproxy.MsgCreate", PolyNetwork.Lockproxy.MsgCreate); +registry.register("/Switcheo.carbon.lockproxy.MsgCreateResponse", PolyNetwork.Lockproxy.MsgCreateResponse); +registry.register("/Switcheo.carbon.lockproxy.MsgBind", PolyNetwork.Lockproxy.MsgBind); +registry.register("/Switcheo.carbon.lockproxy.MsgBindResponse", PolyNetwork.Lockproxy.MsgBindResponse); +registry.register("/Switcheo.carbon.lockproxy.MsgLock", PolyNetwork.Lockproxy.MsgLock); +registry.register("/Switcheo.carbon.lockproxy.MsgLockResponse", PolyNetwork.Lockproxy.MsgLockResponse); export const TxTypes = { "MsgSetTradingFlag": "/Switcheo.carbon.order.MsgSetTradingFlag", @@ -314,27 +319,31 @@ export const TxTypes = { "MsgRemoveDebtResponse": "/Switcheo.carbon.cdp.MsgRemoveDebtResponse", "MsgCreateVaultType": "/Switcheo.carbon.cdp.MsgCreateVaultType", "MsgCreateVaultTypeResponse": "/Switcheo.carbon.cdp.MsgCreateVaultTypeResponse", - "MsgSyncGenesis": "/Switcheo.polynetworkcosmos.headersync.MsgSyncGenesis", - "MsgSyncGenesisResponse": "/Switcheo.polynetworkcosmos.headersync.MsgSyncGenesisResponse", - "MsgSyncHeaders": "/Switcheo.polynetworkcosmos.headersync.MsgSyncHeaders", - "MsgSyncHeadersResponse": "/Switcheo.polynetworkcosmos.headersync.MsgSyncHeadersResponse", + "MsgSyncGenesis": "/Switcheo.carbon.headersync.MsgSyncGenesis", + "MsgSyncGenesisResponse": "/Switcheo.carbon.headersync.MsgSyncGenesisResponse", + "MsgSyncHeaders": "/Switcheo.carbon.headersync.MsgSyncHeaders", + "MsgSyncHeadersResponse": "/Switcheo.carbon.headersync.MsgSyncHeadersResponse", "MsgInitiateLiquidation": "/Switcheo.carbon.broker.MsgInitiateLiquidation", "MsgInitiateLiquidationResponse": "/Switcheo.carbon.broker.MsgInitiateLiquidationResponse", "MsgSetFee": "/Switcheo.carbon.fee.MsgSetFee", "MsgSetFeeResponse": "/Switcheo.carbon.fee.MsgSetFeeResponse", "SetMsgFeeProposal": "/Switcheo.carbon.fee.SetMsgFeeProposal", - "MsgCreate": "/Switcheo.polynetworkcosmos.lockproxy.MsgCreate", - "MsgCreateResponse": "/Switcheo.polynetworkcosmos.lockproxy.MsgCreateResponse", - "MsgBind": "/Switcheo.polynetworkcosmos.lockproxy.MsgBind", - "MsgBindResponse": "/Switcheo.polynetworkcosmos.lockproxy.MsgBindResponse", - "MsgLock": "/Switcheo.polynetworkcosmos.lockproxy.MsgLock", - "MsgLockResponse": "/Switcheo.polynetworkcosmos.lockproxy.MsgLockResponse", + "MsgCreate": "/Switcheo.carbon.lockproxy.MsgCreate", + "MsgCreateResponse": "/Switcheo.carbon.lockproxy.MsgCreateResponse", + "MsgBind": "/Switcheo.carbon.lockproxy.MsgBind", + "MsgBindResponse": "/Switcheo.carbon.lockproxy.MsgBindResponse", + "MsgLock": "/Switcheo.carbon.lockproxy.MsgLock", + "MsgLockResponse": "/Switcheo.carbon.lockproxy.MsgLockResponse", "MsgSetMargin": "/Switcheo.carbon.position.MsgSetMargin", "MsgSetMarginResponse": "/Switcheo.carbon.position.MsgSetMarginResponse", "MsgCreateOracle": "/Switcheo.carbon.oracle.MsgCreateOracle", "MsgCreateOracleResponse": "/Switcheo.carbon.oracle.MsgCreateOracleResponse", "MsgCreateVote": "/Switcheo.carbon.oracle.MsgCreateVote", "MsgCreateVoteResponse": "/Switcheo.carbon.oracle.MsgCreateVoteResponse", + "MsgUpdateOracle": "/Switcheo.carbon.oracle.MsgUpdateOracle", + "MsgUpdateOracleResponse": "/Switcheo.carbon.oracle.MsgUpdateOracleResponse", + "MsgRemoveOracle": "/Switcheo.carbon.oracle.MsgRemoveOracle", + "MsgRemoveOracleResponse": "/Switcheo.carbon.oracle.MsgRemoveOracleResponse", "CreateOracleProposal": "/Switcheo.carbon.oracle.CreateOracleProposal", "SoftwareUpgradeProposal": "/cosmos.upgrade.v1beta1.SoftwareUpgradeProposal", "CancelSoftwareUpgradeProposal": "/cosmos.upgrade.v1beta1.CancelSoftwareUpgradeProposal", @@ -388,8 +397,8 @@ export const TxTypes = { "MsgVoteWeightedResponse": "/cosmos.gov.v1beta1.MsgVoteWeightedResponse", "MsgDeposit": "/cosmos.gov.v1beta1.MsgDeposit", "MsgDepositResponse": "/cosmos.gov.v1beta1.MsgDepositResponse", - "MsgProcessCrossChainTx": "/Switcheo.polynetworkcosmos.ccm.MsgProcessCrossChainTx", - "MsgProcessCrossChainTxResponse": "/Switcheo.polynetworkcosmos.ccm.MsgProcessCrossChainTxResponse", + "MsgProcessCrossChainTx": "/Switcheo.carbon.ccm.MsgProcessCrossChainTx", + "MsgProcessCrossChainTxResponse": "/Switcheo.carbon.ccm.MsgProcessCrossChainTxResponse", "MsgConnectionOpenInit": "/ibc.core.connection.v1.MsgConnectionOpenInit", "MsgConnectionOpenInitResponse": "/ibc.core.connection.v1.MsgConnectionOpenInitResponse", "MsgConnectionOpenTry": "/ibc.core.connection.v1.MsgConnectionOpenTry", @@ -451,6 +460,8 @@ export const TxTypes = { "MsgEditBridgeNameResponse": "/Switcheo.carbon.coin.MsgEditBridgeNameResponse", "MsgRemoveBridge": "/Switcheo.carbon.coin.MsgRemoveBridge", "MsgRemoveBridgeResponse": "/Switcheo.carbon.coin.MsgRemoveBridgeResponse", + "MsgUpdateToken": "/Switcheo.carbon.coin.MsgUpdateToken", + "MsgUpdateTokenResponse": "/Switcheo.carbon.coin.MsgUpdateTokenResponse", "CreateTokenProposal": "/Switcheo.carbon.coin.CreateTokenProposal", "MsgSetLeverage": "/Switcheo.carbon.leverage.MsgSetLeverage", "MsgSetLeverageResponse": "/Switcheo.carbon.leverage.MsgSetLeverageResponse", @@ -466,7 +477,6 @@ export const TxTypes = { "MsgCreateMarketResponse": "/Switcheo.carbon.market.MsgCreateMarketResponse", "MsgUpdateMarket": "/Switcheo.carbon.market.MsgUpdateMarket", "MsgUpdateMarketResponse": "/Switcheo.carbon.market.MsgUpdateMarketResponse", - "CreateMarketProposal": "/Switcheo.carbon.market.CreateMarketProposal", "UpdateMarketProposal": "/Switcheo.carbon.market.UpdateMarketProposal", "MsgCreatePool": "/Switcheo.carbon.liquiditypool.MsgCreatePool", "MsgCreatePoolResponse": "/Switcheo.carbon.liquiditypool.MsgCreatePoolResponse", @@ -511,7 +521,7 @@ export { MessageType } from "./misc/message_type"; export { Transaction, APITransaction } from "./misc/transaction"; export { QuerySearchRequest, QuerySearchResponse, QueryAllMessageTypeRequest, QueryAllMessageTypeResponse, QueryAllTransactionRequest, QueryAllTransactionResponse, QueryAllBlockRequest, QueryAllBlockResponse } from "./misc/query"; export { MsgSetTradingFlag, MsgSetTradingFlagResponse, MsgCreateOrder, MsgCreateOrderResponse, MsgEditOrder, MsgEditOrderResponse, MsgCancelOrder, MsgCancelOrderResponse, MsgCancelAll, MsgCancelAllResponse } from "./order/tx"; -export { Order, APIOrder, DBOrder, OrdersForMarket, OrderIDsForMarket, OrderIDs, Orders } from "./order/order"; +export { Order, DBOrder, OrdersForMarket, OrderIDsForMarket, OrderIDs, Orders } from "./order/order"; export { QueryGetOrderRequest, QueryGetOrderResponse, QueryAllOrderRequest, QueryAllOrderResponse, QueryAccountOpenOrdersRequest, QueryAccountOpenOrdersResponse } from "./order/query"; export { OrderEvent } from "./order/event"; export { MsgAddCollateral, MsgAddCollateralResponse, MsgRemoveCollateral, MsgRemoveCollateralResponse, MsgAddDebt, MsgAddDebtResponse, MsgRemoveDebt, MsgRemoveDebtResponse, MsgCreateVaultType, MsgCreateVaultTypeResponse } from "./cdp/tx"; @@ -544,14 +554,14 @@ export { MsgSetMargin, MsgSetMarginResponse } from "./position/tx"; export { Position, Positions, APIPosition } from "./position/position"; export { QueryGetPositionRequest, QueryGetPositionResponse, QueryAllPositionRequest, QueryAllPositionResponse } from "./position/query"; export { PositionEvent } from "./position/event"; -export { MsgCreateOracle, CreateOracleParams, MsgCreateOracleResponse, MsgCreateVote, MsgCreateVoteResponse } from "./oracle/tx"; +export { MsgCreateOracle, CreateOracleParams, MsgCreateOracleResponse, MsgCreateVote, MsgCreateVoteResponse, MsgUpdateOracle, UpdateOracleParams, MsgUpdateOracleResponse, MsgRemoveOracle, MsgRemoveOracleResponse } from "./oracle/tx"; export { Oracle, Vote, Result, Mark } from "./oracle/oracle"; export { CreateOracleProposal } from "./oracle/proposal"; export { QueryOracleRequest, QueryOracleResponse, QueryAllOracleRequest, QueryAllOracleResponse, QueryAllResultRequest, QueryAllResultResponse, QueryAllVoteRequest, QueryAllVoteResponse, QueryVoterPowerRequest, QueryVoterPowerResponse } from "./oracle/query"; export { NewVoteEvent, RecordVoteEvent, VoteEvent, ResultEvent } from "./oracle/event"; export { QueryParamsRequest, QueryParamsResponse, QueryMarketStatsRequest, QueryMarketStatsResponse } from "./marketstats/query"; export { MarketStats } from "./marketstats/marketstats"; -export { MsgCreateToken, CreateTokenParams, MsgCreateTokenResponse, MsgSyncToken, MsgSyncTokenResponse, MsgMintToken, MsgMintTokenResponse, MsgBindToken, MsgBindTokenResponse, MsgUnbindToken, MsgUnbindTokenResponse, MsgLinkToken, MsgLinkTokenResponse, MsgWithdraw, MsgWithdrawResponse, MsgAuthorizeBridge, MsgAuthorizeBridgeResponse, MsgDeauthorizeBridge, MsgDeauthorizeBridgeResponse, MsgEditBridgeName, MsgEditBridgeNameResponse, MsgRemoveBridge, MsgRemoveBridgeResponse } from "./coin/tx"; +export { MsgCreateToken, CreateTokenParams, MsgCreateTokenResponse, MsgSyncToken, MsgSyncTokenResponse, MsgMintToken, MsgMintTokenResponse, MsgBindToken, MsgBindTokenResponse, MsgUnbindToken, MsgUnbindTokenResponse, MsgLinkToken, MsgLinkTokenResponse, MsgWithdraw, MsgWithdrawResponse, MsgAuthorizeBridge, MsgAuthorizeBridgeResponse, MsgDeauthorizeBridge, MsgDeauthorizeBridgeResponse, MsgEditBridgeName, MsgEditBridgeNameResponse, MsgRemoveBridge, MsgRemoveBridgeResponse, MsgUpdateToken, UpdateTokenParams, MsgUpdateTokenResponse } from "./coin/tx"; export { ExternalTransfer } from "./coin/extevents"; export { CreateTokenProposal } from "./coin/proposal"; export { Bridge } from "./coin/bridge"; @@ -573,7 +583,7 @@ export { OrderBookLevel, OrderBook, StopBook } from "./book/book"; export { QueryGetBookRequest, QueryGetBookResponse, QueryAllBookRequest, QueryAllBookResponse } from "./book/query"; export { OrderBookEvent } from "./book/event"; export { MsgCreateMarket, MsgCreateMarketResponse, MsgUpdateMarket, MsgUpdateMarketResponse } from "./market/tx"; -export { CreateMarketProposal, UpdateMarketProposal } from "./market/proposal"; +export { UpdateMarketProposal } from "./market/proposal"; export { Market, MarketParams } from "./market/market"; export { QueryGetMarketRequest, QueryGetMarketResponse, QueryAllMarketRequest, QueryAllMarketResponse } from "./market/query"; export { MarketEvent } from "./market/event"; diff --git a/src/codec/lockproxy/event.ts b/src/codec/lockproxy/event.ts index 1e35d3b2..bf87b6d0 100644 --- a/src/codec/lockproxy/event.ts +++ b/src/codec/lockproxy/event.ts @@ -2,7 +2,7 @@ import Long from "long"; import _m0 from "protobufjs/minimal"; -export const protobufPackage = "Switcheo.polynetworkcosmos.lockproxy"; +export const protobufPackage = "Switcheo.carbon.lockproxy"; export interface LockEvent { denom: string; diff --git a/src/codec/lockproxy/genesis.ts b/src/codec/lockproxy/genesis.ts index e6658ebd..20f6c8de 100644 --- a/src/codec/lockproxy/genesis.ts +++ b/src/codec/lockproxy/genesis.ts @@ -2,7 +2,7 @@ import Long from "long"; import _m0 from "protobufjs/minimal"; -export const protobufPackage = "Switcheo.polynetworkcosmos.lockproxy"; +export const protobufPackage = "Switcheo.carbon.lockproxy"; /** GenesisState defines the lockproxy module's genesis state. */ export interface GenesisState { diff --git a/src/codec/lockproxy/query.ts b/src/codec/lockproxy/query.ts index 49ace7a5..72dacfe1 100644 --- a/src/codec/lockproxy/query.ts +++ b/src/codec/lockproxy/query.ts @@ -2,7 +2,7 @@ import Long from "long"; import _m0 from "protobufjs/minimal"; -export const protobufPackage = "Switcheo.polynetworkcosmos.lockproxy"; +export const protobufPackage = "Switcheo.carbon.lockproxy"; /** this line is used by starport scaffolding # 3 */ export interface QueryGetProxyRequest { @@ -147,7 +147,7 @@ export class QueryClientImpl implements Query { Proxy(request: QueryGetProxyRequest): Promise { const data = QueryGetProxyRequest.encode(request).finish(); const promise = this.rpc.request( - "Switcheo.polynetworkcosmos.lockproxy.Query", + "Switcheo.carbon.lockproxy.Query", "Proxy", data ); diff --git a/src/codec/lockproxy/tx.ts b/src/codec/lockproxy/tx.ts index 4b5d33e1..0408522c 100644 --- a/src/codec/lockproxy/tx.ts +++ b/src/codec/lockproxy/tx.ts @@ -2,7 +2,7 @@ import Long from "long"; import _m0 from "protobufjs/minimal"; -export const protobufPackage = "Switcheo.polynetworkcosmos.lockproxy"; +export const protobufPackage = "Switcheo.carbon.lockproxy"; /** this line is used by starport scaffolding # proto/tx/message */ export interface MsgCreate { @@ -600,7 +600,7 @@ export class MsgClientImpl implements Msg { Create(request: MsgCreate): Promise { const data = MsgCreate.encode(request).finish(); const promise = this.rpc.request( - "Switcheo.polynetworkcosmos.lockproxy.Msg", + "Switcheo.carbon.lockproxy.Msg", "Create", data ); @@ -612,7 +612,7 @@ export class MsgClientImpl implements Msg { Bind(request: MsgBind): Promise { const data = MsgBind.encode(request).finish(); const promise = this.rpc.request( - "Switcheo.polynetworkcosmos.lockproxy.Msg", + "Switcheo.carbon.lockproxy.Msg", "Bind", data ); @@ -622,7 +622,7 @@ export class MsgClientImpl implements Msg { Lock(request: MsgLock): Promise { const data = MsgLock.encode(request).finish(); const promise = this.rpc.request( - "Switcheo.polynetworkcosmos.lockproxy.Msg", + "Switcheo.carbon.lockproxy.Msg", "Lock", data ); diff --git a/src/codec/market/genesis.ts b/src/codec/market/genesis.ts index ce82b0b0..5dfecf0b 100644 --- a/src/codec/market/genesis.ts +++ b/src/codec/market/genesis.ts @@ -1,7 +1,7 @@ /* eslint-disable */ import Long from "long"; import _m0 from "protobufjs/minimal"; -import { Market } from "../market/market"; +import { Params, Market } from "../market/market"; export const protobufPackage = "Switcheo.carbon.market"; @@ -12,6 +12,8 @@ export interface GenesisState { * this line is used by starport scaffolding # ibc/genesis/proto */ markets: Market[]; + /** params defines all the paramaters of the module. */ + params?: Params; } const baseGenesisState: object = {}; @@ -24,6 +26,9 @@ export const GenesisState = { for (const v of message.markets) { Market.encode(v!, writer.uint32(10).fork()).ldelim(); } + if (message.params !== undefined) { + Params.encode(message.params, writer.uint32(18).fork()).ldelim(); + } return writer; }, @@ -38,6 +43,9 @@ export const GenesisState = { case 1: message.markets.push(Market.decode(reader, reader.uint32())); break; + case 2: + message.params = Params.decode(reader, reader.uint32()); + break; default: reader.skipType(tag & 7); break; @@ -51,6 +59,10 @@ export const GenesisState = { message.markets = (object.markets ?? []).map((e: any) => Market.fromJSON(e) ); + message.params = + object.params !== undefined && object.params !== null + ? Params.fromJSON(object.params) + : undefined; return message; }, @@ -63,12 +75,18 @@ export const GenesisState = { } else { obj.markets = []; } + message.params !== undefined && + (obj.params = message.params ? Params.toJSON(message.params) : undefined); return obj; }, fromPartial(object: DeepPartial): GenesisState { const message = { ...baseGenesisState } as GenesisState; message.markets = (object.markets ?? []).map((e) => Market.fromPartial(e)); + message.params = + object.params !== undefined && object.params !== null + ? Params.fromPartial(object.params) + : undefined; return message; }, }; diff --git a/src/codec/market/market.ts b/src/codec/market/market.ts index ef003633..8ec0bd18 100644 --- a/src/codec/market/market.ts +++ b/src/codec/market/market.ts @@ -11,6 +11,27 @@ import { export const protobufPackage = "Switcheo.carbon.market"; +/** Params defines the parameters for the market module. */ +export interface Params { + defaultLotSizeUsd: string; + defaultTickSizeUsd: string; + defaultMinQuantityUsd: string; + defaultSpotMakerFee: string; + defaultSpotTakerFee: string; + defaultFuturesMakerFee: string; + defaultFuturesTakerFee: string; + defaultRiskStepSizeUsd: string; + defaultInitialMarginBase: string; + defaultInitialMarginStep: string; + defaultMaintenanceMarginRatio: string; + defaultMaxLiquidationOrderTicketUsd: string; + defaultMaxLiquidationOrderDuration?: Duration; + defaultImpactSizeUsd: string; + defaultMarkPriceBand: number; + defaultLastPriceProtectedBand: number; + maxActiveMarkets: number; +} + export interface Market { name: string; displayName: string; @@ -67,6 +88,320 @@ export interface MarketParams { tradingBandwidth?: number; } +const baseParams: object = { + defaultLotSizeUsd: "", + defaultTickSizeUsd: "", + defaultMinQuantityUsd: "", + defaultSpotMakerFee: "", + defaultSpotTakerFee: "", + defaultFuturesMakerFee: "", + defaultFuturesTakerFee: "", + defaultRiskStepSizeUsd: "", + defaultInitialMarginBase: "", + defaultInitialMarginStep: "", + defaultMaintenanceMarginRatio: "", + defaultMaxLiquidationOrderTicketUsd: "", + defaultImpactSizeUsd: "", + defaultMarkPriceBand: 0, + defaultLastPriceProtectedBand: 0, + maxActiveMarkets: 0, +}; + +export const Params = { + encode( + message: Params, + writer: _m0.Writer = _m0.Writer.create() + ): _m0.Writer { + if (message.defaultLotSizeUsd !== "") { + writer.uint32(10).string(message.defaultLotSizeUsd); + } + if (message.defaultTickSizeUsd !== "") { + writer.uint32(18).string(message.defaultTickSizeUsd); + } + if (message.defaultMinQuantityUsd !== "") { + writer.uint32(26).string(message.defaultMinQuantityUsd); + } + if (message.defaultSpotMakerFee !== "") { + writer.uint32(34).string(message.defaultSpotMakerFee); + } + if (message.defaultSpotTakerFee !== "") { + writer.uint32(42).string(message.defaultSpotTakerFee); + } + if (message.defaultFuturesMakerFee !== "") { + writer.uint32(50).string(message.defaultFuturesMakerFee); + } + if (message.defaultFuturesTakerFee !== "") { + writer.uint32(58).string(message.defaultFuturesTakerFee); + } + if (message.defaultRiskStepSizeUsd !== "") { + writer.uint32(66).string(message.defaultRiskStepSizeUsd); + } + if (message.defaultInitialMarginBase !== "") { + writer.uint32(74).string(message.defaultInitialMarginBase); + } + if (message.defaultInitialMarginStep !== "") { + writer.uint32(82).string(message.defaultInitialMarginStep); + } + if (message.defaultMaintenanceMarginRatio !== "") { + writer.uint32(90).string(message.defaultMaintenanceMarginRatio); + } + if (message.defaultMaxLiquidationOrderTicketUsd !== "") { + writer.uint32(98).string(message.defaultMaxLiquidationOrderTicketUsd); + } + if (message.defaultMaxLiquidationOrderDuration !== undefined) { + Duration.encode( + message.defaultMaxLiquidationOrderDuration, + writer.uint32(106).fork() + ).ldelim(); + } + if (message.defaultImpactSizeUsd !== "") { + writer.uint32(114).string(message.defaultImpactSizeUsd); + } + if (message.defaultMarkPriceBand !== 0) { + writer.uint32(120).uint32(message.defaultMarkPriceBand); + } + if (message.defaultLastPriceProtectedBand !== 0) { + writer.uint32(128).uint32(message.defaultLastPriceProtectedBand); + } + if (message.maxActiveMarkets !== 0) { + writer.uint32(136).uint32(message.maxActiveMarkets); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): Params { + const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = { ...baseParams } as Params; + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.defaultLotSizeUsd = reader.string(); + break; + case 2: + message.defaultTickSizeUsd = reader.string(); + break; + case 3: + message.defaultMinQuantityUsd = reader.string(); + break; + case 4: + message.defaultSpotMakerFee = reader.string(); + break; + case 5: + message.defaultSpotTakerFee = reader.string(); + break; + case 6: + message.defaultFuturesMakerFee = reader.string(); + break; + case 7: + message.defaultFuturesTakerFee = reader.string(); + break; + case 8: + message.defaultRiskStepSizeUsd = reader.string(); + break; + case 9: + message.defaultInitialMarginBase = reader.string(); + break; + case 10: + message.defaultInitialMarginStep = reader.string(); + break; + case 11: + message.defaultMaintenanceMarginRatio = reader.string(); + break; + case 12: + message.defaultMaxLiquidationOrderTicketUsd = reader.string(); + break; + case 13: + message.defaultMaxLiquidationOrderDuration = Duration.decode( + reader, + reader.uint32() + ); + break; + case 14: + message.defaultImpactSizeUsd = reader.string(); + break; + case 15: + message.defaultMarkPriceBand = reader.uint32(); + break; + case 16: + message.defaultLastPriceProtectedBand = reader.uint32(); + break; + case 17: + message.maxActiveMarkets = reader.uint32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + + fromJSON(object: any): Params { + const message = { ...baseParams } as Params; + message.defaultLotSizeUsd = + object.defaultLotSizeUsd !== undefined && + object.defaultLotSizeUsd !== null + ? String(object.defaultLotSizeUsd) + : ""; + message.defaultTickSizeUsd = + object.defaultTickSizeUsd !== undefined && + object.defaultTickSizeUsd !== null + ? String(object.defaultTickSizeUsd) + : ""; + message.defaultMinQuantityUsd = + object.defaultMinQuantityUsd !== undefined && + object.defaultMinQuantityUsd !== null + ? String(object.defaultMinQuantityUsd) + : ""; + message.defaultSpotMakerFee = + object.defaultSpotMakerFee !== undefined && + object.defaultSpotMakerFee !== null + ? String(object.defaultSpotMakerFee) + : ""; + message.defaultSpotTakerFee = + object.defaultSpotTakerFee !== undefined && + object.defaultSpotTakerFee !== null + ? String(object.defaultSpotTakerFee) + : ""; + message.defaultFuturesMakerFee = + object.defaultFuturesMakerFee !== undefined && + object.defaultFuturesMakerFee !== null + ? String(object.defaultFuturesMakerFee) + : ""; + message.defaultFuturesTakerFee = + object.defaultFuturesTakerFee !== undefined && + object.defaultFuturesTakerFee !== null + ? String(object.defaultFuturesTakerFee) + : ""; + message.defaultRiskStepSizeUsd = + object.defaultRiskStepSizeUsd !== undefined && + object.defaultRiskStepSizeUsd !== null + ? String(object.defaultRiskStepSizeUsd) + : ""; + message.defaultInitialMarginBase = + object.defaultInitialMarginBase !== undefined && + object.defaultInitialMarginBase !== null + ? String(object.defaultInitialMarginBase) + : ""; + message.defaultInitialMarginStep = + object.defaultInitialMarginStep !== undefined && + object.defaultInitialMarginStep !== null + ? String(object.defaultInitialMarginStep) + : ""; + message.defaultMaintenanceMarginRatio = + object.defaultMaintenanceMarginRatio !== undefined && + object.defaultMaintenanceMarginRatio !== null + ? String(object.defaultMaintenanceMarginRatio) + : ""; + message.defaultMaxLiquidationOrderTicketUsd = + object.defaultMaxLiquidationOrderTicketUsd !== undefined && + object.defaultMaxLiquidationOrderTicketUsd !== null + ? String(object.defaultMaxLiquidationOrderTicketUsd) + : ""; + message.defaultMaxLiquidationOrderDuration = + object.defaultMaxLiquidationOrderDuration !== undefined && + object.defaultMaxLiquidationOrderDuration !== null + ? Duration.fromJSON(object.defaultMaxLiquidationOrderDuration) + : undefined; + message.defaultImpactSizeUsd = + object.defaultImpactSizeUsd !== undefined && + object.defaultImpactSizeUsd !== null + ? String(object.defaultImpactSizeUsd) + : ""; + message.defaultMarkPriceBand = + object.defaultMarkPriceBand !== undefined && + object.defaultMarkPriceBand !== null + ? Number(object.defaultMarkPriceBand) + : 0; + message.defaultLastPriceProtectedBand = + object.defaultLastPriceProtectedBand !== undefined && + object.defaultLastPriceProtectedBand !== null + ? Number(object.defaultLastPriceProtectedBand) + : 0; + message.maxActiveMarkets = + object.maxActiveMarkets !== undefined && object.maxActiveMarkets !== null + ? Number(object.maxActiveMarkets) + : 0; + return message; + }, + + toJSON(message: Params): unknown { + const obj: any = {}; + message.defaultLotSizeUsd !== undefined && + (obj.defaultLotSizeUsd = message.defaultLotSizeUsd); + message.defaultTickSizeUsd !== undefined && + (obj.defaultTickSizeUsd = message.defaultTickSizeUsd); + message.defaultMinQuantityUsd !== undefined && + (obj.defaultMinQuantityUsd = message.defaultMinQuantityUsd); + message.defaultSpotMakerFee !== undefined && + (obj.defaultSpotMakerFee = message.defaultSpotMakerFee); + message.defaultSpotTakerFee !== undefined && + (obj.defaultSpotTakerFee = message.defaultSpotTakerFee); + message.defaultFuturesMakerFee !== undefined && + (obj.defaultFuturesMakerFee = message.defaultFuturesMakerFee); + message.defaultFuturesTakerFee !== undefined && + (obj.defaultFuturesTakerFee = message.defaultFuturesTakerFee); + message.defaultRiskStepSizeUsd !== undefined && + (obj.defaultRiskStepSizeUsd = message.defaultRiskStepSizeUsd); + message.defaultInitialMarginBase !== undefined && + (obj.defaultInitialMarginBase = message.defaultInitialMarginBase); + message.defaultInitialMarginStep !== undefined && + (obj.defaultInitialMarginStep = message.defaultInitialMarginStep); + message.defaultMaintenanceMarginRatio !== undefined && + (obj.defaultMaintenanceMarginRatio = + message.defaultMaintenanceMarginRatio); + message.defaultMaxLiquidationOrderTicketUsd !== undefined && + (obj.defaultMaxLiquidationOrderTicketUsd = + message.defaultMaxLiquidationOrderTicketUsd); + message.defaultMaxLiquidationOrderDuration !== undefined && + (obj.defaultMaxLiquidationOrderDuration = + message.defaultMaxLiquidationOrderDuration + ? Duration.toJSON(message.defaultMaxLiquidationOrderDuration) + : undefined); + message.defaultImpactSizeUsd !== undefined && + (obj.defaultImpactSizeUsd = message.defaultImpactSizeUsd); + message.defaultMarkPriceBand !== undefined && + (obj.defaultMarkPriceBand = message.defaultMarkPriceBand); + message.defaultLastPriceProtectedBand !== undefined && + (obj.defaultLastPriceProtectedBand = + message.defaultLastPriceProtectedBand); + message.maxActiveMarkets !== undefined && + (obj.maxActiveMarkets = message.maxActiveMarkets); + return obj; + }, + + fromPartial(object: DeepPartial): Params { + const message = { ...baseParams } as Params; + message.defaultLotSizeUsd = object.defaultLotSizeUsd ?? ""; + message.defaultTickSizeUsd = object.defaultTickSizeUsd ?? ""; + message.defaultMinQuantityUsd = object.defaultMinQuantityUsd ?? ""; + message.defaultSpotMakerFee = object.defaultSpotMakerFee ?? ""; + message.defaultSpotTakerFee = object.defaultSpotTakerFee ?? ""; + message.defaultFuturesMakerFee = object.defaultFuturesMakerFee ?? ""; + message.defaultFuturesTakerFee = object.defaultFuturesTakerFee ?? ""; + message.defaultRiskStepSizeUsd = object.defaultRiskStepSizeUsd ?? ""; + message.defaultInitialMarginBase = object.defaultInitialMarginBase ?? ""; + message.defaultInitialMarginStep = object.defaultInitialMarginStep ?? ""; + message.defaultMaintenanceMarginRatio = + object.defaultMaintenanceMarginRatio ?? ""; + message.defaultMaxLiquidationOrderTicketUsd = + object.defaultMaxLiquidationOrderTicketUsd ?? ""; + message.defaultMaxLiquidationOrderDuration = + object.defaultMaxLiquidationOrderDuration !== undefined && + object.defaultMaxLiquidationOrderDuration !== null + ? Duration.fromPartial(object.defaultMaxLiquidationOrderDuration) + : undefined; + message.defaultImpactSizeUsd = object.defaultImpactSizeUsd ?? ""; + message.defaultMarkPriceBand = object.defaultMarkPriceBand ?? 0; + message.defaultLastPriceProtectedBand = + object.defaultLastPriceProtectedBand ?? 0; + message.maxActiveMarkets = object.maxActiveMarkets ?? 0; + return message; + }, +}; + const baseMarket: object = { name: "", displayName: "", diff --git a/src/codec/market/proposal.ts b/src/codec/market/proposal.ts index 22b14afb..7684d9d1 100644 --- a/src/codec/market/proposal.ts +++ b/src/codec/market/proposal.ts @@ -1,107 +1,16 @@ /* eslint-disable */ import Long from "long"; import _m0 from "protobufjs/minimal"; -import { Market, MarketParams } from "../market/market"; +import { MarketParams } from "../market/market"; export const protobufPackage = "Switcheo.carbon.market"; -export interface CreateMarketProposal { - title: string; - description: string; - msg?: Market; -} - export interface UpdateMarketProposal { title: string; description: string; msg?: MarketParams; } -const baseCreateMarketProposal: object = { title: "", description: "" }; - -export const CreateMarketProposal = { - encode( - message: CreateMarketProposal, - writer: _m0.Writer = _m0.Writer.create() - ): _m0.Writer { - if (message.title !== "") { - writer.uint32(10).string(message.title); - } - if (message.description !== "") { - writer.uint32(18).string(message.description); - } - if (message.msg !== undefined) { - Market.encode(message.msg, writer.uint32(26).fork()).ldelim(); - } - return writer; - }, - - decode( - input: _m0.Reader | Uint8Array, - length?: number - ): CreateMarketProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); - let end = length === undefined ? reader.len : reader.pos + length; - const message = { ...baseCreateMarketProposal } as CreateMarketProposal; - 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.msg = Market.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }, - - fromJSON(object: any): CreateMarketProposal { - const message = { ...baseCreateMarketProposal } as CreateMarketProposal; - message.title = - object.title !== undefined && object.title !== null - ? String(object.title) - : ""; - message.description = - object.description !== undefined && object.description !== null - ? String(object.description) - : ""; - message.msg = - object.msg !== undefined && object.msg !== null - ? Market.fromJSON(object.msg) - : undefined; - return message; - }, - - toJSON(message: CreateMarketProposal): unknown { - const obj: any = {}; - message.title !== undefined && (obj.title = message.title); - message.description !== undefined && - (obj.description = message.description); - message.msg !== undefined && - (obj.msg = message.msg ? Market.toJSON(message.msg) : undefined); - return obj; - }, - - fromPartial(object: DeepPartial): CreateMarketProposal { - const message = { ...baseCreateMarketProposal } as CreateMarketProposal; - message.title = object.title ?? ""; - message.description = object.description ?? ""; - message.msg = - object.msg !== undefined && object.msg !== null - ? Market.fromPartial(object.msg) - : undefined; - return message; - }, -}; - const baseUpdateMarketProposal: object = { title: "", description: "" }; export const UpdateMarketProposal = { diff --git a/src/codec/market/tx.ts b/src/codec/market/tx.ts index 6262080b..f58a2f7c 100644 --- a/src/codec/market/tx.ts +++ b/src/codec/market/tx.ts @@ -1,14 +1,22 @@ /* eslint-disable */ import Long from "long"; import _m0 from "protobufjs/minimal"; -import { Market, MarketParams } from "../market/market"; +import { MarketParams } from "../market/market"; +import { Timestamp } from "../google/protobuf/timestamp"; export const protobufPackage = "Switcheo.carbon.market"; /** this line is used by starport scaffolding # proto/tx/message */ export interface MsgCreateMarket { creator: string; - market?: Market; + marketType: string; + base: string; + quote: string; + currentBasePriceUsd: string; + currentQuotePriceUsd: string; + /** futures only */ + indexOracleId: string; + expiryTime?: Date; } export interface MsgCreateMarketResponse { @@ -22,7 +30,15 @@ export interface MsgUpdateMarket { export interface MsgUpdateMarketResponse {} -const baseMsgCreateMarket: object = { creator: "" }; +const baseMsgCreateMarket: object = { + creator: "", + marketType: "", + base: "", + quote: "", + currentBasePriceUsd: "", + currentQuotePriceUsd: "", + indexOracleId: "", +}; export const MsgCreateMarket = { encode( @@ -32,8 +48,29 @@ export const MsgCreateMarket = { if (message.creator !== "") { writer.uint32(10).string(message.creator); } - if (message.market !== undefined) { - Market.encode(message.market, writer.uint32(18).fork()).ldelim(); + if (message.marketType !== "") { + writer.uint32(26).string(message.marketType); + } + if (message.base !== "") { + writer.uint32(34).string(message.base); + } + if (message.quote !== "") { + writer.uint32(42).string(message.quote); + } + if (message.currentBasePriceUsd !== "") { + writer.uint32(50).string(message.currentBasePriceUsd); + } + if (message.currentQuotePriceUsd !== "") { + writer.uint32(58).string(message.currentQuotePriceUsd); + } + if (message.indexOracleId !== "") { + writer.uint32(82).string(message.indexOracleId); + } + if (message.expiryTime !== undefined) { + Timestamp.encode( + toTimestamp(message.expiryTime), + writer.uint32(90).fork() + ).ldelim(); } return writer; }, @@ -48,8 +85,28 @@ export const MsgCreateMarket = { case 1: message.creator = reader.string(); break; - case 2: - message.market = Market.decode(reader, reader.uint32()); + case 3: + message.marketType = reader.string(); + break; + case 4: + message.base = reader.string(); + break; + case 5: + message.quote = reader.string(); + break; + case 6: + message.currentBasePriceUsd = reader.string(); + break; + case 7: + message.currentQuotePriceUsd = reader.string(); + break; + case 10: + message.indexOracleId = reader.string(); + break; + case 11: + message.expiryTime = fromTimestamp( + Timestamp.decode(reader, reader.uint32()) + ); break; default: reader.skipType(tag & 7); @@ -65,9 +122,35 @@ export const MsgCreateMarket = { object.creator !== undefined && object.creator !== null ? String(object.creator) : ""; - message.market = - object.market !== undefined && object.market !== null - ? Market.fromJSON(object.market) + message.marketType = + object.marketType !== undefined && object.marketType !== null + ? String(object.marketType) + : ""; + message.base = + object.base !== undefined && object.base !== null + ? String(object.base) + : ""; + message.quote = + object.quote !== undefined && object.quote !== null + ? String(object.quote) + : ""; + message.currentBasePriceUsd = + object.currentBasePriceUsd !== undefined && + object.currentBasePriceUsd !== null + ? String(object.currentBasePriceUsd) + : ""; + message.currentQuotePriceUsd = + object.currentQuotePriceUsd !== undefined && + object.currentQuotePriceUsd !== null + ? String(object.currentQuotePriceUsd) + : ""; + message.indexOracleId = + object.indexOracleId !== undefined && object.indexOracleId !== null + ? String(object.indexOracleId) + : ""; + message.expiryTime = + object.expiryTime !== undefined && object.expiryTime !== null + ? fromJsonTimestamp(object.expiryTime) : undefined; return message; }, @@ -75,18 +158,30 @@ export const MsgCreateMarket = { toJSON(message: MsgCreateMarket): unknown { const obj: any = {}; message.creator !== undefined && (obj.creator = message.creator); - message.market !== undefined && - (obj.market = message.market ? Market.toJSON(message.market) : undefined); + message.marketType !== undefined && (obj.marketType = message.marketType); + message.base !== undefined && (obj.base = message.base); + message.quote !== undefined && (obj.quote = message.quote); + message.currentBasePriceUsd !== undefined && + (obj.currentBasePriceUsd = message.currentBasePriceUsd); + message.currentQuotePriceUsd !== undefined && + (obj.currentQuotePriceUsd = message.currentQuotePriceUsd); + message.indexOracleId !== undefined && + (obj.indexOracleId = message.indexOracleId); + message.expiryTime !== undefined && + (obj.expiryTime = message.expiryTime.toISOString()); return obj; }, fromPartial(object: DeepPartial): MsgCreateMarket { const message = { ...baseMsgCreateMarket } as MsgCreateMarket; message.creator = object.creator ?? ""; - message.market = - object.market !== undefined && object.market !== null - ? Market.fromPartial(object.market) - : undefined; + message.marketType = object.marketType ?? ""; + message.base = object.base ?? ""; + message.quote = object.quote ?? ""; + message.currentBasePriceUsd = object.currentBasePriceUsd ?? ""; + message.currentQuotePriceUsd = object.currentQuotePriceUsd ?? ""; + message.indexOracleId = object.indexOracleId ?? ""; + message.expiryTime = object.expiryTime ?? undefined; return message; }, }; @@ -348,6 +443,32 @@ export type DeepPartial = T extends Builtin ? { [K in keyof T]?: DeepPartial } : Partial; +function toTimestamp(date: Date): Timestamp { + const seconds = numberToLong(date.getTime() / 1_000); + const nanos = (date.getTime() % 1_000) * 1_000_000; + return { seconds, nanos }; +} + +function fromTimestamp(t: Timestamp): Date { + let millis = t.seconds.toNumber() * 1_000; + millis += t.nanos / 1_000_000; + return new Date(millis); +} + +function fromJsonTimestamp(o: any): Date { + if (o instanceof Date) { + return o; + } else if (typeof o === "string") { + return new Date(o); + } else { + return fromTimestamp(Timestamp.fromJSON(o)); + } +} + +function numberToLong(number: number) { + return Long.fromNumber(number); +} + if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/src/codec/misc/block.ts b/src/codec/misc/block.ts index bc077a42..a4712c27 100644 --- a/src/codec/misc/block.ts +++ b/src/codec/misc/block.ts @@ -11,9 +11,12 @@ export interface Block { proposerAddress: string; } -function createBaseBlock(): Block { - return { blockHeight: Long.UZERO, time: "", count: 0, proposerAddress: "" }; -} +const baseBlock: object = { + blockHeight: Long.UZERO, + time: "", + count: 0, + proposerAddress: "", +}; export const Block = { encode(message: Block, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { @@ -35,7 +38,7 @@ export const Block = { decode(input: _m0.Reader | Uint8Array, length?: number): Block { const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseBlock(); + const message = { ...baseBlock } as Block; while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { @@ -60,7 +63,7 @@ export const Block = { }, fromJSON(object: any): Block { - const message = createBaseBlock(); + const message = { ...baseBlock } as Block; message.blockHeight = object.blockHeight !== undefined && object.blockHeight !== null ? Long.fromString(object.blockHeight) @@ -85,14 +88,14 @@ export const Block = { message.blockHeight !== undefined && (obj.blockHeight = (message.blockHeight || Long.UZERO).toString()); message.time !== undefined && (obj.time = message.time); - message.count !== undefined && (obj.count = Math.round(message.count)); + message.count !== undefined && (obj.count = message.count); message.proposerAddress !== undefined && (obj.proposerAddress = message.proposerAddress); return obj; }, - fromPartial, I>>(object: I): Block { - const message = createBaseBlock(); + fromPartial(object: DeepPartial): Block { + const message = { ...baseBlock } as Block; message.blockHeight = object.blockHeight !== undefined && object.blockHeight !== null ? Long.fromValue(object.blockHeight) @@ -112,7 +115,6 @@ type Builtin = | number | boolean | undefined; - export type DeepPartial = T extends Builtin ? T : T extends Long @@ -125,14 +127,6 @@ export type DeepPartial = T extends Builtin ? { [K in keyof T]?: DeepPartial } : Partial; -type KeysOfUnion = T extends T ? keyof T : never; -export type Exact = P extends Builtin - ? P - : P & { [K in keyof P]: Exact } & Record< - Exclude>, - never - >; - if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/src/codec/misc/message.ts b/src/codec/misc/message.ts index 831445b4..9e636762 100644 --- a/src/codec/misc/message.ts +++ b/src/codec/misc/message.ts @@ -13,14 +13,7 @@ export interface Message { blockCreatedAt?: Date; } -function createBaseMessage(): Message { - return { - hash: "", - message: "", - messageType: undefined, - blockCreatedAt: undefined, - }; -} +const baseMessage: object = { hash: "", message: "" }; export const Message = { encode( @@ -51,7 +44,7 @@ export const Message = { decode(input: _m0.Reader | Uint8Array, length?: number): Message { const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseMessage(); + const message = { ...baseMessage } as Message; while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { @@ -78,7 +71,7 @@ export const Message = { }, fromJSON(object: any): Message { - const message = createBaseMessage(); + const message = { ...baseMessage } as Message; message.hash = object.hash !== undefined && object.hash !== null ? String(object.hash) @@ -111,8 +104,8 @@ export const Message = { return obj; }, - fromPartial, I>>(object: I): Message { - const message = createBaseMessage(); + fromPartial(object: DeepPartial): Message { + const message = { ...baseMessage } as Message; message.hash = object.hash ?? ""; message.message = object.message ?? ""; message.messageType = @@ -132,7 +125,6 @@ type Builtin = | number | boolean | undefined; - export type DeepPartial = T extends Builtin ? T : T extends Long @@ -145,14 +137,6 @@ export type DeepPartial = T extends Builtin ? { [K in keyof T]?: DeepPartial } : Partial; -type KeysOfUnion = T extends T ? keyof T : never; -export type Exact = P extends Builtin - ? P - : P & { [K in keyof P]: Exact } & Record< - Exclude>, - never - >; - function toTimestamp(date: Date): Timestamp { const seconds = numberToLong(date.getTime() / 1_000); const nanos = (date.getTime() % 1_000) * 1_000_000; diff --git a/src/codec/misc/message_type.ts b/src/codec/misc/message_type.ts index dc81b86c..a938478c 100644 --- a/src/codec/misc/message_type.ts +++ b/src/codec/misc/message_type.ts @@ -8,9 +8,7 @@ export interface MessageType { messageType: string; } -function createBaseMessageType(): MessageType { - return { messageType: "" }; -} +const baseMessageType: object = { messageType: "" }; export const MessageType = { encode( @@ -26,7 +24,7 @@ export const MessageType = { decode(input: _m0.Reader | Uint8Array, length?: number): MessageType { const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseMessageType(); + const message = { ...baseMessageType } as MessageType; while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { @@ -42,7 +40,7 @@ export const MessageType = { }, fromJSON(object: any): MessageType { - const message = createBaseMessageType(); + const message = { ...baseMessageType } as MessageType; message.messageType = object.messageType !== undefined && object.messageType !== null ? String(object.messageType) @@ -57,10 +55,8 @@ export const MessageType = { return obj; }, - fromPartial, I>>( - object: I - ): MessageType { - const message = createBaseMessageType(); + fromPartial(object: DeepPartial): MessageType { + const message = { ...baseMessageType } as MessageType; message.messageType = object.messageType ?? ""; return message; }, @@ -74,7 +70,6 @@ type Builtin = | number | boolean | undefined; - export type DeepPartial = T extends Builtin ? T : T extends Long @@ -87,14 +82,6 @@ export type DeepPartial = T extends Builtin ? { [K in keyof T]?: DeepPartial } : Partial; -type KeysOfUnion = T extends T ? keyof T : never; -export type Exact = P extends Builtin - ? P - : P & { [K in keyof P]: Exact } & Record< - Exclude>, - never - >; - if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/src/codec/misc/query.ts b/src/codec/misc/query.ts index 891c15c5..36fd63b6 100644 --- a/src/codec/misc/query.ts +++ b/src/codec/misc/query.ts @@ -3,7 +3,7 @@ import Long from "long"; import _m0 from "protobufjs/minimal"; import { PageRequest, PageResponse } from "../query/pagination"; import { Transaction } from "../misc/transaction"; -import { APIOrder } from "../order/order"; +import { Order } from "../order/order"; import { MessageType } from "../misc/message_type"; import { Block } from "../misc/block"; @@ -16,7 +16,7 @@ export interface QuerySearchRequest { export interface QuerySearchResponse { transactions: Transaction[]; - orders: APIOrder[]; + orders: Order[]; } export interface QueryAllMessageTypeRequest {} @@ -46,9 +46,7 @@ export interface QueryAllBlockResponse { pagination?: PageResponse; } -function createBaseQuerySearchRequest(): QuerySearchRequest { - return { keyword: "", limit: Long.UZERO }; -} +const baseQuerySearchRequest: object = { keyword: "", limit: Long.UZERO }; export const QuerySearchRequest = { encode( @@ -67,7 +65,7 @@ export const QuerySearchRequest = { decode(input: _m0.Reader | Uint8Array, length?: number): QuerySearchRequest { const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseQuerySearchRequest(); + const message = { ...baseQuerySearchRequest } as QuerySearchRequest; while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { @@ -86,7 +84,7 @@ export const QuerySearchRequest = { }, fromJSON(object: any): QuerySearchRequest { - const message = createBaseQuerySearchRequest(); + const message = { ...baseQuerySearchRequest } as QuerySearchRequest; message.keyword = object.keyword !== undefined && object.keyword !== null ? String(object.keyword) @@ -106,10 +104,8 @@ export const QuerySearchRequest = { return obj; }, - fromPartial, I>>( - object: I - ): QuerySearchRequest { - const message = createBaseQuerySearchRequest(); + fromPartial(object: DeepPartial): QuerySearchRequest { + const message = { ...baseQuerySearchRequest } as QuerySearchRequest; message.keyword = object.keyword ?? ""; message.limit = object.limit !== undefined && object.limit !== null @@ -119,9 +115,7 @@ export const QuerySearchRequest = { }, }; -function createBaseQuerySearchResponse(): QuerySearchResponse { - return { transactions: [], orders: [] }; -} +const baseQuerySearchResponse: object = {}; export const QuerySearchResponse = { encode( @@ -132,7 +126,7 @@ export const QuerySearchResponse = { Transaction.encode(v!, writer.uint32(10).fork()).ldelim(); } for (const v of message.orders) { - APIOrder.encode(v!, writer.uint32(18).fork()).ldelim(); + Order.encode(v!, writer.uint32(18).fork()).ldelim(); } return writer; }, @@ -140,7 +134,9 @@ export const QuerySearchResponse = { decode(input: _m0.Reader | Uint8Array, length?: number): QuerySearchResponse { const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseQuerySearchResponse(); + const message = { ...baseQuerySearchResponse } as QuerySearchResponse; + message.transactions = []; + message.orders = []; while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { @@ -150,7 +146,7 @@ export const QuerySearchResponse = { ); break; case 2: - message.orders.push(APIOrder.decode(reader, reader.uint32())); + message.orders.push(Order.decode(reader, reader.uint32())); break; default: reader.skipType(tag & 7); @@ -161,13 +157,11 @@ export const QuerySearchResponse = { }, fromJSON(object: any): QuerySearchResponse { - const message = createBaseQuerySearchResponse(); + const message = { ...baseQuerySearchResponse } as QuerySearchResponse; message.transactions = (object.transactions ?? []).map((e: any) => Transaction.fromJSON(e) ); - message.orders = (object.orders ?? []).map((e: any) => - APIOrder.fromJSON(e) - ); + message.orders = (object.orders ?? []).map((e: any) => Order.fromJSON(e)); return message; }, @@ -181,29 +175,24 @@ export const QuerySearchResponse = { obj.transactions = []; } if (message.orders) { - obj.orders = message.orders.map((e) => - e ? APIOrder.toJSON(e) : undefined - ); + obj.orders = message.orders.map((e) => (e ? Order.toJSON(e) : undefined)); } else { obj.orders = []; } return obj; }, - fromPartial, I>>( - object: I - ): QuerySearchResponse { - const message = createBaseQuerySearchResponse(); - message.transactions = - object.transactions?.map((e) => Transaction.fromPartial(e)) || []; - message.orders = object.orders?.map((e) => APIOrder.fromPartial(e)) || []; + fromPartial(object: DeepPartial): QuerySearchResponse { + const message = { ...baseQuerySearchResponse } as QuerySearchResponse; + message.transactions = (object.transactions ?? []).map((e) => + Transaction.fromPartial(e) + ); + message.orders = (object.orders ?? []).map((e) => Order.fromPartial(e)); return message; }, }; -function createBaseQueryAllMessageTypeRequest(): QueryAllMessageTypeRequest { - return {}; -} +const baseQueryAllMessageTypeRequest: object = {}; export const QueryAllMessageTypeRequest = { encode( @@ -219,7 +208,9 @@ export const QueryAllMessageTypeRequest = { ): QueryAllMessageTypeRequest { const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseQueryAllMessageTypeRequest(); + const message = { + ...baseQueryAllMessageTypeRequest, + } as QueryAllMessageTypeRequest; while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { @@ -232,7 +223,9 @@ export const QueryAllMessageTypeRequest = { }, fromJSON(_: any): QueryAllMessageTypeRequest { - const message = createBaseQueryAllMessageTypeRequest(); + const message = { + ...baseQueryAllMessageTypeRequest, + } as QueryAllMessageTypeRequest; return message; }, @@ -241,17 +234,17 @@ export const QueryAllMessageTypeRequest = { return obj; }, - fromPartial, I>>( - _: I + fromPartial( + _: DeepPartial ): QueryAllMessageTypeRequest { - const message = createBaseQueryAllMessageTypeRequest(); + const message = { + ...baseQueryAllMessageTypeRequest, + } as QueryAllMessageTypeRequest; return message; }, }; -function createBaseQueryAllMessageTypeResponse(): QueryAllMessageTypeResponse { - return { messageTypes: [] }; -} +const baseQueryAllMessageTypeResponse: object = {}; export const QueryAllMessageTypeResponse = { encode( @@ -270,7 +263,10 @@ export const QueryAllMessageTypeResponse = { ): QueryAllMessageTypeResponse { const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseQueryAllMessageTypeResponse(); + const message = { + ...baseQueryAllMessageTypeResponse, + } as QueryAllMessageTypeResponse; + message.messageTypes = []; while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { @@ -288,7 +284,9 @@ export const QueryAllMessageTypeResponse = { }, fromJSON(object: any): QueryAllMessageTypeResponse { - const message = createBaseQueryAllMessageTypeResponse(); + const message = { + ...baseQueryAllMessageTypeResponse, + } as QueryAllMessageTypeResponse; message.messageTypes = (object.messageTypes ?? []).map((e: any) => MessageType.fromJSON(e) ); @@ -307,19 +305,24 @@ export const QueryAllMessageTypeResponse = { return obj; }, - fromPartial, I>>( - object: I + fromPartial( + object: DeepPartial ): QueryAllMessageTypeResponse { - const message = createBaseQueryAllMessageTypeResponse(); - message.messageTypes = - object.messageTypes?.map((e) => MessageType.fromPartial(e)) || []; + const message = { + ...baseQueryAllMessageTypeResponse, + } as QueryAllMessageTypeResponse; + message.messageTypes = (object.messageTypes ?? []).map((e) => + MessageType.fromPartial(e) + ); return message; }, }; -function createBaseQueryAllTransactionRequest(): QueryAllTransactionRequest { - return { hash: "", address: "", msgTypeFilters: [], pagination: undefined }; -} +const baseQueryAllTransactionRequest: object = { + hash: "", + address: "", + msgTypeFilters: "", +}; export const QueryAllTransactionRequest = { encode( @@ -347,7 +350,10 @@ export const QueryAllTransactionRequest = { ): QueryAllTransactionRequest { const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseQueryAllTransactionRequest(); + const message = { + ...baseQueryAllTransactionRequest, + } as QueryAllTransactionRequest; + message.msgTypeFilters = []; while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { @@ -372,7 +378,9 @@ export const QueryAllTransactionRequest = { }, fromJSON(object: any): QueryAllTransactionRequest { - const message = createBaseQueryAllTransactionRequest(); + const message = { + ...baseQueryAllTransactionRequest, + } as QueryAllTransactionRequest; message.hash = object.hash !== undefined && object.hash !== null ? String(object.hash) @@ -407,13 +415,15 @@ export const QueryAllTransactionRequest = { return obj; }, - fromPartial, I>>( - object: I + fromPartial( + object: DeepPartial ): QueryAllTransactionRequest { - const message = createBaseQueryAllTransactionRequest(); + const message = { + ...baseQueryAllTransactionRequest, + } as QueryAllTransactionRequest; message.hash = object.hash ?? ""; message.address = object.address ?? ""; - message.msgTypeFilters = object.msgTypeFilters?.map((e) => e) || []; + message.msgTypeFilters = (object.msgTypeFilters ?? []).map((e) => e); message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) @@ -422,9 +432,7 @@ export const QueryAllTransactionRequest = { }, }; -function createBaseQueryAllTransactionResponse(): QueryAllTransactionResponse { - return { transactions: [], pagination: undefined }; -} +const baseQueryAllTransactionResponse: object = {}; export const QueryAllTransactionResponse = { encode( @@ -449,7 +457,10 @@ export const QueryAllTransactionResponse = { ): QueryAllTransactionResponse { const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseQueryAllTransactionResponse(); + const message = { + ...baseQueryAllTransactionResponse, + } as QueryAllTransactionResponse; + message.transactions = []; while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { @@ -470,7 +481,9 @@ export const QueryAllTransactionResponse = { }, fromJSON(object: any): QueryAllTransactionResponse { - const message = createBaseQueryAllTransactionResponse(); + const message = { + ...baseQueryAllTransactionResponse, + } as QueryAllTransactionResponse; message.transactions = (object.transactions ?? []).map((e: any) => Transaction.fromJSON(e) ); @@ -497,12 +510,15 @@ export const QueryAllTransactionResponse = { return obj; }, - fromPartial, I>>( - object: I + fromPartial( + object: DeepPartial ): QueryAllTransactionResponse { - const message = createBaseQueryAllTransactionResponse(); - message.transactions = - object.transactions?.map((e) => Transaction.fromPartial(e)) || []; + const message = { + ...baseQueryAllTransactionResponse, + } as QueryAllTransactionResponse; + message.transactions = (object.transactions ?? []).map((e) => + Transaction.fromPartial(e) + ); message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) @@ -511,9 +527,7 @@ export const QueryAllTransactionResponse = { }, }; -function createBaseQueryAllBlockRequest(): QueryAllBlockRequest { - return { pagination: undefined }; -} +const baseQueryAllBlockRequest: object = {}; export const QueryAllBlockRequest = { encode( @@ -532,7 +546,7 @@ export const QueryAllBlockRequest = { ): QueryAllBlockRequest { const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseQueryAllBlockRequest(); + const message = { ...baseQueryAllBlockRequest } as QueryAllBlockRequest; while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { @@ -548,7 +562,7 @@ export const QueryAllBlockRequest = { }, fromJSON(object: any): QueryAllBlockRequest { - const message = createBaseQueryAllBlockRequest(); + const message = { ...baseQueryAllBlockRequest } as QueryAllBlockRequest; message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromJSON(object.pagination) @@ -565,10 +579,8 @@ export const QueryAllBlockRequest = { return obj; }, - fromPartial, I>>( - object: I - ): QueryAllBlockRequest { - const message = createBaseQueryAllBlockRequest(); + fromPartial(object: DeepPartial): QueryAllBlockRequest { + const message = { ...baseQueryAllBlockRequest } as QueryAllBlockRequest; message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) @@ -577,9 +589,7 @@ export const QueryAllBlockRequest = { }, }; -function createBaseQueryAllBlockResponse(): QueryAllBlockResponse { - return { blocks: [], pagination: undefined }; -} +const baseQueryAllBlockResponse: object = {}; export const QueryAllBlockResponse = { encode( @@ -604,7 +614,8 @@ export const QueryAllBlockResponse = { ): QueryAllBlockResponse { const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseQueryAllBlockResponse(); + const message = { ...baseQueryAllBlockResponse } as QueryAllBlockResponse; + message.blocks = []; while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { @@ -623,7 +634,7 @@ export const QueryAllBlockResponse = { }, fromJSON(object: any): QueryAllBlockResponse { - const message = createBaseQueryAllBlockResponse(); + const message = { ...baseQueryAllBlockResponse } as QueryAllBlockResponse; message.blocks = (object.blocks ?? []).map((e: any) => Block.fromJSON(e)); message.pagination = object.pagination !== undefined && object.pagination !== null @@ -646,11 +657,11 @@ export const QueryAllBlockResponse = { return obj; }, - fromPartial, I>>( - object: I + fromPartial( + object: DeepPartial ): QueryAllBlockResponse { - const message = createBaseQueryAllBlockResponse(); - message.blocks = object.blocks?.map((e) => Block.fromPartial(e)) || []; + const message = { ...baseQueryAllBlockResponse } as QueryAllBlockResponse; + message.blocks = (object.blocks ?? []).map((e) => Block.fromPartial(e)); message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) @@ -752,7 +763,6 @@ type Builtin = | number | boolean | undefined; - export type DeepPartial = T extends Builtin ? T : T extends Long @@ -765,14 +775,6 @@ export type DeepPartial = T extends Builtin ? { [K in keyof T]?: DeepPartial } : Partial; -type KeysOfUnion = T extends T ? keyof T : never; -export type Exact = P extends Builtin - ? P - : P & { [K in keyof P]: Exact } & Record< - Exclude>, - never - >; - if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); diff --git a/src/codec/misc/transaction.ts b/src/codec/misc/transaction.ts index 85a51981..4bf7e94b 100644 --- a/src/codec/misc/transaction.ts +++ b/src/codec/misc/transaction.ts @@ -30,19 +30,15 @@ export interface APITransaction { messages: string; } -function createBaseTransaction(): Transaction { - return { - hash: "", - address: "", - code: 0, - memo: "", - gasUsed: Long.ZERO, - gasWanted: Long.ZERO, - blockHeight: Long.UZERO, - blockCreatedAt: undefined, - messages: [], - }; -} +const baseTransaction: object = { + hash: "", + address: "", + code: 0, + memo: "", + gasUsed: Long.ZERO, + gasWanted: Long.ZERO, + blockHeight: Long.UZERO, +}; export const Transaction = { encode( @@ -85,7 +81,8 @@ export const Transaction = { decode(input: _m0.Reader | Uint8Array, length?: number): Transaction { const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseTransaction(); + const message = { ...baseTransaction } as Transaction; + message.messages = []; while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { @@ -127,7 +124,7 @@ export const Transaction = { }, fromJSON(object: any): Transaction { - const message = createBaseTransaction(); + const message = { ...baseTransaction } as Transaction; message.hash = object.hash !== undefined && object.hash !== null ? String(object.hash) @@ -170,7 +167,7 @@ export const Transaction = { const obj: any = {}; message.hash !== undefined && (obj.hash = message.hash); message.address !== undefined && (obj.address = message.address); - message.code !== undefined && (obj.code = Math.round(message.code)); + message.code !== undefined && (obj.code = message.code); message.memo !== undefined && (obj.memo = message.memo); message.gasUsed !== undefined && (obj.gasUsed = (message.gasUsed || Long.ZERO).toString()); @@ -190,10 +187,8 @@ export const Transaction = { return obj; }, - fromPartial, I>>( - object: I - ): Transaction { - const message = createBaseTransaction(); + fromPartial(object: DeepPartial): Transaction { + const message = { ...baseTransaction } as Transaction; message.hash = object.hash ?? ""; message.address = object.address ?? ""; message.code = object.code ?? 0; @@ -211,25 +206,23 @@ export const Transaction = { ? Long.fromValue(object.blockHeight) : Long.UZERO; message.blockCreatedAt = object.blockCreatedAt ?? undefined; - message.messages = - object.messages?.map((e) => Message.fromPartial(e)) || []; + message.messages = (object.messages ?? []).map((e) => + Message.fromPartial(e) + ); return message; }, }; -function createBaseAPITransaction(): APITransaction { - return { - hash: "", - address: "", - code: 0, - memo: "", - gasUsed: Long.ZERO, - gasWanted: Long.ZERO, - blockHeight: Long.UZERO, - blockCreatedAt: undefined, - messages: "", - }; -} +const baseAPITransaction: object = { + hash: "", + address: "", + code: 0, + memo: "", + gasUsed: Long.ZERO, + gasWanted: Long.ZERO, + blockHeight: Long.UZERO, + messages: "", +}; export const APITransaction = { encode( @@ -272,7 +265,7 @@ export const APITransaction = { decode(input: _m0.Reader | Uint8Array, length?: number): APITransaction { const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseAPITransaction(); + const message = { ...baseAPITransaction } as APITransaction; while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { @@ -314,7 +307,7 @@ export const APITransaction = { }, fromJSON(object: any): APITransaction { - const message = createBaseAPITransaction(); + const message = { ...baseAPITransaction } as APITransaction; message.hash = object.hash !== undefined && object.hash !== null ? String(object.hash) @@ -358,7 +351,7 @@ export const APITransaction = { const obj: any = {}; message.hash !== undefined && (obj.hash = message.hash); message.address !== undefined && (obj.address = message.address); - message.code !== undefined && (obj.code = Math.round(message.code)); + message.code !== undefined && (obj.code = message.code); message.memo !== undefined && (obj.memo = message.memo); message.gasUsed !== undefined && (obj.gasUsed = (message.gasUsed || Long.ZERO).toString()); @@ -372,10 +365,8 @@ export const APITransaction = { return obj; }, - fromPartial, I>>( - object: I - ): APITransaction { - const message = createBaseAPITransaction(); + fromPartial(object: DeepPartial): APITransaction { + const message = { ...baseAPITransaction } as APITransaction; message.hash = object.hash ?? ""; message.address = object.address ?? ""; message.code = object.code ?? 0; @@ -406,7 +397,6 @@ type Builtin = | number | boolean | undefined; - export type DeepPartial = T extends Builtin ? T : T extends Long @@ -419,14 +409,6 @@ export type DeepPartial = T extends Builtin ? { [K in keyof T]?: DeepPartial } : Partial; -type KeysOfUnion = T extends T ? keyof T : never; -export type Exact = P extends Builtin - ? P - : P & { [K in keyof P]: Exact } & Record< - Exclude>, - never - >; - function toTimestamp(date: Date): Timestamp { const seconds = numberToLong(date.getTime() / 1_000); const nanos = (date.getTime() % 1_000) * 1_000_000; diff --git a/src/codec/oracle/tx.ts b/src/codec/oracle/tx.ts index 0e148a07..c65c4120 100644 --- a/src/codec/oracle/tx.ts +++ b/src/codec/oracle/tx.ts @@ -1,6 +1,7 @@ /* eslint-disable */ import Long from "long"; import _m0 from "protobufjs/minimal"; +import { StringValue, Int64Value } from "../google/protobuf/wrappers"; export const protobufPackage = "Switcheo.carbon.oracle"; @@ -35,6 +36,32 @@ export interface MsgCreateVote { export interface MsgCreateVoteResponse {} +export interface MsgUpdateOracle { + updater: string; + updateOracleParams?: UpdateOracleParams; +} + +export interface UpdateOracleParams { + id: string; + description?: string; + status?: string; + minTurnoutPercentage?: Long; + maxResultAge?: Long; + securityType?: string; + resultStrategy?: string; + resolution?: Long; + spec?: string; +} + +export interface MsgUpdateOracleResponse {} + +export interface MsgRemoveOracle { + creator: string; + oracleId: string; +} + +export interface MsgRemoveOracleResponse {} + const baseMsgCreateOracle: object = { creator: "" }; export const MsgCreateOracle = { @@ -494,11 +521,463 @@ export const MsgCreateVoteResponse = { }, }; +const baseMsgUpdateOracle: object = { updater: "" }; + +export const MsgUpdateOracle = { + encode( + message: MsgUpdateOracle, + writer: _m0.Writer = _m0.Writer.create() + ): _m0.Writer { + if (message.updater !== "") { + writer.uint32(10).string(message.updater); + } + if (message.updateOracleParams !== undefined) { + UpdateOracleParams.encode( + message.updateOracleParams, + writer.uint32(18).fork() + ).ldelim(); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateOracle { + const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = { ...baseMsgUpdateOracle } as MsgUpdateOracle; + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.updater = reader.string(); + break; + case 2: + message.updateOracleParams = UpdateOracleParams.decode( + reader, + reader.uint32() + ); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + + fromJSON(object: any): MsgUpdateOracle { + const message = { ...baseMsgUpdateOracle } as MsgUpdateOracle; + message.updater = + object.updater !== undefined && object.updater !== null + ? String(object.updater) + : ""; + message.updateOracleParams = + object.updateOracleParams !== undefined && + object.updateOracleParams !== null + ? UpdateOracleParams.fromJSON(object.updateOracleParams) + : undefined; + return message; + }, + + toJSON(message: MsgUpdateOracle): unknown { + const obj: any = {}; + message.updater !== undefined && (obj.updater = message.updater); + message.updateOracleParams !== undefined && + (obj.updateOracleParams = message.updateOracleParams + ? UpdateOracleParams.toJSON(message.updateOracleParams) + : undefined); + return obj; + }, + + fromPartial(object: DeepPartial): MsgUpdateOracle { + const message = { ...baseMsgUpdateOracle } as MsgUpdateOracle; + message.updater = object.updater ?? ""; + message.updateOracleParams = + object.updateOracleParams !== undefined && + object.updateOracleParams !== null + ? UpdateOracleParams.fromPartial(object.updateOracleParams) + : undefined; + return message; + }, +}; + +const baseUpdateOracleParams: object = { id: "" }; + +export const UpdateOracleParams = { + encode( + message: UpdateOracleParams, + writer: _m0.Writer = _m0.Writer.create() + ): _m0.Writer { + if (message.id !== "") { + writer.uint32(10).string(message.id); + } + if (message.description !== undefined) { + StringValue.encode( + { value: message.description! }, + writer.uint32(18).fork() + ).ldelim(); + } + if (message.status !== undefined) { + StringValue.encode( + { value: message.status! }, + writer.uint32(26).fork() + ).ldelim(); + } + if (message.minTurnoutPercentage !== undefined) { + Int64Value.encode( + { value: message.minTurnoutPercentage! }, + writer.uint32(34).fork() + ).ldelim(); + } + if (message.maxResultAge !== undefined) { + Int64Value.encode( + { value: message.maxResultAge! }, + writer.uint32(42).fork() + ).ldelim(); + } + if (message.securityType !== undefined) { + StringValue.encode( + { value: message.securityType! }, + writer.uint32(50).fork() + ).ldelim(); + } + if (message.resultStrategy !== undefined) { + StringValue.encode( + { value: message.resultStrategy! }, + writer.uint32(58).fork() + ).ldelim(); + } + if (message.resolution !== undefined) { + Int64Value.encode( + { value: message.resolution! }, + writer.uint32(66).fork() + ).ldelim(); + } + if (message.spec !== undefined) { + StringValue.encode( + { value: message.spec! }, + writer.uint32(74).fork() + ).ldelim(); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): UpdateOracleParams { + const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = { ...baseUpdateOracleParams } as UpdateOracleParams; + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.id = reader.string(); + break; + case 2: + message.description = StringValue.decode( + reader, + reader.uint32() + ).value; + break; + case 3: + message.status = StringValue.decode(reader, reader.uint32()).value; + break; + case 4: + message.minTurnoutPercentage = Int64Value.decode( + reader, + reader.uint32() + ).value; + break; + case 5: + message.maxResultAge = Int64Value.decode( + reader, + reader.uint32() + ).value; + break; + case 6: + message.securityType = StringValue.decode( + reader, + reader.uint32() + ).value; + break; + case 7: + message.resultStrategy = StringValue.decode( + reader, + reader.uint32() + ).value; + break; + case 8: + message.resolution = Int64Value.decode(reader, reader.uint32()).value; + break; + case 9: + message.spec = StringValue.decode(reader, reader.uint32()).value; + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + + fromJSON(object: any): UpdateOracleParams { + const message = { ...baseUpdateOracleParams } as UpdateOracleParams; + message.id = + object.id !== undefined && object.id !== null ? String(object.id) : ""; + message.description = + object.description !== undefined && object.description !== null + ? String(object.description) + : undefined; + message.status = + object.status !== undefined && object.status !== null + ? String(object.status) + : undefined; + message.minTurnoutPercentage = + object.minTurnoutPercentage !== undefined && + object.minTurnoutPercentage !== null + ? Long.fromValue(object.minTurnoutPercentage) + : undefined; + message.maxResultAge = + object.maxResultAge !== undefined && object.maxResultAge !== null + ? Long.fromValue(object.maxResultAge) + : undefined; + message.securityType = + object.securityType !== undefined && object.securityType !== null + ? String(object.securityType) + : undefined; + message.resultStrategy = + object.resultStrategy !== undefined && object.resultStrategy !== null + ? String(object.resultStrategy) + : undefined; + message.resolution = + object.resolution !== undefined && object.resolution !== null + ? Long.fromValue(object.resolution) + : undefined; + message.spec = + object.spec !== undefined && object.spec !== null + ? String(object.spec) + : undefined; + return message; + }, + + toJSON(message: UpdateOracleParams): unknown { + const obj: any = {}; + message.id !== undefined && (obj.id = message.id); + message.description !== undefined && + (obj.description = message.description); + message.status !== undefined && (obj.status = message.status); + message.minTurnoutPercentage !== undefined && + (obj.minTurnoutPercentage = message.minTurnoutPercentage); + message.maxResultAge !== undefined && + (obj.maxResultAge = message.maxResultAge); + message.securityType !== undefined && + (obj.securityType = message.securityType); + message.resultStrategy !== undefined && + (obj.resultStrategy = message.resultStrategy); + message.resolution !== undefined && (obj.resolution = message.resolution); + message.spec !== undefined && (obj.spec = message.spec); + return obj; + }, + + fromPartial(object: DeepPartial): UpdateOracleParams { + const message = { ...baseUpdateOracleParams } as UpdateOracleParams; + message.id = object.id ?? ""; + message.description = object.description ?? undefined; + message.status = object.status ?? undefined; + message.minTurnoutPercentage = + object.minTurnoutPercentage !== undefined && + object.minTurnoutPercentage !== null + ? Long.fromValue(object.minTurnoutPercentage) + : undefined; + message.maxResultAge = + object.maxResultAge !== undefined && object.maxResultAge !== null + ? Long.fromValue(object.maxResultAge) + : undefined; + message.securityType = object.securityType ?? undefined; + message.resultStrategy = object.resultStrategy ?? undefined; + message.resolution = + object.resolution !== undefined && object.resolution !== null + ? Long.fromValue(object.resolution) + : undefined; + message.spec = object.spec ?? undefined; + return message; + }, +}; + +const baseMsgUpdateOracleResponse: object = {}; + +export const MsgUpdateOracleResponse = { + encode( + _: MsgUpdateOracleResponse, + writer: _m0.Writer = _m0.Writer.create() + ): _m0.Writer { + return writer; + }, + + decode( + input: _m0.Reader | Uint8Array, + length?: number + ): MsgUpdateOracleResponse { + const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = { + ...baseMsgUpdateOracleResponse, + } as MsgUpdateOracleResponse; + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + + fromJSON(_: any): MsgUpdateOracleResponse { + const message = { + ...baseMsgUpdateOracleResponse, + } as MsgUpdateOracleResponse; + return message; + }, + + toJSON(_: MsgUpdateOracleResponse): unknown { + const obj: any = {}; + return obj; + }, + + fromPartial( + _: DeepPartial + ): MsgUpdateOracleResponse { + const message = { + ...baseMsgUpdateOracleResponse, + } as MsgUpdateOracleResponse; + return message; + }, +}; + +const baseMsgRemoveOracle: object = { creator: "", oracleId: "" }; + +export const MsgRemoveOracle = { + encode( + message: MsgRemoveOracle, + writer: _m0.Writer = _m0.Writer.create() + ): _m0.Writer { + if (message.creator !== "") { + writer.uint32(10).string(message.creator); + } + if (message.oracleId !== "") { + writer.uint32(18).string(message.oracleId); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): MsgRemoveOracle { + const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = { ...baseMsgRemoveOracle } as MsgRemoveOracle; + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.creator = reader.string(); + break; + case 2: + message.oracleId = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + + fromJSON(object: any): MsgRemoveOracle { + const message = { ...baseMsgRemoveOracle } as MsgRemoveOracle; + message.creator = + object.creator !== undefined && object.creator !== null + ? String(object.creator) + : ""; + message.oracleId = + object.oracleId !== undefined && object.oracleId !== null + ? String(object.oracleId) + : ""; + return message; + }, + + toJSON(message: MsgRemoveOracle): unknown { + const obj: any = {}; + message.creator !== undefined && (obj.creator = message.creator); + message.oracleId !== undefined && (obj.oracleId = message.oracleId); + return obj; + }, + + fromPartial(object: DeepPartial): MsgRemoveOracle { + const message = { ...baseMsgRemoveOracle } as MsgRemoveOracle; + message.creator = object.creator ?? ""; + message.oracleId = object.oracleId ?? ""; + return message; + }, +}; + +const baseMsgRemoveOracleResponse: object = {}; + +export const MsgRemoveOracleResponse = { + encode( + _: MsgRemoveOracleResponse, + writer: _m0.Writer = _m0.Writer.create() + ): _m0.Writer { + return writer; + }, + + decode( + input: _m0.Reader | Uint8Array, + length?: number + ): MsgRemoveOracleResponse { + const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = { + ...baseMsgRemoveOracleResponse, + } as MsgRemoveOracleResponse; + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + + fromJSON(_: any): MsgRemoveOracleResponse { + const message = { + ...baseMsgRemoveOracleResponse, + } as MsgRemoveOracleResponse; + return message; + }, + + toJSON(_: MsgRemoveOracleResponse): unknown { + const obj: any = {}; + return obj; + }, + + fromPartial( + _: DeepPartial + ): MsgRemoveOracleResponse { + const message = { + ...baseMsgRemoveOracleResponse, + } as MsgRemoveOracleResponse; + return message; + }, +}; + /** Msg defines the Msg service. */ export interface Msg { /** this line is used by starport scaffolding # proto/tx/rpc */ CreateOracle(request: MsgCreateOracle): Promise; CreateVote(request: MsgCreateVote): Promise; + UpdateOracle(request: MsgUpdateOracle): Promise; + RemoveOracle(request: MsgRemoveOracle): Promise; } export class MsgClientImpl implements Msg { @@ -507,6 +986,8 @@ export class MsgClientImpl implements Msg { this.rpc = rpc; this.CreateOracle = this.CreateOracle.bind(this); this.CreateVote = this.CreateVote.bind(this); + this.UpdateOracle = this.UpdateOracle.bind(this); + this.RemoveOracle = this.RemoveOracle.bind(this); } CreateOracle(request: MsgCreateOracle): Promise { const data = MsgCreateOracle.encode(request).finish(); @@ -531,6 +1012,30 @@ export class MsgClientImpl implements Msg { MsgCreateVoteResponse.decode(new _m0.Reader(data)) ); } + + UpdateOracle(request: MsgUpdateOracle): Promise { + const data = MsgUpdateOracle.encode(request).finish(); + const promise = this.rpc.request( + "Switcheo.carbon.oracle.Msg", + "UpdateOracle", + data + ); + return promise.then((data) => + MsgUpdateOracleResponse.decode(new _m0.Reader(data)) + ); + } + + RemoveOracle(request: MsgRemoveOracle): Promise { + const data = MsgRemoveOracle.encode(request).finish(); + const promise = this.rpc.request( + "Switcheo.carbon.oracle.Msg", + "RemoveOracle", + data + ); + return promise.then((data) => + MsgRemoveOracleResponse.decode(new _m0.Reader(data)) + ); + } } interface Rpc { diff --git a/src/codec/order/order.ts b/src/codec/order/order.ts index 1f329d3f..107f0686 100644 --- a/src/codec/order/order.ts +++ b/src/codec/order/order.ts @@ -32,40 +32,12 @@ export interface Order { avgFilledPrice: string; } -export interface APIOrder { - id: string; - blockHeight: Long; - blockCreatedAt?: Date; - triggeredBlockHeight: Long; - address: string; - market: string; - side: string; - price: string; - quantity: string; - available: string; - filled: string; - status: string; - orderType: string; - initiator: string; - timeInForce: string; - stopPrice: string; - triggerType: string; - allocatedMargin?: Coin; - isLiquidation: boolean; - isPostOnly: boolean; - isReduceOnly: boolean; - poolId: Long; - avgFilledPrice: string; - allocatedMarginDenom: string; - allocatedMarginAmount: string; - username: string; -} - export interface DBOrder { order?: Order; allocatedMarginDenom: string; allocatedMarginAmount: string; username: string; + lastUpdatedBlockHeight: Long; } export interface OrdersForMarket { @@ -453,423 +425,11 @@ export const Order = { }, }; -const baseAPIOrder: object = { - id: "", - blockHeight: Long.ZERO, - triggeredBlockHeight: Long.ZERO, - address: "", - market: "", - side: "", - price: "", - quantity: "", - available: "", - filled: "", - status: "", - orderType: "", - initiator: "", - timeInForce: "", - stopPrice: "", - triggerType: "", - isLiquidation: false, - isPostOnly: false, - isReduceOnly: false, - poolId: Long.UZERO, - avgFilledPrice: "", - allocatedMarginDenom: "", - allocatedMarginAmount: "", - username: "", -}; - -export const APIOrder = { - encode( - message: APIOrder, - writer: _m0.Writer = _m0.Writer.create() - ): _m0.Writer { - if (message.id !== "") { - writer.uint32(10).string(message.id); - } - if (!message.blockHeight.isZero()) { - writer.uint32(16).int64(message.blockHeight); - } - if (message.blockCreatedAt !== undefined) { - Timestamp.encode( - toTimestamp(message.blockCreatedAt), - writer.uint32(26).fork() - ).ldelim(); - } - if (!message.triggeredBlockHeight.isZero()) { - writer.uint32(32).int64(message.triggeredBlockHeight); - } - if (message.address !== "") { - writer.uint32(42).string(message.address); - } - if (message.market !== "") { - writer.uint32(50).string(message.market); - } - if (message.side !== "") { - writer.uint32(58).string(message.side); - } - if (message.price !== "") { - writer.uint32(66).string(message.price); - } - if (message.quantity !== "") { - writer.uint32(74).string(message.quantity); - } - if (message.available !== "") { - writer.uint32(82).string(message.available); - } - if (message.filled !== "") { - writer.uint32(90).string(message.filled); - } - if (message.status !== "") { - writer.uint32(98).string(message.status); - } - if (message.orderType !== "") { - writer.uint32(106).string(message.orderType); - } - if (message.initiator !== "") { - writer.uint32(114).string(message.initiator); - } - if (message.timeInForce !== "") { - writer.uint32(122).string(message.timeInForce); - } - if (message.stopPrice !== "") { - writer.uint32(130).string(message.stopPrice); - } - if (message.triggerType !== "") { - writer.uint32(138).string(message.triggerType); - } - if (message.allocatedMargin !== undefined) { - Coin.encode(message.allocatedMargin, writer.uint32(146).fork()).ldelim(); - } - if (message.isLiquidation === true) { - writer.uint32(152).bool(message.isLiquidation); - } - if (message.isPostOnly === true) { - writer.uint32(160).bool(message.isPostOnly); - } - if (message.isReduceOnly === true) { - writer.uint32(168).bool(message.isReduceOnly); - } - if (!message.poolId.isZero()) { - writer.uint32(176).uint64(message.poolId); - } - if (message.avgFilledPrice !== "") { - writer.uint32(186).string(message.avgFilledPrice); - } - if (message.allocatedMarginDenom !== "") { - writer.uint32(194).string(message.allocatedMarginDenom); - } - if (message.allocatedMarginAmount !== "") { - writer.uint32(202).string(message.allocatedMarginAmount); - } - if (message.username !== "") { - writer.uint32(210).string(message.username); - } - return writer; - }, - - decode(input: _m0.Reader | Uint8Array, length?: number): APIOrder { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); - let end = length === undefined ? reader.len : reader.pos + length; - const message = { ...baseAPIOrder } as APIOrder; - while (reader.pos < end) { - const tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.id = reader.string(); - break; - case 2: - message.blockHeight = reader.int64() as Long; - break; - case 3: - message.blockCreatedAt = fromTimestamp( - Timestamp.decode(reader, reader.uint32()) - ); - break; - case 4: - message.triggeredBlockHeight = reader.int64() as Long; - break; - case 5: - message.address = reader.string(); - break; - case 6: - message.market = reader.string(); - break; - case 7: - message.side = reader.string(); - break; - case 8: - message.price = reader.string(); - break; - case 9: - message.quantity = reader.string(); - break; - case 10: - message.available = reader.string(); - break; - case 11: - message.filled = reader.string(); - break; - case 12: - message.status = reader.string(); - break; - case 13: - message.orderType = reader.string(); - break; - case 14: - message.initiator = reader.string(); - break; - case 15: - message.timeInForce = reader.string(); - break; - case 16: - message.stopPrice = reader.string(); - break; - case 17: - message.triggerType = reader.string(); - break; - case 18: - message.allocatedMargin = Coin.decode(reader, reader.uint32()); - break; - case 19: - message.isLiquidation = reader.bool(); - break; - case 20: - message.isPostOnly = reader.bool(); - break; - case 21: - message.isReduceOnly = reader.bool(); - break; - case 22: - message.poolId = reader.uint64() as Long; - break; - case 23: - message.avgFilledPrice = reader.string(); - break; - case 24: - message.allocatedMarginDenom = reader.string(); - break; - case 25: - message.allocatedMarginAmount = reader.string(); - break; - case 26: - message.username = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }, - - fromJSON(object: any): APIOrder { - const message = { ...baseAPIOrder } as APIOrder; - message.id = - object.id !== undefined && object.id !== null ? String(object.id) : ""; - message.blockHeight = - object.blockHeight !== undefined && object.blockHeight !== null - ? Long.fromString(object.blockHeight) - : Long.ZERO; - message.blockCreatedAt = - object.blockCreatedAt !== undefined && object.blockCreatedAt !== null - ? fromJsonTimestamp(object.blockCreatedAt) - : undefined; - message.triggeredBlockHeight = - object.triggeredBlockHeight !== undefined && - object.triggeredBlockHeight !== null - ? Long.fromString(object.triggeredBlockHeight) - : Long.ZERO; - message.address = - object.address !== undefined && object.address !== null - ? String(object.address) - : ""; - message.market = - object.market !== undefined && object.market !== null - ? String(object.market) - : ""; - message.side = - object.side !== undefined && object.side !== null - ? String(object.side) - : ""; - message.price = - object.price !== undefined && object.price !== null - ? String(object.price) - : ""; - message.quantity = - object.quantity !== undefined && object.quantity !== null - ? String(object.quantity) - : ""; - message.available = - object.available !== undefined && object.available !== null - ? String(object.available) - : ""; - message.filled = - object.filled !== undefined && object.filled !== null - ? String(object.filled) - : ""; - message.status = - object.status !== undefined && object.status !== null - ? String(object.status) - : ""; - message.orderType = - object.orderType !== undefined && object.orderType !== null - ? String(object.orderType) - : ""; - message.initiator = - object.initiator !== undefined && object.initiator !== null - ? String(object.initiator) - : ""; - message.timeInForce = - object.timeInForce !== undefined && object.timeInForce !== null - ? String(object.timeInForce) - : ""; - message.stopPrice = - object.stopPrice !== undefined && object.stopPrice !== null - ? String(object.stopPrice) - : ""; - message.triggerType = - object.triggerType !== undefined && object.triggerType !== null - ? String(object.triggerType) - : ""; - message.allocatedMargin = - object.allocatedMargin !== undefined && object.allocatedMargin !== null - ? Coin.fromJSON(object.allocatedMargin) - : undefined; - message.isLiquidation = - object.isLiquidation !== undefined && object.isLiquidation !== null - ? Boolean(object.isLiquidation) - : false; - message.isPostOnly = - object.isPostOnly !== undefined && object.isPostOnly !== null - ? Boolean(object.isPostOnly) - : false; - message.isReduceOnly = - object.isReduceOnly !== undefined && object.isReduceOnly !== null - ? Boolean(object.isReduceOnly) - : false; - message.poolId = - object.poolId !== undefined && object.poolId !== null - ? Long.fromString(object.poolId) - : Long.UZERO; - message.avgFilledPrice = - object.avgFilledPrice !== undefined && object.avgFilledPrice !== null - ? String(object.avgFilledPrice) - : ""; - message.allocatedMarginDenom = - object.allocatedMarginDenom !== undefined && - object.allocatedMarginDenom !== null - ? String(object.allocatedMarginDenom) - : ""; - message.allocatedMarginAmount = - object.allocatedMarginAmount !== undefined && - object.allocatedMarginAmount !== null - ? String(object.allocatedMarginAmount) - : ""; - message.username = - object.username !== undefined && object.username !== null - ? String(object.username) - : ""; - return message; - }, - - toJSON(message: APIOrder): unknown { - const obj: any = {}; - message.id !== undefined && (obj.id = message.id); - message.blockHeight !== undefined && - (obj.blockHeight = (message.blockHeight || Long.ZERO).toString()); - message.blockCreatedAt !== undefined && - (obj.blockCreatedAt = message.blockCreatedAt.toISOString()); - message.triggeredBlockHeight !== undefined && - (obj.triggeredBlockHeight = ( - message.triggeredBlockHeight || Long.ZERO - ).toString()); - message.address !== undefined && (obj.address = message.address); - message.market !== undefined && (obj.market = message.market); - message.side !== undefined && (obj.side = message.side); - message.price !== undefined && (obj.price = message.price); - message.quantity !== undefined && (obj.quantity = message.quantity); - message.available !== undefined && (obj.available = message.available); - message.filled !== undefined && (obj.filled = message.filled); - message.status !== undefined && (obj.status = message.status); - message.orderType !== undefined && (obj.orderType = message.orderType); - message.initiator !== undefined && (obj.initiator = message.initiator); - message.timeInForce !== undefined && - (obj.timeInForce = message.timeInForce); - message.stopPrice !== undefined && (obj.stopPrice = message.stopPrice); - message.triggerType !== undefined && - (obj.triggerType = message.triggerType); - message.allocatedMargin !== undefined && - (obj.allocatedMargin = message.allocatedMargin - ? Coin.toJSON(message.allocatedMargin) - : undefined); - message.isLiquidation !== undefined && - (obj.isLiquidation = message.isLiquidation); - message.isPostOnly !== undefined && (obj.isPostOnly = message.isPostOnly); - message.isReduceOnly !== undefined && - (obj.isReduceOnly = message.isReduceOnly); - message.poolId !== undefined && - (obj.poolId = (message.poolId || Long.UZERO).toString()); - message.avgFilledPrice !== undefined && - (obj.avgFilledPrice = message.avgFilledPrice); - message.allocatedMarginDenom !== undefined && - (obj.allocatedMarginDenom = message.allocatedMarginDenom); - message.allocatedMarginAmount !== undefined && - (obj.allocatedMarginAmount = message.allocatedMarginAmount); - message.username !== undefined && (obj.username = message.username); - return obj; - }, - - fromPartial(object: DeepPartial): APIOrder { - const message = { ...baseAPIOrder } as APIOrder; - message.id = object.id ?? ""; - message.blockHeight = - object.blockHeight !== undefined && object.blockHeight !== null - ? Long.fromValue(object.blockHeight) - : Long.ZERO; - message.blockCreatedAt = object.blockCreatedAt ?? undefined; - message.triggeredBlockHeight = - object.triggeredBlockHeight !== undefined && - object.triggeredBlockHeight !== null - ? Long.fromValue(object.triggeredBlockHeight) - : Long.ZERO; - message.address = object.address ?? ""; - message.market = object.market ?? ""; - message.side = object.side ?? ""; - message.price = object.price ?? ""; - message.quantity = object.quantity ?? ""; - message.available = object.available ?? ""; - message.filled = object.filled ?? ""; - message.status = object.status ?? ""; - message.orderType = object.orderType ?? ""; - message.initiator = object.initiator ?? ""; - message.timeInForce = object.timeInForce ?? ""; - message.stopPrice = object.stopPrice ?? ""; - message.triggerType = object.triggerType ?? ""; - message.allocatedMargin = - object.allocatedMargin !== undefined && object.allocatedMargin !== null - ? Coin.fromPartial(object.allocatedMargin) - : undefined; - message.isLiquidation = object.isLiquidation ?? false; - message.isPostOnly = object.isPostOnly ?? false; - message.isReduceOnly = object.isReduceOnly ?? false; - message.poolId = - object.poolId !== undefined && object.poolId !== null - ? Long.fromValue(object.poolId) - : Long.UZERO; - message.avgFilledPrice = object.avgFilledPrice ?? ""; - message.allocatedMarginDenom = object.allocatedMarginDenom ?? ""; - message.allocatedMarginAmount = object.allocatedMarginAmount ?? ""; - message.username = object.username ?? ""; - return message; - }, -}; - const baseDBOrder: object = { allocatedMarginDenom: "", allocatedMarginAmount: "", username: "", + lastUpdatedBlockHeight: Long.ZERO, }; export const DBOrder = { @@ -889,6 +449,9 @@ export const DBOrder = { if (message.username !== "") { writer.uint32(34).string(message.username); } + if (!message.lastUpdatedBlockHeight.isZero()) { + writer.uint32(40).int64(message.lastUpdatedBlockHeight); + } return writer; }, @@ -911,6 +474,9 @@ export const DBOrder = { case 4: message.username = reader.string(); break; + case 5: + message.lastUpdatedBlockHeight = reader.int64() as Long; + break; default: reader.skipType(tag & 7); break; @@ -939,6 +505,11 @@ export const DBOrder = { object.username !== undefined && object.username !== null ? String(object.username) : ""; + message.lastUpdatedBlockHeight = + object.lastUpdatedBlockHeight !== undefined && + object.lastUpdatedBlockHeight !== null + ? Long.fromString(object.lastUpdatedBlockHeight) + : Long.ZERO; return message; }, @@ -951,6 +522,10 @@ export const DBOrder = { message.allocatedMarginAmount !== undefined && (obj.allocatedMarginAmount = message.allocatedMarginAmount); message.username !== undefined && (obj.username = message.username); + message.lastUpdatedBlockHeight !== undefined && + (obj.lastUpdatedBlockHeight = ( + message.lastUpdatedBlockHeight || Long.ZERO + ).toString()); return obj; }, @@ -963,6 +538,11 @@ export const DBOrder = { message.allocatedMarginDenom = object.allocatedMarginDenom ?? ""; message.allocatedMarginAmount = object.allocatedMarginAmount ?? ""; message.username = object.username ?? ""; + message.lastUpdatedBlockHeight = + object.lastUpdatedBlockHeight !== undefined && + object.lastUpdatedBlockHeight !== null + ? Long.fromValue(object.lastUpdatedBlockHeight) + : Long.ZERO; return message; }, }; diff --git a/src/codec/order/query.ts b/src/codec/order/query.ts index 99a03d4f..8529225e 100644 --- a/src/codec/order/query.ts +++ b/src/codec/order/query.ts @@ -1,7 +1,7 @@ /* eslint-disable */ import Long from "long"; import _m0 from "protobufjs/minimal"; -import { APIOrder, Order } from "../order/order"; +import { Order } from "../order/order"; import { PageRequest, PageResponse } from "../query/pagination"; export const protobufPackage = "Switcheo.carbon.order"; @@ -12,7 +12,7 @@ export interface QueryGetOrderRequest { } export interface QueryGetOrderResponse { - order?: APIOrder; + order?: Order; } export interface QueryAllOrderRequest { @@ -24,7 +24,7 @@ export interface QueryAllOrderRequest { } export interface QueryAllOrderResponse { - orders: APIOrder[]; + orders: Order[]; pagination?: PageResponse; } @@ -99,7 +99,7 @@ export const QueryGetOrderResponse = { writer: _m0.Writer = _m0.Writer.create() ): _m0.Writer { if (message.order !== undefined) { - APIOrder.encode(message.order, writer.uint32(10).fork()).ldelim(); + Order.encode(message.order, writer.uint32(10).fork()).ldelim(); } return writer; }, @@ -115,7 +115,7 @@ export const QueryGetOrderResponse = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.order = APIOrder.decode(reader, reader.uint32()); + message.order = Order.decode(reader, reader.uint32()); break; default: reader.skipType(tag & 7); @@ -129,7 +129,7 @@ export const QueryGetOrderResponse = { const message = { ...baseQueryGetOrderResponse } as QueryGetOrderResponse; message.order = object.order !== undefined && object.order !== null - ? APIOrder.fromJSON(object.order) + ? Order.fromJSON(object.order) : undefined; return message; }, @@ -137,7 +137,7 @@ export const QueryGetOrderResponse = { toJSON(message: QueryGetOrderResponse): unknown { const obj: any = {}; message.order !== undefined && - (obj.order = message.order ? APIOrder.toJSON(message.order) : undefined); + (obj.order = message.order ? Order.toJSON(message.order) : undefined); return obj; }, @@ -147,7 +147,7 @@ export const QueryGetOrderResponse = { const message = { ...baseQueryGetOrderResponse } as QueryGetOrderResponse; message.order = object.order !== undefined && object.order !== null - ? APIOrder.fromPartial(object.order) + ? Order.fromPartial(object.order) : undefined; return message; }, @@ -277,7 +277,7 @@ export const QueryAllOrderResponse = { writer: _m0.Writer = _m0.Writer.create() ): _m0.Writer { for (const v of message.orders) { - APIOrder.encode(v!, writer.uint32(10).fork()).ldelim(); + Order.encode(v!, writer.uint32(10).fork()).ldelim(); } if (message.pagination !== undefined) { PageResponse.encode( @@ -300,7 +300,7 @@ export const QueryAllOrderResponse = { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.orders.push(APIOrder.decode(reader, reader.uint32())); + message.orders.push(Order.decode(reader, reader.uint32())); break; case 2: message.pagination = PageResponse.decode(reader, reader.uint32()); @@ -315,9 +315,7 @@ export const QueryAllOrderResponse = { fromJSON(object: any): QueryAllOrderResponse { const message = { ...baseQueryAllOrderResponse } as QueryAllOrderResponse; - message.orders = (object.orders ?? []).map((e: any) => - APIOrder.fromJSON(e) - ); + message.orders = (object.orders ?? []).map((e: any) => Order.fromJSON(e)); message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromJSON(object.pagination) @@ -328,9 +326,7 @@ export const QueryAllOrderResponse = { toJSON(message: QueryAllOrderResponse): unknown { const obj: any = {}; if (message.orders) { - obj.orders = message.orders.map((e) => - e ? APIOrder.toJSON(e) : undefined - ); + obj.orders = message.orders.map((e) => (e ? Order.toJSON(e) : undefined)); } else { obj.orders = []; } @@ -345,7 +341,7 @@ export const QueryAllOrderResponse = { object: DeepPartial ): QueryAllOrderResponse { const message = { ...baseQueryAllOrderResponse } as QueryAllOrderResponse; - message.orders = (object.orders ?? []).map((e) => APIOrder.fromPartial(e)); + message.orders = (object.orders ?? []).map((e) => Order.fromPartial(e)); message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination)