@aeternity/aepp-sdk 10.0.0 → 11.0.0

package/src/contract/compiler.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,18 +16,18 @@
  */
 
 /**
- * ContractCompilerAPI module
+ * ContractCompilerHttp module
  *
- * This is the complement to {@link module:@aeternity/aepp-sdk/es/contract}.
  * @module @aeternity/aepp-sdk/es/contract/compiler
- * @export ContractCompilerAPI
- * @example import { ContractCompilerAPI } from '@aeternity/aepp-sdk'
+ * @export ContractCompilerHttp
+ * @example import { ContractCompilerHttp } from '@aeternity/aepp-sdk'
  */
 
-import ContractBase from './index'
 import semverSatisfies from '../utils/semver-satisfies'
 import AsyncInit from '../utils/async-init'
 import genSwaggerClient from '../utils/swagger'
+import { MissingParamError, UnsupportedVersionError } from '../utils/errors'
+import { mapObject } from '../utils/other'
 
 /**
  * Contract Compiler Stamp
@@ -39,16 +39,16 @@ import genSwaggerClient from '../utils/swagger'
  * @param {Object} [options={}] - Initializer object
  * @param {String} [options.compilerUrl] compilerUrl - Url for compiler API
  * @return {Object} Contract compiler instance
- * @example ContractCompilerAPI({ compilerUrl: 'COMPILER_URL' })
+ * @example ContractCompilerHttp({ compilerUrl: 'COMPILER_URL' })
  */
