@cityofzion/bs-neo3 1.15.3 → 1.15.4

package/dist/services/neo3neoXBridge/Neo3NeoXBridgeService.d.ts

@@ -3,11 +3,11 @@ import { BSNeo3 } from '../../BSNeo3';
 export declare class Neo3NeoXBridgeService<BSName extends string = string> implements INeo3NeoXBridgeService<BSName> {
     #private;
     readonly BRIDGE_SCRIPT_HASH = "0xbb19cfc864b73159277e1fd39694b3fd5fc613d2";
-    tokens: TBridgeToken[];
+    tokens: TBridgeToken<BSName>[];
     constructor(service: BSNeo3<BSName>);
     getApprovalFee(): Promise<string>;
-    getBridgeConstants(token: TBridgeToken): Promise<TNeo3NeoXBridgeServiceConstants>;
+    getBridgeConstants(token: TBridgeToken<BSName>): Promise<TNeo3NeoXBridgeServiceConstants>;
     bridge(params: TNeo3NeoXBridgeServiceBridgeParam<BSName>): Promise<string>;
-    getNonce(params: TNeo3NeoXBridgeServiceGetNonceParams): Promise<string | null>;
-    getTransactionHashByNonce(params: TNeo3NeoXBridgeServiceGetTransactionHashByNonceParams): Promise<string | null>;
+    getNonce(params: TNeo3NeoXBridgeServiceGetNonceParams<BSName>): Promise<string>;
+    getTransactionHashByNonce(params: TNeo3NeoXBridgeServiceGetTransactionHashByNonceParams<BSName>): Promise<string>;
 }

package/dist/services/neo3neoXBridge/Neo3NeoXBridgeService.js

@@ -37,8 +37,8 @@ class Neo3NeoXBridgeService {
         _Neo3NeoXBridgeService_service.set(this, void 0);
         __classPrivateFieldSet(this, _Neo3NeoXBridgeService_service, service, "f");
         this.tokens = [
-            Object.assign(Object.assign({}, BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN), { multichainId: 'gas' }),
-            Object.assign(Object.assign({}, BSNeo3Constants_1.BSNeo3Constants.NEO_TOKEN), { multichainId: 'neo' }),
+            Object.assign(Object.assign({}, BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN), { multichainId: 'gas', blockchain: service.name }),
+            Object.assign(Object.assign({}, BSNeo3Constants_1.BSNeo3Constants.NEO_TOKEN), { multichainId: 'neo', blockchain: service.name }),
         ];
     }
     getApprovalFee() {
@@ -147,37 +147,62 @@ class Neo3NeoXBridgeService {
     getNonce(params) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const log = yield DoraBDSNeo3_1.DoraNeoRest.log(params.transactionHash, __classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f").network.id);
-            if (log.vmstate !== 'HALT') {
-                return null;
+            let log;
+            try {
+                log = yield DoraBDSNeo3_1.DoraNeoRest.log(params.transactionHash, __classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f").network.id);
+            }
+            catch (error) {
+                throw new blockchain_service_1.BSError('Failed to get nonce from transaction log', 'FAILED_TO_GET_NONCE', error);
+            }
+            if ((log === null || log === void 0 ? void 0 : log.vmstate) !== 'HALT') {
+                throw new blockchain_service_1.BSError('Transaction invalid', 'INVALID_TRANSACTION');
             }
             const isNativeToken = blockchain_service_1.BSTokenHelper.predicateByHash(params.token)(BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN);
+            let nonce = null;
             if (isNativeToken) {
                 const notification = log.notifications.find(item => item.event_name === 'NativeDeposit');
-                return (_a = notification === null || notification === void 0 ? void 0 : notification.state.value[0].value) !== null && _a !== void 0 ? _a : null;
+                nonce = (_a = notification === null || notification === void 0 ? void 0 : notification.state.value[0].value) !== null && _a !== void 0 ? _a : null;
+            }
+            else {
+                const notification = log.notifications.find(item => item.event_name === 'TokenDeposit');
+                nonce = (_b = notification === null || notification === void 0 ? void 0 : notification.state.value[2].value) !== null && _b !== void 0 ? _b : null;
+            }
+            if (!nonce) {
+                throw new blockchain_service_1.BSError('Nonce not found in transaction log', 'NONCE_NOT_FOUND');
             }
-            const notification = log.notifications.find(item => item.event_name === 'TokenDeposit');
-            return (_b = notification === null || notification === void 0 ? void 0 : notification.state.value[2].value) !== null && _b !== void 0 ? _b : null;
+            return nonce;
         });
     }
     getTransactionHashByNonce(params) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const isNativeToken = blockchain_service_1.BSTokenHelper.predicateByHash(params.token)(BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN);
-            const { data } = yield axios_1.default.post('https://neofura.ngd.network', {
-                jsonrpc: '2.0',
-                method: 'GetBridgeTxByNonce',
-                params: {
-                    ContractHash: this.BRIDGE_SCRIPT_HASH,
-                    TokenHash: isNativeToken ? '' : BSNeo3Constants_1.BSNeo3Constants.NEO_TOKEN.hash,
-                    Nonce: Number(params.nonce),
-                },
-                id: 1,
-            });
+            let data;
+            try {
+                const isNativeToken = blockchain_service_1.BSTokenHelper.predicateByHash(params.token)(BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN);
+                const response = yield axios_1.default.post('https://neofura.ngd.network', {
+                    jsonrpc: '2.0',
+                    method: 'GetBridgeTxByNonce',
+                    params: {
+                        ContractHash: this.BRIDGE_SCRIPT_HASH,
+                        TokenHash: isNativeToken ? '' : BSNeo3Constants_1.BSNeo3Constants.NEO_TOKEN.hash,
+                        Nonce: Number(params.nonce),
+                    },
+                    id: 1,
+                });
+                data = response.data;
+            }
+            catch (error) {
+                throw new blockchain_service_1.BSError('Failed to get transaction by nonce', 'FAILED_TO_GET_TRANSACTION_BY_NONCE', error);
+            }
             if (!(data === null || data === void 0 ? void 0 : data.result)) {
-                throw new blockchain_service_1.BSError('Transaction not found', 'INVALID_RESPONSE');
+                throw new blockchain_service_1.BSError('Failed to get transaction by nonce', 'FAILED_TO_GET_TRANSACTION_BY_NONCE');
+            }
+            if (data.result.Vmstate !== 'HALT') {
+                throw new blockchain_service_1.BSError('Transaction invalid', 'INVALID_TRANSACTION');
+            }
+            if (!data.result.txid) {
+                throw new blockchain_service_1.BSError('Transaction ID not found in response', 'TXID_NOT_FOUND');
             }
-            return data.result.Vmstate === 'HALT' ? (_a = data.result.txid) !== null && _a !== void 0 ? _a : null : null;
+            return data.result.txid;
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo3",
-  "version": "1.15.3",
+  "version": "1.15.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -21,7 +21,7 @@
     "isomorphic-ws": "^5.0.0",
     "lodash.clonedeep": "^4.5.0",
     "date-fns": "~4.1.0",
-    "@cityofzion/blockchain-service": "1.19.2",
+    "@cityofzion/blockchain-service": "1.19.3",
     "@cityofzion/bs-asteroid-sdk": "0.9.1"
   },
   "devDependencies": {