@aeternity/aepp-sdk 11.0.1 → 12.0.0

package/es/utils/autorest.d.ts

@@ -0,0 +1,6 @@
+import { PipelinePolicy } from '@azure/core-rest-pipeline';
+import { AdditionalPolicyConfig } from '@azure/core-client';
+export declare const genRequestQueuesPolicy: () => AdditionalPolicyConfig;
+export declare const genCombineGetRequestsPolicy: () => AdditionalPolicyConfig;
+export declare const genErrorFormatterPolicy: (getMessage: (b: any) => string) => AdditionalPolicyConfig;
+export declare const genVersionCheckPolicy: (name: string, ignorePath: string, versionPromise: Promise<string>, geVersion: string, ltVersion: string) => PipelinePolicy;

package/es/utils/autorest.mjs

@@ -0,0 +1,97 @@
+import { RestError } from '@azure/core-rest-pipeline';
+import { pause } from "./other.mjs";
+import semverSatisfies from "./semver-satisfies.mjs";
+import { UnsupportedVersionError } from "./errors.mjs";
+export const genRequestQueuesPolicy = () => {
+  const requestQueues = new Map();
+  return {
+    policy: {
+      name: 'request-queues',
+
+      async sendRequest(request, next) {
+        var _requestQueues$get;
+
+        const key = request.headers.get('__queue');
+        request.headers.delete('__queue');
+
+        const getResponse = async () => await next(request);
+
+        if (key == null) return await getResponse();
+        const req = ((_requestQueues$get = requestQueues.get(key)) !== null && _requestQueues$get !== void 0 ? _requestQueues$get : Promise.resolve()).then(getResponse, getResponse); // TODO: remove after fixing https://github.com/aeternity/aeternity/issues/3803
+        // gap to ensure that node won't reject the nonce
+
+        requestQueues.set(key, req.then(async () => await pause(750)));
+        return await req;
+      }
+
+    },
+    position: 'perCall'
+  };
+};
+export const genCombineGetRequestsPolicy = () => {
+  const pendingGetRequests = new Map();
+  return {
+    policy: {
+      name: 'combine-requests',
+
+      async sendRequest(request, next) {
+        var _pendingGetRequests$g;
+
+        if (request.method !== 'GET') return await next(request);
+        const key = JSON.stringify([request.url, request.body]);
+        const response = (_pendingGetRequests$g = pendingGetRequests.get(key)) !== null && _pendingGetRequests$g !== void 0 ? _pendingGetRequests$g : next(request);
+        pendingGetRequests.set(key, response);
+
+        try {
+          return await response;
+        } finally {
+          pendingGetRequests.delete(key);
+        }
+      }
+
+    },
+    position: 'perCall'
+  };
+};
+export const genErrorFormatterPolicy = getMessage => ({
+  policy: {
+    name: 'error-formatter',
+
+    async sendRequest(request, next) {
+      try {
+        return await next(request);
+      } catch (error) {
+        var _error$response;
+
+        if (!(error instanceof RestError) || error.request == null) throw error;
+        if (((_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.bodyAsText) == null) throw error;
+        let body;
+
+        try {
+          body = JSON.parse(error.response.bodyAsText);
+        } catch (e) {
+          throw error;
+        }
+
+        error.message = `${new URL(error.request.url).pathname.slice(1)} error`;
+        const message = getMessage(body);
+        if (message !== '') error.message += `:${message}`;
+        throw error;
+      }
+    }
+
+  },
+  position: 'perCall'
+});
+export const genVersionCheckPolicy = (name, ignorePath, versionPromise, geVersion, ltVersion) => ({
+  name: 'version-check',
+
+  async sendRequest(request, next) {
+    if (new URL(request.url).pathname === ignorePath) return await next(request);
+    const args = [await versionPromise, geVersion, ltVersion];
+    if (!semverSatisfies(...args)) throw new UnsupportedVersionError(name, ...args);
+    return await next(request);
+  }
+
+});
+//# sourceMappingURL=autorest.mjs.map

package/es/utils/autorest.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"autorest.mjs","names":["RestError","pause","semverSatisfies","UnsupportedVersionError","genRequestQueuesPolicy","requestQueues","Map","policy","name","sendRequest","request","next","key","headers","get","delete","getResponse","req","Promise","resolve","then","set","position","genCombineGetRequestsPolicy","pendingGetRequests","method","JSON","stringify","url","body","response","genErrorFormatterPolicy","getMessage","error","bodyAsText","parse","e","message","URL","pathname","slice","genVersionCheckPolicy","ignorePath","versionPromise","geVersion","ltVersion","args"],"sources":["../../src/utils/autorest.ts"],"sourcesContent":["import { RestError, PipelineResponse, PipelinePolicy } from '@azure/core-rest-pipeline'\nimport { AdditionalPolicyConfig } from '@azure/core-client'\nimport { pause } from './other'\nimport semverSatisfies from './semver-satisfies'\nimport { UnsupportedVersionError } from './errors'\n\nexport const genRequestQueuesPolicy = (): AdditionalPolicyConfig => {\n  const requestQueues = new Map<string, Promise<unknown>>()\n\n  return {\n    policy: {\n      name: 'request-queues',\n      async sendRequest (request, next) {\n        const key = request.headers.get('__queue')\n        request.headers.delete('__queue')\n        const getResponse = async (): Promise<PipelineResponse> => await next(request)\n        if (key == null) return await getResponse()\n        const req = (requestQueues.get(key) ?? Promise.resolve()).then(getResponse, getResponse)\n        // TODO: remove after fixing https://github.com/aeternity/aeternity/issues/3803\n        // gap to ensure that node won't reject the nonce\n        requestQueues.set(key, req.then(async () => await pause(750)))\n        return await req\n      }\n    },\n    position: 'perCall'\n  }\n}\n\nexport const genCombineGetRequestsPolicy = (): AdditionalPolicyConfig => {\n  const pendingGetRequests = new Map<string, Promise<PipelineResponse>>()\n\n  return {\n    policy: {\n      name: 'combine-requests',\n      async sendRequest (request, next) {\n        if (request.method !== 'GET') return await next(request)\n        const key = JSON.stringify([request.url, request.body])\n        const response = pendingGetRequests.get(key) ?? next(request)\n        pendingGetRequests.set(key, response)\n        try {\n          return await response\n        } finally {\n          pendingGetRequests.delete(key)\n        }\n      }\n    },\n    position: 'perCall'\n  }\n}\n\nexport const genErrorFormatterPolicy = (\n  getMessage: (b: any) => string\n): AdditionalPolicyConfig => ({\n  policy: {\n    name: 'error-formatter',\n    async sendRequest (request, next) {\n      try {\n        return await next(request)\n      } catch (error) {\n        if (!(error instanceof RestError) || error.request == null) throw error\n        if (error.response?.bodyAsText == null) throw error\n\n        let body\n        try {\n          body = JSON.parse(error.response.bodyAsText)\n        } catch (e) {\n          throw error\n        }\n        error.message = `${new URL(error.request.url).pathname.slice(1)} error`\n        const message = getMessage(body)\n        if (message !== '') error.message += `:${message}`\n        throw error\n      }\n    }\n  },\n  position: 'perCall'\n})\n\nexport const genVersionCheckPolicy = (\n  name: string, ignorePath: string,\n  versionPromise: Promise<string>, geVersion: string, ltVersion: string\n): PipelinePolicy => ({\n  name: 'version-check',\n  async sendRequest (request, next) {\n    if (new URL(request.url).pathname === ignorePath) return await next(request)\n    const args = [await versionPromise, geVersion, ltVersion] as const\n    if (!semverSatisfies(...args)) throw new UnsupportedVersionError(name, ...args)\n    return await next(request)\n  }\n})\n"],"mappings":"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"}

