Merge pull request #102 from CityOfZion/CU-86a51rqn8-1

CU-86a51rqn8 - BS Lib - Multi-SEND - Fix issue where the array return…
CityOfZion · Sep 30, 2024 · 757888a · 757888a
2 parents cd17e1a + bf2b2d2
commit 757888a
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 5 deletions.
diff --git a/common/changes/@cityofzion/bs-ethereum/CU-86a51rqn8_2024-09-25-23-00.json b/common/changes/@cityofzion/bs-ethereum/CU-86a51rqn8_2024-09-25-23-00.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@cityofzion/bs-ethereum",
+      "comment": "Fix issue where the array returned by transfer method is inconsistent",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@cityofzion/bs-ethereum"
+}
diff --git a/common/changes/@cityofzion/bs-neo-legacy/CU-86a51rqn8_2024-09-25-23-00.json b/common/changes/@cityofzion/bs-neo-legacy/CU-86a51rqn8_2024-09-25-23-00.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@cityofzion/bs-neo-legacy",
+      "comment": "Fix issue where the array returned by transfer method is inconsistent",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@cityofzion/bs-neo-legacy"
+}
diff --git a/common/changes/@cityofzion/bs-neo3/CU-86a51rqn8_2024-09-25-23-00.json b/common/changes/@cityofzion/bs-neo3/CU-86a51rqn8_2024-09-25-23-00.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@cityofzion/bs-neo3",
+      "comment": "Fix issue where the array returned by transfer method is inconsistent",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@cityofzion/bs-neo3"
+}
diff --git a/packages/bs-ethereum/src/BSEthereum.ts b/packages/bs-ethereum/src/BSEthereum.ts
@@ -215,6 +215,8 @@ export class BSEthereum<BSCustomName extends string = string>
     const sentTransactionHashes: string[] = []
 
     for (const intent of param.intents) {
+      let transactionHash = ''
+
       try {
         const { transactionParams, gasPrice } = await this.#buildTransferParams(intent)
 
@@ -231,11 +233,12 @@ export class BSEthereum<BSCustomName extends string = string>
           maxPriorityFeePerGas: gasPrice,
           maxFeePerGas: gasPrice,
         })
-
-        sentTransactionHashes.push(transaction.hash)
+        transactionHash = transaction.hash
       } catch {
         /* empty */
       }
+
+      sentTransactionHashes.push(transactionHash)
     }
 
     return sentTransactionHashes

diff --git a/packages/bs-neo-legacy/src/services/BSNeoLegacy.ts b/packages/bs-neo-legacy/src/services/BSNeoLegacy.ts
@@ -137,7 +137,7 @@ export class BSNeoLegacy<BSCustomName extends string = string>
       ])
     }
 
-    let response
+    let response: any
 
     if (nep5ScriptBuilder.isEmpty()) {
       response = await api.sendAsset({
@@ -159,7 +159,8 @@ export class BSNeoLegacy<BSCustomName extends string = string>
     }
 
     if (!response.tx) throw new Error('Failed to send transaction')
-    return [response.tx.hash]
+
+    return intents.map(() => response.tx!.hash)
   }
 
   async claim(account: Account): Promise<string> {

diff --git a/packages/bs-neo3/src/BSNeo3.ts b/packages/bs-neo3/src/BSNeo3.ts
@@ -234,7 +234,7 @@ export class BSNeo3<BSCustomName extends string = string>
       signers: [],
     })
 
-    return [transactionHash]
+    return param.intents.map(() => transactionHash)
   }
 
   async claim(account: Account, isLedger?: boolean): Promise<string> {