Merge pull request #1036 from aeternity/release/7.5.0

Release 7.5.0

.env

@@ -1,2 +1,2 @@
 NODE_TAG=v5.5.4
-COMPILER_TAG=v4.2.0
+COMPILER_TAG=v4.3.2

.travis.yml

@@ -1,71 +1,30 @@
-branches:
-  only:
-    - master
-    - develop
-
-dist: xenial
-
-addons:
-  apt:
-    packages:
-      - build-essential
-      - curl
-      - libltdl7
-      - git
+dist: bionic
+language: node_js
+node_js: 12
 
 services:
   - docker
 
-language: node_js
-node_js: '10'
-
-cache:
-  timeout: 604800 # 7 days
-  directories:
-    - "$HOME/.npm"
-
-env:
-  global:
-    - TEST_NODE=http://localhost:3013
-    - TEST_URL=http://localhost:3013
-    - TEST_DEBUG_URL=http://localhost:3113
-    - TEST_WS_URL=ws://localhost:3014/channel
-    - TEST_NETWORK_ID=ae_devnet
-    - COMPILER_URL=http://localhost:3080
-    - FORCE_COMPATIBILITY=false
-
 before_install:
-  - docker-compose up -d node compiler
-
-install:
-  - npm ci
+  - if [[ $TRAVIS_EVENT_TYPE == "cron" ]]; then
+      export NODE_TAG=master;
+      export COMPILER_TAG=latest;
+      export FORCE_COMPATIBILITY=true;
+    fi
+  - docker-compose up -d
 
 jobs:
   include:
     - stage: Tests
-      if: type != "cron"
       name: Test AENS
       script:
         - npm run test-aens
         - npm run report-coverage
-    - stage: Tests
-      if: type != "cron"
-      name: Test Channel
+    - name: Test Channel
       script:
         - npm run test-channel
         - npm run report-coverage
-    - stage: Tests
-      if: type != "cron"
-      name: Test Contract, Node, Oracle, Account and else
+    - name: Test Contract, Node, Oracle, Account and else
       script:
         - npm run test-else
         - npm run report-coverage
-    - stage: Tests
-      if: type = "cron"
-      env:
-        - NODE_TAG=master
-        - COMPILER_TAG=latest
-        - FORCE_COMPATIBILITY=true
-      script:
-        - npm run test
-        - npm run report-coverage

CHANGELOG.md

@@ -1,3 +1,18 @@
+# [7.5.0](https://github.com/aeternity/aepp-sdk-js/compare/7.4.2...7.5.0) (2020-06-18)
+
+
+### Features
+
+* **Account:** Build signature from transaction hash ([#1025](https://github.com/aeternity/aepp-sdk-js/issues/1025)) ([2cb8cc2](https://github.com/aeternity/aepp-sdk-js/commit/2cb8cc2))
+* **ACI:** External contract integration ([#1027](https://github.com/aeternity/aepp-sdk-js/issues/1027)) ([a14d13a](https://github.com/aeternity/aepp-sdk-js/commit/a14d13a))
+
+### Refactor
+
+* **Deps:** Clean up repository ([#1029](https://github.com/aeternity/aepp-sdk-js/pull/1029))
+* **Env:** Simplify Travis and docker-compose ([#1031](https://github.com/aeternity/aepp-sdk-js/pull/1031))
+* **Env:** Remove unused packages ([#1032](https://github.com/aeternity/aepp-sdk-js/pull/1032))
+
+
 ## [7.4.2](https://github.com/aeternity/aepp-sdk-js/compare/7.2.1...7.4.2) (2020-06-10)
 
 

LICENSE

@@ -1,5 +1,5 @@
 ISC License (ISC)
-Copyright © 2018 aeternity developers
+Copyright © 2020 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 copyright notice

apidoc.js

@@ -23,11 +23,12 @@ const fs = require('fs')
 const path = require('path')
 const R = require('ramda')
 
-const config = require(`${__dirname}/.jsdoc2md.json`)
-
 const outputDir = `${__dirname}/docs`
 const prefix = /^@aeternity\/aepp-sdk\/es\//
-const templateData = jsdoc2md.getTemplateDataSync(config)
+const templateData = jsdoc2md.getTemplateDataSync({
+  configure: '.jsdoc.json',
+  files: 'es/**'
+})
 
 function createDirs (path) {
   const paths = path.split(/\//).slice(1, -1)

docker-compose.yml

@@ -8,12 +8,10 @@ services:
       EPOCH_CONFIG: /home/aeternity/aeternity_node.yaml
     command: bin/aeternity console -noinput -aecore expected_mine_rate ${EPOCH_MINE_RATE:-5000}
     volumes:
-      - ${PWD}/docker/aeternity_node_mean16.yaml:/home/aeternity/aeternity_node.yaml
-      - ${PWD}/docker/keys/node:/home/aeternity/node/keys
-      - ${PWD}/docker/accounts_test.json:/home/aeternity/node/data/aecore/.genesis/accounts_test.json
+      - ./docker/aeternity_node_mean16.yaml:/home/aeternity/aeternity_node.yaml
+      - ./docker/keys/node:/home/aeternity/node/keys
+      - ./docker/accounts_test.json:/home/aeternity/node/data/aecore/.genesis/accounts_test.json
       - node_db:/home/aeternity/node/data/mnesia
-      - node_keys:/home/aeternity/node/keys
-
 
   compiler:
     image: aeternity/aesophia_http:${COMPILER_TAG}
@@ -22,4 +20,3 @@ services:
 
 volumes:
   node_db:
-  node_keys:

es/account/index.js

@@ -26,7 +26,7 @@ import stampit from '@stamp/it'
 import { required } from '@stamp/required'
 
 import { hash, personalMessageToBinary, decodeBase64Check, assertedType, verifyPersonalMessage } from '../utils/crypto'
-import { buildTx } from '../tx/builder'
+import { buildTx, buildTxHash } from '../tx/builder'
 import { decode } from '../tx/builder/helpers'
 import { TX_TYPE } from '../tx/builder/schema'
 import { getNetworkId } from '../node'
@@ -40,11 +40,11 @@ import { getNetworkId } from '../node'
  * @param {Object} opt - Options
  * @return {String} Signed transaction
  */
-async function signTransaction (tx, opt = {}) {
+async function signTransaction (tx, opt = { signHash: true }) {
   const networkId = this.getNetworkId(opt)
   const rlpBinaryTx = decodeBase64Check(assertedType(tx, 'tx'))
   // Prepend `NETWORK_ID` to begin of data binary
-  const txWithNetworkId = Buffer.concat([Buffer.from(networkId), rlpBinaryTx])
+  const txWithNetworkId = Buffer.concat([Buffer.from(networkId), opt.signHash ? buildTxHash(rlpBinaryTx, { raw: true }) : rlpBinaryTx])
 
   const signatures = [await this.sign(txWithNetworkId, opt)]
   return buildTx({ encodedTx: rlpBinaryTx, signatures }, TX_TYPE.signed).tx

es/chain/node.js

@@ -101,7 +101,7 @@ async function getBalance (address, { height, hash, format = AE_AMOUNT_FORMATS.A
 
 async function tx (hash, info = true) {
   const tx = await this.api.getTransactionByHash(hash)
-  if (['ContractCreateTx', 'ContractCallTx', 'ChannelForceProgressTx'].includes(tx.tx.type) && info) {
+  if (['ContractCreateTx', 'ContractCallTx', 'ChannelForceProgressTx'].includes(tx.tx.type) && info && tx.blockHeight !== -1) {
     try {
       return { ...tx, ...await this.getTxInfo(hash) }
     } catch (e) {