Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Realign/3.4.0 #438

Merged
merged 56 commits into from
May 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
1642c6c
chore(package): Bump version to 2.4.1
Apr 10, 2019
d0b2dce
chore(Adjust CHANGELOG):
Apr 11, 2019
fa4fdd3
chore(CAHNGELOG): Fix typo
Apr 11, 2019
5914b22
docs(USAGE): Fix networkId in Wallet example
Apr 11, 2019
31d4955
fix(Http): Remove userAgent from axios
Apr 11, 2019
14f0364
chore(CHANGELOG): Fix typo
Apr 11, 2019
cb69a29
docs(*): Regenrate docs
Apr 11, 2019
50dc494
Merge pull request #323 from aeternity/release/2.4.1
nduchak Apr 11, 2019
9e42217
chore(bump version in package):
Apr 16, 2019
525f5ea
chore(CHANGELOG): Adjust changelog to conventional changelog style
Apr 17, 2019
fffdf12
chore(Docker): Update node version tot 2.3.0
Apr 17, 2019
eb3d4be
docs(CHANGELOG): Adjust release
Apr 17, 2019
97c2a3c
feat(npm): Add script for auto-generating changelog
Apr 17, 2019
f78a2bb
Merge remote-tracking branch 'origin/master' into release/3.0.0
Apr 17, 2019
77cfbc8
chore(Node): downgrade to 2.2.0 due to failed channel test
Apr 17, 2019
55a2891
fix(Channel): Fix failing test on 2.3.0 node
Apr 17, 2019
ed82eb6
chore(package-lock): adjust package-lock
Apr 17, 2019
a059273
chore(Channel): Revert to 2.2.0
Apr 17, 2019
71b0d05
docs(Docs): Regenerate docs
Apr 17, 2019
38b8fb9
Merge pull request #344 from aeternity/release/3.0.0
nduchak Apr 17, 2019
d0b7fa6
refactor(node): Add txHash to sendTransaction error
Apr 24, 2019
d8f0bde
chore(package): bump version to 3.1.0
Apr 24, 2019
d405400
chore(Docs): Regeneratee docs and changelog
Apr 24, 2019
9ecf941
Merge remote-tracking branch 'origin/master' into release/3.1.0
Apr 24, 2019
561bb18
chore(package): Add packa-lock
Apr 24, 2019
c3b5ade
chore(changelog): Adjust closes issue
Apr 24, 2019
c2cdb48
Merge pull request #361 from aeternity/release/3.1.0
nduchak Apr 24, 2019
a5f7be4
chore(package): Bump version to 3.2.0
May 16, 2019
4afe94a
docs(Docs and Changelog): Regenerate docs
May 16, 2019
5ab8f97
Merge branch 'master' into release/3.2.0
nduchak May 16, 2019
157f9d4
docs(CHANGELOG): Adjust changelog
May 16, 2019
cb6ce03
docs(CHANGELOG): Adjust changelog
May 16, 2019
9670fef
Merge remote-tracking branch 'origin/release/3.2.0' into release/3.2.0
May 16, 2019
e7e5596
chore(Jenkions): Force jenkins
May 16, 2019
90e5439
fix(NPM): Make audit of npm packages. Remove esm from deps
May 16, 2019
0877fd0
Merge pull request #401 from aeternity/release/3.2.0
nduchak May 16, 2019
564be25
chore(Release): Bump version in package, generate CHNAGELOG
May 16, 2019
e84f890
Merge branch 'master' into release/3.2.1
nduchak May 16, 2019
b75e1f5
force Jenkins
May 16, 2019
184f58e
force Jenkins
May 16, 2019
0c954c1
force Jenkins
May 16, 2019
8b48bc7
force Jenkins
May 16, 2019
1e6a544
Merge pull request #408 from aeternity/release/3.2.1
nduchak May 16, 2019
e2fec19
fix(AEP exampe): Fix contract in AEPP example
May 17, 2019
d957cc9
Release/3.3.0 (#417)
nduchak May 17, 2019
9aec152
Merge remote-tracking branch 'origin/develop' into develop
May 20, 2019
ccb6b62
Merge remote-tracking branch 'origin/develop' into develop
May 20, 2019
ce24f6b
Merge remote-tracking branch 'origin/develop' into develop
May 21, 2019
840d629
Merge remote-tracking branch 'origin/develop' into develop
May 22, 2019
ee04d32
chore(package): Bump version to 3.4.0
May 22, 2019
cb80d2f
chore(CHANGELOG): Adjust CHANGELOG for 3.4.0
May 22, 2019
e27441b
chore(CHANGELOG/.env): Adjust changlog. Point node version in `.env` …
May 22, 2019
17a911d
Merge remote-tracking branch 'origin/master' into release/3.4.0
May 22, 2019
bb546c7
chore(.env): Remove trailing newlines
May 22, 2019
36a076b
docs(Docs): Regenrate docs
May 22, 2019
58e013b
Merge pull request #437 from aeternity/release/3.4.0
nduchak May 22, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
TAG=master
TAG=v3.0.0-rc.1
COMPILER_TAG=v2.1.0

19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
# [3.4.0](https://github.com/aeternity/aepp-sdk-js/compare/2.4.0...3.4.0) (2019-05-22)


### Bug Fixes

* **State Channels:** Remove automatic pinging to fix browser compatibility ([#432](https://github.com/aeternity/aepp-sdk-js/issues/432)) ([0700f3a](https://github.com/aeternity/aepp-sdk-js/commit/0700f3a))


### Features

* **Transaction Builder:** Improve min fee calculation(Reduce the fee) ([#424](https://github.com/aeternity/aepp-sdk-js/pull/424))
* **AXIOS:** Add ability to intercept error from axios ([#431](https://github.com/aeternity/aepp-sdk-js/pull/431))
> Added additional param to sdk initialization `axiosConfig`

> Example: `Universal({ axiosConfig: { config: { // axios config object }, errorHandler: (err) => throw err }})`
* **Transaction Builder:** Implement vm/abi validation for contract/oracle tx based on consensus protocol version. Add custom verification based on transaction type ([#425](https://github.com/aeternity/aepp-sdk-js/pull/425)) ([#426](https://github.com/aeternity/aepp-sdk-js/pull/426))



# [3.3.0](https://github.com/aeternity/aepp-sdk-js/compare/2.4.0...3.3.0) (2019-05-17)


Expand Down
8 changes: 5 additions & 3 deletions docs/api/node.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import Node from '@aeternity/aepp-sdk/es/node'
* [~loader(options)](#module_@aeternity/aepp-sdk/es/node--Node..loader) ⇒ `function`
* [~getConsensusProtocolVersion(protocols, height)](#module_@aeternity/aepp-sdk/es/node--Node..getConsensusProtocolVersion) ⇒ `Number`
* _async_
* [~remoteSwag(url)](#module_@aeternity/aepp-sdk/es/node--Node..remoteSwag) ⇒ `Object`
* [~remoteSwag(url, axiosConfig)](#module_@aeternity/aepp-sdk/es/node--Node..remoteSwag) ⇒ `Object`

<a id="exp_module_@aeternity/aepp-sdk/es/node--Node"></a>

Expand All @@ -29,6 +29,7 @@ import Node from '@aeternity/aepp-sdk/es/node'
| [options] | `Object` | <code>{}</code> | Options |
| options.url | `String` | | Base URL for Node |
| options.internalUrl | `String` | | Base URL for internal requests |
| options.axiosConfig | `String` | | Object with axios configuration. Example { config: {}, errorHandler: (err) => throw err } |

**Example**
```js
Expand Down Expand Up @@ -60,11 +61,11 @@ get consensus protocol version
| Param | Type | Description |
| --- | --- | --- |
| protocols | `Array` | Array of protocols |
| height | `Number` | Geigh |
| height | `Number` | Height |

<a id="module_@aeternity/aepp-sdk/es/node--Node..remoteSwag"></a>

#### Node~remoteSwag(url) ⇒ `Object`
#### Node~remoteSwag(url, axiosConfig) ⇒ `Object`
Obtain Swagger configuration from Node node

**Kind**: inner method of [`Node`](#exp_module_@aeternity/aepp-sdk/es/node--Node)
Expand All @@ -75,4 +76,5 @@ Obtain Swagger configuration from Node node
| Param | Type | Description |
| --- | --- | --- |
| url | `String` | Node base URL |
| axiosConfig | `Object` | Axios configuration object |

1 change: 1 addition & 0 deletions docs/api/utils/swagger.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ Swagger Stamp
| --- | --- | --- |
| options | `Object` | Initializer object |
| options.swag | `Object` | Swagger definition |
| options.axiosConfig | `Object` | Object with axios configuration. Example { config: {}, errorHandler: (err) => throw err } |

**Example**
```js
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aeternity/aepp-sdk",
"version": "3.3.0",
"version": "3.4.0",
"description": "SDK for the æternity blockchain",
"main": "dist/aepp-sdk.js",
"browser": "dist/aepp-sdk.browser.js",
Expand Down