feat: remove date config for chainport upgrade

Author: iflabsfish

main/api/chainport/handleSendChainportBridgeTransaction.ts

@@ -4,10 +4,7 @@ import { z } from "zod";
 import {
   buildTransactionRequestParams,
   buildTransactionRequestParamsInputs,
-  isBridgeFeeV1,
-  isBridgeFeeV2,
 } from "./utils/buildTransactionRequestParams";
-import { getConfig } from "./vendor/config";
 import { manager } from "../manager";
 
 export const handleSendChainportBridgeTransactionInput =
@@ -22,22 +19,6 @@ 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/utils/buildTransactionRequestParams.ts

@@ -15,19 +15,12 @@ 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(),
-      }),
-    ]),
+    bridge_fee: 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(),
@@ -37,40 +30,6 @@ 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,
@@ -92,7 +51,7 @@ export function buildTransactionRequestParams({
   const outputs = [userOutput, gasFeeOutput];
 
   const bridgeFee = txDetails.bridge_fee.source_token_fee_amount;
-  if (isBridgeFeeV2(txDetails) && BigInt(bridgeFee) > 0n) {
+  if (BigInt(bridgeFee) > 0n) {
     userOutput.amount = (
       BigInt(userOutput.amount) - BigInt(bridgeFee)
     ).toString();

main/api/chainport/vendor/config.ts

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

main/api/chainport/vendor/requests.ts

@@ -67,16 +67,12 @@ export const fetchChainportBridgeTransaction = async (
   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);
-  }
+  url.searchParams.append("source_address", sourceAddress);
 
   return await makeChainportRequest<ChainportBridgeTransaction>(url.toString());
 };

main/api/chainport/vendor/types.ts

@@ -29,7 +29,7 @@ export type ChainportBridgeTransaction = {
     amount: string;
     memo: string;
   };
-  bridge_fee: ChainportBridgeFeeV1 | ChainportBridgeFeeV2;
+  bridge_fee: ChainportBridgeFeeV2;
 };
 
 export type ChainportNetwork = {

main/api/chainport/vendor/utils.ts

@@ -36,7 +36,7 @@ export const extractChainportDataFromTransaction = (
 
 const getIncomingChainportTransactionData = (
   transaction: RpcWalletTransaction,
-  config: { incomingAddresses: Set<string>; bridgeFeeUpgrade: Date },
+  config: { incomingAddresses: Set<string> },
 ): ChainportTransactionData => {
   const bridgeNote = transaction.notes?.[0];
 
@@ -60,7 +60,7 @@ const getIncomingChainportTransactionData = (
 
 const getOutgoingChainportTransactionData = (
   transaction: RpcWalletTransaction,
-  config: { outgoingAddresses: Set<string>; bridgeFeeUpgrade: Date },
+  config: { outgoingAddresses: Set<string> },
 ): ChainportTransactionData => {
   if (!transaction.notes || transaction.notes.length < 2) {
     return undefined;

renderer/components/BridgeAssetsForm/BridgeConfirmationModal/BridgeConfirmationModal.tsx

@@ -211,17 +211,6 @@ export function BridgeConfirmationModal({
       return <Skeleton>123 FOO</Skeleton>;
     }
 
-    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,
-      );
-      return `${fee} PORTX`;
-    }
-
     return `${CurrencyUtils.formatCurrency(
       txDetails.bridge_fee.source_token_fee_amount,
       chainportToken.decimals,