feat: update memoHex decoding v1 v2

Author: iflabsfish

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

@@ -38,16 +38,22 @@ describe('ChainportMemoMetadata', () => {
 
   test('decode decodes encoded hex string correctly', () => {
     expect(
-      ChainportMemoMetadata.decode(
+      ChainportMemoMetadata.decodeV1(
         '000214d3c11c03c10481c50cc28e24228a30220620a08c08530c2c614220f24a',
       ),
     ).toEqual([2, '0x5DF170F118753CaE92aaC2868A2C25Ccb6528f9a'.toLowerCase(), false])
 
     expect(
-      ChainportMemoMetadata.decode(
+      ChainportMemoMetadata.decodeV1(
         '02161ca1882c130f04f04638f2092851863c518018c0012ca1093c438b10200a',
       ),
     ).toEqual([22, '0x7A68B1Cf1F16Ef89A566F5606C01BA49F4Eb420A'.toLowerCase(), true])
+
+    expect(
+      ChainportMemoMetadata.decodeV2(
+        '01742d35cc6634c0532925a3b8d4c9db96c4b4d8b668775c9100000000000000',
+      ),
+    ).toEqual([1, '0x742d35cc6634c0532925a3b8d4c9db96c4b4d8b6'.toLowerCase(), false])
   })
 
   test('encode and decode are reversible', () => {
@@ -56,7 +62,7 @@ describe('ChainportMemoMetadata', () => {
     const toIronfish = false
 
     const encoded = ChainportMemoMetadata.encode(networkId, address, toIronfish)
-    const decoded = ChainportMemoMetadata.decode(encoded)
+    const decoded = ChainportMemoMetadata.decodeV1(encoded)
 
     expect(decoded).toEqual([networkId, '0x' + address.toLowerCase(), toIronfish])
   })

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

@@ -63,7 +63,7 @@ export class ChainportMemoMetadata {
     return hexString.padStart(64, '0')
   }
 
-  public static decode(encodedHex: string): [number, string, boolean] {
+  public static decodeV1(encodedHex: string): [number, string, boolean] {
     const hexInteger = BigInt('0x' + encodedHex)
     const encodedString = hexInteger.toString(2)
     const padded = encodedString.padStart(250, '0')
@@ -82,4 +82,14 @@ export class ChainportMemoMetadata {
 
     return [networkId, address.toLowerCase(), toIronfish]
   }
+
+  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
+
+    return [networkId, address.toLowerCase(), toIronfish]
+  }
 }

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

@@ -43,15 +43,23 @@ export const extractChainportDataFromTransaction = (
 
 const getIncomingChainportTransactionData = (
   transaction: RpcWalletTransaction,
-  config: { incomingAddresses: Set<string> },
+  config: { incomingAddresses: Set<string>; bridgeFeeUpgrade: Date },
 ): ChainportTransactionData => {
   const bridgeNote = transaction.notes?.[0]
 
   if (!bridgeNote || !isAddressInSet(bridgeNote.sender, config.incomingAddresses)) {
     return undefined
   }
 
-  const [sourceNetwork, address, _] = ChainportMemoMetadata.decode(bridgeNote.memoHex)
+  let sourceNetwork: number
+  let address: string
+  let _toIronFish: boolean
+
+  if (new Date(transaction.timestamp) < config.bridgeFeeUpgrade) {
+    ;[sourceNetwork, address, _toIronFish] = ChainportMemoMetadata.decodeV1(bridgeNote.memoHex)
+  } else {
+    ;[sourceNetwork, address, _toIronFish] = ChainportMemoMetadata.decodeV2(bridgeNote.memoHex)
+  }
 
   return {
     type: TransactionType.RECEIVE,
@@ -62,7 +70,7 @@ const getIncomingChainportTransactionData = (
 
 const getOutgoingChainportTransactionData = (
   transaction: RpcWalletTransaction,
-  config: { outgoingAddresses: Set<string> },
+  config: { outgoingAddresses: Set<string>; bridgeFeeUpgrade: Date },
 ): ChainportTransactionData => {
   if (!transaction.notes || transaction.notes.length < 2) {
     return undefined
@@ -80,7 +88,15 @@ const getOutgoingChainportTransactionData = (
     return undefined
   }
 
-  const [sourceNetwork, address, _] = ChainportMemoMetadata.decode(bridgeNote.memoHex)
+  let sourceNetwork: number
+  let address: string
+  let _toIronFish: boolean
+
+  if (new Date(transaction.timestamp) < config.bridgeFeeUpgrade) {
+    ;[sourceNetwork, address, _toIronFish] = ChainportMemoMetadata.decodeV1(bridgeNote.memoHex)
+  } else {
+    ;[sourceNetwork, address, _toIronFish] = ChainportMemoMetadata.decodeV2(bridgeNote.memoHex)
+  }
 
   return {
     type: TransactionType.SEND,