Merge pull request #785 from aeternity/release/6.1.1

Release 6.1.1

Author: nduchak

AUTHORS

@@ -1,2 +1,3 @@
 Till Kolter <[email protected]>
 Alexander Kahl <[email protected]>
+Nazar Duchak <[email protected]>

CHANGELOG.md

@@ -1,3 +1,17 @@
+# [6.1.1](https://github.com/aeternity/aepp-sdk-js/compare/6.1.0...6.1.1) (2019-11-12)
+
+
+### Bug Fixes
+
+* **ACI:** Disable bytecode check for source and code on-chain. This changes will be included in next major release ([#783](https://github.com/aeternity/aepp-sdk-js/issues/783)) ([fe6021b](https://github.com/aeternity/aepp-sdk-js/commit/fe6021b))
+
+
+### Features
+
+* **KeyStore:** Remove `argon2` package, use `libsodium` for both browser and node ([#782](https://github.com/aeternity/aepp-sdk-js/issues/782)) ([c18047e](https://github.com/aeternity/aepp-sdk-js/commit/c18047e))
+
+
+
 # [6.1.0](https://github.com/aeternity/aepp-sdk-js/compare/6.0.2...6.1.0) (2019-11-11)
 
 
@@ -48,6 +62,8 @@
 
 
 
+
+
 # [6.0.0](https://github.com/aeternity/aepp-sdk-js/compare/4.7.0...6.0.0) (2019-10-16)
 
 

docs/api.md

@@ -27,4 +27,5 @@
   * [@aeternity/aepp-sdk/es/tx](api/tx.md)
   * [@aeternity/aepp-sdk/es/tx/tx](api/tx/tx.md)
   * [@aeternity/aepp-sdk/es/utils/crypto](api/utils/crypto.md)
+  * [@aeternity/aepp-sdk/es/utils/keystore](api/utils/keystore.md)
   * [@aeternity/aepp-sdk/es/utils/swagger](api/utils/swagger.md)

docs/api/contract/aci.md

@@ -71,7 +71,6 @@ Generate contract ACI object with predefined js methods for contract usage - can
 | [options.aci] | `String` |  | Contract ACI |
 | [options.contractAddress] | `String` |  | Contract address |
 | [options.filesystem] | `Object` |  | Contact source external namespaces map |
-| [options.forceCodeCheck] | `Boolean` | <code>false</code> | Flag to force validation of corresponding on chain bytecode |
 | [options.opt] | `Object` |  | Contract options |
 
 **Example**  

docs/api/utils/keystore.md

@@ -6,7 +6,11 @@ KeyStore module
 
 **Example**  
 ```js
-import * as Crypto from '@aeternity/aepp-sdk/es/utils/keystore'
+import * as Keystore from '@aeternity/aepp-sdk/es/utils/keystore'
+```
+**Example**  
+```js
+const { Keystore } = require('@aeternity/aepp-sdk')
 ```
 
 * [@aeternity/aepp-sdk/es/utils/keystore](#module_@aeternity/aepp-sdk/es/utils/keystore)

docs/examples/node/aecontract.md

@@ -107,7 +107,7 @@ implementation directly in the SDK.
   
 
 ```js
-  Ae({ url: program.host, debug: program.debug, process }).then(ae => {
+  Ae({ url: program.host, debug: program.debug, compilerUrl: program.compilerUrl,  process }).then(ae => {
     return ae.contractCompile(code)
 
 ```

es/ae/wallet.js

@@ -31,7 +31,6 @@ import Rpc from '../rpc/server'
 import * as R from 'ramda'
 import Tx from '../tx/tx'
 import Contract from './contract'
-import NodePool from '../node-pool'
 import GeneralizeAccount from '../contract/ga'
 
 const contains = R.flip(R.contains)
@@ -131,7 +130,7 @@ async function rpcAddress ({ params, session }) {
   onContract: confirm
 })
  */
-const Wallet = Ae.compose(Accounts, Chain, NodePool, Tx, Contract, GeneralizeAccount, Rpc, {
+const Wallet = Ae.compose(Accounts, Chain, Tx, Contract, GeneralizeAccount, Rpc, {
   init ({ onTx = this.onTx, onChain = this.onChain, onAccount = this.onAccount, onContract = this.onContract }, { stamp }) {
     this.onTx = onTx
     this.onChain = onChain

es/chain/index.js

@@ -43,7 +43,7 @@ const Chain = Oracle.compose({
     Ae: {
       methods: [
         'sendTransaction', 'height', 'awaitHeight', 'poll', 'balance', 'getBalance', 'tx',
-        'mempool', 'topBlock', 'getTxInfo', 'txDryRun', 'getName', 'getNodeInfo', 'getAccount', 'getContractByteCode', 'getContract'
+        'mempool', 'topBlock', 'getTxInfo', 'txDryRun', 'getName', 'getNodeInfo', 'getAccount'
       ]
     }
   }
@@ -60,7 +60,9 @@ const Chain = Oracle.compose({
     getTxInfo: required,
     mempool: required,
     txDryRun: required,
-    getAccount: required
+    getAccount: required,
+    getContractByteCode: required,
+    getContract: required
   }
 }))
 

es/contract/aci/index.js

@@ -29,7 +29,6 @@ import { validateArguments, transform, transformDecodedData } from './transforma
 import { buildContractMethods, getFunctionACI } from './helpers'
 import AsyncInit from '../../utils/async-init'
 import { BigNumber } from 'bignumber.js'
-import { isAddressValid } from '../../utils/crypto'
 
 /**
  * Validated contract call arguments using contract ACI
@@ -62,7 +61,6 @@ async function prepareArgsForEncode (aci, params) {
  * @param {String} [options.aci] Contract ACI
  * @param {String} [options.contractAddress] Contract address
  * @param {Object} [options.filesystem] Contact source external namespaces map
- * @param {Boolean} [options.forceCodeCheck = false] Flag to force validation of corresponding on chain bytecode
  * @param {Object} [options.opt] Contract options
  * @return {ContractInstance} JS Contract API
  * @example
@@ -73,7 +71,7 @@ async function prepareArgsForEncode (aci, params) {
  * Also you can call contract like: await contractIns.methods.setState(123, options)
  * Then sdk decide to make on-chain or static call(dry-run API) transaction based on function is stateful or not
  */
-async function getContractInstance (source, { aci, contractAddress, filesystem = {}, forceCodeCheck = false, opt } = {}) {
+async function getContractInstance (source, { aci, contractAddress, filesystem = {}, opt } = {}) {
   aci = aci || await this.contractGetACI(source, { filesystem })
   const defaultOptions = {
     skipArgsConvert: false,
@@ -100,17 +98,6 @@ async function getContractInstance (source, { aci, contractAddress, filesystem =
       this.options = R.merge(this.options, opt)
     }
   }
-  // Check for valid contract address and contract code
-  if (contractAddress) {
-    if (!isAddressValid(contractAddress, 'ct')) throw new Error('Invalid contract address')
-    const contract = await this.getContract(contractAddress).catch(e => null)
-    if (!contract) throw new Error(`Contract with address ${contractAddress} not found on-chain`)
-    if (!forceCodeCheck) {
-      const onChanByteCode = (await this.getContractByteCode(contractAddress)).bytecode
-      instance.compiled = (await this.contractCompile(source, instance.options)).bytecode
-      if (instance.compile !== onChanByteCode) throw new Error('Contract source do not correspond to the contract source deploying on the chain')
-    }
-  }
 
   /**
    * Compile contract

es/utils/keystore.js

@@ -4,6 +4,8 @@ import uuid from 'uuid'
 import { encodeBase58Check, isBase64 } from './crypto'
 import { isHex } from './string'
 
+const _sodium = require('libsodium-wrappers-sumo')
+
 /**
  * KeyStore module
  * !!!Work only in node.js!!!
@@ -31,30 +33,23 @@ const DERIVED_KEY_FUNCTIONS = {
 }
 
 export async function deriveKeyUsingArgon2id (password, salt, options) {
-  const { memlimit_kib: memoryCost, parallelism, opslimit: timeCost } = options.kdf_params
-  const isBrowser = !(typeof module !== 'undefined' && module.exports)
-
-  if (isBrowser) {
-    const _sodium = require('libsodium-wrappers-sumo')
-
-    return _sodium.ready.then(async () => {
-      // tslint:disable-next-line:typedef
-      const sodium = _sodium
-
-      const result = sodium.crypto_pwhash(
-        32,
-        password,
-        salt,
-        timeCost,
-        memoryCost * 1024,
-        sodium.crypto_pwhash_ALG_ARGON2ID13
-      )
-      return Buffer.from(result)
-    })
-  } else {
-    const argon2 = require('argon2')
-    return argon2.hash(password, { timeCost, memoryCost, parallelism, type: argon2.argon2id, raw: true, salt })
-  }
+  const { memlimit_kib: memoryCost, opslimit: timeCost } = options.kdf_params
+  // const isBrowser = !(typeof module !== 'undefined' && module.exports)
+
+  return _sodium.ready.then(async () => {
+    // tslint:disable-next-line:typedef
+    const sodium = _sodium
+
+    const result = sodium.crypto_pwhash(
+      32,
+      password,
+      salt,
+      timeCost,
+      memoryCost * 1024,
+      sodium.crypto_pwhash_ALG_ARGON2ID13
+    )
+    return Buffer.from(result)
+  })
 }
 
 // CRYPTO PART