Bug Fix: User is not able to send tBTC from Sui network

package.json

@@ -3,10 +3,10 @@
  "version": "0.1.78",
  "private": true,
  "dependencies": {
- "@certusone/wormhole-sdk": "^0.9.22",
- "@injectivelabs/sdk-ts": "^1.10.72",
- "@injectivelabs/ts-types": "^1.10.4",
- "@injectivelabs/wallet-ts": "^1.10.51",
+ "@certusone/wormhole-sdk": "^0.10.2",
+ "@injectivelabs/sdk-ts": "^1.12.1",
+ "@injectivelabs/ts-types": "^1.12.1",
+ "@injectivelabs/wallet-ts": "^1.12.1",
  "@manahippo/aptos-wallet-adapter": "^1.0.2",
  "@material-ui/core": "^4.12.2",
  "@material-ui/icons": "^4.11.2",
@@ -48,7 +48,7 @@
  "@xpla/wallet-provider": "^0.3.4",
  "@xpla/xpla.js": "^0.2.1",
  "alchemy-sdk": "2.8.0",
- "algosdk": "^1.15.0",
+ "algosdk": "^2.5.0",
  "aptos": "1.5.0",
  "axios": "^0.21.1",
  "bech32": "^1.1.4",

src/assets/providers/tbtc/solana/WormholeGateway.v2.ts

@@ -16,10 +16,10 @@ import {
 import {
  CHAIN_ID_ETH,
  CHAIN_ID_SOLANA,
- ChainId,
  SignedVaa,
  parseTokenTransferVaa,
 } from "@certusone/wormhole-sdk";
+import { ChainId } from "@xlabs-libs/wallet-aggregator-core";
 import { WormholeGatewayIdl } from "./WormholeGatewayIdl";
 import * as coreBridge from "@certusone/wormhole-sdk/lib/esm/solana/wormhole";
 import * as tokenBridge from "@certusone/wormhole-sdk/lib/esm/solana/tokenBridge";

src/components/ConnectWalletButton.tsx

@@ -1,4 +1,4 @@
-import { ChainId } from "@certusone/wormhole-sdk";
+import { ChainId } from "@xlabs-libs/wallet-aggregator-core";
 import { useCallback, useEffect, useState } from "react";
 import { Wallet } from "@xlabs-libs/wallet-aggregator-core";
 import {

src/components/KeyAndBalance.tsx

@@ -1,5 +1,4 @@
 import {
- ChainId,
  CHAIN_ID_ALGORAND,
  CHAIN_ID_APTOS,
  CHAIN_ID_INJECTIVE,
@@ -10,6 +9,7 @@ import {
  isTerraChain,
  CHAIN_ID_SUI,
 } from "@certusone/wormhole-sdk";
+import { ChainId } from "@xlabs-libs/wallet-aggregator-core";
 import ConnectWalletButton from "./ConnectWalletButton";
 
 function isChainAllowed(chainId: ChainId) {

src/components/LowBalanceWarning.tsx

@@ -1,4 +1,5 @@
-import { ChainId, isTerraChain } from "@certusone/wormhole-sdk";
+import { isTerraChain } from "@certusone/wormhole-sdk";
+import { ChainId } from "@xlabs-libs/wallet-aggregator-core";
 import { makeStyles, Typography } from "@material-ui/core";
 import { Alert } from "@material-ui/lab";
 import { useSelector } from "react-redux";

src/components/Migration/EvmQuickMigrate.tsx

@@ -1,4 +1,5 @@
-import { ChainId, ethers_contracts } from "@certusone/wormhole-sdk";
+import { ethers_contracts } from "@certusone/wormhole-sdk";
+import { ChainId } from "@xlabs-libs/wallet-aggregator-core";
 import { Signer } from "@ethersproject/abstract-signer";
 import { getAddress } from "@ethersproject/address";
 import { BigNumber } from "@ethersproject/bignumber";

src/components/Migration/EvmWorkflow.tsx

@@ -1,4 +1,4 @@
-import { ChainId } from "@certusone/wormhole-sdk";
+import { ChainId } from "@xlabs-libs/wallet-aggregator-core";
 import { CircularProgress, makeStyles, Typography } from "@material-ui/core";
 import { Alert } from "@material-ui/lab";
 import { parseUnits } from "ethers/lib/utils";

src/components/Migration/index.tsx

@@ -1,9 +1,9 @@
 import {
- ChainId,
  CHAIN_ID_BSC,
  CHAIN_ID_CELO,
  CHAIN_ID_ETH,
 } from "@certusone/wormhole-sdk";
+import { ChainId } from "@xlabs-libs/wallet-aggregator-core";
 import { getAddress } from "@ethersproject/address";
 import { Container, makeStyles, Paper, Typography } from "@material-ui/core";
 import { withRouter } from "react-router";

src/components/NFT/index.tsx

@@ -63,10 +63,10 @@ function NFT() {
  return;
  }
  if (sourceChain) {
- dispatch(setSourceChain(sourceChain));
+ dispatch(setSourceChain(sourceChain as any));
  }
  if (targetChain) {
- dispatch(setTargetChain(targetChain));
+ dispatch(setTargetChain(targetChain as any));
  }
  } catch (e) {
  console.error("Invalid path params specified.");

src/components/NFTOriginVerifier.tsx

@@ -1,5 +1,4 @@
 import {
- ChainId,
  CHAIN_ID_AURORA,
  CHAIN_ID_AVAX,
  CHAIN_ID_BSC,
@@ -11,6 +10,7 @@ import {
  isEVMChain,
  CHAIN_ID_APTOS,
 } from "@certusone/wormhole-sdk";
+import { ChainId } from "@xlabs-libs/wallet-aggregator-core";
 import {
  getOriginalAssetEth,
  getOriginalAssetSol,
@@ -82,8 +82,8 @@ export default function NFTOriginVerifier() {
  const classes = useStyles();
  const isBeta = useBetaContext();
  const [lookupChain, setLookupChain] = useState<ChainId>(CHAIN_ID_ETH);
- const { provider, signerAddress } = useEthereumProvider(lookupChain);
- const { isReady, statusMessage } = useIsWalletReady(lookupChain);
+ const { provider, signerAddress } = useEthereumProvider(lookupChain as any);
+ const { isReady, statusMessage } = useIsWalletReady(lookupChain as any);
  const [lookupAsset, setLookupAsset] = useState("");
  const [lookupTokenId, setLookupTokenId] = useState("");
  const [lookupCreatorAddress, setLookupCreatorAddress] = useState("");

src/components/Recovery.tsx

@@ -1,5 +1,4 @@
 import {
- ChainId,
  CHAIN_ID_ACALA,
  CHAIN_ID_ALGORAND,
  CHAIN_ID_APTOS,
@@ -37,6 +36,7 @@ import {
  CHAIN_ID_SUI,
  getForeignAssetSui,
 } from "@certusone/wormhole-sdk";
+import { ChainId } from "@xlabs-libs/wallet-aggregator-core";
 import { repairVaa } from "@certusone/wormhole-sdk/lib/esm/utils/repairVaa";
 import {
  Accordion,
@@ -623,7 +623,7 @@ export default function Recovery() {
  const tokenBridgeAddress =
  getTokenBridgeAddressForChain(CHAIN_ID_INJECTIVE);
  const tokenId = await queryExternalIdInjective(
- client,
+ client as any,
  tokenBridgeAddress,
  parsedPayload.originAddress
  );
@@ -658,7 +658,7 @@ export default function Recovery() {
  useEffect(() => {
  try {
  if (sourceChain && transactionId) {
- setRecoverySourceChain(sourceChain);
+ setRecoverySourceChain(sourceChain as any);
  setRecoverySourceTx(transactionId);
  } else if (vaaHex) {
  setRecoverySignedVAA(vaaHex);

src/components/TokenOriginVerifier.tsx

@@ -1,12 +1,12 @@
 import {
- ChainId,
  CHAIN_ID_ETH,
  CHAIN_ID_NEAR,
  CHAIN_ID_SOLANA,
  CHAIN_ID_TERRA2,
  isEVMChain,
  nativeToHexString,
 } from "@certusone/wormhole-sdk";
+import { ChainId } from "@xlabs-libs/wallet-aggregator-core";
 import {
  Card,
  CircularProgress,

src/components/TokenSelectors/EvmTokenPicker.tsx

@@ -1,8 +1,5 @@
-import {
- ChainId,
- CHAIN_ID_ETH,
- ethers_contracts,
-} from "@certusone/wormhole-sdk";
+import { CHAIN_ID_ETH, ethers_contracts } from "@certusone/wormhole-sdk";
+import { ChainId } from "@xlabs-libs/wallet-aggregator-core";
 import { WormholeAbi__factory } from "@certusone/wormhole-sdk/lib/esm/ethers-contracts/abi";
 import { getAddress as getEthAddress } from "@ethersproject/address";
 import React, { useCallback } from "react";

src/components/TransactionProgress.tsx

@@ -1,5 +1,4 @@
 import {
- ChainId,
  CHAIN_ID_ACALA,
  CHAIN_ID_ARBITRUM,
  CHAIN_ID_AURORA,
@@ -16,6 +15,7 @@ import {
  isEVMChain,
  CHAIN_ID_BASE,
 } from "@certusone/wormhole-sdk";
+import { ChainId } from "@xlabs-libs/wallet-aggregator-core";
 import { LinearProgress, makeStyles, Typography } from "@material-ui/core";
 import { Connection } from "@solana/web3.js";
 import { useEffect, useState } from "react";

src/components/Transfer/RegisterNowButton.tsx

@@ -16,7 +16,6 @@ import {
  selectTransferTargetChain,
 } from "../../store/selectors";
 import {
- ChainId,
  CHAIN_ID_APTOS,
  CHAIN_ID_INJECTIVE,
  CHAIN_ID_NEAR,
@@ -25,6 +24,7 @@ import {
  hexToNativeAssetString,
  CHAIN_ID_SUI,
 } from "@certusone/wormhole-sdk";
+import { ChainId } from "@xlabs-libs/wallet-aggregator-core";
 
 export function RegisterNowButtonCore({
  originChain,
@@ -57,7 +57,7 @@ export function RegisterNowButtonCore({
  if (originChain && originAsset && nativeAsset && canSwitch) {
  dispatch(setSourceChain(originChain));
  dispatch(setSourceAsset(nativeAsset));
- dispatch(setTargetChain(targetChain));
+ dispatch(setTargetChain(targetChain as any));
  dispatch(setStep(2));
  history.push("/register");
  }

src/components/Transfer/index.tsx

@@ -49,8 +49,8 @@ function Transfer() {
 
  useEffect(() => {
  if (sourceChain && targetChain) {
- dispatch(setSourceChain(sourceChain));
- dispatch(setTargetChain(targetChain));
+ dispatch(setSourceChain(sourceChain as any));
+ dispatch(setTargetChain(targetChain as any));
  }
  }, [sourceChain, targetChain, dispatch]);
 

src/contexts/TerraWalletContext.tsx

@@ -1,5 +1,6 @@
 import { ConnectType } from "@terra-money/wallet-provider";
-import { ChainId, isTerraChain } from "@xlabs-libs/wallet-aggregator-core";
+import { isTerraChain } from "@xlabs-libs/wallet-aggregator-core";
+import { ChainId } from "@xlabs-libs/wallet-aggregator-core";
 import { useWallet } from "@xlabs-libs/wallet-aggregator-react";
 import { getWallets, TerraWallet } from "@xlabs-libs/wallet-aggregator-terra";
 import { useEffect, useMemo, useState } from "react";

src/hooks/useAllowance.ts

@@ -1,10 +1,10 @@
 import {
  approveEth,
- ChainId,
  CHAIN_ID_KLAYTN,
  getAllowanceEth,
  isEVMChain,
 } from "@certusone/wormhole-sdk";
+import { ChainId } from "@xlabs-libs/wallet-aggregator-core";
 import { BigNumber } from "ethers";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";

src/hooks/useCheckIfWormholeWrapped.ts

@@ -1,5 +1,4 @@
 import {
- ChainId,
  CHAIN_ID_ALGORAND,
  CHAIN_ID_APTOS,
  CHAIN_ID_NEAR,
@@ -20,6 +19,7 @@ import {
  getOriginalAssetSui,
  CHAIN_ID_ETH,
 } from "@certusone/wormhole-sdk";
+import { ChainId } from "@xlabs-libs/wallet-aggregator-core";
 import {
  getOriginalAssetEth as getOriginalAssetEthNFT,
  getOriginalAssetSol as getOriginalAssetSolNFT,
@@ -75,6 +75,7 @@ const makeStateSafe = (
  info: WormholeWrappedInfo
 ): StateSafeWormholeWrappedInfo => ({
  ...info,
+ chainId: info.chainId as any,
  assetAddress: uint8ArrayToHex(info.assetAddress),
 });
 
@@ -247,7 +248,7 @@ function useCheckIfWormholeWrapped(nft?: boolean) {
  );
  const wrappedInfo = makeStateSafe(
  await getOriginalAssetAlgorand(
- algodClient,
+ algodClient as any,
  ALGORAND_TOKEN_BRIDGE_ID,
  BigInt(sourceAsset)
  )
@@ -280,7 +281,7 @@ function useCheckIfWormholeWrapped(nft?: boolean) {
  try {
  const client = getInjectiveWasmClient();
  const wrappedInfo = makeStateSafe(
- await getOriginalAssetInjective(sourceAsset, client)
+ await getOriginalAssetInjective(sourceAsset, client as any)
  );
  if (!cancelled) {
  dispatch(setSourceWormholeWrappedInfo(wrappedInfo));

src/hooks/useEvmMetadata.ts

@@ -1,4 +1,5 @@
-import { ChainId, isEVMChain } from "@certusone/wormhole-sdk";
+import { isEVMChain } from "@certusone/wormhole-sdk";
+import { ChainId } from "@xlabs-libs/wallet-aggregator-core";
 import { ethers } from "ethers";
 import { useEffect, useMemo, useState } from "react";
 import {

src/hooks/useFetchForeignAsset.ts

@@ -1,6 +1,5 @@
 import {
  buildTokenId,
- ChainId,
  CHAIN_ID_ALGORAND,
  CHAIN_ID_APTOS,
  CHAIN_ID_INJECTIVE,
@@ -22,6 +21,7 @@ import {
  CHAIN_ID_SUI,
  getForeignAssetSui,
 } from "@certusone/wormhole-sdk";
+import { ChainId } from "@xlabs-libs/wallet-aggregator-core";
 import { Connection } from "@solana/web3.js";
 import { LCDClient } from "@terra-money/terra.js";
 import { ethers } from "ethers";
@@ -196,7 +196,7 @@ function useFetchForeignAsset(
  ALGORAND_HOST.algodPort
  );
  return getForeignAssetAlgorand(
- algodClient,
+ algodClient as any,
  ALGORAND_TOKEN_BRIDGE_ID,
  originChain,
  originAssetHex
@@ -220,7 +220,7 @@ function useFetchForeignAsset(
  const client = getInjectiveWasmClient();
  return getForeignAssetInjective(
  getTokenBridgeAddressForChain(foreignChain),
- client,
+ client as any,
  originChain,
  hexToUint8Array(originAssetHex)
  );

src/hooks/useFetchTargetAsset.ts

@@ -1,5 +1,4 @@
 import {
- ChainId,
  CHAIN_ID_ALGORAND,
  CHAIN_ID_APTOS,
  CHAIN_ID_INJECTIVE,
@@ -25,6 +24,7 @@ import {
  CHAIN_ID_SUI,
  getForeignAssetSui,
 } from "@certusone/wormhole-sdk";
+import { ChainId } from "@xlabs-libs/wallet-aggregator-core";
 import {
  getForeignAssetEth as getForeignAssetEthNFT,
  getForeignAssetSol as getForeignAssetSolNFT,
@@ -263,7 +263,7 @@ function useFetchTargetAsset(nft?: boolean) {
  const tokenBridgeAddress =
  getTokenBridgeAddressForChain(CHAIN_ID_INJECTIVE);
  const tokenId = await queryExternalIdInjective(
- client,
+ client as any,
  tokenBridgeAddress,
  originAsset || ""
  );
@@ -525,7 +525,7 @@ function useFetchTargetAsset(nft?: boolean) {
  ALGORAND_HOST.algodPort
  );
  const asset = await getForeignAssetAlgorand(
- algodClient,
+ algodClient as any,
  ALGORAND_TOKEN_BRIDGE_ID,
  originChain,
  originAsset
@@ -599,7 +599,7 @@ function useFetchTargetAsset(nft?: boolean) {
  const client = getInjectiveWasmClient();
  const asset = await getForeignAssetInjective(
  getTokenBridgeAddressForChain(targetChain),
- client,
+ client as any,
  originChain,
  hexToUint8Array(originAsset)
  );

src/hooks/useGetIsTransferCompleted.ts

@@ -195,7 +195,7 @@ export default function useGetIsTransferCompleted(
  ALGORAND_HOST.algodPort
  );
  transferCompleted = await getIsTransferCompletedAlgorand(
- algodClient,
+ algodClient as any,
  ALGORAND_TOKEN_BRIDGE_ID,
  signedVAA
  );
@@ -233,7 +233,7 @@ export default function useGetIsTransferCompleted(
  transferCompleted = await getIsTransferCompletedInjective(
  getTokenBridgeAddressForChain(targetChain),
  signedVAA,
- client
+ client as any
  );
  } catch (error) {
  console.error(error);