feat: update bridge memoHex encoding/decoding and remove upgrade date config

Author: iflabsfish

ironfish-cli/src/commands/wallet/chainport/send.ts

@@ -19,18 +19,14 @@ import { IronfishCommand } from '../../../command'
 import { HexFlag, IronFlag, RemoteFlags, ValueFlag } from '../../../flags'
 import * as ui from '../../../ui'
 import {
-  ChainportBridgeFeeV2,
   ChainportBridgeTransaction,
   ChainportToken,
   ChainportTokenWithNetwork,
   fetchChainportBridgeTransaction,
   fetchChainportTokenPaths,
   fetchChainportTokens,
-  isBridgeFeeV1,
-  isBridgeFeeV2,
 } from '../../../utils/chainport'
 import { isEthereumAddress } from '../../../utils/chainport/address'
-import { getConfig } from '../../../utils/chainport/config'
 import { promptCurrency } from '../../../utils/currency'
 import { promptExpiration } from '../../../utils/expiration'
 import { getExplorer } from '../../../utils/explorer'
@@ -353,30 +349,17 @@ export class BridgeCommand extends IronfishCommand {
     }
 
     const outputs = [userOutput, gasOutput]
-    const isChainportFeeUpgradeActive = new Date() > getConfig(networkId).bridgeFeeUpgrade
-    const bridgeFeeV1 = isBridgeFeeV1(txn.bridge_fee)
-    const bridgeFeeV2 = isBridgeFeeV2(txn.bridge_fee)
-    if (isChainportFeeUpgradeActive) {
-      if (!bridgeFeeV2) {
-        throw new Error('Bridge fee upgrade is active but the bridge fee is not v2')
-      } else {
-        const bridgeFee = txn.bridge_fee as ChainportBridgeFeeV2
-        const bridgeFeeAmount = BigInt(bridgeFee.source_token_fee_amount)
-        if (bridgeFeeAmount > 0n) {
-          userOutput.amount = (BigInt(userOutput.amount) - bridgeFeeAmount).toString()
-          const bridgeFeeOutput = {
-            publicAddress: bridgeFee.publicAddress,
-            amount: bridgeFeeAmount.toString(),
-            memo: bridgeFee.memo,
-            assetId: bridgeFee.assetId,
-          }
-          outputs.push(bridgeFeeOutput)
-        }
-      }
-    } else {
-      if (!bridgeFeeV1) {
-        throw new Error('Bridge fee upgrade is not active but the bridge fee is not v1')
+
+    const bridgeFeeAmount = BigInt(txn.bridge_fee.source_token_fee_amount)
+    if (bridgeFeeAmount > 0n) {
+      userOutput.amount = (BigInt(userOutput.amount) - bridgeFeeAmount).toString()
+      const bridgeFeeOutput = {
+        publicAddress: txn.bridge_fee.publicAddress,
+        amount: bridgeFeeAmount.toString(),
+        memo: txn.bridge_fee.memo,
+        assetId: txn.bridge_fee.assetId,
       }
+      outputs.push(bridgeFeeOutput)
     }
 
     const params: CreateTransactionRequest = {
@@ -442,31 +425,15 @@ export class BridgeCommand extends IronfishCommand {
 
     const targetNetworkFee = CurrencyUtils.render(BigInt(txn.gas_fee_output.amount), true)
 
-    let chainportFee: string
-
-    if ('is_portx_fee_payment' in txn.bridge_fee && txn.bridge_fee.is_portx_fee_payment) {
-      this.logger.log('\nStaked PortX detected')
-
-      chainportFee = CurrencyUtils.render(
-        BigInt(txn.bridge_fee.portx_fee_amount),
-        true,
-        'portx asset id',
-        {
-          decimals: 18,
-          symbol: 'PORTX',
-        },
-      )
-    } else {
-      chainportFee = CurrencyUtils.render(
-        BigInt(txn.bridge_fee.source_token_fee_amount ?? 0),
-        true,
-        'chainport fee id',
-        {
-          decimals: sourceToken.decimals,
-          symbol: sourceAsset.verification.symbol,
-        },
-      )
-    }
+    const chainportFee = CurrencyUtils.render(
+      BigInt(txn.bridge_fee.source_token_fee_amount ?? 0),
+      true,
+      'chainport fee id',
+      {
+        decimals: sourceToken.decimals,
+        symbol: sourceAsset.verification.symbol,
+      },
+    )
 
     const summary = `\
  \nBRIDGE TRANSACTION SUMMARY:

ironfish-cli/src/utils/chainport/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'),
   },
 }
 

ironfish-cli/src/utils/chainport/metadata.test.ts

@@ -38,31 +38,50 @@ describe('ChainportMemoMetadata', () => {
 
   test('decode decodes encoded hex string correctly', () => {
     expect(
-      ChainportMemoMetadata.decodeV1(
+      ChainportMemoMetadata.decode(
         '000214d3c11c03c10481c50cc28e24228a30220620a08c08530c2c614220f24a',
       ),
     ).toEqual([2, '0x5DF170F118753CaE92aaC2868A2C25Ccb6528f9a'.toLowerCase(), false])
 
     expect(
-      ChainportMemoMetadata.decodeV1(
+      ChainportMemoMetadata.decode(
         '02161ca1882c130f04f04638f2092851863c518018c0012ca1093c438b10200a',
       ),
     ).toEqual([22, '0x7A68B1Cf1F16Ef89A566F5606C01BA49F4Eb420A'.toLowerCase(), true])
 
     expect(
-      ChainportMemoMetadata.decodeV2(
-        '01742d35cc6634c0532925a3b8d4c9db96c4b4d8b668775c9100000000000000',
+      ChainportMemoMetadata.decode(
+        '004f99a1a130db7faf2d00d729ad1fc41c76547c5646d10f28e0000000000000',
       ),
-    ).toEqual([1, '0x742d35cc6634c0532925a3b8d4c9db96c4b4d8b6'.toLowerCase(), false])
+    ).toEqual([15, '0x99A1a130DB7FAf2d00d729aD1FC41c76547c5646'.toLowerCase(), false])
   })
 
-  test('encode and decode are reversible', () => {
+  test('encode and decode are reversible v1', () => {
     const networkId = 2
     const address = '5DF170F118753CaE92aaC2868A2C25Ccb6528f9a'
     const toIronfish = false
 
     const encoded = ChainportMemoMetadata.encode(networkId, address, toIronfish)
-    const decoded = ChainportMemoMetadata.decodeV1(encoded)
+    const decoded = ChainportMemoMetadata.decode(encoded)
+
+    expect(decoded).toEqual([networkId, '0x' + address.toLowerCase(), toIronfish])
+  })
+
+  test('encode and decode are reversible v2', () => {
+    const networkId = 2
+    const address = '5DF170F118753CaE92aaC2868A2C25Ccb6528f9a'
+    const toIronfish = false
+    const timestamp = 1753715824
+    const version = 1
+
+    const encoded = ChainportMemoMetadata.encodeV2(
+      networkId,
+      address,
+      toIronfish,
+      timestamp,
+      version,
+    )
+    const decoded = ChainportMemoMetadata.decode(encoded)
 
     expect(decoded).toEqual([networkId, '0x' + address.toLowerCase(), toIronfish])
   })

ironfish-cli/src/utils/chainport/metadata.ts

@@ -44,6 +44,15 @@ export class ChainportMemoMetadata {
     return String.fromCharCode(num - 10 + 'a'.charCodeAt(0))
   }
 
+  public static convertHexToBinary(encodedHex: string): string {
+    const buffer = Buffer.from(encodedHex, 'hex')
+    let binaryString = ''
+    for (let i = 0; i < buffer.length; i++) {
+      binaryString += buffer[i].toString(2).padStart(8, '0')
+    }
+    return binaryString
+  }
+
   public static encode(networkId: number, address: string, toIronfish: boolean) {
     if (address.startsWith('0x')) {
       address = address.slice(2)
@@ -63,6 +72,89 @@ export class ChainportMemoMetadata {
     return hexString.padStart(64, '0')
   }
 
+  public static encodeV2(
+    networkId: number,
+    address: string,
+    toIronfish: boolean,
+    timestamp: number,
+    version: number,
+  ) {
+    if (networkId >= 1 << 6) {
+      throw new Error('networkId exceeds 6-bit capacity')
+    }
+    if (version >= 1 << 2) {
+      throw new Error('version exceeds 2-bit capacity')
+    }
+    if (BigInt(timestamp) >= 1n << 31n) {
+      throw new Error('timestamp exceeds 31-bit capacity')
+    }
+
+    let addressClean = address
+    if (addressClean.startsWith('0x')) {
+      addressClean = addressClean.slice(2)
+    }
+
+    if (addressClean.length !== 40) {
+      throw new Error('address must be 40 hexadecimal characters')
+    }
+
+    const addrBytes = Buffer.from(addressClean, 'hex')
+
+    if (addrBytes.length !== 20) {
+      throw new Error('address must decode to 20 bytes')
+    }
+
+    const bitArray: number[] = new Array(256).fill(0) as number[]
+    let pos = 0
+
+    pos += 6
+
+    bitArray[pos] = toIronfish ? 1 : 0
+    pos += 1
+
+    pos += 1
+
+    bitArray[pos] = (version >> 1) & 1
+    bitArray[pos + 1] = version & 1
+    pos += 2
+
+    for (let i = 0; i < 6; i++) {
+      bitArray[pos + i] = (networkId >> (5 - i)) & 1
+    }
+    pos += 6
+
+    for (const byte of addrBytes) {
+      for (let i = 0; i < 8; i++) {
+        bitArray[pos] = (byte >> (7 - i)) & 1
+        pos += 1
+      }
+    }
+
+    for (let i = 0; i < 31; i++) {
+      bitArray[pos + i] = (timestamp >> (30 - i)) & 1
+    }
+    pos += 31
+
+    pos += 49
+
+    if (pos !== 256) {
+      throw new Error('pos is not 256')
+    }
+
+    const result = new Uint8Array(32)
+    for (let i = 0; i < 32; i++) {
+      let byte = 0
+      for (let j = 0; j < 8; j++) {
+        byte = (byte << 1) | bitArray[i * 8 + j]
+      }
+      result[i] = byte
+    }
+
+    return Array.from(result)
+      .map((byte) => byte.toString(16).padStart(2, '0'))
+      .join('')
+  }
+
   public static decodeV1(encodedHex: string): [number, string, boolean] {
     const hexInteger = BigInt('0x' + encodedHex)
     const encodedString = hexInteger.toString(2)
@@ -84,12 +176,30 @@ export class ChainportMemoMetadata {
   }
 
   public static decodeV2(encodedHex: string): [number, string, boolean] {
-    const bytes = Buffer.from(encodedHex, 'hex')
-    const networkId = bytes.readUInt8(0)
-    const addressBytes = bytes.subarray(1, 21)
-    const address = '0x' + addressBytes.toString('hex')
-    const toIronfish = (bytes[21] & 0x80) !== 0
+    const bits = this.convertHexToBinary(encodedHex)
+    const toIronfish = bits[6] === '1'
+    const memoHexVersion = bits.slice(8, 10)
+    if (memoHexVersion !== '01') {
+      throw new Error(`Unexpected memoHex version: ${memoHexVersion}`)
+    }
+
+    const networkIdBits = bits.slice(10, 16)
+    const networkId = parseInt(networkIdBits, 2)
+    const addressBits = bits.slice(16, 176)
+    let address = '0x'
+    for (let i = 0; i < addressBits.length; i += 4) {
+      address += parseInt(addressBits.slice(i, i + 4), 2).toString(16)
+    }
 
     return [networkId, address.toLowerCase(), toIronfish]
   }
+
+  public static decode(encodedHex: string): [number, string, boolean] {
+    const bits = this.convertHexToBinary(encodedHex)
+    const memoHexVersion = bits.slice(8, 10)
+    if (memoHexVersion === '01') {
+      return this.decodeV2(encodedHex)
+    }
+    return this.decodeV1(encodedHex)
+  }
 }

ironfish-cli/src/utils/chainport/requests.ts

@@ -65,11 +65,7 @@ export const fetchChainportBridgeTransaction = async (
   url.searchParams.append('asset_id', assetId)
   url.searchParams.append('target_network_id', targetNetworkId.toString())
   url.searchParams.append('target_address', targetAddress.toString())
-  const isBridgeFeeUpgradeActivated = new Date(config.bridgeFeeUpgrade) < new Date()
-
-  if (isBridgeFeeUpgradeActivated) {
-    url.searchParams.append('source_address', sourceAddress)
-  }
+  url.searchParams.append('source_address', sourceAddress)
 
   return await makeChainportRequest<ChainportBridgeTransaction>(url.toString())
 }

ironfish-cli/src/utils/chainport/types.ts

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

ironfish-cli/src/utils/chainport/utils.test.ts

@@ -14,7 +14,6 @@ describe('isChainportTransaction', () => {
   const mockConfig = {
     incomingAddresses: new Set(['incoming1', 'incoming2']),
     outgoingAddresses: new Set(['outgoing1', 'outgoing2']),
-    bridgeFeeUpgrade: new Date('2025-07-01T00:00:00Z'),
   }
 
   beforeEach(() => {
@@ -44,11 +43,10 @@ describe('isChainportTransaction', () => {
     })
 
     it('should return true for valid incoming chainport transaction', () => {
-      ;(ChainportMemoMetadata.decodeV1 as Mock).mockReturnValue([1, 'address', true])
+      ;(ChainportMemoMetadata.decode as Mock).mockReturnValue([1, 'address'])
 
       const transaction = {
         type: TransactionType.RECEIVE,
-        timestamp: new Date('2024-01-01T00:00:00Z').getTime(),
         notes: [{ sender: 'incoming1', memoHex: 'mockHex' }] as RpcWalletNote[],
       } as RpcWalletTransaction
       const result = extractChainportDataFromTransaction(1, transaction)
@@ -95,10 +93,9 @@ describe('isChainportTransaction', () => {
     })
 
     it('should return true for valid outgoing chainport transaction with bridge fee v1', () => {
-      ;(ChainportMemoMetadata.decodeV1 as Mock).mockReturnValue([1, 'address', false])
+      ;(ChainportMemoMetadata.decode as Mock).mockReturnValue([1, 'address'])
       const transaction = {
         type: TransactionType.SEND,
-        timestamp: new Date('2024-01-01T00:00:00Z').getTime(),
         notes: [
           { owner: 'outgoing1', memo: '{"type": "fee_payment"}', memoHex: 'mockHex' },
           { owner: 'outgoing1', memo: '', memoHex: 'mockHex' },
@@ -114,10 +111,9 @@ describe('isChainportTransaction', () => {
     })
 
     it('should return true for valid outgoing chainport transaction with bridge fee v2', () => {
-      ;(ChainportMemoMetadata.decodeV2 as Mock).mockReturnValue([1, 'address', false])
+      ;(ChainportMemoMetadata.decode as Mock).mockReturnValue([1, 'address'])
       const transaction = {
         type: TransactionType.SEND,
-        timestamp: new Date('2026-01-01T00:00:00Z').getTime(),
         notes: [
           { owner: 'outgoing1', memo: '{"type": "fee_payment"}', memoHex: 'mockHex' },
           { owner: 'outgoing1', memo: '', memoHex: 'mockHex' },