Merge pull request #854 from aeternity/release/7.0.0-next.2

Release 7.0.0-next.2

Author: nduchak

CHANGELOG.md

@@ -1,3 +1,25 @@
+# [7.0.0-next.2](https://github.com/aeternity/aepp-sdk-js/compare/6.0.1...7.0.0-next.2) (2020-01-10)
+
+
+### Bug Fixes
+
+* **codecov:** Adjust codecov badge. Move @babel/runtime to dev-deps ([#848](https://github.com/aeternity/aepp-sdk-js/issues/848)) ([109b851](https://github.com/aeternity/aepp-sdk-js/commit/109b851))
+* **AEX-2:** Fix `getBrowserAPI` function for firefox ([#853](https://github.com/aeternity/aepp-sdk-js/pull/853))
+
+
+### Features
+
+* **Account:** Add ability to pass `keypair` or `MemoryAccount` as nAccount` option ([#847](https://github.com/aeternity/aepp-sdk-js/issues/847)) ([75d8ad8](https://github.com/aeternity/aepp-sdk-js/commit/75d8ad8))
+* **Test:** Increase code coverage ([#830](https://github.com/aeternity/aepp-sdk-js/issues/830)) ([6f760fb](https://github.com/aeternity/aepp-sdk-js/commit/6f760fb))
+* **Chain:** Extend transaction verification error ([#849](https://github.com/aeternity/aepp-sdk-js/pull/849))
+* **Aepp<->Wallet:** Add tests for Aepp<->Wallet communication ([#834](https://github.com/aeternity/aepp-sdk-js/pull/834))
+
+### Documentation
+
+* **Guide:** Add guide for Contract ACI usage ([#852](https://github.com/aeternity/aepp-sdk-js/pull/852))
+
+
+
 # [7.0.0-next.1](https://github.com/aeternity/aepp-sdk-js/compare/6.0.1...7.0.0-next.1) (2019-12-18)
 
 

README.md

@@ -1,11 +1,12 @@
 # [Æternity](https://aeternity.com/)'s Javascript SDK
 
 [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/aeternity/aepp-sdk-js.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/aeternity/aepp-sdk-js/context:javascript)
-[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
+[![codecov](https://codecov.io/gh/aeternity/aepp-sdk-js/branch/develop/graph/badge.svg)](https://codecov.io/gh/aeternity/aepp-sdk-js)
 [![Build Status](https://travis-ci.com/aeternity/aepp-sdk-js.svg?branch=develop)](http://travis-ci.com/aeternity/aepp-sdk-js?branch=develop)
+[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 [![npm](https://img.shields.io/npm/v/@aeternity/aepp-sdk.svg)](https://www.npmjs.com/package/@aeternity/aepp-sdk)
-[![npm](https://img.shields.io/npm/l/@aeternity/aepp-sdk.svg)](https://www.npmjs.com/package/@aeternity/aepp-sdk) [![Greenkeeper badge](https://badges.greenkeeper.io/aeternity/aepp-sdk-js.svg)](https://greenkeeper.io/)
-
+[![npm](https://img.shields.io/npm/l/@aeternity/aepp-sdk.svg)](https://www.npmjs.com/package/@aeternity/aepp-sdk) 
+[![Greenkeeper badge](https://badges.greenkeeper.io/aeternity/aepp-sdk-js.svg)](https://greenkeeper.io/)
 JavaScript SDK for the revolutionary [æternity] blockchain, targeting the
 [æternity node] implementation. Aepp-sdk is [hosted on GitHub].
 

docs/api/accounts.md

@@ -13,7 +13,6 @@ import Accounts from '@aeternity/aepp-sdk/es/accounts'
     * [addresses()](#exp_module_@aeternity/aepp-sdk/es/accounts--addresses) ⇒ `Array.<String>` ⏏
     * [Accounts([options])](#exp_module_@aeternity/aepp-sdk/es/accounts--Accounts) ⇒ `Object` ⏏
     * _async_
-        * [signWith(address, data)](#exp_module_@aeternity/aepp-sdk/es/accounts--signWith) ⇒ `String` ⏏
         * [addAccount(account, [options])](#exp_module_@aeternity/aepp-sdk/es/accounts--addAccount) ⇒ `Void` ⏏
 
 <a id="exp_module_@aeternity/aepp-sdk/es/accounts--removeAccount"></a>
@@ -70,21 +69,6 @@ accounts.removeAccount(address) // Remove account
 accounts.selectAccount(address) // Select account
 accounts.addresses() // Get available accounts
 ```
-<a id="exp_module_@aeternity/aepp-sdk/es/accounts--signWith"></a>
-
-### signWith(address, data) ⇒ `String` ⏏
-Sign data blob with specific key
-
-**Kind**: Exported function  
-**Returns**: `String` - Signed data blob  
-**Category**: async  
-**rtype**: `(address: String, data: String) => data: Promise[String], throws: Error`
-
-| Param | Type | Description |
-| --- | --- | --- |
-| address | `String` | Public key of account to sign with |
-| data | `String` | Data blob to sign |
-
 <a id="exp_module_@aeternity/aepp-sdk/es/accounts--addAccount"></a>
 
 ### addAccount(account, [options]) ⇒ `Void` ⏏

docs/api/tx/builder.md

@@ -113,7 +113,7 @@ Unpack transaction hash
 
 | Param | Type | Description |
 | --- | --- | --- |
-| encodedTx | `String` \| `Array` | String or RLP encoded transaction array (if fromRlpBinary flag is true) |
+| encodedTx | `String` \| `Buffer` | String or RLP encoded transaction array (if fromRlpBinary flag is true) |
 | fromRlpBinary | `Boolean` | Unpack from RLP encoded transaction (default: false) |
 | prefix | `String` | Prefix of data |
 

docs/api/utils/aepp-wallet-communication/rpc/aepp-rpc.md

@@ -16,7 +16,7 @@ import ContentScriptBridge from '@aeternity/aepp-sdk/es/utils/aepp-wallet-commun
         * [.subscribeAddress(type, value)](#module_@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/aepp-rpc--exports.AeppRpc+subscribeAddress) ⇒ `Promise`
         * [.signTransaction()](#module_@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/aepp-rpc--exports.AeppRpc+signTransaction) ⇒ `Promise.<String>`
         * [.sendConnectRequest()](#module_@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/aepp-rpc--exports.AeppRpc+sendConnectRequest) ⇒ `Promise`
-        * [.send()](#module_@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/aepp-rpc--exports.AeppRpc+send) ⇒ `Promise.<Object>`
+        * [.send(tx, [options])](#module_@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/aepp-rpc--exports.AeppRpc+send) ⇒ `Promise.<Object>`
 
 <a id="exp_module_@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/aepp-rpc--exports.AeppRpc"></a>
 
@@ -100,11 +100,18 @@ Send connection request to wallet
 **rtype**: `() => Promise`
 <a id="module_@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/aepp-rpc--exports.AeppRpc+send"></a>
 
-#### exports.AeppRpc.send() ⇒ `Promise.&lt;Object&gt;`
+#### exports.AeppRpc.send(tx, [options]) ⇒ `Promise.&lt;Object&gt;`
 Overwriting of `send` AE method
 All sdk API which use it will be send notification to wallet and wait for callBack
 This method will sign, broadcast and wait until transaction will be accepted using rpc communication with wallet
 
 **Kind**: instance method of [`exports.AeppRpc`](#exp_module_@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/aepp-rpc--exports.AeppRpc)  
 **Returns**: `Promise.&lt;Object&gt;` - Transaction broadcast result  
 **rtype**: `(tx: String, options = {}) => Promise`
+
+| Param | Type | Default |
+| --- | --- | --- |
+| tx | `String` |  | 
+| [options] | `Object` | <code>{}</code> | 
+| [options.walletBroadcast] | `Object` | <code>{}</code> | 
+

docs/api/utils/aepp-wallet-communication/rpc/rpc-client.md

@@ -21,7 +21,7 @@ import RpcClients from '@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/r
         * [.isConnected()](#module_@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/rpc-client--exports.RpcClient+isConnected) ⇒ `Boolean`
         * [.getCurrentAccount(options)](#module_@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/rpc-client--exports.RpcClient+getCurrentAccount) ⇒ `String`
         * [.disconnect()](#module_@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/rpc-client--exports.RpcClient+disconnect) ⇒ `void`
-        * [.updateSubscription(type, value)](#module_@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/rpc-client--exports.RpcClient+updateSubscription) ⇒ `void`
+        * [.updateSubscription(type, value)](#module_@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/rpc-client--exports.RpcClient+updateSubscription) ⇒ `Array.<String>`
         * [.addAction(action, resolvers)](#module_@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/rpc-client--exports.RpcClient+addAction) ⇒ `Object`
         * [.addCallback(msgId)](#module_@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/rpc-client--exports.RpcClient+addCallback) ⇒ `Promise`
         * [.processResponse(msg, [transformResult])](#module_@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/rpc-client--exports.RpcClient+processResponse) ⇒ `void`
@@ -125,7 +125,7 @@ Disconnect
 **rtype**: `() => void`
 <a id="module_@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/rpc-client--exports.RpcClient+updateSubscription"></a>
 
-#### exports.RpcClient.updateSubscription(type, value) ⇒ `void`
+#### exports.RpcClient.updateSubscription(type, value) ⇒ `Array.&lt;String&gt;`
 Update subsription
 
 **Kind**: instance method of [`exports.RpcClient`](#exp_module_@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/rpc-client--exports.RpcClient)  

docs/api/utils/crypto.md

@@ -11,13 +11,11 @@ import * as Crypto from '@aeternity/aepp-sdk/es/utils/crypto'
 * [@aeternity/aepp-sdk/es/utils/crypto](#module_@aeternity/aepp-sdk/es/utils/crypto)
     * _static_
         * [.decode](#module_@aeternity/aepp-sdk/es/utils/crypto.decode) ⇒ `Array`
-        * [.isBase64(str)](#module_@aeternity/aepp-sdk/es/utils/crypto.isBase64) ⇒ `boolean`
         * [.formatAddress(format, address)](#module_@aeternity/aepp-sdk/es/utils/crypto.formatAddress) ⇒ `String`
         * [.isAddressValid(address, prefix)](#module_@aeternity/aepp-sdk/es/utils/crypto.isAddressValid) ⇒ `Boolean`
         * [.addressToHex(base58CheckAddress)](#module_@aeternity/aepp-sdk/es/utils/crypto.addressToHex) ⇒ `String`
         * [.addressFromDecimal(decimalAddress)](#module_@aeternity/aepp-sdk/es/utils/crypto.addressFromDecimal) ⇒ `String`
         * [.hash(input)](#module_@aeternity/aepp-sdk/es/utils/crypto.hash) ⇒ `Buffer`
-        * [.nameId(input)](#module_@aeternity/aepp-sdk/es/utils/crypto.nameId) ⇒ `Buffer`
         * [.sha256hash(input)](#module_@aeternity/aepp-sdk/es/utils/crypto.sha256hash) ⇒ `String`
         * [.salt()](#module_@aeternity/aepp-sdk/es/utils/crypto.salt) ⇒ `Number`
         * [.encodeBase64Check(input)](#module_@aeternity/aepp-sdk/es/utils/crypto.encodeBase64Check) ⇒ `Buffer`
@@ -41,11 +39,10 @@ import * as Crypto from '@aeternity/aepp-sdk/es/utils/crypto'
         * [.decryptPrivateKey(password)](#module_@aeternity/aepp-sdk/es/utils/crypto.decryptPrivateKey) ⇒ `Buffer`
         * [.decryptPubKey(password)](#module_@aeternity/aepp-sdk/es/utils/crypto.decryptPubKey) ⇒ `Buffer`
         * [.assertedType(data, type, forceError)](#module_@aeternity/aepp-sdk/es/utils/crypto.assertedType) ⇒ `String` \| `Boolean`
-        * [.decodeTx(password)](#module_@aeternity/aepp-sdk/es/utils/crypto.decodeTx) ⇒ `Array`
+        * [.decodeTx(txHash)](#module_@aeternity/aepp-sdk/es/utils/crypto.decodeTx) ⇒ `Buffer`
         * [.encodeTx(txData)](#module_@aeternity/aepp-sdk/es/utils/crypto.encodeTx) ⇒ `String`
         * [.isValidKeypair(privateKey, publicKey)](#module_@aeternity/aepp-sdk/es/utils/crypto.isValidKeypair) ⇒ `Boolean`
-        * [.envKeypair(env)](#module_@aeternity/aepp-sdk/es/utils/crypto.envKeypair) ⇒ `Object`
-        * [.deserialize(binary, opts)](#module_@aeternity/aepp-sdk/es/utils/crypto.deserialize) ⇒ `Object`
+        * [.envKeypair(env, [force])](#module_@aeternity/aepp-sdk/es/utils/crypto.envKeypair) ⇒ `Object`
         * [.encryptData(msg, publicKey)](#module_@aeternity/aepp-sdk/es/utils/crypto.encryptData) ⇒ `Object`
         * [.decryptData(secretKey, encryptedData)](#module_@aeternity/aepp-sdk/es/utils/crypto.decryptData) ⇒ `Buffer` \| `null`
     * _inner_
@@ -64,18 +61,6 @@ RLP decode
 | --- | --- | --- |
 | data | `Buffer` \| `String` \| `Integer` \| `Array` | Data to decode |
 
-<a id="module_@aeternity/aepp-sdk/es/utils/crypto.isBase64"></a>
-
-### @aeternity/aepp-sdk/es/utils/crypto.isBase64(str) ⇒ `boolean`
-Check whether a string is valid base-64.
-
-**Kind**: static method of [`@aeternity/aepp-sdk/es/utils/crypto`](#module_@aeternity/aepp-sdk/es/utils/crypto)  
-**Returns**: `boolean` - True if the string is valid base-64, false otherwise.  
-
-| Param | Type | Description |
-| --- | --- | --- |
-| str | `string` | String to validate. |
-
 <a id="module_@aeternity/aepp-sdk/es/utils/crypto.formatAddress"></a>
 
 ### @aeternity/aepp-sdk/es/utils/crypto.formatAddress(format, address) ⇒ `String`
@@ -143,20 +128,6 @@ Calculate 256bits Blake2b hash of `input`
 | --- | --- | --- |
 | input | `String` \| `Buffer` | Data to hash |
 
-<a id="module_@aeternity/aepp-sdk/es/utils/crypto.nameId"></a>
-
-### @aeternity/aepp-sdk/es/utils/crypto.nameId(input) ⇒ `Buffer`
-Calculate 256bits Blake2b nameId of `input`
-as defined in https://github.com/aeternity/protocol/blob/master/AENS.md#hashing
-
-**Kind**: static method of [`@aeternity/aepp-sdk/es/utils/crypto`](#module_@aeternity/aepp-sdk/es/utils/crypto)  
-**Returns**: `Buffer` - Hash  
-**rtype**: `(input: String) => hash: String`
-
-| Param | Type | Description |
-| --- | --- | --- |
-| input | `String` | Data to hash |
-
 <a id="module_@aeternity/aepp-sdk/es/utils/crypto.sha256hash"></a>
 
 ### @aeternity/aepp-sdk/es/utils/crypto.sha256hash(input) ⇒ `String`
@@ -378,7 +349,7 @@ Verify that signature was signed by public key
 
 | Param | Type | Description |
 | --- | --- | --- |
-| str | `String` | Data to verify |
+| str | `String` \| `Buffer` | Data to verify |
 | signature | `Buffer` | Signature to verify |
 | publicKey | `Buffer` | Key to verify against |
 
@@ -466,16 +437,16 @@ Assert base58 encoded type and return its payload
 
 <a id="module_@aeternity/aepp-sdk/es/utils/crypto.decodeTx"></a>
 
-### @aeternity/aepp-sdk/es/utils/crypto.decodeTx(password) ⇒ `Array`
+### @aeternity/aepp-sdk/es/utils/crypto.decodeTx(txHash) ⇒ `Buffer`
 Decode a transaction
 
 **Kind**: static method of [`@aeternity/aepp-sdk/es/utils/crypto`](#module_@aeternity/aepp-sdk/es/utils/crypto)  
-**Returns**: `Array` - Decoded transaction  
+**Returns**: `Buffer` - Decoded transaction  
 **rtype**: `(txHash: String) => Buffer`
 
 | Param | Type | Description |
 | --- | --- | --- |
-| password | `String` | Password to decrypt with |
+| txHash | `String` | Transaction hash |
 
 <a id="module_@aeternity/aepp-sdk/es/utils/crypto.encodeTx"></a>
 
@@ -508,7 +479,7 @@ Sign a message, and then verifying that signature
 
 <a id="module_@aeternity/aepp-sdk/es/utils/crypto.envKeypair"></a>
 
-### @aeternity/aepp-sdk/es/utils/crypto.envKeypair(env) ⇒ `Object`
+### @aeternity/aepp-sdk/es/utils/crypto.envKeypair(env, [force]) ⇒ `Object`
 Obtain key pair from `env`
 
 Designed to be used with `env` from nodejs. Assumes enviroment variables
@@ -518,23 +489,10 @@ Designed to be used with `env` from nodejs. Assumes enviroment variables
 **Returns**: `Object` - Key pair  
 **rtype**: `(env: Object) => {publicKey: String, secretKey: String}, throws: Error`
 
-| Param | Type | Description |
-| --- | --- | --- |
-| env | `Object` | Environment |
-
-<a id="module_@aeternity/aepp-sdk/es/utils/crypto.deserialize"></a>
-
-### @aeternity/aepp-sdk/es/utils/crypto.deserialize(binary, opts) ⇒ `Object`
-Deserialize `binary` state channel transaction
-
-**Kind**: static method of [`@aeternity/aepp-sdk/es/utils/crypto`](#module_@aeternity/aepp-sdk/es/utils/crypto)  
-**Returns**: `Object` - Channel data  
-**rtype**: `(binary: String) => Object`
-
-| Param | Type | Description |
-| --- | --- | --- |
-| binary | `String` | Data to deserialize |
-| opts | `Object` | Options |
+| Param | Type | Default | Description |
+| --- | --- | --- | --- |
+| env | `Object` |  | Environment |
+| [force] | `Boolean` | <code>false</code> | Force throwing error |
 
 <a id="module_@aeternity/aepp-sdk/es/utils/crypto.encryptData"></a>
 

docs/api/utils/keystore.md

@@ -2,7 +2,6 @@
 
 ## @aeternity/aepp-sdk/es/utils/keystore
 KeyStore module
-!!!Work only in node.js!!!
 
 **Example**  
 ```js

docs/examples/node/aecontract.md

@@ -62,18 +62,18 @@ We'll need the main client module `Ae` in the `Universal` flavor from the SDK.
 
 
 ```js
-const { Universal: Ae } = require('@aeternity/aepp-sdk')
+const { Universal: Ae, Node } = require('@aeternity/aepp-sdk')
 const program = require('commander')
 const fs = require('fs')
 
-function exec (infile, fn, args) {
+async function exec (infile, fn, args) {
   if (!infile || !fn) {
     program.outputHelp()
     process.exit(1)
   }
 
   const code = fs.readFileSync(infile, 'utf-8')
-
+  const node = await Node({ url: program.host })
 
 ```
 
@@ -107,7 +107,7 @@ implementation directly in the SDK.
   
 
 ```js
-  Ae({ url: program.host, debug: program.debug, compilerUrl: program.compilerUrl,  process }).then(ae => {
+  Ae({ debug: program.debug, process, nodes: [{ name: 'testNode', instance: node }] }).then(ae => {
     return ae.contractCompile(code)
 
 ```
@@ -197,7 +197,6 @@ program
   .arguments('<infile> <function> [args...]')
   .option('-i, --init [state]', 'Arguments to contructor function')
   .option('-H, --host [hostname]', 'Node to connect to', 'http://localhost:3013')
-  .option('-C, --compilerUrl [compilerUrl]', 'Compiler to connect to', 'http://localhost:3088')
   .option('--debug', 'Switch on debugging')
   .action(exec)
   .parse(process.argv)