package/es/utils/bignumber.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Big Number Helpers
+ */
+import BigNumber from 'bignumber.js';
+/**
+ * Check if value is BigNumber, Number, BigInt or number string representation
+ * @param number - number to check
+ */
+export declare const isBigNumber: (number: string | number | bigint | BigNumber) => boolean;
+/**
+ * BigNumber ceil operation
+ */
+export declare const ceil: (bigNumber: BigNumber) => BigNumber;

package/es/utils/bignumber.mjs

@@ -1,20 +1,22 @@
+import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
+
 /**
  * Big Number Helpers
- * @module @aeternity/aepp-sdk/es/utils/bignumber
- * @example import { isBigNumber, ceil } from '@aeternity/aepp-sdk/es/utils/bignumber'
  */
 import BigNumber from 'bignumber.js';
 /**
- * Check if value is BigNumber, Number or number string representation
- * @param {String|Number|BigNumber} number number to convert
- * @return {Boolean}
+ * Check if value is BigNumber, Number, BigInt or number string representation
+ * @param number - number to check
  */
 
-export const isBigNumber = number => ['number', 'object', 'string', 'bigint'].includes(typeof number) && (!isNaN(number) || Number.isInteger(number) || BigNumber.isBigNumber(number));
+export const isBigNumber = number => {
+  var _context;
+
+  if (typeof number === 'bigint') return true;
+  return _includesInstanceProperty(_context = ['number', 'object', 'string']).call(_context, typeof number) && (!isNaN(number) || Number.isInteger(number) || BigNumber.isBigNumber(number));
+};
 /**
  * BigNumber ceil operation
- * @param {BigNumber} bigNumber
- * @return {BigNumber}
  */
 
 export const ceil = bigNumber => bigNumber.integerValue(BigNumber.ROUND_CEIL);

