Skip to content

Commit

Permalink
Realign 6.1.3 (#825)
Browse files Browse the repository at this point in the history
* Release/6.0.2 (#741)

* Update @aeternity/aepp-sdk in group default to the latest version 🚀 (#702)

* fix(package): update @aeternity/aepp-sdk to version 5.0.0

* fix(package): update @aeternity/aepp-sdk to version 5.0.0

* chore(package): update lockfile examples/browser/vuejs/connect-two-ae/identity/yarn.lock

* chore(package): update lockfile examples/browser/vuejs/connect-two-ae/aepp/yarn.lock

* Realign 5.0.0 (#701)

* chrome(Release): Bump version 5.0.0. Regenerate docs

* chrome(Release): Prepare CHANGELOG. Regenerate lock file

* Update README.md (#704)

fix typo

* Feat(AENS): auction name fee calculation (#706)

* chrome(Release): Bump version 5.0.0. Regenerate docs

* chrome(Release): Prepare CHANGELOG. Regenerate lock file

* feat(AENS): Add auction name fee helpers and schema

* feat(AENS): Add nameFee calculation and validation to name `claim` function

* feat(AENS): Fix name length

* feat(AENS): Add `bid` function. Add test for name auction

* feat(AENS): Clear logs

* refactor(AENS): refactor claim (#709)

* chrome(Release): Bump version 5.0.0. Regenerate docs

* chrome(Release): Prepare CHANGELOG. Regenerate lock file

* refactor(constants): Move const to shema. Improve isAddressValid.

* refactor(constants): Move const to shema. Improve isAddressValid.

* refactor(AENS): Remove `prelimaCommitmentId`. Add function for generating `nameId`

* refactor(AE): Generate nameId in spend by name function instead of calling node

* Fix(Example): FIx example app (#712)

* chrome(Release): Bump version 5.0.0. Regenerate docs

* chrome(Release): Prepare CHANGELOG. Regenerate lock file

* fix(examples): Fix contract in example AEPP

* fix(examples): Add compilerVersion to AEPP example app

* fix(Compiler): Add cross compiler compatibility for old compiler

* fix(Compiler): Revert cross compiler options check

* chore(Jenkins): Force

* fix(AENS): Change tld for Lima from `aet` to `chain` (#714)

* fix(AENS): Change tld for Lima from `aet` to `chain`
Point docker to the rc-5 node and 4.0.0 compiler
Move `classify` method from AENS to transaction builder helpers

* fix(AENS): Fix claim command with new tld

* feat(SPEND): Add additional validation for recipient (#715)

* feat(state channels): make state channels compatible with node v5.0.0… (#688)

* feat(Lima): Create Lima branch

* feat(Compiler): Compiler 4.0.0 compatibility (#632)

* feat(newCompiler): Increase compiler version. Add `backend` option to compiler API

* fix(TX): Add fate vm version

* feat(Contract): Make Contract works with node 5.0.0 rc1 (lima hard-fork) and compiler 4.0.0 rc2

* chore(test): Debug channel test

* fix(channel): fix contract in channel test

* chore(test): Remove logs

* feat(ACI): Add `payable` to contract call

* feat(ACI): Add test for payable

* fix(Linter): Fix linter error

* feat(Compiler): Point to compiler 3.2.0. Improve `payble` to support old compiler

* feat(Compiler): disable payable test

* feat(Lima): Point compiler to 4.0.0. Enable tests for `payable`

* feat(Lima): Make contact for channel test payable

* chore(test): Enable tests

* feat(Contract/ACI): Add ability to use contract with external deps(`include "someLib"`) (#653)

* docs(Contract): Adjust contract docs (#658)

* Release 4.7.0-next.1 (#660)

* chore(release): Generate CHANGELOG. Bump version

* chore(test): Test backward compatibility

* chore(test): revert

* feat(SCHEMA): Add fate constants

* chore(release): bump version to 5.0.0-next.1

* feat(Lima): add check for compiler <-> consensus protocol version check

* feat(Lima): add check for abi/vm <-> backend(FATE/AEVM) (#680)

* feat(Lima): add check for abi/vm <-> backend(FATE/AEVM)

* feat(Lima): add check for abi/vm <-> backend(FATE/AEVM)

* feat(Contract): Add fate tests

* feat(Contract): enable all tests

* feat(Node): Add check in dry-run endpoint(node cross compatibility)

* feat(Contract): enable all tests

* feat(Contract): enable all tests

* feat(Contract): fix docker file run command

* feat(Swagger): Resolve refs

* feat(tests): Skip Channel and AENS

* feat(Node): Change compatibility range from 4.x.x to 5.x.x

* feat(Node): Change compatibility range from 4.x.x to 6.0.0

* fix(Oracle): fix abi field resolving

* chrome(build): Regenerate lock

* feat(state channels): make state channels compatible with node v5.0.0-rc.2

* feat(Compiler): make FATE by default (#693)

* feat(Contract): Use FATE by default

* Fix lint error

* feat(AENS): Lima compatibility (#687)

* Aens lima compatibility

* Make aens cross compatible with pre-lima releases

* Remove .only

* Fix native build of claim tx test

* feat(GA): Make GA compatible with Lima. Add cross compiler compatibility

* fix(Test): Fix test for cross compatibility. Add test for AEVM

* fix(AE): Add pointers verification for spend by name. Improve AENS cross node tests

* build(Node): Point node to 5.0.0-rc3

* Change node version to v5.0.0-rc.3

* Fix test

* Fix channel contracts tests

* Update @aeternity/aepp-sdk in group default to the latest version 🚀 (#720)

* fix(package): update @aeternity/aepp-sdk to version 6.0.0

* fix(package): update @aeternity/aepp-sdk to version 6.0.0

* chore(package): update lockfile examples/browser/vuejs/connect-two-ae/identity/yarn.lock

* chore(package): update lockfile examples/browser/vuejs/connect-two-ae/aepp/yarn.lock

* Realign 6.0.0 (#719)

* chrome(Release): Bump version 5.0.0. Regenerate docs

* chrome(Release): Prepare CHANGELOG. Regenerate lock file

* Release 6.0.0 (#716)

* Update @aeternity/aepp-sdk in group default to the latest version 🚀 (#702)

* fix(package): update @aeternity/aepp-sdk to version 5.0.0

* fix(package): update @aeternity/aepp-sdk to version 5.0.0

* chore(package): update lockfile examples/browser/vuejs/connect-two-ae/identity/yarn.lock

* chore(package): update lockfile examples/browser/vuejs/connect-two-ae/aepp/yarn.lock

* Realign 5.0.0 (#701)

* chrome(Release): Bump version 5.0.0. Regenerate docs

* chrome(Release): Prepare CHANGELOG. Regenerate lock file

* Update README.md (#704)

fix typo

* Feat(AENS): auction name fee calculation (#706)

* chrome(Release): Bump version 5.0.0. Regenerate docs

* chrome(Release): Prepare CHANGELOG. Regenerate lock file

* feat(AENS): Add auction name fee helpers and schema

* feat(AENS): Add nameFee calculation and validation to name `claim` function

* feat(AENS): Fix name length

* feat(AENS): Add `bid` function. Add test for name auction

* feat(AENS): Clear logs

* refactor(AENS): refactor claim (#709)

* chrome(Release): Bump version 5.0.0. Regenerate docs

* chrome(Release): Prepare CHANGELOG. Regenerate lock file

* refactor(constants): Move const to shema. Improve isAddressValid.

* refactor(constants): Move const to shema. Improve isAddressValid.

* refactor(AENS): Remove `prelimaCommitmentId`. Add function for generating `nameId`

* refactor(AE): Generate nameId in spend by name function instead of calling node

* Fix(Example): FIx example app (#712)

* chrome(Release): Bump version 5.0.0. Regenerate docs

* chrome(Release): Prepare CHANGELOG. Regenerate lock file

* fix(examples): Fix contract in example AEPP

* fix(examples): Add compilerVersion to AEPP example app

* fix(Compiler): Add cross compiler compatibility for old compiler

* fix(Compiler): Revert cross compiler options check

* chore(Jenkins): Force

* fix(AENS): Change tld for Lima from `aet` to `chain` (#714)

* fix(AENS): Change tld for Lima from `aet` to `chain`
Point docker to the rc-5 node and 4.0.0 compiler
Move `classify` method from AENS to transaction builder helpers

* fix(AENS): Fix claim command with new tld

* feat(SPEND): Add additional validation for recipient (#715)

* feat(state channels): make state channels compatible with node v5.0.0… (#688)

* feat(Lima): Create Lima branch

* feat(Compiler): Compiler 4.0.0 compatibility (#632)

* feat(newCompiler): Increase compiler version. Add `backend` option to compiler API

* fix(TX): Add fate vm version

* feat(Contract): Make Contract works with node 5.0.0 rc1 (lima hard-fork) and compiler 4.0.0 rc2

* chore(test): Debug channel test

* fix(channel): fix contract in channel test

* chore(test): Remove logs

* feat(ACI): Add `payable` to contract call

* feat(ACI): Add test for payable

* fix(Linter): Fix linter error

* feat(Compiler): Point to compiler 3.2.0. Improve `payble` to support old compiler

* feat(Compiler): disable payable test

* feat(Lima): Point compiler to 4.0.0. Enable tests for `payable`

* feat(Lima): Make contact for channel test payable

* chore(test): Enable tests

* feat(Contract/ACI): Add ability to use contract with external deps(`include "someLib"`) (#653)

* docs(Contract): Adjust contract docs (#658)

* Release 4.7.0-next.1 (#660)

* chore(release): Generate CHANGELOG. Bump version

* chore(test): Test backward compatibility

* chore(test): revert

* feat(SCHEMA): Add fate constants

* chore(release): bump version to 5.0.0-next.1

* feat(Lima): add check for compiler <-> consensus protocol version check

* feat(Lima): add check for abi/vm <-> backend(FATE/AEVM) (#680)

* feat(Lima): add check for abi/vm <-> backend(FATE/AEVM)

* feat(Lima): add check for abi/vm <-> backend(FATE/AEVM)

* feat(Contract): Add fate tests

* feat(Contract): enable all tests

* feat(Node): Add check in dry-run endpoint(node cross compatibility)

* feat(Contract): enable all tests

* feat(Contract): enable all tests

* feat(Contract): fix docker file run command

* feat(Swagger): Resolve refs

* feat(tests): Skip Channel and AENS

* feat(Node): Change compatibility range from 4.x.x to 5.x.x

* feat(Node): Change compatibility range from 4.x.x to 6.0.0

* fix(Oracle): fix abi field resolving

* chrome(build): Regenerate lock

* feat(state channels): make state channels compatible with node v5.0.0-rc.2

* feat(Compiler): make FATE by default (#693)

* feat(Contract): Use FATE by default

* Fix lint error

* feat(AENS): Lima compatibility (#687)

* Aens lima compatibility

* Make aens cross compatible with pre-lima releases

* Remove .only

* Fix native build of claim tx test

* feat(GA): Make GA compatible with Lima. Add cross compiler compatibility

* fix(Test): Fix test for cross compatibility. Add test for AEVM

* fix(AE): Add pointers verification for spend by name. Improve AENS cross node tests

* build(Node): Point node to 5.0.0-rc3

* Change node version to v5.0.0-rc.3

* Fix test

* Fix channel contracts tests

* chore(release): Bump version to 6.0.0

* chore(release): Adjust CHANGELOG. Regenerate lock file. Regenerate docs

* chore(release): Force Jenkins

* chore(Test): Adjust timeout for pollQuery test

* chrome(test): enable State chanel tests

* chrome(test): fix oracle pollQuery

* Update libsodium-wrappers-sumo to the latest version 🚀 (#721)

* fix(package): update libsodium-wrappers-sumo to version 0.7.6

* chore(package): update lockfile package-lock.json

* Keystore: Make usable in nodejs@10 and below (#726)

* keystore: Fix name in example

* Add missed Keystore module export

* keystore: Add example for versions of nodejs that don't supports esm

* fix(aens): added lower case transformation for aens names (#730)

* fix(aens): added lower case transformation for aens names

commitment Id has been generated incorrectly because names have not been transformed to a lower case

* fix(aens): removed unnecessary lower case transformation during the name encoding process

* fix(aens): disable test for spend by name

#728

* fix(aens): fixed namespace for claim transactions

#728

* removed empty lines

* style(changelog): added whitespaces to separate changelog sections

* name claim: Revert ignoring waitMined from user passed options (#727)

Reverts changes in 8850900#diff-bd3d95ffcb66b185645d812b7d5ba656L179-R176

* Bump version to 6.0.2

* Regenerate lock file. Regenerate docs

* removed empty lines

* style(changelog): added whitespaces to separate changelog sections

* Feat(AENS): auction name fee calculation (#706)

* chrome(Release): Bump version 5.0.0. Regenerate docs

* chrome(Release): Prepare CHANGELOG. Regenerate lock file

* feat(AENS): Add auction name fee helpers and schema

* feat(AENS): Add nameFee calculation and validation to name `claim` function

* feat(AENS): Fix name length

* feat(AENS): Add `bid` function. Add test for name auction

* feat(AENS): Clear logs

* refactor(AENS): refactor claim (#709)

* chrome(Release): Bump version 5.0.0. Regenerate docs

* chrome(Release): Prepare CHANGELOG. Regenerate lock file

* refactor(constants): Move const to shema. Improve isAddressValid.

* refactor(constants): Move const to shema. Improve isAddressValid.

* refactor(AENS): Remove `prelimaCommitmentId`. Add function for generating `nameId`

* refactor(AE): Generate nameId in spend by name function instead of calling node

* feat(state channels): make state channels compatible with node v5.0.0… (#688)

* feat(Lima): Create Lima branch

* feat(Compiler): Compiler 4.0.0 compatibility (#632)

* feat(newCompiler): Increase compiler version. Add `backend` option to compiler API

* fix(TX): Add fate vm version

* feat(Contract): Make Contract works with node 5.0.0 rc1 (lima hard-fork) and compiler 4.0.0 rc2

* chore(test): Debug channel test

* fix(channel): fix contract in channel test

* chore(test): Remove logs

* feat(ACI): Add `payable` to contract call

* feat(ACI): Add test for payable

* fix(Linter): Fix linter error

* feat(Compiler): Point to compiler 3.2.0. Improve `payble` to support old compiler

* feat(Compiler): disable payable test

* feat(Lima): Point compiler to 4.0.0. Enable tests for `payable`

* feat(Lima): Make contact for channel test payable

* chore(test): Enable tests

* feat(Contract/ACI): Add ability to use contract with external deps(`include "someLib"`) (#653)

* docs(Contract): Adjust contract docs (#658)

* Release 4.7.0-next.1 (#660)

* chore(release): Generate CHANGELOG. Bump version

* chore(test): Test backward compatibility

* chore(test): revert

* feat(SCHEMA): Add fate constants

* chore(release): bump version to 5.0.0-next.1

* feat(Lima): add check for compiler <-> consensus protocol version check

* feat(Lima): add check for abi/vm <-> backend(FATE/AEVM) (#680)

* feat(Lima): add check for abi/vm <-> backend(FATE/AEVM)

* feat(Lima): add check for abi/vm <-> backend(FATE/AEVM)

* feat(Contract): Add fate tests

* feat(Contract): enable all tests

* feat(Node): Add check in dry-run endpoint(node cross compatibility)

* feat(Contract): enable all tests

* feat(Contract): enable all tests

* feat(Contract): fix docker file run command

* feat(Swagger): Resolve refs

* feat(tests): Skip Channel and AENS

* feat(Node): Change compatibility range from 4.x.x to 5.x.x

* feat(Node): Change compatibility range from 4.x.x to 6.0.0

* fix(Oracle): fix abi field resolving

* chrome(build): Regenerate lock

* feat(state channels): make state channels compatible with node v5.0.0-rc.2

* feat(Compiler): make FATE by default (#693)

* feat(Contract): Use FATE by default

* Fix lint error

* feat(AENS): Lima compatibility (#687)

* Aens lima compatibility

* Make aens cross compatible with pre-lima releases

* Remove .only

* Fix native build of claim tx test

* feat(GA): Make GA compatible with Lima. Add cross compiler compatibility

* fix(Test): Fix test for cross compatibility. Add test for AEVM

* fix(AE): Add pointers verification for spend by name. Improve AENS cross node tests

* build(Node): Point node to 5.0.0-rc3

* Change node version to v5.0.0-rc.3

* Fix test

* Fix channel contracts tests

* Realign 6.0.0 (#719)

* chrome(Release): Bump version 5.0.0. Regenerate docs

* chrome(Release): Prepare CHANGELOG. Regenerate lock file

* Release 6.0.0 (#716)

* Update @aeternity/aepp-sdk in group default to the latest version 🚀 (#702)

* fix(package): update @aeternity/aepp-sdk to version 5.0.0

* fix(package): update @aeternity/aepp-sdk to version 5.0.0

* chore(package): update lockfile examples/browser/vuejs/connect-two-ae/identity/yarn.lock

* chore(package): update lockfile examples/browser/vuejs/connect-two-ae/aepp/yarn.lock

* Realign 5.0.0 (#701)

* chrome(Release): Bump version 5.0.0. Regenerate docs

* chrome(Release): Prepare CHANGELOG. Regenerate lock file

* Update README.md (#704)

fix typo

* Feat(AENS): auction name fee calculation (#706)

* chrome(Release): Bump version 5.0.0. Regenerate docs

* chrome(Release): Prepare CHANGELOG. Regenerate lock file

* feat(AENS): Add auction name fee helpers and schema

* feat(AENS): Add nameFee calculation and validation to name `claim` function

* feat(AENS): Fix name length

* feat(AENS): Add `bid` function. Add test for name auction

* feat(AENS): Clear logs

* refactor(AENS): refactor claim (#709)

* chrome(Release): Bump version 5.0.0. Regenerate docs

* chrome(Release): Prepare CHANGELOG. Regenerate lock file

* refactor(constants): Move const to shema. Improve isAddressValid.

* refactor(constants): Move const to shema. Improve isAddressValid.

* refactor(AENS): Remove `prelimaCommitmentId`. Add function for generating `nameId`

* refactor(AE): Generate nameId in spend by name function instead of calling node

* Fix(Example): FIx example app (#712)

* chrome(Release): Bump version 5.0.0. Regenerate docs

* chrome(Release): Prepare CHANGELOG. Regenerate lock file

* fix(examples): Fix contract in example AEPP

* fix(examples): Add compilerVersion to AEPP example app

* fix(Compiler): Add cross compiler compatibility for old compiler

* fix(Compiler): Revert cross compiler options check

* chore(Jenkins): Force

* fix(AENS): Change tld for Lima from `aet` to `chain` (#714)

* fix(AENS): Change tld for Lima from `aet` to `chain`
Point docker to the rc-5 node and 4.0.0 compiler
Move `classify` method from AENS to transaction builder helpers

* fix(AENS): Fix claim command with new tld

* feat(SPEND): Add additional validation for recipient (#715)

* feat(state channels): make state channels compatible with node v5.0.0… (#688)

* feat(Lima): Create Lima branch

* feat(Compiler): Compiler 4.0.0 compatibility (#632)

* feat(newCompiler): Increase compiler version. Add `backend` option to compiler API

* fix(TX): Add fate vm version

* feat(Contract): Make Contract works with node 5.0.0 rc1 (lima hard-fork) and compiler 4.0.0 rc2

* chore(test): Debug channel test

* fix(channel): fix contract in channel test

* chore(test): Remove logs

* feat(ACI): Add `payable` to contract call

* feat(ACI): Add test for payable

* fix(Linter): Fix linter error

* feat(Compiler): Point to compiler 3.2.0. Improve `payble` to support old compiler

* feat(Compiler): disable payable test

* feat(Lima): Point compiler to 4.0.0. Enable tests for `payable`

* feat(Lima): Make contact for channel test payable

* chore(test): Enable tests

* feat(Contract/ACI): Add ability to use contract with external deps(`include "someLib"`) (#653)

* docs(Contract): Adjust contract docs (#658)

* Release 4.7.0-next.1 (#660)

* chore(release): Generate CHANGELOG. Bump version

* chore(test): Test backward compatibility

* chore(test): revert

* feat(SCHEMA): Add fate constants

* chore(release): bump version to 5.0.0-next.1

* feat(Lima): add check for compiler <-> consensus protocol version check

* feat(Lima): add check for abi/vm <-> backend(FATE/AEVM) (#680)

* feat(Lima): add check for abi/vm <-> backend(FATE/AEVM)

* feat(Lima): add check for abi/vm <-> backend(FATE/AEVM)

* feat(Contract): Add fate tests

* feat(Contract): enable all tests

* feat(Node): Add check in dry-run endpoint(node cross compatibility)

* feat(Contract): enable all tests

* feat(Contract): enable all tests

* feat(Contract): fix docker file run command

* feat(Swagger): Resolve refs

* feat(tests): Skip Channel and AENS

* feat(Node): Change compatibility range from 4.x.x to 5.x.x

* feat(Node): Change compatibility range from 4.x.x to 6.0.0

* fix(Oracle): fix abi field resolving

* chrome(build): Regenerate lock

* feat(state channels): make state channels compatible with node v5.0.0-rc.2

* feat(Compiler): make FATE by default (#693)

* feat(Contract): Use FATE by default

* Fix lint error

* feat(AENS): Lima compatibility (#687)

* Aens lima compatibility

* Make aens cross compatible with pre-lima releases

* Remove .only

* Fix native build of claim tx test

* feat(GA): Make GA compatible with Lima. Add cross compiler compatibility

* fix(Test): Fix test for cross compatibility. Add test for AEVM

* fix(AE): Add pointers verification for spend by name. Improve AENS cross node tests

* build(Node): Point node to 5.0.0-rc3

* Change node version to v5.0.0-rc.3

* Fix test

* Fix channel contracts tests

* chore(release): Bump version to 6.0.0

* chore(release): Adjust CHANGELOG. Regenerate lock file. Regenerate docs

* chore(release): Force Jenkins

* chore(Test): Adjust timeout for pollQuery test

* chrome(test): enable State chanel tests

* chrome(test): fix oracle pollQuery

* Update libsodium-wrappers-sumo to the latest version 🚀 (#721)

* fix(package): update libsodium-wrappers-sumo to version 0.7.6

* chore(package): update lockfile package-lock.json

* Update commander to the latest version 🚀 (#743)

* fix(package): update commander to version 4.0.0

* chore(package): update lockfile package-lock.json

* Update vue-loader in group default to the latest version 🚀 (#745)

* chore(package): update vue-loader to version 15.7.2

* chore(package): update vue-loader to version 15.7.2

* Update rlp to the latest version 🚀 (#744)

* fix(package): update rlp to version 2.2.4

* chore(package): update lockfile package-lock.json

* fix(AENS): auction end block calculation (#746)

* fix(AENS): auction end block calculation

* chore(build): Update node to 5.0.2

* fix(AENS): Fix `produceNameId` function(Make name lowercase). Enable … (#750)

* fix(AENS): Fix `produceNameId` function(Make name lowercase). Enable spend by name test

* chore(Test): Increase amount of tokens for AENS tests

* aensQuery: Fix default value of pointers field (#735)

* Update @aeternity/aepp-sdk in group default to the latest version 🚀 (#733)

* fix(package): update @aeternity/aepp-sdk to version 6.0.1

* fix(package): update @aeternity/aepp-sdk to version 6.0.1

* chore(package): update lockfile examples/browser/vuejs/connect-two-ae/identity/yarn.lock

* chore(package): update lockfile examples/browser/vuejs/connect-two-ae/aepp/yarn.lock

* Remove extra eslint exceptions (#729)

* Update babel7 in group default to the latest version 🚀 (#754)

* chore(package): update @babel/cli to version 7.7.0

* chore(package): update @babel/cli to version 7.7.0

* chore(package): update @babel/cli to version 7.7.0

* chore(package): update @babel/core to version 7.7.0

* chore(package): update @babel/core to version 7.7.0

* chore(package): update @babel/core to version 7.7.0

* chore(package): update @babel/node to version 7.7.0

* chore(package): update @babel/node to version 7.7.0

* chore(package): update @babel/node to version 7.7.0

* chore(package): update @babel/preset-env to version 7.7.0

* chore(package): update @babel/preset-env to version 7.7.0

* chore(package): update @babel/preset-env to version 7.7.0

* chore(package): update @babel/register to version 7.7.0

* chore(package): update @babel/register to version 7.7.0

* chore(package): update @babel/register to version 7.7.0

* chore(package): update @babel/runtime to version 7.7.0

* chore(package): update @babel/runtime to version 7.7.0

* chore(package): update @babel/runtime to version 7.7.0

* chore(package): update lockfile package-lock.json

* chore(package): update lockfile examples/browser/vuejs/connect-two-ae/identity/yarn.lock

* chore(package): update lockfile examples/browser/vuejs/connect-two-ae/aepp/yarn.lock

* feat(state channels): allow to pass metadata to transfer update (#755)

* feat(state channels): allow off chain updates to be cancelled with custom error code (#753)

* fix(state channels): wait for connection to be established before sending generic message (#723)

* feat(state channels): add .off method

* fix(state channels): wait for connection to be established before sending generic message

* feat(state channels): add round method (#763)

* feat(ACI): Add validation for contractAddress (#764)

* feat(ACI): Add validation for contractAddress and provided bytecode with corresponding one on-chain

* feat(ACI): Add tests

* feat(AENS): Add nameFee validation to TxValidator (#765)

*  feat(Crypto): Implement asymmetric encoding/decoding using `tweennacl` and `Ed25519` keypair (#466)

* feat(Add nacl box implementtation): ]

* feat(Crypto): Implement asymetric encoding/decoding using tweennacl and Ed25519 keypair

Converts a 32-byte Ed25519 public key into a 32-byte Curve25519 public key.Converts a 64-byte
Ed25519 secret key (or just the first 32-byte part of it, which is the secret value) into a 32-byte
Curve25519 secret key

#465

* chore(merge): Fix conflict

* feat(Contract): Add ability to pass arguments or callData for contract `deploy/call/callStatic` API (#768)

* Update babel7 in group default to the latest version 🚀 (#771)

* chore(package): update @babel/core to version 7.7.2

* chore(package): update @babel/core to version 7.7.2

* chore(package): update @babel/core to version 7.7.2

* chore(package): update @babel/preset-env to version 7.7.1

* chore(package): update @babel/preset-env to version 7.7.1

* chore(package): update @babel/preset-env to version 7.7.1

* chore(package): update @babel/runtime to version 7.7.2

* chore(package): update @babel/runtime to version 7.7.2

* chore(package): update @babel/runtime to version 7.7.2

* chore(package): update lockfile package-lock.json

* chore(package): update lockfile examples/browser/vuejs/connect-two-ae/identity/yarn.lock

* chore(package): update lockfile examples/browser/vuejs/connect-two-ae/aepp/yarn.lock

* feat(AENS): Increase default nameTtl (#775)

* feat(AENS): Increase default nameTtl

* feat(AENS): Increase default nameTtl

* feat(Http): Assign error object to http error (#770)

* feat(state channels): make state channels compatible with node v5.1.0… (#776)

* feat(state channels): make state channels compatible with node v5.1.0-rc.1

* Fix lint error

* docs(Examples): Fix contract example (#778)

* fix(TxHelpers): Use BigNumber in auction end block calculation

* docs(Helpers): Add missed jsdocs

* chore(release): Bump version. Regenerate docs and CHANGELOG

* removed empty lines

* style(changelog): added whitespaces to separate changelog sections

*  feat(Crypto): Implement asymmetric encoding/decoding using `tweennacl` and `Ed25519` keypair (#466)

* feat(Add nacl box implementtation): ]

* feat(Crypto): Implement asymetric encoding/decoding using tweennacl and Ed25519 keypair

Converts a 32-byte Ed25519 public key into a 32-byte Curve25519 public key.Converts a 64-byte
Ed25519 secret key (or just the first 32-byte part of it, which is the secret value) into a 32-byte
Curve25519 secret key

#465

* chore(merge): Fix conflict

* feat(Http): Assign error object to http error (#770)

* docs(Examples): Fix contract example (#778)

* feat(KeyStore): Remove `argon2` package, use `libsodium` for both browser and node (#782)

* fix(ACI): Disable bytecode check for source and code on-chain (#783)

* fix(ACI): Disable bytecode check for source and code on-chain

* fix(ACI): Disable bytecode check for source and code on-chain

* chore(release): Regenerate docs

* fix(Composition): Chain composition

* fix(Composition): Chain composition

* fix(Channel): 5.2.0 compatibility

* Fix lint error

* chore(release): Bump version. Generate CHANGELOG

* Fix internal.js

* chore(release): Point docker to node 5.2.0

* fix(.env): Fix env name
  • Loading branch information
nduchak authored Dec 12, 2019
1 parent 6161485 commit 843f189
Show file tree
Hide file tree
Showing 7 changed files with 73 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
NODE_TAG=v5.1.0
NODE_TAG=v5.2.0
COMPILER_TAG=v4.1.0
16 changes: 9 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
## [6.1.3](https://github.com/aeternity/aepp-sdk-js/compare/6.1.2...6.1.3) (2019-12-11)


### Bug Fixes

* **Channel:** 5.2.0 compatibility ([4be8eb8](https://github.com/aeternity/aepp-sdk-js/commit/4be8eb8))



## [6.1.2](https://github.com/aeternity/aepp-sdk-js/compare/6.1.1...6.1.2) (2019-11-12)


Expand Down Expand Up @@ -66,13 +75,6 @@










# [6.0.0](https://github.com/aeternity/aepp-sdk-js/compare/4.7.0...6.0.0) (2019-10-16)


Expand Down
7 changes: 7 additions & 0 deletions docs/api/channel/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import Channel from '@aeternity/aepp-sdk/es/channel/index'
* [~state()](#module_@aeternity/aepp-sdk/es/channel/index--Channel..state)`Promise.&lt;Object&gt;`
* [~round()](#module_@aeternity/aepp-sdk/es/channel/index--Channel..round)`Number`
* [~id()](#module_@aeternity/aepp-sdk/es/channel/index--Channel..id)`String`
* [~fsmId()](#module_@aeternity/aepp-sdk/es/channel/index--Channel..fsmId)`String`
* [~update(from, to, amount, sign, metadata)](#module_@aeternity/aepp-sdk/es/channel/index--Channel..update)`Promise.&lt;Object&gt;`
* [~poi(addresses)](#module_@aeternity/aepp-sdk/es/channel/index--Channel..poi)`Promise.&lt;String&gt;`
* [~balances(accounts)](#module_@aeternity/aepp-sdk/es/channel/index--Channel..balances)`Promise.&lt;Object&gt;`
Expand Down Expand Up @@ -151,6 +152,12 @@ it will return `null`.
#### Channel~id() ⇒ `String`
Get channel id

**Kind**: inner method of [`Channel`](#exp_module_@aeternity/aepp-sdk/es/channel/index--Channel)
<a id="module_@aeternity/aepp-sdk/es/channel/index--Channel..fsmId"></a>

#### Channel~fsmId() ⇒ `String`
Get channel's fsm id

**Kind**: inner method of [`Channel`](#exp_module_@aeternity/aepp-sdk/es/channel/index--Channel)
<a id="module_@aeternity/aepp-sdk/es/channel/index--Channel..update"></a>

Expand Down
12 changes: 10 additions & 2 deletions es/channel/handlers.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ import {
send,
emit,
channelId,
disconnect
disconnect,
fsmId
} from './internal'
import { unpackTx, buildTx } from '../tx/builder'

Expand Down Expand Up @@ -67,6 +68,10 @@ export function awaitingConnection (channel, message, state) {
if (message.params.data.event === 'channel_reestablished') {
return { handler: awaitingOpenConfirmation }
}
if (message.params.data.event === 'fsm_up') {
fsmId.set(channel, message.params.data.fsm_id)
return { handler: awaitingConnection }
}
return { handler: awaitingConnection }
}
if (message.method === 'channels.error') {
Expand All @@ -78,6 +83,7 @@ export function awaitingConnection (channel, message, state) {
export async function awaitingReconnection (channel, message, state) {
if (message.method === 'channels.info') {
if (message.params.data.event === 'fsm_up') {
fsmId.set(channel, message.params.data.fsm_id)
changeState(channel, (await call(channel, 'channels.get.offchain_state', {})).signed_tx)
return { handler: channelOpen }
}
Expand Down Expand Up @@ -175,14 +181,16 @@ export async function channelOpen (channel, message, state) {
case 'deposit_locked':
case 'peer_disconnected':
case 'channel_reestablished':
case 'fsm_up':
case 'open':
// TODO: Better handling of peer_disconnected event.
//
// We should enter intermediate state where offchain transactions
// are blocked until channel is reestablished.
emit(channel, message.params.data.event)
return { handler: channelOpen }
case 'fsm_up':
fsmId.set(channel, message.params.data.fsm_id)
return { handler: channelOpen }
case 'close_mutual':
return { handler: channelOpen }
case 'closing':
Expand Down
13 changes: 12 additions & 1 deletion es/channel/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ import {
send,
channelId,
call,
disconnect as channelDisconnect
disconnect as channelDisconnect,
fsmId as channelFsmId
} from './internal'
import * as R from 'ramda'

Expand Down Expand Up @@ -136,6 +137,15 @@ function id () {
return channelId.get(this)
}

/**
* Get channel's fsm id
*
* @return {String}
*/
function fsmId () {
return channelFsmId.get(this)
}

/**
* Trigger a transfer update
*
Expand Down Expand Up @@ -783,6 +793,7 @@ const Channel = AsyncInit.compose({
state,
round,
id,
fsmId,
update,
poi,
balances,
Expand Down
10 changes: 4 additions & 6 deletions es/channel/internal.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@ import { EventEmitter } from 'events'
import * as R from 'ramda'
import JSONBig from '../utils/json-big'
import { pascalToSnake } from '../utils/string'
import {
awaitingConnection,
awaitingReconnection,
channelOpen
} from './handlers'
import { awaitingConnection, awaitingReconnection, channelOpen } from './handlers'

// Send ping message every 10 seconds
const PING_TIMEOUT_MS = 10000
Expand All @@ -46,6 +42,7 @@ const channelId = new WeakMap()
const rpcCallbacks = new WeakMap()
const pingTimeoutId = new WeakMap()
const pongTimeoutId = new WeakMap()
const fsmId = new WeakMap()

function channelURL (url, params) {
const paramString = R.join('&', R.values(R.mapObjIndexed((value, key) =>
Expand Down Expand Up @@ -268,5 +265,6 @@ export {
enqueueAction,
channelId,
call,
disconnect
disconnect,
fsmId
}
43 changes: 30 additions & 13 deletions test/integration/channel.js
Original file line number Diff line number Diff line change
Expand Up @@ -1065,19 +1065,35 @@ describe('Channel', function () {
result.accepted.should.be.true
const channelId = await initiatorCh.id()
const round = initiatorCh.round()
initiatorCh.disconnect()
const ch = await Channel.reconnect({
...sharedParams,
role: 'initiator',
port: 3006,
sign: initiatorSign
}, {
channelId,
round,
role: 'initiator',
pubkey: await initiator.address()
})
await waitForChannel(ch)
let ch
if (majorVersion > 5 || (majorVersion === 5 && minorVersion >= 2)) {
const fsmId = initiatorCh.fsmId()
initiatorCh.disconnect()
ch = await Channel({
url: sharedParams.url,
host: sharedParams.host,
port: 3006,
role: 'initiator',
existingChannelId: channelId,
existingFsmId: fsmId
})
await waitForChannel(ch)
ch.fsmId().should.equal(fsmId)
} else {
initiatorCh.disconnect()
ch = await Channel.reconnect({
...sharedParams,
role: 'initiator',
port: 3006,
sign: initiatorSign
}, {
channelId,
round,
role: 'initiator',
pubkey: await initiator.address()
})
await waitForChannel(ch)
}
// TODO: why node doesn't return signed_tx when channel is reestablished?
// await new Promise((resolve) => {
// const checkRound = () => {
Expand All @@ -1089,6 +1105,7 @@ describe('Channel', function () {
// ch.on('stateChanged', checkRound)
// })
ch.state().should.eventually.be.fulfilled
await new Promise(resolve => setTimeout(resolve, 10 * 1000))
})

it('can post backchannel update', async () => {
Expand Down

0 comments on commit 843f189

Please sign in to comment.