Fix FIO obt data encryption/decryption

EdgeApp · Jan 11, 2025 · 1c8e693 · 1c8e693
1 parent f5f6080
commit 1c8e693
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ## 4.32.4 (2024-12-25)
 
 - fixed: Set correct Thorchain fee parameters when sending.
+- fixed: (FIO) OBT data encryption/decryption
 
 ## 4.32.3 (2024-12-25)
 

diff --git a/src/fio/FioEngine.ts b/src/fio/FioEngine.ts
@@ -235,24 +235,20 @@ export class FioEngine extends CurrencyEngine<FioTools, SafeFioWalletInfo> {
         privateKeys: JsonObject,
         ...rest: any[]
       ): Promise<ObtData[]> => {
-        const obtDecoder = new GetObtData({
-          fioPublicKey: this.walletInfo.keys.publicKey,
-          getEncryptKey: this.defaultGetEncryptKey,
-          includeEncrypted: false
-        })
-        const encryptedObtData = await this.fetchEncryptedObtData(
-          'getObtData',
-          obtDecoder
+        const fioSdk = new FIOSDK(
+          privateKeys.fioKey,
+          this.walletInfo.keys.publicKey,
+          this.networkInfo.historyNodeUrls,
+          this.fetchCors
         )
-        obtDecoder.privateKey = privateKeys.fioKey
-        obtDecoder.publicKey = this.walletInfo.keys.publicKey
-        const decryptedObtData: { obt_data_records: ObtData[] } =
-          (await obtDecoder.decrypt({
-            obt_data_records: encryptedObtData,
-            more: 0
-          })) ?? { obt_data_records: [] }
-
-        return decryptedObtData.obt_data_records
+
+        const res = await fioSdk.genericAction('getObtData', {
+          limit: 100,
+          offset: 0,
+          includeEncrypted: true
+        })
+
+        return res.obt_data_records ?? []
       }
     }
   }
@@ -1704,12 +1700,24 @@ export class FioEngine extends CurrencyEngine<FioTools, SafeFioWalletInfo> {
             hash: undefined,
             offline_url: undefined
           }
+
+          const fioSdk = new FIOSDK(
+            privateKeys.fioKey,
+            this.walletInfo.keys.publicKey,
+            this.networkInfo.historyNodeUrls,
+            this.fetchCors
+          )
+
+          const { encrypt_public_key: encryptPublicKey } =
+            await fioSdk.getEncryptKey(payeeFioAddress)
+
           const cipherContent = transactions.getCipherContent(
             'record_obt_data_content',
             content,
             fioPrivateKeys.fioKey,
-            payerPublicAddress
+            encryptPublicKey
           )
+
           txParams = {
             account: 'fio.reqobt',
             action: 'recordobt',