@alephium/web3 0.2.0-rc.11 → 0.2.0-rc.12

package/dist/src/api/api-explorer.js

@@ -12,14 +12,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Api = exports.HttpClient = exports.ContentType = void 0;
 require("cross-fetch/polyfill");
-function convertHttpResponse(response) {
-    if (response.error) {
-        throw new Error(response.error.detail);
-    }
-    else {
-        return response.data;
-    }
-}
+const utils_1 = require("./utils");
 var ContentType;
 (function (ContentType) {
     ContentType["Json"] = "application/json";
@@ -113,8 +106,6 @@ class HttpClient {
                 if (cancelToken) {
                     this.abortControllers.delete(cancelToken);
                 }
-                if (!response.ok)
-                    throw data;
                 return data;
             });
         };
@@ -177,7 +168,7 @@ class Api extends HttpClient {
                 query: query,
                 format: 'json',
                 ...params
-            }).then(convertHttpResponse),
+            }).then(utils_1.convertHttpResponse),
             /**
              * @description Get a block with hash
              *
@@ -190,7 +181,7 @@ class Api extends HttpClient {
                 method: 'GET',
                 format: 'json',
                 ...params
-            }).then(convertHttpResponse),
+            }).then(utils_1.convertHttpResponse),
             /**
              * @description Get block's transactions
              *
@@ -204,7 +195,7 @@ class Api extends HttpClient {
                 query: query,
                 format: 'json',
                 ...params
-            }).then(convertHttpResponse)
+            }).then(utils_1.convertHttpResponse)
         };
         this.transactions = {
             /**
@@ -219,7 +210,7 @@ class Api extends HttpClient {
                 method: 'GET',
                 format: 'json',
                 ...params
-            }).then(convertHttpResponse)
+            }).then(utils_1.convertHttpResponse)
         };
         this.addresses = {
             /**
@@ -234,7 +225,7 @@ class Api extends HttpClient {
                 method: 'GET',
                 format: 'json',
                 ...params
-            }).then(convertHttpResponse),
+            }).then(utils_1.convertHttpResponse),
             /**
              * @description List transactions of a given address
              *
@@ -248,7 +239,7 @@ class Api extends HttpClient {
                 query: query,
                 format: 'json',
                 ...params
-            }).then(convertHttpResponse),
+            }).then(utils_1.convertHttpResponse),
             /**
              * @description Get total transactions of a given address
              *
@@ -261,7 +252,7 @@ class Api extends HttpClient {
                 method: 'GET',
                 format: 'json',
                 ...params
-            }).then(convertHttpResponse),
+            }).then(utils_1.convertHttpResponse),
             /**
              * @description Get address balance
              *
@@ -274,7 +265,7 @@ class Api extends HttpClient {
                 method: 'GET',
                 format: 'json',
                 ...params
-            }).then(convertHttpResponse)
+            }).then(utils_1.convertHttpResponse)
         };
         this.infos = {
             /**
@@ -289,7 +280,7 @@ class Api extends HttpClient {
                 method: 'GET',
                 format: 'json',
                 ...params
-            }).then(convertHttpResponse),
+            }).then(utils_1.convertHttpResponse),
             /**
              * @description List latest height for each chain
              *
@@ -302,7 +293,7 @@ class Api extends HttpClient {
                 method: 'GET',
                 format: 'json',
                 ...params
-            }).then(convertHttpResponse),
+            }).then(utils_1.convertHttpResponse),
             /**
              * @description Get token supply list
              *
@@ -316,7 +307,7 @@ class Api extends HttpClient {
                 query: query,
                 format: 'json',
                 ...params
-            }).then(convertHttpResponse),
+            }).then(utils_1.convertHttpResponse),
             /**
              * @description Get the ALPH total supply
              *
@@ -328,7 +319,7 @@ class Api extends HttpClient {
                 path: `/infos/supply/total-alph`,
                 method: 'GET',
                 ...params
-            }).then(convertHttpResponse),
+            }).then(utils_1.convertHttpResponse),
             /**
              * @description Get the ALPH circulating supply
              *
@@ -340,7 +331,7 @@ class Api extends HttpClient {
                 path: `/infos/supply/circulating-alph`,
                 method: 'GET',
                 ...params
-            }).then(convertHttpResponse),
+            }).then(utils_1.convertHttpResponse),
             /**
              * @description Get the ALPH reserved supply
              *
@@ -352,7 +343,7 @@ class Api extends HttpClient {
                 path: `/infos/supply/reserved-alph`,
                 method: 'GET',
                 ...params
-            }).then(convertHttpResponse),
+            }).then(utils_1.convertHttpResponse),
             /**
              * @description Get the ALPH locked supply
              *
@@ -364,7 +355,7 @@ class Api extends HttpClient {
                 path: `/infos/supply/locked-alph`,
                 method: 'GET',
                 ...params
-            }).then(convertHttpResponse),
+            }).then(utils_1.convertHttpResponse),
             /**
              * @description Get the total number of transactions
              *
@@ -376,7 +367,7 @@ class Api extends HttpClient {
                 path: `/infos/total-transactions`,
                 method: 'GET',
                 ...params
-            }).then(convertHttpResponse),
+            }).then(utils_1.convertHttpResponse),
             /**
              * @description Get the average block time for each chain
              *
@@ -389,7 +380,7 @@ class Api extends HttpClient {
                 method: 'GET',
                 format: 'json',
                 ...params
-            }).then(convertHttpResponse)
+            }).then(utils_1.convertHttpResponse)
         };
         this.charts = {
             /**
@@ -406,7 +397,7 @@ class Api extends HttpClient {
                 query: query,
                 format: 'json',
                 ...params
-            }).then(convertHttpResponse),
+            }).then(utils_1.convertHttpResponse),
             /**
              * @description `interval-type` query param: hourly, daily
              *
@@ -421,7 +412,7 @@ class Api extends HttpClient {
                 query: query,
                 format: 'json',
                 ...params
-            }).then(convertHttpResponse),
+            }).then(utils_1.convertHttpResponse),
             /**
              * @description `interval-type` query param: hourly, daily
              *
@@ -436,7 +427,7 @@ class Api extends HttpClient {
                 query: query,
                 format: 'json',
                 ...params
-            }).then(convertHttpResponse)
+            }).then(utils_1.convertHttpResponse)
         };
         this.utils = {
             /**
@@ -450,7 +441,7 @@ class Api extends HttpClient {
                 path: `/utils/sanity-check`,
                 method: 'PUT',
                 ...params
-            }).then(convertHttpResponse),
+            }).then(utils_1.convertHttpResponse),
             /**
              * @description Update global log level, accepted: TRACE, DEBUG, INFO, WARN, ERROR
              *
@@ -463,7 +454,7 @@ class Api extends HttpClient {
                 method: 'PUT',
                 body: data,
                 ...params
-            }).then(convertHttpResponse),
+            }).then(utils_1.convertHttpResponse),
             /**
              * @description Update logging file, only logback.xml is accepted
              *
@@ -476,7 +467,7 @@ class Api extends HttpClient {
                 method: 'PUT',
                 body: data,
                 ...params
-            }).then(convertHttpResponse)
+            }).then(utils_1.convertHttpResponse)
         };
     }
 }

package/dist/src/api/utils.d.ts

@@ -0,0 +1,6 @@
+export declare function convertHttpResponse<T>(response: {
+    data: T;
+    error?: {
+        detail: string;
+    };
+}): T;

package/dist/src/api/utils.js

@@ -0,0 +1,29 @@
+"use strict";
+/*
+Copyright 2018 - 2022 The Alephium Authors
+This file is part of the alephium project.
+
+The library is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+The library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with the library. If not, see <http://www.gnu.org/licenses/>.
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertHttpResponse = void 0;
+function convertHttpResponse(response) {
+    if (response.error) {
+        throw new Error(`[Node API Error] - ${response.error.detail}`);
+    }
+    else {
+        return response.data;
+    }
+}
+exports.convertHttpResponse = convertHttpResponse;

package/dist/src/utils/utils.d.ts

@@ -1,11 +1,4 @@
 import { ec as EC, SignatureInput } from 'elliptic';
-import * as node from '../api/api-alephium';
-import * as explorer from '../api/api-explorer';
-export declare function convertHttpResponse<T>(response: node.HttpResponse<T, {
-    detail: string;
-}> | explorer.HttpResponse<T, {
-    detail: string;
-}>): T;
 export declare function signatureEncode(signature: EC.Signature): string;
 export declare function signatureDecode(ec: EC, signature: string): SignatureInput;
 export declare function xorByte(intValue: number): number;

package/dist/src/utils/utils.js

@@ -20,7 +20,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertType = exports.timeout = exports.hexToString = exports.stringToHex = exports.subContractId = exports.contractIdFromTx = exports.addressFromContractId = exports.addressFromPublicKey = exports.publicKeyFromPrivateKey = exports.binToHex = exports.hexToBinUnsafe = exports.tokenIdFromAddress = exports.contractIdFromAddress = exports.groupOfAddress = exports.isHexString = exports.xorByte = exports.signatureDecode = exports.signatureEncode = exports.convertHttpResponse = void 0;
+exports.assertType = exports.timeout = exports.hexToString = exports.stringToHex = exports.subContractId = exports.contractIdFromTx = exports.addressFromContractId = exports.addressFromPublicKey = exports.publicKeyFromPrivateKey = exports.binToHex = exports.hexToBinUnsafe = exports.tokenIdFromAddress = exports.contractIdFromAddress = exports.groupOfAddress = exports.isHexString = exports.xorByte = exports.signatureDecode = exports.signatureEncode = void 0;
 const elliptic_1 = require("elliptic");
 const bn_js_1 = __importDefault(require("bn.js"));
 const blakejs_1 = __importDefault(require("blakejs"));
@@ -29,15 +29,6 @@ const buffer_1 = require("buffer/");
 const constants_1 = require("../constants");
 const djb2_1 = __importDefault(require("./djb2"));
 const ec = new elliptic_1.ec('secp256k1');
-function convertHttpResponse(response) {
-    if (response.error) {
-        throw new Error(response.error.detail);
-    }
-    else {
-        return response.data;
-    }
-}
-exports.convertHttpResponse = convertHttpResponse;
 function signatureEncode(signature) {
     let sNormalized = signature.s;
     if (ec.n && signature.s.cmp(ec.nh) === 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/web3",
-  "version": "0.2.0-rc.11",
+  "version": "0.2.0-rc.12",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "main": "dist/src/index.js",
@@ -34,8 +34,8 @@
     "build": "rm -rf dist/* && npx tsc --build . && webpack",
     "test": "jest -i --config ./jest-config.json",
     "update-schemas": "npm run update-schema:alephium && npm run update-schema:explorer",
-    "update-schema:alephium": "npx swagger-typescript-api -t ./configs -o ./src/api -n api-alephium.ts -p https://raw.githubusercontent.com/alephium/alephium/v${npm_package_config_alephium_version}/api/src/main/resources/openapi.json",
-    "update-schema:explorer": "npx swagger-typescript-api -t ./configs -o ./src/api -n api-explorer.ts -p https://raw.githubusercontent.com/alephium/explorer-backend/v${npm_package_config_explorer_backend_version}/app/src/main/resources/explorer-backend-openapi.json",
+    "update-schema:alephium": "npx swagger-typescript-api --disable-throw-on-error -t ./configs -o ./src/api -n api-alephium.ts -p https://raw.githubusercontent.com/alephium/alephium/v${npm_package_config_alephium_version}/api/src/main/resources/openapi.json",
+    "update-schema:explorer": "npx swagger-typescript-api --disable-throw-on-error -t ./configs -o ./src/api -n api-explorer.ts -p https://raw.githubusercontent.com/alephium/explorer-backend/v${npm_package_config_explorer_backend_version}/app/src/main/resources/explorer-backend-openapi.json",
     "check-versions": "node scripts/check-versions.js ${npm_package_config_alephium_version} ${npm_package_config_explorer_backend_version}",
     "start-devnet": "node scripts/start-devnet.js ${npm_package_config_alephium_version}",
     "restart-devnet": "npm run start-devnet",

package/src/api/api-alephium.ts

@@ -1085,16 +1085,7 @@ export interface WalletUnlock {
 }
 
 import 'cross-fetch/polyfill'
-
-function convertHttpResponse<T>(
-  response: HttpResponse<T, { detail: string }> | HttpResponse<T, { detail: string }>
-): T {
-  if (response.error) {
-    throw new Error(response.error.detail)
-  } else {
-    return response.data
-  }
-}
+import { convertHttpResponse } from './utils'
 
 export type QueryParamsType = Record<string | number, any>
 export type ResponseFormat = keyof Omit<Body, 'body' | 'bodyUsed'>
@@ -1298,7 +1289,6 @@ export class HttpClient<SecurityDataType = unknown> {
         this.abortControllers.delete(cancelToken)
       }
 
-      if (!response.ok) throw data
       return data
     })
   }

package/src/api/api-explorer.ts

@@ -278,16 +278,7 @@ export interface UnconfirmedTransaction {
 }
 
 import 'cross-fetch/polyfill'
-
-function convertHttpResponse<T>(
-  response: HttpResponse<T, { detail: string }> | HttpResponse<T, { detail: string }>
-): T {
-  if (response.error) {
-    throw new Error(response.error.detail)
-  } else {
-    return response.data
-  }
-}
+import { convertHttpResponse } from './utils'
 
 export type QueryParamsType = Record<string | number, any>
 export type ResponseFormat = keyof Omit<Body, 'body' | 'bodyUsed'>
@@ -491,7 +482,6 @@ export class HttpClient<SecurityDataType = unknown> {
         this.abortControllers.delete(cancelToken)
       }
 
-      if (!response.ok) throw data
       return data
     })
   }

package/src/api/utils.ts

@@ -0,0 +1,25 @@
+/*
+Copyright 2018 - 2022 The Alephium Authors
+This file is part of the alephium project.
+
+The library is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+The library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with the library. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+export function convertHttpResponse<T>(response: { data: T; error?: { detail: string } }): T {
+  if (response.error) {
+    throw new Error(`[Node API Error] - ${response.error.detail}`)
+  } else {
+    return response.data
+  }
+}

package/src/utils/utils.ts

@@ -29,16 +29,6 @@ import * as explorer from '../api/api-explorer'
 
 const ec = new EC('secp256k1')
 
-export function convertHttpResponse<T>(
-  response: node.HttpResponse<T, { detail: string }> | explorer.HttpResponse<T, { detail: string }>
-): T {
-  if (response.error) {
-    throw new Error(response.error.detail)
-  } else {
-    return response.data
-  }
-}
-
 export function signatureEncode(signature: EC.Signature): string {
   let sNormalized = signature.s
   if (ec.n && signature.s.cmp(ec.nh) === 1) {

package/templates/base/package.json

@@ -12,7 +12,7 @@
     "stop-devnet": "node scripts/stop-devnet.js"
   },
   "dependencies": {
-    "@alephium/web3": "0.2.0-rc.11"
+    "@alephium/web3": "0.2.0-rc.12"
   },
   "devDependencies": {
     "@types/elliptic": "^6.4.13",

package/templates/react/package.json

@@ -12,7 +12,7 @@
     "@types/node": "^16.11.26",
     "@types/react": "^18.0.3",
     "@types/react-dom": "^18.0.0",
-    "@alephium/web3": "0.2.0-rc.11",
+    "@alephium/web3": "0.2.0-rc.12",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-scripts": "5.0.1",