chore: working tx submission

Author: micaelae

shared/modules/bridge-utils/bridge.util.ts

@@ -152,6 +152,7 @@ export async function fetchBridgeQuotes(
     insufficientBal: request.insufficientBal ? 'true' : 'false',
     resetApproval: request.resetApproval ? 'true' : 'false',
     aggIds: isMultichainRequest(request) ? 'lifi' : 'lifi,squid,socket',
+    destWalletAddress: request.destWalletAddress,
   });
   const url = `${BRIDGE_API_BASE_URL}/getQuote?${queryParams}`;
   const quotes = await fetchWithCache({

shared/types/bridge.ts

@@ -124,7 +124,7 @@ export type Quote = {
 export type QuoteResponse = {
   quote: Quote;
   approval: TxData | null;
-  trade: TxData;
+  trade: TxData | string;
   estimatedProcessingTimeInSeconds: number;
 };
 

ui/hooks/accounts/useMultichainWalletSnapClient.ts

@@ -3,6 +3,7 @@ import { HandlerType } from '@metamask/snaps-utils';
 import { CaipChainId, Json, JsonRpcRequest } from '@metamask/utils';
 import { SnapId } from '@metamask/snaps-sdk';
 import { useMemo } from 'react';
+import { KeyringRequest } from '@metamask/keyring-api';
 import {
   handleSnapRequest,
   multichainUpdateBalance,
@@ -63,6 +64,21 @@ export class MultichainWalletSnapClient {
     // fetch explicitly here (since we are already in a `async` call) and wait for it to be updated!
     await multichainUpdateBalance(account.id);
   }
+
+  async submitRequest(request: KeyringRequest) {
+    // This will trigger the Snap account creation flow (+ account renaming)
+    const accounts = await this.#client.submitRequest({
+      origin: 'metamask',
+      handler: HandlerType.OnRpcRequest,
+      request,
+      params: {
+        scope: request.scope,
+        account: request.account,
+        id: request.id,
+      },
+    });
+    return accounts;
+  }
 }
 
 export function useMultichainWalletSnapClient(clientType: WalletClientType) {

ui/pages/bridge/hooks/useHandleBridgeTx.ts

@@ -1,11 +1,14 @@
 import { BigNumber } from 'bignumber.js';
 import { TransactionType } from '@metamask/transaction-controller';
+import { useSelector } from 'react-redux';
 import { Numeric } from '../../../../shared/modules/Numeric';
 import { FeeType, type QuoteResponse } from '../../../../shared/types/bridge';
+import { getMultichainIsSolana } from '../../../selectors/multichain';
 import useHandleTx from './useHandleTx';
 
 export default function useHandleBridgeTx() {
-  const { handleTx } = useHandleTx();
+  const { handleTx, handleSolanaTx } = useHandleTx();
+  const isSolana = useSelector(getMultichainIsSolana);
 
   const handleBridgeTx = async ({
     quoteResponse,
@@ -21,6 +24,12 @@ export default function useHandleBridgeTx() {
       .shiftedBy(quoteResponse.quote.srcAsset.decimals)
       .toString();
 
+    if (isSolana) {
+      return await handleSolanaTx({
+        txType: TransactionType.bridge,
+        trade: quoteResponse.trade,
+      });
+    }
     const txMeta = await handleTx({
       txType: TransactionType.bridge,
       txParams: quoteResponse.trade,

ui/pages/bridge/hooks/useHandleTx.ts

@@ -8,16 +8,21 @@ import {
   addTransaction,
   updateTransaction,
   addTransactionAndWaitForPublish,
+  bridgeMultichainTransaction,
 } from '../../../store/actions';
 import {
   getHexMaxGasLimit,
   getTxGasEstimates,
 } from '../../../ducks/bridge/utils';
 import { getGasFeeEstimates } from '../../../ducks/metamask/metamask';
-import { checkNetworkAndAccountSupports1559 } from '../../../selectors';
+import {
+  checkNetworkAndAccountSupports1559,
+  getSelectedInternalAccount,
+} from '../../../selectors';
 import type { ChainId } from '../../../../shared/types/bridge';
 import { decimalToPrefixedHex } from '../../../../shared/modules/conversion.utils';
 import { getIsSmartTransaction } from '../../../../shared/modules/selectors';
+import { useMultichainSelector } from '../../../hooks/useMultichainSelector';
 
 export default function useHandleTx() {
   const dispatch = useDispatch();
@@ -88,5 +93,30 @@ export default function useHandleTx() {
     return txMeta;
   };
 
-  return { handleTx };
+  const selectedAccount = useMultichainSelector(getSelectedInternalAccount);
+
+  const handleSolanaTx = async ({
+    txType,
+    trade,
+    fieldsToAddToTxMeta,
+  }: {
+    txType: TransactionType.bridge;
+    trade: string;
+    fieldsToAddToTxMeta: Omit<Partial<TransactionMeta>, 'status'>; // We don't add status, so omit it to fix the type error
+  }) => {
+    const res = await bridgeMultichainTransaction(
+      selectedAccount.metadata.snap.id,
+      {
+        account: selectedAccount.id,
+        scope: selectedAccount.options.scope,
+        base64EncodedTransactionMessage: trade,
+      },
+    );
+    console.log('=======res', res);
+    // await dispatch(setDefaultHomeActiveTabName('activity'));
+    await forceUpdateMetamaskState(dispatch);
+
+    return {};
+  };
+  return { handleTx, handleSolanaTx };
 }

ui/pages/bridge/hooks/useSubmitBridgeTransaction.ts

@@ -15,11 +15,17 @@ import {
 } from '../../../helpers/constants/routes';
 import { setDefaultHomeActiveTabName } from '../../../store/actions';
 import { startPollingForBridgeTxStatus } from '../../../ducks/bridge-status/actions';
-import { isHardwareWallet } from '../../../selectors';
+import {
+  getMemoizedUnapprovedTemplatedConfirmations,
+  getSelectedInternalAccount,
+  isHardwareWallet,
+} from '../../../selectors';
 import { getQuoteRequest } from '../../../ducks/bridge/selectors';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
 import { getCurrentChainId } from '../../../../shared/modules/selectors/networks';
 import { setWasTxDeclined } from '../../../ducks/bridge/actions';
+import { getMultichainIsSolana } from '../../../selectors/multichain';
+import { useMultichainSelector } from '../../../hooks/useMultichainSelector';
 import useAddToken from './useAddToken';
 import useHandleApprovalTx from './useHandleApprovalTx';
 import useHandleBridgeTx from './useHandleBridgeTx';
@@ -57,9 +63,41 @@ export default function useSubmitBridgeTransaction() {
   const hardwareWalletUsed = useSelector(isHardwareWallet);
   const { slippage } = useSelector(getQuoteRequest);
 
+  const isSolana = useSelector(getMultichainIsSolana);
+  const unapprovedTemplatedConfirmations = useSelector(
+    getMemoizedUnapprovedTemplatedConfirmations,
+  );
+  const selectedAccount = useMultichainSelector(getSelectedInternalAccount);
+  // Navigate to confirmation page on submit
+  // We don't need this since only one approval is required
+  /*
+  useEffect(() => {
+    const templatedSnapApproval = unapprovedTemplatedConfirmations.find(
+      (approval) => {
+        return (
+          approval.type === 'snap_dialog' &&
+          selectedAccount.metadata.snap &&
+          selectedAccount.metadata.snap.id === approval.origin &&
+          isMultichainWalletSnap(selectedAccount.metadata.snap.id)
+        );
+      },
+    );
+
+    if (templatedSnapApproval) {
+      history.push(`${CONFIRMATION_V_NEXT_ROUTE}/${templatedSnapApproval.id}`);
+    }
+  }, [unapprovedTemplatedConfirmations, history, selectedAccount]);
+  */
+
   const submitBridgeTransaction = async (
     quoteResponse: QuoteResponse & QuoteMetadata,
   ) => {
+    if (isSolana) {
+      console.log('=======submitting this trade', quoteResponse.trade);
+      await handleBridgeTx({ quoteResponse, approvalTxId: undefined });
+      // TODO fetch the tx status afterwards and mabe show the tx in the activity tab
+      return;
+    }
     if (hardwareWalletUsed) {
       history.push(`${CROSS_CHAIN_SWAP_ROUTE}${AWAITING_SIGNATURES_ROUTE}`);
     }

ui/store/actions.ts

@@ -6062,3 +6062,31 @@ export async function sendMultichainTransaction(
     },
   });
 }
+
+export async function bridgeMultichainTransaction(
+  snapId: string,
+  {
+    account,
+    scope,
+    base64EncodedTransactionMessage,
+  }: {
+    account: string;
+    scope: string;
+    base64EncodedTransactionMessage: string;
+  },
+) {
+  await handleSnapRequest({
+    snapId,
+    origin: 'metamask',
+    handler: HandlerType.OnRpcRequest,
+    request: {
+      id: crypto.randomUUID(),
+      method: 'submitBridgeTx',
+      params: {
+        account,
+        scope,
+        base64EncodedTransactionMessage,
+      },
+    },
+  });
+}

ui/store/store.ts

@@ -154,7 +154,7 @@ export default function configureStore(preloadedState: any) {
         immutableCheck: false,
       }).concat((store: any) => (next: any) => (action: any) => {
         console.groupCollapsed(action.type);
-        console.log('=====bridgeState', store.getState().metamask.bridgeState);
+        console.log('=====', store.getState().metamask);
         const result = next(action);
         console.log('=====bridge', store.getState().bridge);
         console.groupEnd(action.type);