@aeternity/aepp-sdk 9.0.1 → 11.0.0

package/src/contract/ga/helpers.js

@@ -1,22 +1,19 @@
 import BigNumber from 'bignumber.js'
 import { MAX_AUTH_FUN_GAS } from '../../tx/builder/schema'
-import { hash } from '../../utils/crypto'
+import { InvalidAuthDataError } from '../../utils/errors'
 
 export const prepareGaParams = (ins) => async (authData, authFnName) => {
-  if (typeof authData !== 'object') throw new Error('AuthData must be an object')
-  if (authData.gas && BigNumber(authData.gas).gt(MAX_AUTH_FUN_GAS)) throw new Error(`the maximum gas value for ga authFun is ${MAX_AUTH_FUN_GAS}, got ${authData.gas}`)
+  if (typeof authData !== 'object') throw new InvalidAuthDataError('AuthData must be an object')
+  if (authData.gas && BigNumber(authData.gas).gt(MAX_AUTH_FUN_GAS)) { throw new InvalidAuthDataError(`the maximum gas value for ga authFun is ${MAX_AUTH_FUN_GAS}, got ${authData.gas}`) }
   const gas = authData.gas || MAX_AUTH_FUN_GAS
   if (authData.callData) {
-    if (authData.callData.split('_')[0] !== 'cb') throw new Error('Auth data must be a string with "cb" prefix.')
+    if (authData.callData.split('_')[0] !== 'cb') throw new InvalidAuthDataError('Auth data must be a string with "cb" prefix.')
     return { authCallData: authData.callData, gas }
-  } else {
-    if (!authData.source || !authData.args) throw new Error('Auth data must contain source code and arguments.')
-    return { authCallData: await ins.contractEncodeCall(authData.source, authFnName, authData.args), gas }
   }
-}
-
-export const getContractAuthFan = (ins) => async (source, fnName) => {
-  const { bytecode } = await ins.contractCompile(source)
-
-  return { bytecode, authFun: hash(fnName) }
+  if (!authData.source || !authData.args) throw new InvalidAuthDataError('Auth data must contain source code and arguments.')
+  const contract = await ins.getContractInstance({ source: authData.source })
+  return {
+    authCallData: contract.calldata.encode(contract._name, authFnName, authData.args),
+    gas
+  }
 }

package/src/contract/ga/index.js

@@ -1,6 +1,6 @@
 /*
  * ISC License (ISC)
- * Copyright (c) 2018 aeternity developers
+ * Copyright (c) 2021 aeternity developers
  *
  *  Permission to use, copy, modify, and/or distribute this software for any
  *  purpose with or without fee is hereby granted, provided that the above
@@ -16,51 +16,53 @@
  */
 
 /**
- * Generalize Account module - routines to use generalize account
+ * Generalized Account module - routines to use generalized account
  *
  * @module @aeternity/aepp-sdk/es/contract/ga
- * @export GeneralizeAccount
- * @example import { GeneralizeAccount } from '@aeternity/aepp-sdk'
+ * @export GeneralizedAccount
+ * @example import { GeneralizedAccount } from '@aeternity/aepp-sdk'
  */
-import * as R from 'ramda'
-
-import { ContractAPI } from '../../ae/contract'
+import Contract from '../../ae/contract'
 import { TX_TYPE } from '../../tx/builder/schema'
 import { buildTx, unpackTx } from '../../tx/builder'
-import { getContractAuthFan, prepareGaParams } from './helpers'
+import { prepareGaParams } from './helpers'
+import { hash } from '../../utils/crypto'
+import { IllegalArgumentError, MissingParamError } from '../../utils/errors'
 
 /**
- * GeneralizeAccount Stamp
+ * GeneralizedAccount Stamp
  *
- * Provide Generalize Account implementation
+ * Provide Generalized Account implementation
  * {@link module:@aeternity/aepp-sdk/es/contract/ga} clients.
  * @function
  * @alias module:@aeternity/aepp-sdk/es/contract/ga
  * @rtype Stamp
  * @param {Object} [options={}] - Initializer object
- * @return {Object} GeneralizeAccount instance
+ * @return {Object} GeneralizedAccount instance
  * @example
  * const authContract = ``
- * await client.createGeneralizeAccount(authFnName, authContract, [...authFnArguments]
+ * await aeSdk.createGeneralizedAccount(authFnName, authContract, [...authFnArguments]
  * // Make spend using GA
  * const callData = 'cb_...' // encoded call data for auth contract
- * await client.spend(10000, receiverPub, { authData: { callData } })
+ * await aeSdk.spend(10000, receiverPub, { authData: { callData } })
  * // or
- * await client.spend(10000, receiverPub, { authData: { source: authContract, args: [...authContractArgs] } }) // sdk will prepare callData itself
+ * await aeSdk.spend(10000, receiverPub, {
+ *   authData: { source: authContract, args: [...authContractArgs] }
+ * }) // sdk will prepare callData itself
  */
