Skip to content

Commit

Permalink
Fix yarn build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
sarah-thong committed Apr 8, 2022
1 parent 195fed6 commit b68fc4a
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 115 deletions.
1 change: 0 additions & 1 deletion src/clients/TokenClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@ class TokenClient {
offset: Long.UZERO,
key: new Uint8Array(),
countTotal: false,
reverse: false,
},
});

Expand Down
100 changes: 29 additions & 71 deletions src/modules/admin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand All @@ -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);
}
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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,
Expand Down
10 changes: 1 addition & 9 deletions src/modules/gov.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -19,7 +19,6 @@ import {
transfromSetRewardCurveParams,
transfromSetCommitmentCurveParams,
transfromSetRewardsWeightsParams,
transformCreateMarketParams,
transfromCreateOracleParams,
transfromUpdatePoolParams,
AdminModule,
Expand Down Expand Up @@ -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,
Expand Down
28 changes: 1 addition & 27 deletions src/provider/amino/types/gov.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -28,7 +28,6 @@ const ContentTypes: TypeUtils.SimpleMap<string> = {
[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",
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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({
Expand Down
8 changes: 1 addition & 7 deletions src/util/gov.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {
CreateMarketProposal, CreateOracleProposal, CreateTokenProposal, LinkPoolProposal,
CreateOracleProposal, CreateTokenProposal, LinkPoolProposal,
SetCommitmentCurveProposal, SetMsgFeeProposal, SetRewardCurveProposal, SetRewardsWeightsProposal,
SettlementPriceProposal, UnlinkPoolProposal, UpdateMarketProposal, UpdatePoolProposal
} from "@carbon-sdk/codec";
Expand All @@ -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",
};
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit b68fc4a

Please sign in to comment.