Redeem via relayer

bridge_ui/src/components/Transfer/WaitingForWalletMessage.tsx

@@ -4,6 +4,7 @@ import { useSelector } from "react-redux";
 import {
   selectTransferIsApproving,
   selectTransferIsRedeeming,
+  selectTransferIsRedeemingViaRelayer,
   selectTransferIsSending,
   selectTransferIsWalletApproved,
   selectTransferRedeemTx,
@@ -33,15 +34,18 @@ export default function WaitingForWalletMessage() {
   const transferTx = useSelector(selectTransferTransferTx);
   const targetChain = useSelector(selectTransferTargetChain);
   const isRedeeming = useSelector(selectTransferIsRedeeming);
+  const isRedeemingViaRelayer = useSelector(selectTransferIsRedeemingViaRelayer);
   const redeemTx = useSelector(selectTransferRedeemTx);
-  const showWarning =
+  const showNote =
     isApproving || (isSending && !transferTx) || (isRedeeming && !redeemTx);
-  return showWarning ? (
-    <Typography className={classes.message} variant="body2">
-      {isWalletApproved ? WAITING_FOR_TX_CONFIRMATION : WAITING_FOR_WALLET_APPROVAL}{" "}
-      {targetChain === CHAIN_ID_SOLANA && isRedeeming
-        ? "Note: there will be several transactions"
-        : null}
-    </Typography>
-  ) : null;
+  return isRedeemingViaRelayer
+    ? (<Typography className={classes.message} variant="body2">Trying redeem via relayer...</Typography>)
+    : showNote
+    ? (<Typography className={classes.message} variant="body2">
+        {isWalletApproved ? WAITING_FOR_TX_CONFIRMATION : WAITING_FOR_WALLET_APPROVAL}{" "}
+        {targetChain === CHAIN_ID_SOLANA && isRedeeming
+          ? "Note: there will be several transactions"
+          : null}
+       </Typography>)
+    : null;
 }

bridge_ui/src/hooks/useHandleRedeem.tsx

@@ -13,7 +13,8 @@ import {
   uint8ArrayToHex,
   getTokenBridgeForChainId,
   getIsTransferCompletedAlph,
-  redeemOnAlphWithReward
+  redeemOnAlphWithReward,
+  deserializeVAA
 } from "@alephium/wormhole-sdk";
 import { Alert } from "@material-ui/lab";
 import { WalletContextState } from "@solana/wallet-adapter-react";
@@ -38,7 +39,7 @@ import {
   selectTransferSourceChain,
   selectTransferTargetChain,
 } from "../store/selectors";
-import { setIsRedeeming, setIsWalletApproved, setRedeemTx } from "../store/transferSlice";
+import { setIsRedeeming, setIsRedeemingViaRelayer, setIsWalletApproved, setRedeemCompleted, setRedeemTx } from "../store/transferSlice";
 import { signSendAndConfirmAlgorand } from "../utils/algorand";
 import {
   ACALA_RELAY_URL,
@@ -54,6 +55,8 @@ import {
   SOL_BRIDGE_ADDRESS,
   SOL_TOKEN_BRIDGE_ADDRESS,
   TERRA_TOKEN_BRIDGE_ADDRESS,
+  CLUSTER,
+  RELAYER_HOST,
 } from "../utils/consts";
 import parseError from "../utils/parseError";
 import { postVaaWithRetry } from "../utils/postVaa";
@@ -63,6 +66,7 @@ import { getEmitterChainId, waitALPHTxConfirmed } from "../utils/alephium";
 import useTransferSignedVAA from "./useTransferSignedVAA";
 import { redeemOnEthNativeWithoutWait, redeemOnEthWithoutWait } from "../utils/ethereum";
 import { useWallet, Wallet as AlephiumWallet } from "@alephium/web3-react";
+import { SignerProvider } from "@alephium/web3";
 
 async function algo(
   dispatch: any,
@@ -235,6 +239,46 @@ async function terra(
   }
 }
 
+async function redeemViaRelayer(
+  dispatch: any,
+  signer: SignerProvider,
+  tokenBridgeForChainId: string,
+  signedVAA: Uint8Array
+): Promise<string | undefined> {
+  try {
+    dispatch(setIsRedeemingViaRelayer(true))
+    const parsedVAA = deserializeVAA(signedVAA)
+    const emitterChain = parsedVAA.body.emitterChainId.toString()
+    const targetChain = parsedVAA.body.targetChainId.toString()
+    const emitterAddress = uint8ArrayToHex(parsedVAA.body.emitterAddress)
+    const sequence = parsedVAA.body.sequence.toString()
+    const url = `${RELAYER_HOST}/vaas/${emitterChain}/${emitterAddress}/${targetChain}/${sequence}`
+    const { data } = await axios.request({ url, method: 'POST', timeout: 15000 })
+    if (data.error) {
+      throw new Error(data.error)
+    }
+    dispatch(setIsWalletApproved(true))
+    dispatch(setIsRedeemingViaRelayer(false))
+    return data.txId ? data.txId as string : undefined
+  } catch (error) {
+    dispatch(setIsRedeemingViaRelayer(false))
+    console.error(`failed to redeem via relayer, error: ${error}`)
+    return await redeemManually(dispatch, signer, tokenBridgeForChainId, signedVAA)
+  }
+}
+
+async function redeemManually(
+  dispatch: any,
+  signer: SignerProvider,
+  tokenBridgeForChainId: string,
+  signedVAA: Uint8Array
+): Promise<string> {
+  const result = await redeemOnAlphWithReward(signer, ALEPHIUM_BRIDGE_REWARD_ROUTER_ID, tokenBridgeForChainId, signedVAA)
+  console.log(`the redemption tx has been submitted, txId: ${result.txId}`)
+  dispatch(setIsWalletApproved(true))
+  return result.txId
+}
+
 async function alephium(
   dispatch: any,
   enqueueSnackbar: any,
@@ -248,19 +292,31 @@ async function alephium(
   try {
     const emitterChainId = getEmitterChainId(signedVAA)
     const tokenBridgeForChainId = getTokenBridgeForChainId(ALEPHIUM_TOKEN_BRIDGE_CONTRACT_ID, emitterChainId, ALEPHIUM_BRIDGE_GROUP_INDEX)
-    console.log('redeem on alephium')
-    const result = await redeemOnAlphWithReward(wallet.signer, ALEPHIUM_BRIDGE_REWARD_ROUTER_ID, tokenBridgeForChainId, signedVAA)
-    console.log(`the redeem tx has been submitted, txId: ${result.txId}`)
-    dispatch(setIsWalletApproved(true))
-    const confirmedTx = await waitALPHTxConfirmed(wallet.nodeProvider, result.txId, 1)
+
+    let txId: string | undefined = undefined
+    if (CLUSTER === 'mainnet') {
+      txId = await redeemViaRelayer(dispatch, wallet.signer, tokenBridgeForChainId, signedVAA)
+    } else {
+      txId = await redeemManually(dispatch, wallet.signer, tokenBridgeForChainId, signedVAA)
+    }
+
+    if (txId === undefined) {
+      dispatch(setRedeemCompleted())
+      enqueueSnackbar(null, {
+        content: <Alert severity="success">Transaction confirmed</Alert>,
+      });
+      return
+    }
+
+    const confirmedTx = await waitALPHTxConfirmed(wallet.nodeProvider, txId, 1)
     const blockHeader = await wallet.nodeProvider.blockflow.getBlockflowHeadersBlockHash(confirmedTx.blockHash)
     dispatch(
-      setRedeemTx({ id: result.txId, blockHeight: blockHeader.height })
+      setRedeemTx({ id: txId, blockHeight: blockHeader.height })
     );
-    console.log(`the redeem tx has been confirmed, txId: ${result.txId}`)
+    console.log(`the redeem tx has been confirmed, txId: ${txId}`)
     const isTransferCompleted = await getIsTransferCompletedAlph(
       tokenBridgeForChainId,
-      wallet.account.group,
+      ALEPHIUM_BRIDGE_GROUP_INDEX,
       signedVAA
     )
     if (isTransferCompleted) {
@@ -272,6 +328,7 @@ async function alephium(
         content: <Alert severity="error">Transfer failed, please try again later</Alert>,
       });
     }
+
   } catch (e) {
     enqueueSnackbar(null, {
       content: <Alert severity="error">{parseError(e)}</Alert>,

bridge_ui/src/store/selectors.ts

@@ -215,6 +215,8 @@ export const selectTransferIsWalletApproved = (state: RootState) =>
   state.transfer.isWalletApproved
 export const selectTransferIsRedeeming = (state: RootState) =>
   state.transfer.isRedeeming;
+export const selectTransferIsRedeemingViaRelayer = (state: RootState) =>
+  state.transfer.isRedeemingViaRelayer
 export const selectTransferRedeemTx = (state: RootState) =>
   state.transfer.redeemTx;
 export const selectTransferIsApproving = (state: RootState) =>
@@ -352,7 +354,7 @@ export const selectTransferIsTargetComplete = (state: RootState) =>
 export const selectTransferIsSendComplete = (state: RootState) =>
   !!selectTransferSignedVAAHex(state);
 export const selectTransferIsRedeemComplete = (state: RootState) =>
-  !!selectTransferRedeemTx(state);
+  !!selectTransferRedeemTx(state) || state.transfer.isRedeemCompleted;
 export const selectTransferShouldLockFields = (state: RootState) =>
   selectTransferIsSending(state) || selectTransferIsSendComplete(state);
 export const selectTransferIsRecovery = (state: RootState) =>

bridge_ui/src/store/transferSlice.ts

@@ -56,7 +56,9 @@ export interface TransferState {
   isSending: boolean;
   isWalletApproved: boolean;
   isRedeeming: boolean;
+  isRedeemingViaRelayer: boolean;
   redeemTx: Transaction | undefined;
+  isRedeemCompleted: boolean;
   isApproving: boolean;
   isRecovery: boolean;
   gasPrice: number | undefined;
@@ -83,7 +85,9 @@ const initialState: TransferState = {
   isSending: false,
   isWalletApproved: false,
   isRedeeming: false,
+  isRedeemingViaRelayer: false,
   redeemTx: undefined,
+  isRedeemCompleted: false,
   isApproving: false,
   isRecovery: false,
   gasPrice: undefined,
@@ -222,11 +226,21 @@ export const transferSlice = createSlice({
     setIsRedeeming: (state, action: PayloadAction<boolean>) => {
       state.isRedeeming = action.payload;
     },
+    setIsRedeemingViaRelayer: (state, action: PayloadAction<boolean>) => {
+      state.isRedeemingViaRelayer = action.payload
+    },
     setRedeemTx: (state, action: PayloadAction<Transaction>) => {
       state.redeemTx = action.payload;
       state.isRedeeming = false;
+      state.isRedeemingViaRelayer = false;
       state.isWalletApproved = false;
     },
+    setRedeemCompleted: (state) => {
+      state.isRedeemCompleted = true
+      state.isRedeeming = false
+      state.isRedeemingViaRelayer = false;
+      state.isWalletApproved = false
+    },
     setIsApproving: (state, action: PayloadAction<boolean>) => {
       state.isApproving = action.payload;
     },
@@ -270,6 +284,7 @@ export const transferSlice = createSlice({
       state.activeStep = 3;
       state.isRecovery = true;
       state.redeemTx = undefined
+      state.isRedeemCompleted = false
       state.useRelayer = action.payload.useRelayer;
     },
     setGasPrice: (state, action: PayloadAction<number | undefined>) => {
@@ -332,7 +347,9 @@ export const {
   setIsSending,
   setIsWalletApproved,
   setIsRedeeming,
+  setIsRedeemingViaRelayer,
   setRedeemTx,
+  setRedeemCompleted,
   setIsApproving,
   reset,
   setRecoveryVaa,

bridge_ui/src/utils/consts.ts

@@ -315,6 +315,13 @@ export const EXPLORER_API_SERVER_HOST =
     ? 'https://v2.indexer-api.explorer.testnet.bridge.alephium.org'
     : 'http://localhost:8100'
 
+export const RELAYER_HOST =
+  CLUSTER === 'mainnet'
+    ? ''
+    : CLUSTER === 'testnet'
+    ? ''
+    : 'http://localhost:31000'
+
 export const ALEPHIUM_HOST =
   CLUSTER === "mainnet"
     ? alephiumMainnetConfig.nodeUrl