From b68fc4ae94ca06dc8142bad902aaf8296e6b9b04 Mon Sep 17 00:00:00 2001 From: Thong Yuan Yu Sarah Date: Wed, 6 Apr 2022 11:58:22 +0800 Subject: [PATCH] Fix yarn build errors --- src/clients/TokenClient.ts | 1 - src/modules/admin.ts | 100 +++++++++----------------------- src/modules/gov.ts | 10 +--- src/provider/amino/types/gov.ts | 28 +-------- src/util/gov.ts | 8 +-- 5 files changed, 32 insertions(+), 115 deletions(-) diff --git a/src/clients/TokenClient.ts b/src/clients/TokenClient.ts index ea5b2b61..d42c29a8 100644 --- a/src/clients/TokenClient.ts +++ b/src/clients/TokenClient.ts @@ -300,7 +300,6 @@ class TokenClient { offset: Long.UZERO, key: new Uint8Array(), countTotal: false, - reverse: false, }, }); diff --git a/src/modules/admin.ts b/src/modules/admin.ts index 86c03896..d3216aab 100644 --- a/src/modules/admin.ts +++ b/src/modules/admin.ts @@ -122,8 +122,14 @@ export class AdminModule extends BaseModule { const wallet = this.getWallet(); const value = MsgCreateMarket.fromPartial({ - creator: wallet.bech32Address, - market: transformCreateMarketParams(params) + creator: wallet.bech32Address, + marketType: params.marketType, + base: params.base, + quote: params.quote, + currentBasePriceUsd: params.currentBasePriceUsd.toString(10), + currentQuotePriceUsd: params.currentQuotePriceUsd.toString(10), + indexOracleId: params.indexOracleId ?? "", + ...params.expiryTime && { expiryTime: params.expiryTime }, }) return await wallet.sendTx({ @@ -135,17 +141,23 @@ export class AdminModule extends BaseModule { public async createMarkets(params: AdminModule.CreateMarketParams[]) { const wallet = this.getWallet(); - const msgs = params.map(param => { + const msgs = params.map((param: AdminModule.CreateMarketParams) => { const value = MsgCreateMarket.fromPartial({ - creator: wallet.bech32Address, - market: transformCreateMarketParams(param) - }) + creator: wallet.bech32Address, + marketType: param.marketType, + base: param.base, + quote: param.quote, + currentBasePriceUsd: param.currentBasePriceUsd.toString(10), + currentQuotePriceUsd: param.currentQuotePriceUsd.toString(10), + indexOracleId: param.indexOracleId ?? "", + ...param.expiryTime && { expiryTime: param.expiryTime }, + }); return { typeUrl: CarbonTx.Types.MsgCreateMarket, value, - } - }) + }; + }); return await wallet.sendTxs(msgs, CarbonTx.DEFAULT_SIGN_OPTS); } @@ -402,35 +414,15 @@ export namespace AdminModule { } export interface CreateMarketParams { - name: string - displayName: string - description: string - marketType: string - base: string - quote: string - basePrecision?: number - quotePrecision?: number - lotSize: BigNumber - tickSize: BigNumber - minQuantity: BigNumber - makerFee: BigNumber - takerFee: BigNumber - createdBlockHeight?: number - riskStepSize: BigNumber - initialMarginBase: BigNumber - initialMarginStep: BigNumber - maintenanceMarginRatio: BigNumber - maxLiquidationOrderTicket: BigNumber - maxLiquidationOrderDuration: Duration - impactSize: BigNumber - markPriceBand: number - lastPriceProtectedBand: number - indexOracleId: string - expiryTime: Date - isSettled?: boolean - isActive?: boolean - closedBlockHeight?: number - tradingBandwidth: number + marketType: string; + base: string; + quote: string; + currentBasePriceUsd: BigNumber; + currentQuotePriceUsd: BigNumber; + + /** futures only */ + indexOracleId?: string; + expiryTime?: Date; } export interface CreateVaultTypeParams { @@ -547,40 +539,6 @@ export function transfromSyncTokenParams(msg: AdminModule.SyncTokenParams, addre } } -export function transformCreateMarketParams(msg: AdminModule.CreateMarketParams) { - return { - name: msg.name, - displayName: msg.displayName, - description: msg.description, - marketType: msg.marketType, - base: msg.base, - quote: msg.quote, - basePrecision: new Long(msg.basePrecision || 0), - quotePrecision: new Long(msg.quotePrecision || 0), - lotSize: msg.lotSize.toString(10), - tickSize: msg.tickSize.shiftedBy(18).toString(10), - minQuantity: msg.minQuantity.toString(10), - makerFee: msg.makerFee.shiftedBy(18).toString(10), - takerFee: msg.takerFee.shiftedBy(18).toString(10), - createdBlockHeight: new Long(msg.createdBlockHeight || 0), - riskStepSize: msg.riskStepSize.toString(10), - initialMarginBase: msg.initialMarginBase.shiftedBy(18).toString(10), - initialMarginStep: msg.initialMarginStep.shiftedBy(18).toString(10), - maintenanceMarginRatio: msg.maintenanceMarginRatio.shiftedBy(18).toString(10), - maxLiquidationOrderTicket: msg.maxLiquidationOrderTicket.toString(10), - maxLiquidationOrderDuration: msg.maxLiquidationOrderDuration, - impactSize: msg.impactSize.toString(10), - markPriceBand: msg.markPriceBand, - lastPriceProtectedBand: msg.lastPriceProtectedBand, - indexOracleId: msg.indexOracleId, - expiryTime: msg.expiryTime, - isSettled: !!msg.isSettled, - isActive: !!msg.isActive, - closedBlockHeight: new Long(msg.createdBlockHeight || 0), - tradingBandwidth: msg.tradingBandwidth, - } -} - export function transfromCreateVaultTypeParams(msg: AdminModule.CreateVaultTypeParams, address: string) { return { creator: address, diff --git a/src/modules/gov.ts b/src/modules/gov.ts index 0a31c38a..f35d38a0 100644 --- a/src/modules/gov.ts +++ b/src/modules/gov.ts @@ -1,7 +1,7 @@ import { CreateTokenProposal } from "@carbon-sdk/codec/coin/proposal"; import { SetMsgFeeProposal } from "@carbon-sdk/codec/fee/proposal"; import { LinkPoolProposal, SetCommitmentCurveProposal, SetRewardCurveProposal, SetRewardsWeightsProposal, UnlinkPoolProposal, UpdatePoolProposal } from "@carbon-sdk/codec/liquiditypool/proposal"; -import { CreateMarketProposal, UpdateMarketProposal } from "@carbon-sdk/codec/market/proposal"; +import { UpdateMarketProposal } from "@carbon-sdk/codec/market/proposal"; import { CreateOracleProposal } from "@carbon-sdk/codec/oracle/proposal"; import { SettlementPriceParams, SettlementPriceProposal } from "@carbon-sdk/codec/pricing/proposal"; import { coins, Coin } from "@cosmjs/amino"; @@ -19,7 +19,6 @@ import { transfromSetRewardCurveParams, transfromSetCommitmentCurveParams, transfromSetRewardsWeightsParams, - transformCreateMarketParams, transfromCreateOracleParams, transfromUpdatePoolParams, AdminModule, @@ -136,13 +135,6 @@ export class GovModule extends BaseModule { msg: transfromUpdatePoolParams(msg) } return UpdatePoolProposal.encode(updatePoolProposalMsg).finish() - case "CreateMarketProposal": - const createMarketProposalMsg = { - title : title, - description: description, - msg: transformCreateMarketParams(msg) - } - return CreateMarketProposal.encode(createMarketProposalMsg).finish() case "UpdateMarketProposal": const updateMarketProposalMsg = { title : title, diff --git a/src/provider/amino/types/gov.ts b/src/provider/amino/types/gov.ts index 16c6092e..6a02009f 100644 --- a/src/provider/amino/types/gov.ts +++ b/src/provider/amino/types/gov.ts @@ -1,6 +1,6 @@ import { MsgSubmitProposal } from "@carbon-sdk/codec/cosmos/gov/v1beta1/tx"; import { - CreateMarketProposal, CreateOracleProposal, + CreateOracleProposal, CreateTokenProposal, LinkPoolProposal, SetCommitmentCurveProposal, SetMsgFeeProposal, SetRewardCurveProposal, SetRewardsWeightsProposal, UnlinkPoolProposal, SettlementPriceProposal, UpdateMarketProposal, UpdatePoolProposal, @@ -28,7 +28,6 @@ const ContentTypes: TypeUtils.SimpleMap = { [GovUtils.ProposalTypes.UpdatePool]: "liquiditypool/UpdatePoolProposal", [GovUtils.ProposalTypes.LinkPool]: "liquiditypool/LinkPoolProposal", [GovUtils.ProposalTypes.UnlinkPool]: "liquiditypool/UnlinkPoolProposal", - [GovUtils.ProposalTypes.CreateMarket]: "market/CreateMarketProposal", [GovUtils.ProposalTypes.UpdateMarket]: "market/UpdateMarketProposal", [GovUtils.ProposalTypes.CreateOracle]: "oracle/CreateOracleProposal", [GovUtils.ProposalTypes.SettlementPrice]: "pricing/SettlementPriceProposal", @@ -223,16 +222,6 @@ const checkDecodeProposal = (content: any, amino: AminoValueMap): AminoProposalR const newAmino = { ...amino }; switch (content.typeUrl) { - case GovUtils.ProposalTypes.CreateMarket: - newAmino.content = { ...CreateMarket }; - const prunedContent = pruneAmino(newContent.value, CreateMarket.value.msg); - return { - newContent: { - type: ContentTypes[content.typeUrl], - value: prunedContent, - }, - newAmino, - }; case GovUtils.ProposalTypes.UpdatePool: newAmino.content = { ...UpdatePool }; break; @@ -277,21 +266,6 @@ const checkDecodeProposal = (content: any, amino: AminoValueMap): AminoProposalR const checkEncodeProposal = (content: any, amino: AminoValueMap): DirectProposalRes => { switch (content.type) { - case ContentTypes[GovUtils.ProposalTypes.CreateMarket]: - const createMarketMsg = preProcessAmino(content.value.msg, CreateMarket.value.msg); - const createMarketProp = CreateMarketProposal.fromPartial({ - ...content.value, - msg: createMarketMsg, - }); - return { - newContent: { - typeUrl: GovUtils.ProposalTypes.CreateMarket, - value: CreateMarketProposal.encode(createMarketProp).finish(), - }, - newAmino: { - ...amino, - }, - }; case ContentTypes[GovUtils.ProposalTypes.UpdatePool]: const updatePoolMsg = preProcessAmino(content.value.msg, UpdatePool.value.msg); const updatePoolProp = UpdatePoolProposal.fromPartial({ diff --git a/src/util/gov.ts b/src/util/gov.ts index 300d4ed2..85b7219c 100644 --- a/src/util/gov.ts +++ b/src/util/gov.ts @@ -1,5 +1,5 @@ import { - CreateMarketProposal, CreateOracleProposal, CreateTokenProposal, LinkPoolProposal, + CreateOracleProposal, CreateTokenProposal, LinkPoolProposal, SetCommitmentCurveProposal, SetMsgFeeProposal, SetRewardCurveProposal, SetRewardsWeightsProposal, SettlementPriceProposal, UnlinkPoolProposal, UpdateMarketProposal, UpdatePoolProposal } from "@carbon-sdk/codec"; @@ -25,7 +25,6 @@ export enum ProposalTypes { SetRewardCurve = "/Switcheo.carbon.liquiditypool.SetRewardCurveProposal", SetRewardsWeights = "/Switcheo.carbon.liquiditypool.SetRewardsWeightsProposal", SetCommitmentCurve = "/Switcheo.carbon.liquiditypool.SetCommitmentCurveProposal", - CreateMarket = "/Switcheo.carbon.market.CreateMarketProposal", UpdateMarket = "/Switcheo.carbon.market.UpdateMarketProposal", SettlementPrice = "/Switcheo.carbon.pricing.SettlementPriceProposal", }; @@ -75,11 +74,6 @@ export const decodeContent = (content?: Any): PropDecoded => { ...content, value: UpdatePoolProposal.decode(content.value), }; - case ProposalTypes.CreateMarket: - return { - ...content, - value: CreateMarketProposal.decode(content.value), - }; case ProposalTypes.CreateOracle: return { ...content,