From 10e4b6dad70ae7130a73f23097311f40d61f4859 Mon Sep 17 00:00:00 2001 From: Bojan Angjelkoski Date: Mon, 22 Aug 2022 15:35:06 +0200 Subject: [PATCH] fix: eip712 typing order --- packages/sdk-ts/src/core/MsgBase.ts | 2 +- packages/sdk-ts/src/core/bank/msgs/MsgSend.ts | 5 +++-- packages/sdk-ts/src/core/eip712.ts | 1 - packages/sdk-ts/src/core/gov/msgs/MsgDeposit.ts | 5 +++-- .../gov/msgs/MsgSubmitProposalExpiryFuturesMarketLaunch.ts | 5 ++++- .../core/gov/msgs/MsgSubmitProposalPerpetualMarketLaunch.ts | 5 ++++- .../src/core/gov/msgs/MsgSubmitProposalSpotMarketLaunch.ts | 5 ++++- .../core/gov/msgs/MsgSubmitProposalSpotMarketParamUpdate.ts | 5 ++++- packages/sdk-ts/src/core/gov/msgs/MsgSubmitTextProposal.ts | 5 ++++- packages/sdk-ui-ts/src/core/clients/MsgBroadcastClient.ts | 1 - 10 files changed, 27 insertions(+), 12 deletions(-) diff --git a/packages/sdk-ts/src/core/MsgBase.ts b/packages/sdk-ts/src/core/MsgBase.ts index 025b51004..b82410572 100644 --- a/packages/sdk-ts/src/core/MsgBase.ts +++ b/packages/sdk-ts/src/core/MsgBase.ts @@ -31,7 +31,7 @@ export abstract class MsgBase< } public toEip712Types(): Map { - return objectKeysToEip712Types(this.toAmino()) + return objectKeysToEip712Types(this.toAmino() as Record) } public toEip712(): { diff --git a/packages/sdk-ts/src/core/bank/msgs/MsgSend.ts b/packages/sdk-ts/src/core/bank/msgs/MsgSend.ts index e9df3f793..fbfc56ed7 100644 --- a/packages/sdk-ts/src/core/bank/msgs/MsgSend.ts +++ b/packages/sdk-ts/src/core/bank/msgs/MsgSend.ts @@ -69,11 +69,12 @@ export default class MsgSend extends MsgBase< } public toAmino(): MsgSend.Amino { - const { params } = this const proto = this.toProto() const message = { ...snakeCaseKeys(proto.toObject()), - amount: [{ ...snakeCaseKeys(params.amount) }], + amount: proto + .getAmountList() + .map((amount) => snakeCaseKeys(amount.toObject())), } // @ts-ignore diff --git a/packages/sdk-ts/src/core/eip712.ts b/packages/sdk-ts/src/core/eip712.ts index 14058a890..2dc2500ec 100644 --- a/packages/sdk-ts/src/core/eip712.ts +++ b/packages/sdk-ts/src/core/eip712.ts @@ -181,7 +181,6 @@ export const objectKeysToEip712Types = ( ) => { const output = new Map() const types = new Array() - // const sortedProperties = Object.keys(object).sort() for (const property in object) { if (property === '@type' || property === 'type') { diff --git a/packages/sdk-ts/src/core/gov/msgs/MsgDeposit.ts b/packages/sdk-ts/src/core/gov/msgs/MsgDeposit.ts index 33b3c1448..19d0d08d6 100644 --- a/packages/sdk-ts/src/core/gov/msgs/MsgDeposit.ts +++ b/packages/sdk-ts/src/core/gov/msgs/MsgDeposit.ts @@ -69,11 +69,12 @@ export default class MsgDeposit extends MsgBase< } public toAmino(): MsgDeposit.Amino { - const { params } = this const proto = this.toProto() const message = { ...snakeCaseKeys(proto.toObject()), - amount: [{ ...snakeCaseKeys(params.amount) }], + amount: proto + .getAmountList() + .map((amount) => snakeCaseKeys(amount.toObject())), } // @ts-ignore diff --git a/packages/sdk-ts/src/core/gov/msgs/MsgSubmitProposalExpiryFuturesMarketLaunch.ts b/packages/sdk-ts/src/core/gov/msgs/MsgSubmitProposalExpiryFuturesMarketLaunch.ts index cbc65da6d..cc5b803fe 100644 --- a/packages/sdk-ts/src/core/gov/msgs/MsgSubmitProposalExpiryFuturesMarketLaunch.ts +++ b/packages/sdk-ts/src/core/gov/msgs/MsgSubmitProposalExpiryFuturesMarketLaunch.ts @@ -99,6 +99,7 @@ export default class MsgSubmitProposalExpiryFuturesMarketLaunch extends MsgBase< public toAmino(): MsgSubmitProposalExpiryFuturesMarketLaunch.Amino { const { params } = this + const proto = this.toProto() const content = this.getContent() const proposalType = '/injective.exchange.v1beta1.ExpiryFuturesMarketLaunchProposal' @@ -108,7 +109,9 @@ export default class MsgSubmitProposalExpiryFuturesMarketLaunch extends MsgBase< content: { ...content.toObject(), }, - initial_deposit: [{ ...snakeCaseKeys(params.deposit) }], + initial_deposit: proto + .getInitialDepositList() + .map((amount) => snakeCaseKeys(amount.toObject())), } const messageWithProposalType = { diff --git a/packages/sdk-ts/src/core/gov/msgs/MsgSubmitProposalPerpetualMarketLaunch.ts b/packages/sdk-ts/src/core/gov/msgs/MsgSubmitProposalPerpetualMarketLaunch.ts index 9835bdeb0..9fd43144e 100644 --- a/packages/sdk-ts/src/core/gov/msgs/MsgSubmitProposalPerpetualMarketLaunch.ts +++ b/packages/sdk-ts/src/core/gov/msgs/MsgSubmitProposalPerpetualMarketLaunch.ts @@ -98,6 +98,7 @@ export default class MsgSubmitProposalPerpetualMarketLaunch extends MsgBase< public toAmino(): MsgSubmitProposalPerpetualMarketLaunch.Amino { const { params } = this + const proto = this.toProto() const content = this.getContent() const proposalType = '/injective.exchange.v1beta1.PerpetualMarketLaunchProposal' @@ -107,7 +108,9 @@ export default class MsgSubmitProposalPerpetualMarketLaunch extends MsgBase< content: { ...content.toObject(), }, - initial_deposit: [{ ...snakeCaseKeys(params.deposit) }], + initial_deposit: proto + .getInitialDepositList() + .map((amount) => snakeCaseKeys(amount.toObject())), } const messageWithProposalType = { diff --git a/packages/sdk-ts/src/core/gov/msgs/MsgSubmitProposalSpotMarketLaunch.ts b/packages/sdk-ts/src/core/gov/msgs/MsgSubmitProposalSpotMarketLaunch.ts index dcc3036d1..c97011de1 100644 --- a/packages/sdk-ts/src/core/gov/msgs/MsgSubmitProposalSpotMarketLaunch.ts +++ b/packages/sdk-ts/src/core/gov/msgs/MsgSubmitProposalSpotMarketLaunch.ts @@ -91,6 +91,7 @@ export default class MsgSubmitProposalSpotMarketLaunch extends MsgBase< public toAmino(): MsgSubmitProposalSpotMarketLaunch.Amino { const { params } = this + const proto = this.toProto() const content = this.getContent() const proposalType = '/injective.exchange.v1beta1.SpotMarketLaunchProposal' @@ -99,7 +100,9 @@ export default class MsgSubmitProposalSpotMarketLaunch extends MsgBase< content: { ...content.toObject(), }, - initial_deposit: [{ ...snakeCaseKeys(params.deposit) }], + initial_deposit: proto + .getInitialDepositList() + .map((amount) => snakeCaseKeys(amount.toObject())), } const messageWithProposalType = { diff --git a/packages/sdk-ts/src/core/gov/msgs/MsgSubmitProposalSpotMarketParamUpdate.ts b/packages/sdk-ts/src/core/gov/msgs/MsgSubmitProposalSpotMarketParamUpdate.ts index c423ba938..5d7d1a9ff 100644 --- a/packages/sdk-ts/src/core/gov/msgs/MsgSubmitProposalSpotMarketParamUpdate.ts +++ b/packages/sdk-ts/src/core/gov/msgs/MsgSubmitProposalSpotMarketParamUpdate.ts @@ -93,6 +93,7 @@ export default class MsgSubmitProposalSpotMarketParamUpdate extends MsgBase< public toAmino(): MsgSubmitProposalSpotMarketParamUpdate.Amino { const { params } = this + const proto = this.toProto() const content = this.getContent() const proposalType = '/injective.exchange.v1beta1.SpotMarketParamUpdateProposal' @@ -102,7 +103,9 @@ export default class MsgSubmitProposalSpotMarketParamUpdate extends MsgBase< content: { ...content.toObject(), }, - initial_deposit: [{ ...snakeCaseKeys(params.deposit) }], + initial_deposit: proto + .getInitialDepositList() + .map((amount) => snakeCaseKeys(amount.toObject())), } const messageWithProposalType = { diff --git a/packages/sdk-ts/src/core/gov/msgs/MsgSubmitTextProposal.ts b/packages/sdk-ts/src/core/gov/msgs/MsgSubmitTextProposal.ts index 192c7161f..288ff854d 100644 --- a/packages/sdk-ts/src/core/gov/msgs/MsgSubmitTextProposal.ts +++ b/packages/sdk-ts/src/core/gov/msgs/MsgSubmitTextProposal.ts @@ -80,6 +80,7 @@ export default class MsgSubmitTextProposal extends MsgBase< public toAmino(): MsgSubmitTextProposal.Amino { const { params } = this + const proto = this.toProto() const content = this.getContent() const proposalType = '/cosmos.gov.v1beta1.TextProposal' @@ -88,7 +89,9 @@ export default class MsgSubmitTextProposal extends MsgBase< content: { ...content.toObject(), }, - initial_deposit: [{ ...snakeCaseKeys(params.deposit) }], + initial_deposit: proto + .getInitialDepositList() + .map((amount) => snakeCaseKeys(amount.toObject())), } const messageWithProposalType = { diff --git a/packages/sdk-ui-ts/src/core/clients/MsgBroadcastClient.ts b/packages/sdk-ui-ts/src/core/clients/MsgBroadcastClient.ts index 991d33a9e..3ab5e9df6 100644 --- a/packages/sdk-ui-ts/src/core/clients/MsgBroadcastClient.ts +++ b/packages/sdk-ui-ts/src/core/clients/MsgBroadcastClient.ts @@ -77,7 +77,6 @@ export class MsgBroadcastClient { try { const txResponse = await prepareTx() const signature = await signTx(txResponse.getData()) - // console.log(txResponse.getData(), signature) const promise = transactionApi.broadcastTxRequest({ signature,