Skip to content

Commit 996dc29

Browse files
authored
Merge pull request #1427 from aeternity/release/v11.0.0
Release v11.0.0
2 parents ad36e7e + 5ad6309 commit 996dc29

File tree

147 files changed

+7306
-7200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+7306
-7200
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
NODE_TAG=v6.3.0
1+
NODE_TAG=v6.4.0
22
COMPILER_TAG=v6.1.0

.github/workflows/main.yml

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,39 @@
1-
name: Test, build, and deploy
1+
name: Test & build
22
on: [push, pull_request]
33
jobs:
44
main:
55
runs-on: ubuntu-latest
66
steps:
7-
- if: github.ref != 'refs/heads/develop'
8-
uses: actions/checkout@v2
9-
with:
10-
ref: develop
117
- uses: actions/checkout@v2
128
with:
13-
fetch-depth: 100
14-
- if: github.ref != 'refs/heads/develop'
15-
run: git branch develop origin/develop
16-
9+
fetch-depth: 0
1710
- uses: actions/setup-node@v2
1811
with:
19-
node-version: 14.x
12+
node-version: 16.x
2013
- uses: actions/cache@v2
2114
with:
2215
path: ~/.npm
2316
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
24-
2517
- run: npm ci --ignore-scripts
18+
- name: Run Commitlint
19+
env:
20+
EVENT_TYPE: ${{ github.event_name }}
21+
HEAD: ${{ github.event.pull_request.head.sha }}
22+
BASE: ${{ github.event.pull_request.base.sha }}
23+
run: |
24+
if [ "$EVENT_TYPE" = "push" ]; then
25+
npx commitlint --from HEAD~${{ github.event.push.commits }} --to HEAD --verbose
26+
else
27+
npx commitlint --from $BASE --to $HEAD --verbose
28+
fi
2629
- run: npm run lint
2730
- run: npm run build
2831
- run: npm run test:unit
29-
- run: npm run report-coverage
30-
if: always()
31-
3232
- run: docker-compose up -d
3333
- name: Ensure that node is running
3434
run: |
3535
while [[ `curl -s -o /dev/null -w %{http_code} localhost:3013/api` != 200 ]]; do
3636
sleep 0.2;
3737
done
38-
3938
- run: npm run test:integration
40-
- run: npm run report-coverage
41-
if: always()
4239
- run: docker-compose logs
43-
if: always()

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ node_modules
1010
/docs/examples
1111
/docs/public
1212
/docs/docco.css
13-
/docs/CHANGELOG.md
1413
__pycache__
1514
/.envrc
1615
/yarn-error.log

.mocharc.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
module.exports = {
2+
require: [
3+
'@babel/register',
4+
'ts-node/register'
5+
],
6+
recursive: true,
7+
timeout: '40s',
8+
exit: true // TODO: fix in state channel tests
9+
}

README.md

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,40 @@
1-
# [æternity](https://aeternity.com/)'s JavaScript SDK
1+
# [æternity](https://aeternity.com)'s JavaScript SDK
22

