feat: support chainport bridge fee upgrade

Author: whohideonbug

main/api/chainport/handleSendChainportBridgeTransaction.ts

@@ -4,7 +4,10 @@ import { z } from "zod";
 import {
   buildTransactionRequestParams,
   buildTransactionRequestParamsInputs,
+  isBridgeFeeV1,
+  isBridgeFeeV2,
 } from "./utils/buildTransactionRequestParams";
+import { getConfig } from "./vendor/config";
 import { manager } from "../manager";
 
 export const handleSendChainportBridgeTransactionInput =
@@ -19,6 +22,22 @@ export async function handleSendChainportBridgeTransaction({
 }: z.infer<typeof handleSendChainportBridgeTransactionInput>) {
   const ironfish = await manager.getIronfish();
   const rpcClient = await ironfish.rpcClient();
+  const currentNetwork = (await rpcClient.chain.getNetworkInfo()).content
+    .networkId;
+  const config = getConfig(currentNetwork);
+  const isBridgeFeeUpgradeActivated =
+    new Date(config.bridgeFeeUpgrade) < new Date();
+  const bridgeFeeV1 = isBridgeFeeV1(txDetails);
+  const bridgeFeeV2 = isBridgeFeeV2(txDetails);
+  if (isBridgeFeeUpgradeActivated) {
+    if (!bridgeFeeV2) {
+      throw new Error("Unsupported bridge fee version");
+    }
+  } else {
+    if (!bridgeFeeV1) {
+      throw new Error("Unsupported bridge fee version");
+    }
+  }
 
   const params = buildTransactionRequestParams({
     fromAccount,

main/api/chainport/index.ts

@@ -86,21 +86,27 @@ ${err}
         assetId: z.string(),
         to: z.string(),
         selectedNetwork: z.number(),
+        fromAccount: z.string(),
       }),
     )
     .query(async (opts) => {
       const ironfish = await manager.getIronfish();
       const rpcClient = await ironfish.rpcClient();
       const network = await rpcClient.chain.getNetworkInfo();
 
-      const { amount, assetId, to, selectedNetwork } = opts.input;
+      const { amount, assetId, to, selectedNetwork, fromAccount } = opts.input;
+      const publicAddressResponse = await rpcClient.wallet.getAccountPublicKey({
+        account: fromAccount,
+      });
+      const sourceAddress = publicAddressResponse.content.publicKey;
       try {
         return await fetchChainportBridgeTransaction(
           network.content.networkId,
           BigInt(amount),
           assetId,
           selectedNetwork,
           to,
+          sourceAddress,
         );
       } catch (err) {
         log.error(`Failed to fetch Chainport bridge transaction details.

main/api/chainport/utils/buildTransactionRequestParams.ts

@@ -15,6 +15,19 @@ export const buildTransactionRequestParamsInputs = z.object({
       amount: z.string(),
       memo: z.string(),
     }),
+    bridge_fee: z.union([
+      z.object({
+        source_token_fee_amount: z.string(),
+        portx_fee_amount: z.string(),
+        is_portx_fee_payment: z.boolean(),
+      }),
+      z.object({
+        publicAddress: z.string(),
+        source_token_fee_amount: z.string(),
+        memo: z.string(),
+        assetId: z.string(),
+      }),
+    ]),
   }),
   fee: z.number().optional(),
   feeRate: z.string().optional(),
@@ -24,27 +37,78 @@ export type BuildTransactionRequestParamsInputs = z.infer<
   typeof buildTransactionRequestParamsInputs
 >;
 
+export function isBridgeFeeV1(
+  txDetails: BuildTransactionRequestParamsInputs["txDetails"],
+): txDetails is BuildTransactionRequestParamsInputs["txDetails"] & {
+  bridge_fee: {
+    source_token_fee_amount: string;
+    portx_fee_amount: string;
+    is_portx_fee_payment: boolean;
+  };
+} {
+  return (
+    "is_portx_fee_payment" in txDetails.bridge_fee &&
+    "source_token_fee_amount" in txDetails.bridge_fee &&
+    "portx_fee_amount" in txDetails.bridge_fee
+  );
+}
+
+export function isBridgeFeeV2(
+  txDetails: BuildTransactionRequestParamsInputs["txDetails"],
+): txDetails is BuildTransactionRequestParamsInputs["txDetails"] & {
+  bridge_fee: {
+    publicAddress: string;
+    assetId: string;
+    memo: string;
+    source_token_fee_amount: string;
+  };
+} {
+  return (
+    "publicAddress" in txDetails.bridge_fee &&
+    "memo" in txDetails.bridge_fee &&
+    "assetId" in txDetails.bridge_fee &&
+    "source_token_fee_amount" in txDetails.bridge_fee
+  );
+}
+
 export function buildTransactionRequestParams({
   fromAccount,
   txDetails,
   fee,
   feeRate,
 }: BuildTransactionRequestParamsInputs) {
+  const userOutput = {
+    publicAddress: txDetails.bridge_output.publicAddress,
+    amount: txDetails.bridge_output.amount,
+    memoHex: txDetails.bridge_output.memoHex,
+    assetId: txDetails.bridge_output.assetId,
+  };
+  const gasFeeOutput = {
+    publicAddress: txDetails.gas_fee_output.publicAddress,
+    amount: txDetails.gas_fee_output.amount,
+    memo: txDetails.gas_fee_output.memo,
+  };
+
+  const outputs = [userOutput, gasFeeOutput];
+
+  const bridgeFee = txDetails.bridge_fee.source_token_fee_amount;
+  if (isBridgeFeeV2(txDetails) && BigInt(bridgeFee) > 0n) {
+    userOutput.amount = (
+      BigInt(userOutput.amount) - BigInt(bridgeFee)
+    ).toString();
+
+    const bridgeFeeOutput = {
+      publicAddress: txDetails.bridge_fee.publicAddress,
+      amount: bridgeFee,
+      memo: txDetails.bridge_fee.memo,
+      assetId: txDetails.bridge_fee.assetId,
+    };
+    outputs.push(bridgeFeeOutput);
+  }
+
   const params: CreateTransactionRequest = {
     account: fromAccount,
-    outputs: [
-      {
-        publicAddress: txDetails.bridge_output.publicAddress,
-        amount: txDetails.bridge_output.amount,
-        memoHex: txDetails.bridge_output.memoHex,
-        assetId: txDetails.bridge_output.assetId,
-      },
-      {
-        publicAddress: txDetails.gas_fee_output.publicAddress,
-        amount: txDetails.gas_fee_output.amount,
-        memo: txDetails.gas_fee_output.memo,
-      },
-    ],
+    outputs,
     fee: fee ? CurrencyUtils.encode(BigInt(fee)) : null,
     feeRate: feeRate ?? null,
     expiration: undefined,

main/api/chainport/vendor/config.ts

@@ -15,6 +15,7 @@ const config = {
     incomingAddresses: new Set([
       "06102d319ab7e77b914a1bd135577f3e266fd82a3e537a02db281421ed8b3d13",
     ]),
+    bridgeFeeUpgrade: new Date("2025-07-01T00:00:00Z"),
   },
   [MAINNET.id]: {
     endpoint: "https://api.ironfish.network",
@@ -25,6 +26,7 @@ const config = {
     incomingAddresses: new Set([
       "1216302193e8f1ad020f458b54a163039403d803e98673c6a85e59b5f4a1a900",
     ]),
+    bridgeFeeUpgrade: new Date("2025-07-15T00:00:00Z"),
   },
 };
 

main/api/chainport/vendor/requests.ts

@@ -64,13 +64,19 @@ export const fetchChainportBridgeTransaction = async (
   assetId: string,
   targetNetworkId: number,
   targetAddress: string,
+  sourceAddress: string,
 ): Promise<ChainportBridgeTransaction> => {
   const config = getConfig(networkId);
+  const isBridgeFeeUpgradeActivated =
+    new Date(config.bridgeFeeUpgrade) < new Date();
   const url = new URL(`/bridges/transactions/create`, config.endpoint);
   url.searchParams.append("amount", amount.toString());
   url.searchParams.append("asset_id", assetId);
   url.searchParams.append("target_network_id", targetNetworkId.toString());
   url.searchParams.append("target_address", targetAddress.toString());
+  if (isBridgeFeeUpgradeActivated) {
+    url.searchParams.append("source_address", sourceAddress);
+  }
 
   return await makeChainportRequest<ChainportBridgeTransaction>(url.toString());
 };

main/api/chainport/vendor/types.ts

@@ -4,6 +4,19 @@
 
 // This file contains response types for chainport requests
 
+export type ChainportBridgeFeeV1 = {
+  source_token_fee_amount: string;
+  portx_fee_amount: string;
+  is_portx_fee_payment: boolean;
+};
+
+export type ChainportBridgeFeeV2 = {
+  publicAddress: string;
+  source_token_fee_amount: string;
+  memo: string;
+  assetId: string;
+};
+
 export type ChainportBridgeTransaction = {
   bridge_output: {
     publicAddress: string;
@@ -16,11 +29,7 @@ export type ChainportBridgeTransaction = {
     amount: string;
     memo: string;
   };
-  bridge_fee: {
-    source_token_fee_amount: string;
-    portx_fee_amount: string;
-    is_portx_fee_payment: boolean;
-  };
+  bridge_fee: ChainportBridgeFeeV1 | ChainportBridgeFeeV2;
 };
 
 export type ChainportNetwork = {

renderer/components/BridgeAssetsForm/BridgeConfirmationModal/BridgeConfirmationModal.tsx

@@ -115,6 +115,7 @@ export function BridgeConfirmationModal({
       assetId: chainportToken.web3_address,
       to: formData.destinationAddress,
       selectedNetwork: destinationNetwork.network.chainport_network_id,
+      fromAccount: formData.fromAccount,
     },
     {
       retry: false,
@@ -210,7 +211,10 @@ export function BridgeConfirmationModal({
       return <Skeleton>123 FOO</Skeleton>;
     }
 
-    if (txDetails.bridge_fee.is_portx_fee_payment) {
+    if (
+      "is_portx_fee_payment" in txDetails.bridge_fee &&
+      txDetails.bridge_fee.is_portx_fee_payment
+    ) {
       const fee = CurrencyUtils.formatCurrency(
         txDetails.bridge_fee.portx_fee_amount,
         18,