@aeternity/aepp-sdk 9.0.1 → 10.0.0-beta.1

package/src/node-pool/index.js

@@ -5,7 +5,6 @@
  * @example import { NodePool } from '@aeternity/aepp-sdk'
  */
 import stampit from '@stamp/it'
-import Joi from 'joi-browser'
 import { getNetworkId } from '../node'
 
 /**
@@ -141,17 +140,27 @@ export default stampit({
       }))
     },
     validateNodes (nodes) {
-      const { error } = Joi.array().items(
-        Joi.object({
-          name: Joi.string().required(),
-          instance: Joi.object({
-            api: Joi.object().required(),
-            consensusProtocolVersion: Joi.number().required(),
-            genesisHash: Joi.string().required()
-          }).unknown()
-        })
-      ).label('node').validate(nodes)
-      if (error) throw error
+      // TODO: validate it on TypeScript level instead (to speedup development, save runtime resources)
+      if (!Array.isArray(nodes)) throw new Error('"nodes" should be an array')
+      const notObject = nodes.map(n => typeof n).find(t => t !== 'object')
+      if (notObject) throw new Error(`Each node should be an object, got ${notObject} instead`)
+      const wrongFields = nodes.find(n => typeof n.name !== 'string' || typeof n.instance !== 'object')
+      if (notObject) {
+        throw new Error(
+          'Each node should have name (string), instance (object) ' +
+          `fields, got ${JSON.stringify(wrongFields)} instead`
+        )
+      }
+      const wrongInstanceFields = nodes
+        .map(n => n.instance)
+        .find(i => typeof i.api !== 'object' || typeof i.genesisHash !== 'string' ||
+          typeof i.consensusProtocolVersion !== 'number')
+      if (wrongInstanceFields) {
+        throw new Error(
+          'Each node instance should have api (object), consensusProtocolVersion (number), ' +
+          `genesisHash (string) fields, got ${JSON.stringify(wrongInstanceFields)} instead`
+        )
+      }
     }
   },
   props: {

package/src/node.js

@@ -39,26 +39,6 @@ export function getNetworkId ({ networkId, force = false } = {}) {
   return networkId || this.networkId || this.selectedNode.networkId
 }
 
-/**
- * get consensus protocol version
- * @param {Array} protocols Array of protocols
- * @param {Number} height Height
- * @return {Number} version Protocol version
- */
-async function getConsensusProtocolVersion (protocols = [], height) {
-  if (!protocols) throw new Error('Protocols must be an array')
-  if (!height) height = (await this.api.getCurrentKeyBlock()).height
-  if (height < 0) throw new Error('height must be a number >= 0')
-
-  return protocols
-    .filter(({ effectiveAtHeight }) => height >= effectiveAtHeight)
-    .reduce(
-      (acc, p) => p.effectiveAtHeight > acc.effectiveAtHeight ? p : acc,
-      { effectiveAtHeight: -1, version: 0 }
-    )
-    .version
-}
-
 /**
  * {@link genSwaggerClient} based Node remote API Stamp
  * @function
@@ -76,7 +56,15 @@ const Node = AsyncInit.compose({
     if (!url) throw new Error('"url" required')
     this.url = url.replace(/\/$/, '')
     this.internalUrl = internalUrl ? internalUrl.replace(/\/$/, '') : this.url
-    const client = await genSwaggerClient(`${this.url}/api?oas3`, { internalUrl: this.internalUrl })
+    const client = await genSwaggerClient(`${this.url}/api?oas3`, {
+      internalUrl: this.internalUrl,
+      responseInterceptor: response => {
+        if (response.ok) return
+        return Object.assign(response, {
+          statusText: `${new URL(response.url).pathname.slice(1)} error: ` + response.body.reason
+        })
+      }
+    })
     this.version = client.spec.info.version
     if (
       !semverSatisfies(this.version, NODE_GE_VERSION, NODE_LT_VERSION) &&
@@ -89,8 +77,17 @@ const Node = AsyncInit.compose({
     }
     this.api = client.api
 
-    const { nodeRevision: revision, genesisKeyBlockHash: genesisHash, networkId, protocols } = await this.api.getStatus()
-    this.consensusProtocolVersion = await this.getConsensusProtocolVersion(protocols)
+    const {
+      nodeRevision: revision, genesisKeyBlockHash: genesisHash, networkId,
+      protocols, topBlockHeight
+    } = await this.api.getStatus()
+    this.consensusProtocolVersion = protocols
+      .filter(({ effectiveAtHeight }) => topBlockHeight >= effectiveAtHeight)
+      .reduce(
+        (acc, p) => p.effectiveAtHeight > acc.effectiveAtHeight ? p : acc,
+        { effectiveAtHeight: -1, version: 0 }
+      )
+      .version
     this.nodeNetworkId = networkId
     return Object.assign(this, { revision, genesisHash })
   },
@@ -103,8 +100,7 @@ const Node = AsyncInit.compose({
         version: this.version,
         consensusProtocolVersion: this.consensusProtocolVersion
       }
-    },
-    getConsensusProtocolVersion
+    }
   },
   props: {
     version: null,
@@ -113,7 +109,7 @@ const Node = AsyncInit.compose({
   }
 })
 
-const NODE_GE_VERSION = '6.0.0'
+const NODE_GE_VERSION = '6.2.0'
 const NODE_LT_VERSION = '7.0.0'
 
 export default Node

package/src/tx/builder/index.js

@@ -256,7 +256,8 @@ function buildFee (txType, { params, gas = 0, multiplier, vsn }) {
     .plus(TX_FEE_OTHER_GAS(txType, txSize, {
       relativeTtl: getOracleRelativeTtl(params, txType),
       innerTxSize: [TX_TYPE.gaMeta, TX_TYPE.payingFor].includes(txType)
-        ? params.tx.tx.encodedTx.rlpEncoded.length : 0
+        ? params.tx.tx.encodedTx.rlpEncoded.length
+        : 0
     }))
     .times(multiplier)
 }

package/src/tx/builder/schema.js

@@ -48,7 +48,8 @@ export const NAME_ID_KEY = {
   ct: 'contract_pubkey',
   ch: 'channel'
 }
-// # ref: https://github.com/aeternity/aeternity/blob/72e440b8731422e335f879a31ecbbee7ac23a1cf/apps/aecore/src/aec_governance.erl#L290
+// # https://github.com/aeternity/aeternity/blob/72e440b8731422e335f879a31ecbbee7ac23a1cf/apps/aecore/src/aec_governance.erl#L290
+// # https://github.com/aeternity/protocol/blob/master/AENS.md#protocol-fees-and-protection-times
 // # bid ranges:
 export const NAME_BID_RANGES = {
   31: BigNumber(3).times(NAME_FEE_MULTIPLIER),