Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: parse undefined memo sent from api #237

Merged
merged 2 commits into from
Nov 1, 2023
Merged

fix: parse undefined memo sent from api #237

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbb64aa
fix: parse undefined memo sent from api
odcey Nov 1, 2023
513a5b4
Merge remote-tracking branch 'origin/main' into fix/handle-undefined-…
odcey Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@ import axios, { AxiosInstance } from "axios";
import { BigNumber, UnsignedTransaction, ethers } from "ethers";

import {
ChainType,
Allowance,
Approve,
ApproveRoute,
ChainData,
ChainType,
Config,
CosmosAddress,
CosmosBalance,
CosmosChain,
CosmosMsg,
ExecuteRoute,
GetRoute,
Expand All @@ -38,10 +41,7 @@ import {
TransactionRequest,
ValidateBalanceAndApproval,
WASM_TYPE,
WasmHookMsg,
CosmosChain,
CosmosAddress,
CosmosBalance
WasmHookMsg
} from "./types";

import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
Expand All @@ -53,10 +53,10 @@ import { parseStatusResponse } from "./0xsquid/v1/status";
import erc20Abi from "./abi/erc20.json";
import { nativeTokenConstant, uint256MaxValue } from "./constants";
import { ErrorType, SquidError } from "./error";
import { getCosmosBalances } from "./services/getCosmosBalances";
import { getAllEvmTokensBalance } from "./services/getEvmBalances";
import { getChainData, getTokenData } from "./utils";
import { setAxiosInterceptors } from "./utils/setAxiosInterceptors";
import { getAllEvmTokensBalance } from "./services/getEvmBalances";
import { getCosmosBalances } from "./services/getCosmosBalances";

const baseUrl = "https://testnet.api.0xsquid.com/";

Expand Down Expand Up @@ -514,10 +514,14 @@ export class Squid {
// TODO: At the moment there's a limit on Ledger Nano S models
// This limit prevents WASM_TYPE messages to be signed (because payload message is too big)
const aminoTypes = this.getAminoTypeConverters();
const firstMsg = msgs[0];
const formattedMsg = {
...msgs[0],
...firstMsg,
value: {
...msgs[0].value,
...firstMsg.value,
// Memo cannot be undefined, otherwise amino converter throws error
memo: (firstMsg.value as any).memo || "",
// Timeout wasn't formatted in the right way, so getting it manually
timeoutTimestamp: this.getTimeoutTimestamp()
}
};
Expand Down
Loading