-export const GeneralizeAccount = ContractAPI.compose({
+export const GeneralizedAccount = Contract.compose({
   methods: {
-    createGeneralizeAccount,
+    createGeneralizedAccount,
     createMetaTx,
     isGA
   }
 })
-export default GeneralizeAccount
+export default GeneralizedAccount
 
 /**
  * @alias module:@aeternity/aepp-sdk/es/contract/ga
  * @function
- * Check if account is GA account
+ * Check if account is GA
  * @param {String} address - Account address
  * @return {Boolean}
  */
@@ -70,31 +72,38 @@ async function isGA (address) {
 }
 
 /**
- * Convert current account to GA account
+ * Convert current account to GA
  * @alias module:@aeternity/aepp-sdk/es/contract/ga
  * @function
  * @param {String} authFnName - Authorization function name
  * @param {String} source - Auth contract source code
  * @param {Array} [args] - init arguments
  * @param {Object} [options] - Options
- * @return {Promise<Readonly<{result: *, owner: *, createdAt: Date, address, rawTx: *, transaction: *}>>}
+ * @return {Promise<Readonly<{
+ *   result: *, owner: *, address, rawTx: *, transaction: *
+ * }>>}
  */
-async function createGeneralizeAccount (authFnName, source, args = [], options = {}) {
-  const opt = R.merge(this.Ae.defaults, options)
+async function createGeneralizedAccount (authFnName, source, args = [], options = {}) {
+  const opt = { ...this.Ae.defaults, ...options }
   const ownerId = await this.address(opt)
+  if (await this.isGA(ownerId)) throw new IllegalArgumentError(`Account ${ownerId} is already GA`)
 
-  if (await this.isGA(ownerId)) throw new Error(`Account ${ownerId} is already GA`)
-
-  const { authFun, bytecode } = await getContractAuthFan(this)(source, authFnName)
-  const callData = await this.contractEncodeCall(source, 'init', args)
-
-  const { tx, contractId } = await this.gaAttachTx(R.merge(opt, { ownerId, code: bytecode, callData, authFun }))
+  const contract = await this.getContractInstance({ source })
+  await contract.compile()
+  const { tx, contractId } = await this.gaAttachTx({
+    ...opt,
+    gas: opt.gas ?? await contract._estimateGas('init', args, opt),
+    ownerId,
+    code: contract.bytecode,
+    callData: contract.calldata.encode(contract._name, 'init', args),
+    authFun: hash(authFnName)
+  })
 
-  const { hash, rawTx } = await this.send(tx, opt)
+  const { hash: transaction, rawTx } = await this.send(tx, opt)
 
   return Object.freeze({
     owner: ownerId,
-    transaction: hash,
+    transaction,
     rawTx,
     gaContractId: contractId
   })
@@ -113,10 +122,10 @@ const wrapInEmptySignedTx = (tx) => buildTx({ encodedTx: tx, signatures: [] }, T
  * @return {String}
  */
 async function createMetaTx (rawTransaction, authData, authFnName, options = {}) {
-  if (!authData) throw new Error('authData is required')
+  if (!authData) throw new MissingParamError('authData is required')
   // Check if authData is callData or if it's an object prepare a callData from source and args
   const { authCallData, gas } = await prepareGaParams(this)(authData, authFnName)
-  const opt = R.merge(this.Ae.defaults, options)
+  const opt = { ...this.Ae.defaults, ...options }
   const { abiVersion } = await this.getVmVersion(TX_TYPE.contractCall)
   const wrappedTx = wrapInEmptySignedTx(unpackTx(rawTransaction))
   const params = {
@@ -126,7 +135,7 @@ async function createMetaTx (rawTransaction, authData, authFnName, options = {})
       tx: wrappedTx.txObject
     },
     gaId: await this.address(opt),
-    abiVersion: abiVersion,
+    abiVersion,
     authData: authCallData,
     gas,
     vsn: 2

package/src/index.js

@@ -1,6 +1,6 @@
 /*
  * ISC License (ISC)
- * Copyright (c) 2018 aeternity developers
+ * Copyright (c) 2021 aeternity developers
  *
  *  Permission to use, copy, modify, and/or distribute this software for any
  *  purpose with or without fee is hereby granted, provided that the above
@@ -21,10 +21,8 @@ import * as Bytes from './utils/bytes'
 import * as TxBuilder from './tx/builder'
 import * as TxBuilderHelper from './tx/builder/helpers'
 import * as SCHEMA from './tx/builder/schema'
-import * as ACIHelpers from './contract/aci/helpers'
-import * as ACITransformation from './contract/aci/transformation'
 import * as AmountFormatter from './utils/amount-formatter'
-import HdWallet from './utils/hd-wallet'
+import * as HdWallet from './utils/hd-wallet'
 
 import Ae from './ae'
 import Chain from './chain'
@@ -39,8 +37,8 @@ import AccountMultiple from './account/multiple'
 import MemoryAccount from './account/memory'
 import Aens from './ae/aens'
 import Contract from './ae/contract'
-import GeneralizeAccount from './contract/ga'
-import ContractCompilerAPI from './contract/compiler'
+import GeneralizedAccount from './contract/ga'
+import ContractCompilerHttp from './contract/compiler'
 import RpcAepp from './ae/aepp'
 import RpcWallet from './ae/wallet'
 import Oracle from './ae/oracle'
@@ -54,6 +52,9 @@ export * as AeppWalletSchema from './utils/aepp-wallet-communication/schema'
 export { default as WalletDetector } from './utils/aepp-wallet-communication/wallet-detector'
 export { default as BrowserRuntimeConnection } from './utils/aepp-wallet-communication/connection/browser-runtime'
 export { default as BrowserWindowMessageConnection } from './utils/aepp-wallet-communication/connection/browser-window-message'
+export * from './utils/errors'
+
+export const getDefaultPointerKey = TxBuilderHelper.getDefaultPointerKey
 
 export {
   AmountFormatter,
@@ -63,9 +64,7 @@ export {
   Aens,
   Bytes,
   Contract,
-  ContractCompilerAPI,
-  ACIHelpers,
-  ACITransformation,
+  ContractCompilerHttp,
   ChainNode,
   RpcAepp,
   RpcWallet,
@@ -73,7 +72,7 @@ export {
   Crypto,
   Keystore,
   Chain,
-  GeneralizeAccount,
+  GeneralizedAccount,
   HdWallet,
   MemoryAccount,
   Node,

package/src/node-pool/index.js

@@ -5,8 +5,8 @@
  * @example import { NodePool } from '@aeternity/aepp-sdk'
  */
 import stampit from '@stamp/it'
-import Joi from 'joi-browser'
 import { getNetworkId } from '../node'
+import { DisconnectedError, DuplicateNodeError, NodeNotFoundError, TypeError } from '../utils/errors'
 
 /**
  * Node Pool Stamp
@@ -35,7 +35,7 @@ export default stampit({
       configurable: false,
       get () {
         if (!this.selectedNode || !this.selectedNode.instance) {
-          throw new Error('You can\'t use Node API. Node is not connected or not defined!')
+          throw new NodeNotFoundError('You can\'t use Node API. Node is not connected or not defined!')
         }
         return this.selectedNode.instance.api
       }
@@ -52,10 +52,11 @@ export default stampit({
      * @param {Boolean} select - Select this node as current
      * @return {void}
      * @example
-     * nodePool.addNode('testNode', awaitNode({ url, internalUrl }), true) // add and select new node with name 'testNode'
+     * // add and select new node with name 'testNode'
+     * nodePool.addNode('testNode', awaitNode({ url, internalUrl }), true)
      */
     addNode (name, node, select = false) {
-      if (this.pool.has(name)) throw new Error(`Node with name ${name} already exist`)
+      if (this.pool.has(name)) throw new DuplicateNodeError(name)
 
       this.validateNodes([{ name, instance: node }])
 
@@ -83,7 +84,7 @@ export default stampit({
      * nodePool.selectNode('testNode')
      */
     selectNode (name) {
-      if (!this.pool.has(name)) throw new Error(`Node with name ${name} not in pool`)
+      if (!this.pool.has(name)) throw new NodeNotFoundError(`Node with name ${name} not in pool`)
 
       this.selectedNode = this.pool.get(name)
     },
@@ -119,7 +120,7 @@ export default stampit({
      * nodePool.getNodeInfo() // { name, version, networkId, protocol, ... }
      */
     getNodeInfo () {
-      if (!this.isNodeConnected()) throw new Error('Can not get node info. Node is not connected')
+      if (!this.isNodeConnected()) throw new DisconnectedError()
       return {
         name: this.selectedNode.name,
         ...this.selectedNode.instance.getNodeInfo()
@@ -141,17 +142,28 @@ 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 TypeError('"nodes" should be an array')
+      const notObject = nodes.map(n => typeof n).find(t => t !== 'object')
+      if (notObject) throw new TypeError(`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 TypeError(
+          '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 TypeError(
+          'Each node instance should have api (object), consensusProtocolVersion (number), ' +
+          `genesisHash (string) fields, got ${JSON.stringify(wrongInstanceFields)} instead`
+        )
+      }
     }
   },
   props: {

package/src/node.js

@@ -25,6 +25,7 @@
 import AsyncInit from './utils/async-init'
 import genSwaggerClient from './utils/swagger'
 import semverSatisfies from './utils/semver-satisfies'
+import { MissingParamError, UnsupportedVersionError } from './utils/errors'
 
 /**
  * Obtain networkId from account or node
@@ -34,29 +35,10 @@ import semverSatisfies from './utils/semver-satisfies'
  * @return {String} NetworkId
  */
 export function getNetworkId ({ networkId, force = false } = {}) {
-  if (!force && !networkId && !this.networkId && (!this.selectedNode || !this.selectedNode.networkId)) throw new Error('networkId is not provided')
-  if (force && !networkId && !this.networkId && (!this.selectedNode || !this.selectedNode.networkId)) return null
-  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
+  const res = networkId || this.networkId || this.selectedNode?.networkId
+  if (!force && !res) throw new MissingParamError('networkId is not provided')
+  if (force && !res) return null
+  return res
 }
 
 /**
@@ -67,30 +49,46 @@ async function getConsensusProtocolVersion (protocols = [], height) {
  * @param {Object} [options={}] - Options
  * @param {String} options.url - Base URL for Node
  * @param {String} options.internalUrl - Base URL for internal requests
- * @param {String} options.axiosConfig - Object with axios configuration. Example { config: {}, errorHandler: (err) => throw err }
+ * @param {Object} options.axiosConfig - Object with axios configuration
+ * @param {Object} options.axiosConfig.config
+ * @param {Function} options.axiosConfig.errorHandler - (err) => throw err
  * @return {Object} Node client
  * @example Node({url: 'https://testnet.aeternity.io'})
  */
 const Node = AsyncInit.compose({
   async init ({ url, internalUrl, ignoreVersion }) {
-    if (!url) throw new Error('"url" required')
+    if (!url) throw new MissingParamError('"url" required')
     this.url = url.replace(/\/$/, '')
-    this.internalUrl = internalUrl ? internalUrl.replace(/\/$/, '') : this.url
-    const client = await genSwaggerClient(`${this.url}/api?oas3`, { internalUrl: this.internalUrl })
+    this.internalUrl = internalUrl?.replace(/\/$/, '')
+    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) &&
       !ignoreVersion
     ) {
-      throw new Error(
-        `Unsupported node version ${this.version}. ` +
-        `Supported: >= ${NODE_GE_VERSION} < ${NODE_LT_VERSION}`
-      )
+      throw new UnsupportedVersionError('node', this.version, NODE_GE_VERSION, NODE_LT_VERSION)
     }
     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 +101,7 @@ const Node = AsyncInit.compose({
         version: this.version,
         consensusProtocolVersion: this.consensusProtocolVersion
       }
-    },
-    getConsensusProtocolVersion
+    }
   },
   props: {
     version: null,
@@ -113,7 +110,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/field-types.js

@@ -0,0 +1,61 @@
+import {
+  writeId, readId, isNameValid, produceNameId, ensureNameValid, getMinimumNameFee, readInt, writeInt
+} from './helpers'
+import { InsufficientNameFeeError, IllegalArgumentError } from '../../utils/errors'
+
+export class Field {
+  static serialize (value) {
+    return value
+  }
+
+  static deserialize (value) {
+    return value
+  }
+}
+
+export class Name extends Field {
+  static serialize (value) {
+    ensureNameValid(value)
+    return Buffer.from(value)
+  }
+
+  static deserialize (value) {
+    return value.toString()
+  }
+}
+
+export class NameId extends Field {
+  static serialize (value) {
+    return writeId(isNameValid(value) ? produceNameId(value) : value)
+  }
+
+  static deserialize (value) {
+    return readId(value)
+  }
+}
+
+export class NameFee extends Field {
+  static serialize (value, { name }) {
+    const minNameFee = getMinimumNameFee(name)
+    value ??= minNameFee
+    if (minNameFee.gt(value)) {
+      throw new InsufficientNameFeeError(value, minNameFee)
+    }
+    return writeInt(value)
+  }
+
+  static deserialize (value) {
+    return readInt(value)
+  }
+}
+
+export class Deposit extends Field {
+  static serialize (value, { name }) {
+    if (+value) throw new IllegalArgumentError(`Contract deposit is not refundable, so it should be equal 0, got ${value} instead`)
+    return writeInt(0)
+  }
+
+  static deserialize (value) {
+    return readInt(value)
+  }
+}