@aeternity/aepp-sdk 13.3.0 → 13.3.2

package/dist/aepp-sdk.js

@@ -7943,16 +7943,20 @@ function isAuctionName(name) {
  * @param type - Type
  * @param options - Options
  */
-function _getPollInterval(type,
-// TODO: rename to 'key-block' | 'micro-block'
-{
-  _expectedMineRate = 180000,
-  _microBlockCycle = 3000
+async function _getPollInterval(type, {
+  _expectedMineRate,
+  _microBlockCycle,
+  onNode
 }) {
-  const base = {
-    block: _expectedMineRate,
-    microblock: _microBlockCycle
-  }[type];
+  var _ref, _await$getVal;
+  const getVal = async (t, val, devModeDef, def) => {
+    if (t !== type) return null;
+    if (val != null) return val;
+    return (await (onNode === null || onNode === void 0 ? void 0 : onNode.getNetworkId())) === 'ae_dev' ? devModeDef : def;
+  };
+  const base = (_ref = (_await$getVal = await getVal('key-block', _expectedMineRate, 0, 180000)) !== null && _await$getVal !== void 0 ? _await$getVal : await getVal('micro-block', _microBlockCycle, 0, 3000)) !== null && _ref !== void 0 ? _ref : (() => {
+    throw new InternalError(`Unknown type: ${type}`);
+  })();
   return Math.floor(base / 3);
 }
 const heightCache = new WeakMap();
@@ -7973,7 +7977,7 @@ async function getHeight({
   const onNode = unwrapProxy(options.onNode);
   if (cached) {
     const cache = heightCache.get(onNode);
-    if (cache != null && cache.time > Date.now() - _getPollInterval('block', options)) {
+    if (cache != null && cache.time > Date.now() - (await _getPollInterval('key-block', options))) {
       return cache.height;
     }
   }
@@ -8002,26 +8006,23 @@ async function getHeight({
 async function poll(th, {
   blocks = 5,
   interval,
-  onNode,
   ...options
 }) {
   var _interval;
-  (_interval = interval) !== null && _interval !== void 0 ? _interval : interval = _getPollInterval('microblock', options);
+  (_interval = interval) !== null && _interval !== void 0 ? _interval : interval = await _getPollInterval('micro-block', options);
   let max;
   do {
-    const tx = await onNode.getTransactionByHash(th);
+    const tx = await options.onNode.getTransactionByHash(th);
     if (tx.blockHeight !== -1) return tx;
     if (max == null) {
       max = tx.tx.ttl !== 0 ? -1 : (await getHeight({
         ...options,
-        onNode,
         cached: true
       })) + blocks;
     }
     await pause(interval);
   } while (max === -1 ? true : (await getHeight({
     ...options,
-    onNode,
     cached: true
   })) < max);
   throw new TxTimedOutError(blocks, th);
@@ -8038,17 +8039,14 @@ async function poll(th, {
  */
 async function awaitHeight(height, {
   interval,
-  onNode,
   ...options
 }) {
   var _interval2;
-  (_interval2 = interval) !== null && _interval2 !== void 0 ? _interval2 : interval = Math.min(_getPollInterval('block', options), 5000);
+  (_interval2 = interval) !== null && _interval2 !== void 0 ? _interval2 : interval = Math.min(await _getPollInterval('key-block', options), 5000);
   let currentHeight;
   do {
     if (currentHeight != null) await pause(interval);
-    currentHeight = await getHeight({
-      onNode
-    });
+    currentHeight = await getHeight(options);
   } while (currentHeight < height);
   return currentHeight;
 }
@@ -8669,17 +8667,16 @@ function genEncodedField(encoding, optional) {
   }
 });
 ;// CONCATENATED MODULE: ./src/utils/semver-satisfies.ts
-function semverSatisfies(version, geVersion, ltVersion) {
+function verCmp(a, b) {
   const getComponents = v => v.split(/[-+]/)[0].split('.').map(i => +i);
-  const versionComponents = getComponents(version);
-  const geComponents = getComponents(geVersion);
-  const ltComponents = getComponents(ltVersion);
-  const base = Math.max(...versionComponents, ...geComponents, ...ltComponents) + 1;
+  const aComponents = getComponents(a);
+  const bComponents = getComponents(b);
+  const base = Math.max(...aComponents, ...bComponents) + 1;
   const componentsToNumber = components => components.reverse().reduce((acc, n, idx) => acc + n * base ** idx, 0);
-  const vNumber = componentsToNumber(versionComponents);
-  const geNumber = componentsToNumber(geComponents);
-  const ltNumber = componentsToNumber(ltComponents);
-  return vNumber >= geNumber && vNumber < ltNumber;
+  return componentsToNumber(aComponents) - componentsToNumber(bComponents);
+}
+function semverSatisfies(version, geVersion, ltVersion) {
+  return verCmp(version, geVersion) >= 0 && (ltVersion == null || verCmp(version, ltVersion) < 0);
 }
 ;// CONCATENATED MODULE: ./src/tx/builder/field-types/gas-price.ts
 
@@ -8699,10 +8696,7 @@ async function getCachedIncreasedGasPrice(node) {
   const {
     nodeVersion
   } = await node._getCachedStatus();
-  // TODO: remove remove '6.12.0+' check after releasing 6.13.0
-  if (!nodeVersion.startsWith('6.12.0+') && !semverSatisfies(nodeVersion, '6.13.0', '7.0.0')) {
-    return 0n;
-  }
+  if (!semverSatisfies(nodeVersion, '6.13.0')) return 0n;
   const {
     minGasPrice,
     utilization
@@ -16199,7 +16193,7 @@ class Node_Node extends NodeTransformed {
     // eslint-disable-next-line constructor-super
     super(url, {
       allowInsecureConnection: true,
-      additionalPolicies: [...(ignoreVersion ? [] : [genVersionCheckPolicy('node', getVersion, '6.2.0', '7.0.0')]), genRequestQueuesPolicy(), genCombineGetRequestsPolicy(), genRetryOnFailurePolicy(retryCount, retryOverallDelay), genErrorFormatterPolicy(body => [' ', body.reason, body.errorCode == null ? '' : ` (${body.errorCode})`].join(''))],
+      additionalPolicies: [...(ignoreVersion ? [] : [genVersionCheckPolicy('node', getVersion, '6.2.0', '8.0.0')]), genRequestQueuesPolicy(), genCombineGetRequestsPolicy(), genRetryOnFailurePolicy(retryCount, retryOverallDelay), genErrorFormatterPolicy(body => [' ', body.reason, body.errorCode == null ? '' : ` (${body.errorCode})`].join(''))],
       ...options
     });
     Node_classPrivateFieldInitSpec(this, _cachedStatusPromise, {
@@ -18392,6 +18386,9 @@ function _getCallResult2({
       break;
     case 'error':
       message = decode(returnValue).toString();
+      if (/Expected \d+ arguments, got \d+/.test(message)) {
+        throw new ContractError(`ACI doesn't match called contract. Error provided by node: ${message}`);
+      }
       break;
     default:
       throw new InternalError(`Unknown return type: ${returnType}`);
@@ -18483,15 +18480,12 @@ const ContractWithMethods = Contract;
  */
 function pollForQueries(oracleId, onQuery, {
   interval,
-  onNode,
   ...options
 }) {
-  var _interval;
-  (_interval = interval) !== null && _interval !== void 0 ? _interval : interval = _getPollInterval('microblock', options);
   const knownQueryIds = new Set();
   const checkNewQueries = async () => {
-    var _await$onNode$getOrac;
-    const queries = ((_await$onNode$getOrac = (await onNode.getOracleQueriesByPubkey(oracleId)).oracleQueries) !== null && _await$onNode$getOrac !== void 0 ? _await$onNode$getOrac : []).filter(({
+    var _await$options$onNode;
+    const queries = ((_await$options$onNode = (await options.onNode.getOracleQueriesByPubkey(oracleId)).oracleQueries) !== null && _await$options$onNode !== void 0 ? _await$options$onNode : []).filter(({
       id
     }) => !knownQueryIds.has(id));
     queries.forEach(query => {
@@ -18502,7 +18496,8 @@ function pollForQueries(oracleId, onQuery, {
   let stopped = false;
 
   // eslint-disable-next-line @typescript-eslint/no-floating-promises
-  (async () => {
+  (async _interval => {
+    (_interval = interval) !== null && _interval !== void 0 ? _interval : interval = await _getPollInterval('micro-block', options);
     while (!stopped) {
       // eslint-disable-line no-unmodified-loop-condition
       // TODO: allow to handle this error somehow
@@ -18527,11 +18522,10 @@ function pollForQueries(oracleId, onQuery, {
  */
 async function pollForQueryResponse(oracleId, queryId, {
   interval,
-  onNode,
   ...options
 }) {
   var _interval2;
-  (_interval2 = interval) !== null && _interval2 !== void 0 ? _interval2 : interval = _getPollInterval('microblock', options);
+  (_interval2 = interval) !== null && _interval2 !== void 0 ? _interval2 : interval = await _getPollInterval('micro-block', options);
   let height;
   let ttl;
   let response;
@@ -18539,13 +18533,12 @@ async function pollForQueryResponse(oracleId, queryId, {
     ({
       response,
       ttl
-    } = await onNode.getOracleQueryByPubkeyAndQueryId(oracleId, queryId));
+    } = await options.onNode.getOracleQueryByPubkeyAndQueryId(oracleId, queryId));
     const responseBuffer = decode(response);
     if (responseBuffer.length > 0) return responseBuffer.toString();
     await pause(interval);
     height = await getHeight({
       ...options,
-      onNode,
       cached: true
     });
   } while (ttl >= height);