33
[![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)
4-
[![codecov](https://codecov.io/gh/aeternity/aepp-sdk-js/branch/develop/graph/badge.svg)](https://codecov.io/gh/aeternity/aepp-sdk-js)
5-
[![Build Status](https://travis-ci.com/aeternity/aepp-sdk-js.svg?branch=develop)](http://travis-ci.com/aeternity/aepp-sdk-js?branch=develop)
6-
[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
74
[![npm](https://img.shields.io/npm/v/@aeternity/aepp-sdk.svg)](https://www.npmjs.com/package/@aeternity/aepp-sdk)
85
[![npm](https://img.shields.io/npm/l/@aeternity/aepp-sdk.svg)](https://www.npmjs.com/package/@aeternity/aepp-sdk)
9-
[![Greenkeeper badge](https://badges.greenkeeper.io/aeternity/aepp-sdk-js.svg)](https://greenkeeper.io/)
6+
107
JavaScript SDK for the revolutionary [æternity] blockchain, targeting the
11-
[æternity node] implementation. Aepp-sdk is [hosted on GitHub].
8+
[æternity node] implementation. The aepp-sdk is [hosted on GitHub].
129

13-
[æternity]: https://aeternity.com/
10+
[æternity]: https://aeternity.com
1411
[æternity node]: https://github.com/aeternity/aeternity
1512
[hosted on GitHub]: https://github.com/aeternity/aepp-sdk-js
1613

17-
[develop branch]: https://github.com/aeternity/aepp-sdk-js/tree/develop
18-
1914
## Guides & Examples
2015

2116
Introduction
2217
- [Installation](docs/index.md)
2318
- [Quick Start](docs/quick-start.md)
2419

2520
Usage guides:
26-
- [æternity naming system](docs/guides/aens.md)
21+
- [AENS](docs/guides/aens.md) (æternity naming system)
2722
- [Contracts](docs/guides/contracts.md)
28-
- [Contract events](docs/guides/contract-events.md)
23+
- [Contract Events](docs/guides/contract-events.md)
2924
- [Oracles](docs/guides/oracles.md)
25+
- [PayingForTx](docs/guides/paying-for-tx.md) (Meta-Transactions)
26+
- [Batch Transactions](docs/guides//batch-requests.md)
27+
- [Error Handling](docs/guides/error-handling.md)
3028
- [Low vs High level API](docs/guides/low-vs-high-usage.md)
29+
- Wallet Interaction
30+
- [Connect an æpp to a wallet](docs/guides/connect-aepp-to-wallet.md)
31+
- [How to build a wallet](docs/guides/build-wallet.md)
3132

3233
There are also [examples](examples/README.md) that you can directly use and play with.
3334

34-
## CLI - Command Line Client
35+
## CLI - Command Line Interface
3536

36-
To quickly test _all_ of æternity's blockchain features from your terminal, you can install and use our **NodeJS [CLI](https://github.com/aeternity/aepp-cli-js)** by running:
37+
To quickly test _all_ of æternity's blockchain features from your terminal, you can install and use the [CLI](https://github.com/aeternity/aepp-cli-js) by running:
3738

3839
1. `npm i -g @aeternity/aepp-cli` to globally install the CLI
3940
2. `aecli --help` to get a list of possible commands
@@ -44,7 +45,7 @@ For advanced use, to get a deeper understanding of the SDK or to contribute to i
4445

4546
## Changelog
4647

47-
We keep our [Changelog](CHANGELOG.md) up to date.
48+
We keep our [Changelog](docs/CHANGELOG.md) up to date.
4849

4950
## License
5051

apidoc.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
const jsdoc2md = require('jsdoc-to-markdown')
2222
const fs = require('fs')
2323
const path = require('path')
24-
const R = require('ramda')
2524

2625
const outputDir = path.join(__dirname, 'docs')
2726
const prefix = /^@aeternity\/aepp-sdk\/es\//
@@ -32,7 +31,7 @@ const templateData = jsdoc2md.getTemplateDataSync({
3231

3332
function createDirs (path) {
3433
const paths = path.split(/\//).slice(1, -1)
35-
.reduce((acc, e) => acc.concat([`${R.last(acc)}/${e}`]), ['']).slice(1)
34+
.reduce((acc, e) => acc.concat([`${acc[acc.length - 1]}/${e}`]), ['']).slice(1)
3635

3736
paths.forEach(dir => {
3837
try {
@@ -44,12 +43,12 @@ function createDirs (path) {
4443
}
4544

4645
const modules = templateData
47-
.filter(R.propEq('kind', 'module'))
46+
.filter(({ kind }) => kind === 'module')
4847
.map(({ name }) => {
4948
return { name, out: `api/${name.replace(prefix, '')}` }
5049
})
5150

52-
R.forEachObjIndexed(({ name, out }) => {
51+
Object.values(modules).forEach(({ name, out }) => {
5352
const template = `{{#module name="${name}"}}{{>docs}}{{/module}}`
5453
console.log(`rendering ${name}`)
5554
const dest = path.resolve(outputDir, `${out}.md`)
@@ -64,7 +63,7 @@ R.forEachObjIndexed(({ name, out }) => {
6463
})
6564
createDirs(dest)
6665
fs.writeFileSync(dest, output)
67-
}, modules)
66+
})
6867

6968
const output = jsdoc2md.renderSync({
7069
data: modules,

babel.config.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
module.exports = {
2+
presets: [
3+
['@babel/preset-env', {
4+
include: [
5+
'@babel/plugin-proposal-nullish-coalescing-operator',
6+
'@babel/plugin-proposal-logical-assignment-operators'
7+
]
8+
}],
9+
'@babel/preset-typescript'
10+
],
11+
plugins: [
12+
['@babel/plugin-transform-runtime', { corejs: 3 }]
13+
]
14+
}

babel.config.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

babel.esm.config.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1-
const config = require('./babel.config.json')
1+
const config = require('./babel.config.js')
22

3-
config.presets[0] = ['@babel/preset-env', { modules: false }]
3+
config.presets
4+
.filter(plugin => Array.isArray(plugin))
5+
.find(([name]) => name === '@babel/preset-env')[1].modules = false
6+
7+
config.plugins.push(
8+
['add-import-extension', { extension: 'mjs' }],
9+
['import-globals', {
10+
Buffer: { moduleName: 'buffer', exportName: 'Buffer' }
11+
}],
12+
['transform-default-named-imports']
13+
)
414

515
module.exports = config

docker-compose.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@ services:
44
image: aeternity/aeternity:${NODE_TAG}
55
hostname: node
66
ports: ["3013:3013", "3113:3113", "3014:3014", "3114:3114"]
7-
environment:
8-
EPOCH_CONFIG: /home/aeternity/aeternity_node.yaml
9-
command: bin/aeternity console -noinput -aecore
107
volumes:
11-
- ./docker/aeternity_node_mean16.yaml:/home/aeternity/aeternity_node.yaml
8+
- ./docker/aeternity_node_mean16.yaml:/home/aeternity/node/aeternity.yaml
129
- ./docker/accounts_test.json:/home/aeternity/node/data/aecore/.genesis/accounts_test.json
1310

1411
compiler:

0 commit comments

Comments
 (0)