package/es/utils/bignumber.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/bignumber.ts"],"names":["BigNumber","isBigNumber","number","includes","isNaN","Number","isInteger","ceil","bigNumber","integerValue","ROUND_CEIL"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA,OAAOA,SAAP,MAAsB,cAAtB;AAEA;AACA;AACA;AACA;AACA;;AACA,OAAO,MAAMC,WAAW,GAAIC,MAAD,IACzB,CAAC,QAAD,EAAW,QAAX,EAAqB,QAArB,EAA+B,QAA/B,EAAyCC,QAAzC,CAAkD,OAAOD,MAAzD,MACC,CAACE,KAAK,CAACF,MAAD,CAAN,IAA4BG,MAAM,CAACC,SAAP,CAAiBJ,MAAjB,CAA5B,IAAwDF,SAAS,CAACC,WAAV,CAAsBC,MAAtB,CADzD,CADK;AAIP;AACA;AACA;AACA;AACA;;AACA,OAAO,MAAMK,IAAI,GAAIC,SAAD,IAAqCA,SAAS,CAACC,YAAV,CAAuBT,SAAS,CAACU,UAAjC,CAAlD","sourcesContent":["/**\n * Big Number Helpers\n * @module @aeternity/aepp-sdk/es/utils/bignumber\n * @example import { isBigNumber, ceil } from '@aeternity/aepp-sdk/es/utils/bignumber'\n */\nimport BigNumber from 'bignumber.js'\n\n/**\n * Check if value is BigNumber, Number or number string representation\n * @param {String|Number|BigNumber} number number to convert\n * @return {Boolean}\n */\nexport const isBigNumber = (number: string | number | BigNumber): boolean =>\n  ['number', 'object', 'string', 'bigint'].includes(typeof number) &&\n  (!isNaN(number as number) || Number.isInteger(number) || BigNumber.isBigNumber(number))\n\n/**\n * BigNumber ceil operation\n * @param {BigNumber} bigNumber\n * @return {BigNumber}\n */\nexport const ceil = (bigNumber: BigNumber): BigNumber => bigNumber.integerValue(BigNumber.ROUND_CEIL)\n"],"file":"bignumber.mjs"}
+{"version":3,"file":"bignumber.mjs","names":["BigNumber","isBigNumber","number","isNaN","Number","isInteger","ceil","bigNumber","integerValue","ROUND_CEIL"],"sources":["../../src/utils/bignumber.ts"],"sourcesContent":["/**\n * Big Number Helpers\n */\nimport BigNumber from 'bignumber.js'\n\n/**\n * Check if value is BigNumber, Number, BigInt or number string representation\n * @param number - number to check\n */\nexport const isBigNumber = (number: string | number | bigint | BigNumber): boolean => {\n  if (typeof number === 'bigint') return true\n  return ['number', 'object', 'string'].includes(typeof number) &&\n    (!isNaN(number as number) || Number.isInteger(number) || BigNumber.isBigNumber(number))\n}\n\n/**\n * BigNumber ceil operation\n */\nexport const ceil = (bigNumber: BigNumber): BigNumber => bigNumber\n  .integerValue(BigNumber.ROUND_CEIL)\n"],"mappings":";;AAAA;AACA;AACA;AACA,OAAOA,SAAP,MAAsB,cAAtB;AAEA;AACA;AACA;AACA;;AACA,OAAO,MAAMC,WAAW,GAAIC,MAAD,IAA2D;EAAA;;EACpF,IAAI,OAAOA,MAAP,KAAkB,QAAtB,EAAgC,OAAO,IAAP;EAChC,OAAO,sCAAC,QAAD,EAAW,QAAX,EAAqB,QAArB,kBAAwC,OAAOA,MAA/C,MACJ,CAACC,KAAK,CAACD,MAAD,CAAN,IAA4BE,MAAM,CAACC,SAAP,CAAiBH,MAAjB,CAA5B,IAAwDF,SAAS,CAACC,WAAV,CAAsBC,MAAtB,CADpD,CAAP;AAED,CAJM;AAMP;AACA;AACA;;AACA,OAAO,MAAMI,IAAI,GAAIC,SAAD,IAAqCA,SAAS,CAC/DC,YADsD,CACzCR,SAAS,CAACS,UAD+B,CAAlD"}

package/es/{bytes.d.ts → utils/bytes.d.ts}

@@ -1,29 +1,26 @@
 /// <reference types="node" />
 import BigNumber from 'bignumber.js';
-/**
- * Bytes module
- * @module @aeternity/aepp-sdk/es/utils/bytes
- * @example import { Crypto } from '@aeternity/aepp-sdk'
- */
 /**
  * Convert bignumber to byte array
- * @param {BigNumber} x bignumber instance
- * @return Buffer
+ * @param x - bignumber instance
+ * @returns Buffer
  */
 export declare function bigNumberToByteArray(x: BigNumber): Buffer;
 /**
  * Convert string, number, or BigNumber to byte array
- * @param {null|string|number|BigNumber} val
- * @param {boolean} big enables force conversion to BigNumber
- * @return Buffer
+ * @param val - value to convert
+ * @param big - enables force conversion to BigNumber
+ * @returns Buffer
  */
 export declare function toBytes(val?: null | string | number | BigNumber, big?: boolean): Buffer;
 /**
  * Convert a string to a Buffer.  If encoding is not specified, hex-encoding
  * will be used if the input is valid hex.  If the input is valid base64 but
  * not valid hex, base64 will be used.  Otherwise, utf8 will be used.
- * @param {string} str String to be converted.
- * @param {string} [enc] Encoding of the input string.
- * @return {buffer} Buffer containing the input data.
+ * @param str - String to be converted.
+ * @param enc - Encoding of the input string.
+ * @returns Buffer containing the input data.
  */
 export declare function str2buf(str: string, enc?: BufferEncoding): Buffer;
+export declare const bytesToHex: (b: Uint8Array) => string;
+export declare const hexToBytes: (s: string) => Uint8Array;

package/es/utils/bytes.mjs