-export default AsyncInit.compose(ContractBase, {
+export default AsyncInit.compose({
   async init ({ compilerUrl, ignoreVersion }) {
     if (!compilerUrl) return
     await this.setCompilerUrl(compilerUrl, { ignoreVersion })
   },
   methods: {
     async setCompilerUrl (compilerUrl, { ignoreVersion = false } = {}) {
-      if (!compilerUrl) throw new Error('"compilerUrl" required')
+      if (!compilerUrl) throw new MissingParamError('compilerUrl required')
       compilerUrl = compilerUrl.replace(/\/$/, '')
       const client = await genSwaggerClient(`${compilerUrl}/api`, {
         disableBigNumbers: true,
@@ -73,117 +73,22 @@ export default AsyncInit.compose(ContractBase, {
         }
       })
       this.compilerVersion = client.spec.info.version
-      this._compilerApi = client.api
+      this.compilerApi = mapObject(
+        client.api,
+        ([key, fn]) => [
+          key,
+          ({ options: { filesystem, ...options } = {}, ...args } = {}) => fn({
+            ...args, options: { ...options, file_system: filesystem }
+          })
+        ]
+      )
 
       if (ignoreVersion) return
       if (!semverSatisfies(this.compilerVersion, COMPILER_GE_VERSION, COMPILER_LT_VERSION)) {
-        throw new Error(`Unsupported compiler version ${this.compilerVersion}. ` +
-          `Supported: >= ${COMPILER_GE_VERSION} < ${COMPILER_LT_VERSION}`)
+        throw new UnsupportedVersionError(
+          'compiler', this.compilerVersion, COMPILER_GE_VERSION, COMPILER_LT_VERSION
+        )
       }
-    },
-    _ensureCompilerReady () {
-      if (!this._compilerApi) throw new Error('Compiler is not ready')
-    },
-    _prepareCompilerOptions ({ filesystem = {} } = {}) {
-      return { file_system: filesystem }
-    },
-    getCompilerVersion () {
-      this._ensureCompilerReady()
-      return Promise.resolve(this.compilerVersion)
-    },
-    /**
-     * Encode call data for contract call
-     * @function
-     * @category async
-     * @param {String} source Contract source code
-     * @param {String} name Name of function to call
-     * @param {Array} args Argument's for call
-     * @param {Object} [options={}]  Options
-     * @param {Object} [options.filesystem={}] Contract external namespaces map
-     * @return {Promise<String>}
-     */
-    async contractEncodeCallDataAPI (source, name, args = [], options) {
-      this._ensureCompilerReady()
-      const { calldata } = await this._compilerApi.encodeCalldata({
-        source,
-        function: name,
-        arguments: args,
-        options: this._prepareCompilerOptions(options)
-      })
-      return calldata
-    },
-    async compileContractAPI (code, options) {
-      this._ensureCompilerReady()
-      const { bytecode } = await this._compilerApi.compileContract({
-        code,
-        options: this._prepareCompilerOptions(options)
-      })
-      return bytecode
-    },
-    contractGetACI (code, options) {
-      this._ensureCompilerReady()
-      return this._compilerApi.generateACI({ code, options: this._prepareCompilerOptions(options) })
-    },
-    contractDecodeCallDataByCodeAPI (bytecode, calldata) {
-      this._ensureCompilerReady()
-      return this._compilerApi.decodeCalldataBytecode({ bytecode, calldata })
-    },
-    contractDecodeCallDataBySourceAPI (source, fn, callData, options) {
-      this._ensureCompilerReady()
-      return this._compilerApi.decodeCalldataSource({
-        function: fn,
-        source,
-        calldata: callData,
-        options: this._prepareCompilerOptions(options)
-      })
-    },
-    /**
-     * Decode contract call result data
-     * @function
-     * @category async
-     * @param {String} source - source code
-     * @param {String } fn - function name
-     * @param {String} callValue - result call data
-     * @param {String} callResult - result status
-     * @param {Object} [options={}]  Options
-     * @param {Object} [options.filesystem={}] Contract external namespaces map
-     * @return {Promise<String>} Result object
-     * @example
-     * const decodedData = await sdk.contractDecodeCallResultAPI(
-     *   SourceCode ,'functionName', 'cb_asdasdasd...', 'ok|revert'
-     * )
-     */
-    contractDecodeCallResultAPI (source, fn, callValue, callResult, options) {
-      this._ensureCompilerReady()
-      return this._compilerApi.decodeCallResult({
-        function: fn,
-        source,
-        'call-result': callResult,
-        'call-value': callValue,
-        options: this._prepareCompilerOptions(options)
-      })
-    },
-    async validateByteCodeAPI (bytecode, source, options) {
-      this._ensureCompilerReady()
-      const res = await this._compilerApi.validateByteCode({
-        bytecode,
-        source,
-        options: this._prepareCompilerOptions(options)
-      })
-      return typeof res === 'object' ? true : res
-    },
-    getFateAssembler (bytecode, options) {
-      this._ensureCompilerReady()
-      return this._compilerApi.getFateAssemblerCode(
-        { bytecode, options: this._prepareCompilerOptions(options) }
-      )
-    },
-    getBytecodeCompilerVersion (bytecode, options) {
-      this._ensureCompilerReady()
-      return this._compilerApi.getCompilerVersion({
-        bytecode,
-        options: this._prepareCompilerOptions(options)
-      })
     }
   },
   props: {
@@ -191,5 +96,5 @@ export default AsyncInit.compose(ContractBase, {
   }
 })
 
-const COMPILER_GE_VERSION = '6.0.0'
+const COMPILER_GE_VERSION = '6.1.0'
 const COMPILER_LT_VERSION = '7.0.0'

package/src/contract/ga/helpers.js

@@ -1,17 +1,19 @@
 import BigNumber from 'bignumber.js'
 import { MAX_AUTH_FUN_GAS } from '../../tx/builder/schema'
+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 }
   }
-  if (!authData.source || !authData.args) throw new Error('Auth data must contain source code and arguments.')
+  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: await ins.contractEncodeCallDataAPI(authData.source, authFnName, authData.args),
+    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,52 +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 { ContractAPI } from '../../ae/contract'
+import Contract from '../../ae/contract'
 import { TX_TYPE } from '../../tx/builder/schema'
 import { buildTx, unpackTx } from '../../tx/builder'
 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, {
+ * 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}
  */
@@ -71,7 +72,7 @@ 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
@@ -79,20 +80,22 @@ async function isGA (address) {
  * @param {Array} [args] - init arguments
  * @param {Object} [options] - Options
  * @return {Promise<Readonly<{
- *   result: *, owner: *, createdAt: Date, address, rawTx: *, transaction: *
+ *   result: *, owner: *, address, rawTx: *, transaction: *
  * }>>}
  */
-async function createGeneralizeAccount (authFnName, source, args = [], 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 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: (await this.contractCompile(source)).bytecode,
-    callData: await this.contractEncodeCallDataAPI(source, 'init', args),
+    code: contract.bytecode,
+    callData: contract.calldata.encode(contract._name, 'init', args),
     authFun: hash(authFnName)
   })
 
@@ -119,7 +122,7 @@ 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 = { ...this.Ae.defaults, ...options }
@@ -132,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,9 +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 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'
@@ -38,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'
@@ -53,6 +52,7 @@ 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
 
@@ -64,8 +64,7 @@ export {
   Aens,
   Bytes,
   Contract,
-  ContractCompilerAPI,
-  ACITransformation,
+  ContractCompilerHttp,
   ChainNode,
   RpcAepp,
   RpcWallet,
@@ -73,7 +72,7 @@ export {
   Crypto,
   Keystore,
   Chain,
-  GeneralizeAccount,
+  GeneralizedAccount,
   HdWallet,
   MemoryAccount,
   Node,

package/src/node-pool/index.js

@@ -6,6 +6,7 @@
  */
 import stampit from '@stamp/it'
 import { getNetworkId } from '../node'
+import { DisconnectedError, DuplicateNodeError, NodeNotFoundError, TypeError } from '../utils/errors'
 
 /**
  * Node Pool Stamp
@@ -34,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
       }
@@ -55,7 +56,7 @@ export default stampit({
      * 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()
@@ -143,12 +144,12 @@ export default stampit({
     validateNodes (nodes) {
       // 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')
+      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 Error(`Each node should be an object, got ${notObject} instead`)
+      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 Error(
+        throw new TypeError(
           'Each node should have name (string), instance (object) ' +
           `fields, got ${JSON.stringify(wrongFields)} instead`
         )
@@ -158,7 +159,7 @@ export default stampit({
         .find(i => typeof i.api !== 'object' || typeof i.genesisHash !== 'string' ||
           typeof i.consensusProtocolVersion !== 'number')
       if (wrongInstanceFields) {
-        throw new Error(
+        throw new TypeError(
           'Each node instance should have api (object), consensusProtocolVersion (number), ' +
           `genesisHash (string) fields, got ${JSON.stringify(wrongInstanceFields)} instead`
         )

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
@@ -35,7 +36,7 @@ import semverSatisfies from './utils/semver-satisfies'
  */
 export function getNetworkId ({ networkId, force = false } = {}) {
   const res = networkId || this.networkId || this.selectedNode?.networkId
-  if (!force && !res) throw new Error('networkId is not provided')
+  if (!force && !res) throw new MissingParamError('networkId is not provided')
   if (force && !res) return null
   return res
 }
@@ -56,9 +57,9 @@ export function getNetworkId ({ networkId, force = false } = {}) {
  */
 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
+    this.internalUrl = internalUrl?.replace(/\/$/, '')
     const client = await genSwaggerClient(`${this.url}/api?oas3`, {
       internalUrl: this.internalUrl,
       responseInterceptor: response => {
@@ -73,10 +74,7 @@ const Node = AsyncInit.compose({
       !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
 

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)
+  }
+}