@@ -22,16 +22,10 @@ const {
 import BigNumber from 'bignumber.js';
 import { NoSerializerFoundError, TypeError } from "./errors.mjs";
 import { isBase64, isHex } from "./string.mjs";
-/**
- * Bytes module
- * @module @aeternity/aepp-sdk/es/utils/bytes
- * @example import { Crypto } from '@aeternity/aepp-sdk'
- */
-
 /**
  * Convert bignumber to byte array
- * @param {BigNumber} x bignumber instance
- * @return Buffer
+ * @param x - bignumber instance
+ * @returns Buffer
  */
 
 export function bigNumberToByteArray(x) {
@@ -42,9 +36,9 @@ export function bigNumberToByteArray(x) {
 }
 /**
  * Convert string, number, or BigNumber to byte array
- * @param {null|string|number|BigNumber} val
- * @param {boolean} big enables force conversion to BigNumber
- * @return Buffer
+ * @param val - value to convert
+ * @param big - enables force conversion to BigNumber
+ * @returns Buffer
  */
 
 export function toBytes(val) {
@@ -69,9 +63,9 @@ export function toBytes(val) {
  * Convert a string to a Buffer.  If encoding is not specified, hex-encoding
  * will be used if the input is valid hex.  If the input is valid base64 but
  * not valid hex, base64 will be used.  Otherwise, utf8 will be used.
- * @param {string} str String to be converted.
- * @param {string} [enc] Encoding of the input string.
- * @return {buffer} Buffer containing the input data.
+ * @param str - String to be converted.
+ * @param enc - Encoding of the input string.
+ * @returns Buffer containing the input data.
  */
 
 export function str2buf(str, enc) {
@@ -79,4 +73,6 @@ export function str2buf(str, enc) {
 
   return _Buffer.from(str, (_ref = enc !== null && enc !== void 0 ? enc : isHex(str) ? 'hex' : undefined) !== null && _ref !== void 0 ? _ref : isBase64(str) ? 'base64' : undefined);
 }
+export const bytesToHex = b => _Buffer.from(b).toString('hex');
+export const hexToBytes = s => _Buffer.from(s, 'hex');
 //# sourceMappingURL=bytes.mjs.map

package/es/utils/bytes.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/bytes.ts"],"names":["BigNumber","NoSerializerFoundError","TypeError","isBase64","isHex","bigNumberToByteArray","x","isInteger","toFixed","hexString","toString","length","from","toBytes","val","big","undefined","Number","isBigNumber","str2buf","str","enc"],"mappings":";;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAOA,SAAP,MAAsB,cAAtB;SACSC,sB,EAAwBC,S;SACxBC,Q,EAAUC,K;AAEnB;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AACA,OAAO,SAASC,oBAAT,CAA+BC,CAA/B,EAAqD;AAC1D,MAAI,CAACA,CAAC,CAACC,SAAF,EAAL,EAAoB,MAAM,IAAIL,SAAJ,CAAe,iCAAgCI,CAAC,CAACE,OAAF,EAAY,EAA3D,CAAN;AACpB,MAAIC,SAAS,GAAGH,CAAC,CAACI,QAAF,CAAW,EAAX,CAAhB;AACA,MAAID,SAAS,CAACE,MAAV,GAAmB,CAAnB,KAAyB,CAA7B,EAAgCF,SAAS,GAAG,MAAMA,SAAlB;AAChC,SAAO,QAAOG,IAAP,CAAYH,SAAZ,EAAuB,KAAvB,CAAP;AACD;AAED;AACA;AACA;AACA;AACA;AACA;;AACA,OAAO,SAASI,OAAT,CAAkBC,GAAlB,EAA0F;AAAA,MAA9BC,GAA8B,uEAAf,KAAe;AAC/F;AACA;AACA;AAEA,MAAID,GAAG,KAAKE,SAAR,IAAqBF,GAAG,KAAK,IAAjC,EAAuC,OAAO,QAAOF,IAAP,CAAY,EAAZ,CAAP;;AACvC,MAAIK,MAAM,CAACV,SAAP,CAAiBO,GAAjB,KAAyBd,SAAS,CAACkB,WAAV,CAAsBJ,GAAtB,CAAzB,IAAuDC,GAA3D,EAAgE;AAC9D,QAAI,CAACf,SAAS,CAACkB,WAAV,CAAsBJ,GAAtB,CAAL,EAAiCA,GAAG,GAAG,IAAId,SAAJ,CAAcc,GAAd,CAAN;AACjC,WAAOT,oBAAoB,CAACS,GAAD,CAA3B;AACD;;AACD,MAAI,OAAOA,GAAP,KAAe,QAAnB,EAA6B;AAC3B,WAAO,QAAOF,IAAP,CAAYE,GAAZ,CAAP;AACD;;AACD,QAAM,IAAIb,sBAAJ,EAAN;AACD;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AACA,OAAO,SAASkB,OAAT,CAAkBC,GAAlB,EAA+BC,GAA/B,EAA6D;AAAA;;AAClE,SAAO,QAAOT,IAAP,CACLQ,GADK,UAELC,GAFK,aAELA,GAFK,cAELA,GAFK,GAEGjB,KAAK,CAACgB,GAAD,CAAL,GAAa,KAAb,GAAqBJ,SAFxB,uCAEuCb,QAAQ,CAACiB,GAAD,CAAR,GAAgB,QAAhB,GAA2BJ,SAFlE,CAAP;AAID","sourcesContent":["/*\n * ISC License (ISC)\n * Copyright 2018 aeternity developers\n *\n *  Permission to use, copy, modify, and/or distribute this software for any\n *  purpose with or without fee is hereby granted, provided that the above\n *  copyright notice and this permission notice appear in all copies.\n *\n *  THE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\n *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY\n *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\n *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\n *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR\n *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\n *  PERFORMANCE OF THIS SOFTWARE.\n */\nimport BigNumber from 'bignumber.js'\nimport { NoSerializerFoundError, TypeError } from './errors'\nimport { isBase64, isHex } from './string'\n\n/**\n * Bytes module\n * @module @aeternity/aepp-sdk/es/utils/bytes\n * @example import { Crypto } from '@aeternity/aepp-sdk'\n */\n\n/**\n * Convert bignumber to byte array\n * @param {BigNumber} x bignumber instance\n * @return Buffer\n */\nexport function bigNumberToByteArray (x: BigNumber): Buffer {\n  if (!x.isInteger()) throw new TypeError(`Unexpected not integer value: ${x.toFixed()}`)\n  let hexString = x.toString(16)\n  if (hexString.length % 2 === 1) hexString = '0' + hexString\n  return Buffer.from(hexString, 'hex')\n}\n\n/**\n * Convert string, number, or BigNumber to byte array\n * @param {null|string|number|BigNumber} val\n * @param {boolean} big enables force conversion to BigNumber\n * @return Buffer\n */\nexport function toBytes (val?: null | string | number | BigNumber, big: boolean = false): Buffer {\n  // Encode a value to bytes.\n  // If the value is an int it will be encoded as bytes big endian\n  // Raises ValueError if the input is not an int or string\n\n  if (val === undefined || val === null) return Buffer.from([])\n  if (Number.isInteger(val) || BigNumber.isBigNumber(val) || big) {\n    if (!BigNumber.isBigNumber(val)) val = new BigNumber(val)\n    return bigNumberToByteArray(val)\n  }\n  if (typeof val === 'string') {\n    return Buffer.from(val)\n  }\n  throw new NoSerializerFoundError()\n}\n\n/**\n * Convert a string to a Buffer.  If encoding is not specified, hex-encoding\n * will be used if the input is valid hex.  If the input is valid base64 but\n * not valid hex, base64 will be used.  Otherwise, utf8 will be used.\n * @param {string} str String to be converted.\n * @param {string} [enc] Encoding of the input string.\n * @return {buffer} Buffer containing the input data.\n */\nexport function str2buf (str: string, enc?: BufferEncoding): Buffer {\n  return Buffer.from(\n    str,\n    enc ?? (isHex(str) ? 'hex' : undefined) ?? (isBase64(str) ? 'base64' : undefined)\n  )\n}\n"],"file":"bytes.mjs"}
+{"version":3,"file":"bytes.mjs","names":["BigNumber","NoSerializerFoundError","TypeError","isBase64","isHex","bigNumberToByteArray","x","isInteger","toFixed","hexString","toString","length","from","toBytes","val","big","undefined","Number","isBigNumber","str2buf","str","enc","bytesToHex","b","hexToBytes","s"],"sources":["../../src/utils/bytes.ts"],"sourcesContent":["/*\n * ISC License (ISC)\n * Copyright 2018 aeternity developers\n *\n *  Permission to use, copy, modify, and/or distribute this software for any\n *  purpose with or without fee is hereby granted, provided that the above\n *  copyright notice and this permission notice appear in all copies.\n *\n *  THE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\n *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY\n *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\n *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\n *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR\n *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\n *  PERFORMANCE OF THIS SOFTWARE.\n */\nimport BigNumber from 'bignumber.js'\nimport { NoSerializerFoundError, TypeError } from './errors'\nimport { isBase64, isHex } from './string'\n\n/**\n * Convert bignumber to byte array\n * @param x - bignumber instance\n * @returns Buffer\n */\nexport function bigNumberToByteArray (x: BigNumber): Buffer {\n  if (!x.isInteger()) throw new TypeError(`Unexpected not integer value: ${x.toFixed()}`)\n  let hexString = x.toString(16)\n  if (hexString.length % 2 === 1) hexString = '0' + hexString\n  return Buffer.from(hexString, 'hex')\n}\n\n/**\n * Convert string, number, or BigNumber to byte array\n * @param val - value to convert\n * @param big - enables force conversion to BigNumber\n * @returns Buffer\n */\nexport function toBytes (val?: null | string | number | BigNumber, big: boolean = false): Buffer {\n  // Encode a value to bytes.\n  // If the value is an int it will be encoded as bytes big endian\n  // Raises ValueError if the input is not an int or string\n\n  if (val === undefined || val === null) return Buffer.from([])\n  if (Number.isInteger(val) || BigNumber.isBigNumber(val) || big) {\n    if (!BigNumber.isBigNumber(val)) val = new BigNumber(val)\n    return bigNumberToByteArray(val)\n  }\n  if (typeof val === 'string') {\n    return Buffer.from(val)\n  }\n  throw new NoSerializerFoundError()\n}\n\n/**\n * Convert a string to a Buffer.  If encoding is not specified, hex-encoding\n * will be used if the input is valid hex.  If the input is valid base64 but\n * not valid hex, base64 will be used.  Otherwise, utf8 will be used.\n * @param str - String to be converted.\n * @param enc - Encoding of the input string.\n * @returns Buffer containing the input data.\n */\nexport function str2buf (str: string, enc?: BufferEncoding): Buffer {\n  return Buffer.from(\n    str,\n    enc ?? (isHex(str) ? 'hex' : undefined) ?? (isBase64(str) ? 'base64' : undefined)\n  )\n}\n\nexport const bytesToHex = (b: Uint8Array): string => Buffer.from(b).toString('hex')\n\nexport const hexToBytes = (s: string): Uint8Array => Buffer.from(s, 'hex')\n"],"mappings":";;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAOA,SAAP,MAAsB,cAAtB;SACSC,sB,EAAwBC,S;SACxBC,Q,EAAUC,K;AAEnB;AACA;AACA;AACA;AACA;;AACA,OAAO,SAASC,oBAAT,CAA+BC,CAA/B,EAAqD;EAC1D,IAAI,CAACA,CAAC,CAACC,SAAF,EAAL,EAAoB,MAAM,IAAIL,SAAJ,CAAe,iCAAgCI,CAAC,CAACE,OAAF,EAAY,EAA3D,CAAN;EACpB,IAAIC,SAAS,GAAGH,CAAC,CAACI,QAAF,CAAW,EAAX,CAAhB;EACA,IAAID,SAAS,CAACE,MAAV,GAAmB,CAAnB,KAAyB,CAA7B,EAAgCF,SAAS,GAAG,MAAMA,SAAlB;EAChC,OAAO,QAAOG,IAAP,CAAYH,SAAZ,EAAuB,KAAvB,CAAP;AACD;AAED;AACA;AACA;AACA;AACA;AACA;;AACA,OAAO,SAASI,OAAT,CAAkBC,GAAlB,EAA0F;EAAA,IAA9BC,GAA8B,uEAAf,KAAe;EAC/F;EACA;EACA;EAEA,IAAID,GAAG,KAAKE,SAAR,IAAqBF,GAAG,KAAK,IAAjC,EAAuC,OAAO,QAAOF,IAAP,CAAY,EAAZ,CAAP;;EACvC,IAAIK,MAAM,CAACV,SAAP,CAAiBO,GAAjB,KAAyBd,SAAS,CAACkB,WAAV,CAAsBJ,GAAtB,CAAzB,IAAuDC,GAA3D,EAAgE;IAC9D,IAAI,CAACf,SAAS,CAACkB,WAAV,CAAsBJ,GAAtB,CAAL,EAAiCA,GAAG,GAAG,IAAId,SAAJ,CAAcc,GAAd,CAAN;IACjC,OAAOT,oBAAoB,CAACS,GAAD,CAA3B;EACD;;EACD,IAAI,OAAOA,GAAP,KAAe,QAAnB,EAA6B;IAC3B,OAAO,QAAOF,IAAP,CAAYE,GAAZ,CAAP;EACD;;EACD,MAAM,IAAIb,sBAAJ,EAAN;AACD;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AACA,OAAO,SAASkB,OAAT,CAAkBC,GAAlB,EAA+BC,GAA/B,EAA6D;EAAA;;EAClE,OAAO,QAAOT,IAAP,CACLQ,GADK,UAELC,GAFK,aAELA,GAFK,cAELA,GAFK,GAEGjB,KAAK,CAACgB,GAAD,CAAL,GAAa,KAAb,GAAqBJ,SAFxB,uCAEuCb,QAAQ,CAACiB,GAAD,CAAR,GAAgB,QAAhB,GAA2BJ,SAFlE,CAAP;AAID;AAED,OAAO,MAAMM,UAAU,GAAIC,CAAD,IAA2B,QAAOX,IAAP,CAAYW,CAAZ,EAAeb,QAAf,CAAwB,KAAxB,CAA9C;AAEP,OAAO,MAAMc,UAAU,GAAIC,CAAD,IAA2B,QAAOb,IAAP,CAAYa,CAAZ,EAAe,KAAf,CAA9C"}

package/es/utils/crypto.d.ts

@@ -0,0 +1,103 @@
+/// <reference types="node" />
+import { SignKeyPair } from 'tweetnacl';
+import { Data } from 'blakejs';
+import { sha256hash, EncodedData, EncodingType } from './encoder';
+export { sha256hash };
+/**
+ * Generate address from secret key
+ * @param secret - Private key
+ * @returns Public key encoded as address
+ */
+export declare function getAddressFromPriv(secret: string | Uint8Array): EncodedData<'ak'>;
+/**
+ * Check if address is valid
+ * @param address - Address
+ * @param prefix - Transaction prefix. Default: 'ak'
+ * @returns is valid
+ */
+export declare function isAddressValid(address: string, prefix?: EncodingType): boolean;
+/**
+ * Generate a random salt (positive integer)
+ * @returns random salt
+ */
+export declare function salt(): number;
+/**
+ * Converts a positive integer to the smallest possible
+ * representation in a binary digit representation
+ * @param value - Value to encode
+ * @returns Encoded number
+ */
+export declare function encodeUnsigned(value: number): Buffer;
+/**
+ * Calculate 256bits Blake2b hash of `input`
+ * @param input - Data to hash
+ * @returns Hash
+ */
+export declare function hash(input: Data): Buffer;
+/**
+ * Compute contract address
+ * @param owner - Address of contract owner
+ * @param nonce - Round when contract was created
+ * @returns Contract address
+ */
+export declare function encodeContractAddress(owner: EncodedData<'ak'>, nonce: number): EncodedData<'ct'>;
+/**
+ * Generate keyPair from secret key
+ * @param secret - secret key
+ * @returns Object with Private(privateKey) and Public(publicKey) keys
+ */
+export declare function generateKeyPairFromSecret(secret: Uint8Array): SignKeyPair;
+/**
+ * Generate a random ED25519 keypair
+ * @param raw - Whether to return raw (binary) keys
+ * @returns Key pair
+ */
+export declare function generateKeyPair(raw: true): {
+    publicKey: Buffer;
+    secretKey: Buffer;
+};
+export declare function generateKeyPair(raw?: false): {
+    publicKey: EncodedData<'ak'>;
+    secretKey: string;
+};
+/**
+ * Encrypt given data using `password`
+ * @param password - Password to encrypt with
+ * @param binaryData - Data to encrypt
+ * @returns Encrypted data
+ */
+export declare function encryptKey(password: string, binaryData: Uint8Array): Uint8Array;
+/**
+ * Decrypt given data using `password`
+ * @param password - Password to decrypt with
+ * @param encrypted - Data to decrypt
+ * @returns Decrypted data
+ */
+export declare function decryptKey(password: string, encrypted: Uint8Array): Uint8Array;
+/**
+ * Generate signature
+ * @param data - Data to sign
+ * @param privateKey - Key to sign with
+ * @returns Signature
+ */
+export declare function sign(data: string | Uint8Array, privateKey: string | Uint8Array): Uint8Array;
+/**
+ * Verify that signature was signed by public key
+ * @param data - Data to verify
+ * @param signature - Signature to verify
+ * @param publicKey - Key to verify against
+ * @returns Valid?
+ */
+export declare function verify(data: Uint8Array, signature: Uint8Array, publicKey: string | Uint8Array): boolean;
+export declare function messageToHash(message: string): Buffer;
+export declare function signMessage(message: string, privateKey: string | Buffer): Uint8Array;
+export declare function verifyMessage(str: string, signature: Uint8Array, publicKey: string | Uint8Array): boolean;
+/**
+ * Check key pair for validity
+ *
+ * Sign a message, and then verifying that signature
+ * @param privateKey - Private key to verify
+ * @param publicKey - Public key to verify
+ * @returns Valid?
+ */
+export declare function isValidKeypair(privateKey: string | Uint8Array, publicKey: string | Uint8Array): boolean;

package/es/utils/crypto.mjs

@@ -19,48 +19,44 @@ const {
  *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  *  PERFORMANCE OF THIS SOFTWARE.
  */
-
-/**
- * Crypto module
- * @module @aeternity/aepp-sdk/es/utils/crypto
- * @example import { Crypto } from '@aeternity/aepp-sdk'
- */
 import nacl from 'tweetnacl';
 import aesjs from 'aes-js';
+import _blakejs from 'blakejs';
+const {
+  blake2b
+} = _blakejs;
+import _varuintBitcoin from 'varuint-bitcoin';
+const {
+  encode: varuintEncode
+} = _varuintBitcoin;
 import { str2buf } from "./bytes.mjs";
+import { concatBuffers } from "./other.mjs";
 import { encode, decode, sha256hash } from "./encoder.mjs";
-import { hash } from "./crypto-ts.mjs";
-import { NotImplementedError } from "./errors.mjs";
-export * from "./crypto-ts.mjs";
 export { sha256hash };
 const Ecb = aesjs.ModeOfOperation.ecb;
 /**
  * Generate address from secret key
- * @rtype (secret: String) => tx: Promise[String]
- * @param {String} secret - Private key
- * @return {String} Public key
+ * @param secret - Private key
+ * @returns Public key encoded as address
  */
 
 export function getAddressFromPriv(secret) {
-  const keys = nacl.sign.keyPair.fromSecretKey(str2buf(secret));
-
-  const publicBuffer = _Buffer.from(keys.publicKey);
-
-  return encode(publicBuffer, 'ak');
+  const secretBuffer = typeof secret === 'string' ? str2buf(secret) : secret;
+  const keys = nacl.sign.keyPair.fromSecretKey(secretBuffer);
+  return encode(keys.publicKey, 'ak');
 }
 /**
  * Check if address is valid
- * @rtype (input: String) => valid: Boolean
- * @param {String} address - Address
- * @param {String} prefix Transaction prefix. Default: 'ak'
- * @return {Boolean} valid
+ * @param address - Address
+ * @param prefix - Transaction prefix. Default: 'ak'
+ * @returns is valid
  */
 
 export function isAddressValid(address) {
   let prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'ak';
 
   try {
-    decode(address, prefix);
+    decode(address);
     return true;
   } catch (e) {
     return false;
@@ -68,8 +64,7 @@ export function isAddressValid(address) {
 }
 /**
  * Generate a random salt (positive integer)
- * @rtype () => salt: Number
- * @return {Number} random salt
+ * @returns random salt
  */
 
 export function salt() {
@@ -78,9 +73,8 @@ export function salt() {
 /**
  * Converts a positive integer to the smallest possible
  * representation in a binary digit representation
- * @rtype (value: Number) => Buffer
- * @param {Number} value - Value to encode
- * @return {Buffer} - Encoded data
+ * @param value - Value to encode
+ * @returns Encoded number
  */
 
 export function encodeUnsigned(value) {
@@ -88,29 +82,34 @@ export function encodeUnsigned(value) {
 
   binary.writeUInt32BE(value);
   return binary.slice(binary.findIndex(i => i !== 0));
+}
+/**
+ * Calculate 256bits Blake2b hash of `input`
+ * @param input - Data to hash
+ * @returns Hash
+ */
+
+export function hash(input) {
+  return _Buffer.from(blake2b(input, undefined, 32)); // 256 bits
 } // Todo Duplicated in tx builder. remove
 
 /**
  * Compute contract address
- * @rtype (owner: String, nonce: Number) => String
- * @param {String} owner - Address of contract owner
- * @param {Number} nonce - Round when contract was created
- * @return {String} - Contract address
+ * @param owner - Address of contract owner
+ * @param nonce - Round when contract was created
+ * @returns Contract address
  */
 
 export function encodeContractAddress(owner, nonce) {
-  const publicKey = decode(owner, 'ak');
-
-  const binary = _Buffer.concat([publicKey, encodeUnsigned(nonce)]);
-
+  const publicKey = decode(owner);
+  const binary = concatBuffers([publicKey, encodeUnsigned(nonce)]);
   return encode(hash(binary), 'ct');
 } // KEY-PAIR HELPERS
 
 /**
  * Generate keyPair from secret key
- * @rtype (secret: Uint8Array) => KeyPair
- * @param {Uint8Array} secret - secret key
- * @return {Object} - Object with Private(privateKey) and Public(publicKey) keys
+ * @param secret - secret key
+ * @returns Object with Private(privateKey) and Public(publicKey) keys
  */
 
 export function generateKeyPairFromSecret(secret) {
@@ -118,14 +117,12 @@ export function generateKeyPairFromSecret(secret) {
 }
 /**
  * Generate a random ED25519 keypair
- * @rtype (raw: Boolean) => {publicKey: String | Buffer, secretKey: String | Buffer}
- * @param {Boolean} raw - Whether to return raw (binary) keys
- * @return {Object} Key pair
+ * @param raw - Whether to return raw (binary) keys
+ * @returns Key pair
  */
 
 export function generateKeyPair() {
   let raw = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-  // <node>/apps/aens/test/aens_test_utils.erl
   const keyPair = nacl.sign.keyPair();
 
   const publicBuffer = _Buffer.from(keyPair.publicKey);
@@ -146,10 +143,9 @@ export function generateKeyPair() {
 }
 /**
  * Encrypt given data using `password`
- * @rtype (password: String, binaryData: Buffer) => Uint8Array
- * @param {String} password - Password to encrypt with
- * @param {Buffer} binaryData - Data to encrypt
- * @return {Uint8Array} Encrypted data
+ * @param password - Password to encrypt with
+ * @param binaryData - Data to encrypt
+ * @returns Encrypted data
  */
 
 export function encryptKey(password, binaryData) {
@@ -159,10 +155,9 @@ export function encryptKey(password, binaryData) {
 }
 /**
  * Decrypt given data using `password`
- * @rtype (password: String, encrypted: String) => Uint8Array
- * @param {String} password - Password to decrypt with
- * @param {String} encrypted - Data to decrypt
- * @return {Buffer} Decrypted data
+ * @param password - Password to decrypt with
+ * @param encrypted - Data to decrypt
+ * @returns Decrypted data
  */
 
 export function decryptKey(password, encrypted) {
@@ -170,15 +165,14 @@ export function decryptKey(password, encrypted) {
 
   const hashedPasswordBytes = sha256hash(password);
   const aesEcb = new Ecb(hashedPasswordBytes);
-  return _Buffer.from(aesEcb.decrypt(encryptedBytes));
+  return aesEcb.decrypt(encryptedBytes);
 } // SIGNATURES
 
 /**
  * Generate signature
- * @rtype (data: String|Buffer, privateKey: Buffer) => Buffer
- * @param {String|Buffer} data - Data to sign
- * @param {String|Buffer} privateKey - Key to sign with
- * @return {Buffer|Uint8Array} Signature
+ * @param data - Data to sign
+ * @param privateKey - Key to sign with
+ * @returns Signature
  */
 
 export function sign(data, privateKey) {
@@ -186,23 +180,22 @@ export function sign(data, privateKey) {
 }
 /**
  * Verify that signature was signed by public key
- * @rtype (str: String, signature: Buffer, publicKey: Buffer) => Boolean
- * @param {String|Buffer} str - Data to verify
- * @param {Buffer} signature - Signature to verify
- * @param {Buffer} publicKey - Key to verify against
- * @return {Boolean} Valid?
+ * @param data - Data to verify
+ * @param signature - Signature to verify
+ * @param publicKey - Key to verify against
+ * @returns Valid?
  */
 
-export function verify(str, signature, publicKey) {
-  return nacl.sign.detached.verify(new Uint8Array(str), signature, publicKey);
+export function verify(data, signature, publicKey) {
+  const publicKeyBuffer = typeof publicKey === 'string' ? str2buf(publicKey) : publicKey;
+  return nacl.sign.detached.verify(data, signature, publicKeyBuffer);
 }
 export function messageToHash(message) {
   const p = _Buffer.from('aeternity Signed Message:\n', 'utf8');
 
   const msg = _Buffer.from(message, 'utf8');
 
-  if (msg.length >= 0xFD) throw new NotImplementedError('Message too long');
-  return hash(_Buffer.concat([_Buffer.from([p.length]), p, _Buffer.from([msg.length]), msg]));
+  return hash(concatBuffers([varuintEncode(p.length), p, varuintEncode(msg.length), msg]));
 }
 export function signMessage(message, privateKey) {
   return sign(messageToHash(message), privateKey);
@@ -214,10 +207,9 @@ export function verifyMessage(str, signature, publicKey) {
  * Check key pair for validity
  *
  * Sign a message, and then verifying that signature
- * @rtype (privateKey: Buffer, publicKey: Buffer) => Boolean
- * @param {Buffer} privateKey - Private key to verify
- * @param {Buffer} publicKey - Public key to verify
- * @return {Boolean} Valid?
+ * @param privateKey - Private key to verify
+ * @param publicKey - Public key to verify
+ * @returns Valid?
  */
 
 export function isValidKeypair(privateKey, publicKey) {