Skip to content

Commit

Permalink
Release/6.0.1 (#732)
Browse files Browse the repository at this point in the history
* 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

* chore: bump version to 6.0.1

* chore: adjust CHANGELOG. Regenerate lock file. Regenerate docs

* test(state channels): disable state channel tests

* update changelog

*  fix jenkins

* update change log
  • Loading branch information
mpowaga committed Oct 29, 2019
1 parent 697a097 commit 4fdff75
Show file tree
Hide file tree
Showing 17 changed files with 74 additions and 103 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
## [6.0.1](https://github.com/aeternity/aepp-sdk-js/compare/6.0.0...6.0.1) (2019-10-29)


### Bug Fixes

* **aens:** added lower case transformation for aens names ([#730](https://github.com/aeternity/aepp-sdk-js/issues/730)) ([f7f9f17](https://github.com/aeternity/aepp-sdk-js/commit/f7f9f17246c727566ce3c8159d30b7de19b027c9)), closes [#728](https://github.com/aeternity/aepp-sdk-js/issues/728)




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


Expand Down
4 changes: 0 additions & 4 deletions docs/api.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,9 @@
* [@aeternity/aepp-sdk/es/oracle](api/oracle.md)
* [@aeternity/aepp-sdk/es/oracle/node](api/oracle/node.md)
* [@aeternity/aepp-sdk/es/rpc/client](api/rpc/client.md)
* [@aeternity/aepp-sdk/es/tx/builder/helpers](api/tx/builder/helpers.md)
* [@aeternity/aepp-sdk/es/tx/builder](api/tx/builder.md)
* [@aeternity/aepp-sdk/es/tx/builder/schema](api/tx/builder/schema.md)
* [@aeternity/aepp-sdk/es/tx](api/tx.md)
* [@aeternity/aepp-sdk/es/tx/tx](api/tx/tx.md)
* [@aeternity/aepp-sdk/es/tx/validator](api/tx/validator.md)
* [@aeternity/aepp-sdk/es/utils/bytes](api/utils/bytes.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)
21 changes: 0 additions & 21 deletions docs/api/accounts.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,13 @@ import Accounts from '@aeternity/aepp-sdk/es/accounts'
```

* [@aeternity/aepp-sdk/es/accounts](#module_@aeternity/aepp-sdk/es/accounts)
* ~~[setKeypair(keypair)](#exp_module_@aeternity/aepp-sdk/es/accounts--setKeypair)`Void`~~
* [removeAccount(address)](#exp_module_@aeternity/aepp-sdk/es/accounts--removeAccount)`Void`
* [addresses()](#exp_module_@aeternity/aepp-sdk/es/accounts--addresses)`Array.&lt;String&gt;`
* [Accounts([options])](#exp_module_@aeternity/aepp-sdk/es/accounts--Accounts)`Object`
* _async_
* [signWith(address, data)](#exp_module_@aeternity/aepp-sdk/es/accounts--signWith)`String`
* [addAccount(account, [options])](#exp_module_@aeternity/aepp-sdk/es/accounts--addAccount)`Void`

<a id="exp_module_@aeternity/aepp-sdk/es/accounts--setKeypair"></a>

### ~~setKeypair(keypair) ⇒ `Void`~~
***Deprecated***

Select specific account

**Kind**: Exported function
**rtype**: `(keypair: {publicKey: String, secretKey: String}) => Void`

| Param | Type | Description |
| --- | --- | --- |
| keypair | `Object` | Key pair to use |
| keypair.publicKey | `String` | Public key |
| keypair.secretKey | `String` | Private key |

**Example**
```js
setKeypair(keypair)
```
<a id="exp_module_@aeternity/aepp-sdk/es/accounts--removeAccount"></a>

### removeAccount(address) ⇒ `Void`
Expand Down
11 changes: 7 additions & 4 deletions docs/api/ae/oracle.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,21 @@ Oracle provides oracle-system related methods atop
| --- | --- | --- | --- |
| [options] | `Object` | <code>{}</code> | Initializer object |

<a id="exp_module_@aeternity/aepp-sdk/es/ae/oracle--getOracleObject"></a>
<a id="exp_module_@aeternity/aepp-sdk/es/ae/oracle--pollForQueries"></a>

### .getOracleObject(oracleId) ⇒ `Promise.&lt;Object&gt;`
Constructor for Oracle Object (helper object for using Oracle)
### .pollForQueries(oracleId, onQuery, [options]) ⇒ `function`
Poll for oracle queries

**Kind**: instance method of [`@aeternity/aepp-sdk/es/ae/oracle`](#module_@aeternity/aepp-sdk/es/ae/oracle)
**Returns**: `Promise.&lt;Object&gt;` - Oracle object
**Returns**: `function` - stopPolling - Stop polling function
**Category**: async

| Param | Type | Description |
| --- | --- | --- |
| oracleId | `String` | Oracle public key |
| onQuery | `function` | OnQuery callback |
| [options] | `Object` | Options object |
| [options.interval] | `Object` | Poll interval(default: 5000) |

### .pollForQueries(oracleId, onQuery, [options]) ⇒ `function`
Poll for oracle queries
Expand Down
59 changes: 17 additions & 42 deletions docs/api/tx.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,48 +9,23 @@ import Tx from '@aeternity/aepp-sdk/es/tx'
```

* [@aeternity/aepp-sdk/es/tx](#module_@aeternity/aepp-sdk/es/tx)
* [Tx([options])](#exp_module_@aeternity/aepp-sdk/es/tx--Tx)`Object`
* *[.spendTx(options)](#module_@aeternity/aepp-sdk/es/tx--Tx+spendTx)`String`*
* *[.namePreclaimTx(options)](#module_@aeternity/aepp-sdk/es/tx--Tx+namePreclaimTx)`String`*
* *[.nameClaimTx(options)](#module_@aeternity/aepp-sdk/es/tx--Tx+nameClaimTx)`String`*
* *[.nameTransferTx(options)](#module_@aeternity/aepp-sdk/es/tx--Tx+nameTransferTx)`String`*
* *[.nameUpdateTx(options)](#module_@aeternity/aepp-sdk/es/tx--Tx+nameUpdateTx)`String`*
* *[.nameRevokeTx(options)](#module_@aeternity/aepp-sdk/es/tx--Tx+nameRevokeTx)`String`*
* *[.contractCreateTx(options)](#module_@aeternity/aepp-sdk/es/tx--Tx+contractCreateTx)`String`*
* *[.contractCallTx(options)](#module_@aeternity/aepp-sdk/es/tx--Tx+contractCallTx)`String`*
* *[.oracleRegisterTx(options)](#module_@aeternity/aepp-sdk/es/tx--Tx+oracleRegisterTx)`String`*
* *[.oracleExtendTx(options)](#module_@aeternity/aepp-sdk/es/tx--Tx+oracleExtendTx)`String`*
* *[.oraclePostQuery(options)](#module_@aeternity/aepp-sdk/es/tx--Tx+oraclePostQuery)`String`*
* *[.oracleRespondTx(options)](#module_@aeternity/aepp-sdk/es/tx--Tx+oracleRespondTx)`String`*
* *[.getAccountNonce(address)](#module_@aeternity/aepp-sdk/es/tx--Tx+getAccountNonce)`Number`*

<a id="exp_module_@aeternity/aepp-sdk/es/tx--Tx"></a>

### Tx([options]) ⇒ `Object`
Basic Tx Stamp

Attempting to create instances from the Stamp without overwriting all
abstract methods using composition will result in an exception.

Tx is one of the three basic building blocks of an
[Ae](#exp_module_@aeternity/aepp-sdk/es/ae--Ae) client and provides methods to
create aeternity transactions.

**Kind**: Exported function
**Returns**: `Object` - Tx instance
**rtype**: `Stamp`

| Param | Type | Default | Description |
| --- | --- | --- | --- |
| [options] | `Object` | <code>{}</code> | Initializer object |

**Example**
```js
Tx()
```
<a id="module_@aeternity/aepp-sdk/es/tx--Tx+spendTx"></a>

#### *tx.spendTx(options) ⇒ `String`*
* *[.spendTx(options)](#module_@aeternity/aepp-sdk/es/tx+spendTx)`String`*
* *[.namePreclaimTx(options)](#module_@aeternity/aepp-sdk/es/tx+namePreclaimTx)`String`*
* *[.nameClaimTx(options)](#module_@aeternity/aepp-sdk/es/tx+nameClaimTx)`String`*
* *[.nameTransferTx(options)](#module_@aeternity/aepp-sdk/es/tx+nameTransferTx)`String`*
* *[.nameUpdateTx(options)](#module_@aeternity/aepp-sdk/es/tx+nameUpdateTx)`String`*
* *[.nameRevokeTx(options)](#module_@aeternity/aepp-sdk/es/tx+nameRevokeTx)`String`*
* *[.contractCreateTx(options)](#module_@aeternity/aepp-sdk/es/tx+contractCreateTx)`String`*
* *[.contractCallTx(options)](#module_@aeternity/aepp-sdk/es/tx+contractCallTx)`String`*
* *[.oracleRegisterTx(options)](#module_@aeternity/aepp-sdk/es/tx+oracleRegisterTx)`String`*
* *[.oracleExtendTx(options)](#module_@aeternity/aepp-sdk/es/tx+oracleExtendTx)`String`*
* *[.oraclePostQuery(options)](#module_@aeternity/aepp-sdk/es/tx+oraclePostQuery)`String`*
* *[.oracleRespondTx(options)](#module_@aeternity/aepp-sdk/es/tx+oracleRespondTx)`String`*
* *[.getAccountNonce(address)](#module_@aeternity/aepp-sdk/es/tx+getAccountNonce)`Number`*

<a id="module_@aeternity/aepp-sdk/es/tx+spendTx"></a>

### *@aeternity/aepp-sdk/es/tx.spendTx(options) ⇒ `String`*
Create a `spend_tx` transaction

**Kind**: instance abstract method of [`@aeternity/aepp-sdk/es/tx`](#module_@aeternity/aepp-sdk/es/tx)
Expand Down
2 changes: 2 additions & 0 deletions es/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/

import * as Crypto from './utils/crypto'
import * as Keystore from './utils/keystore'
import * as Bytes from './utils/bytes'
import * as TxBuilder from './tx/builder'
import * as TxBuilderHelper from './tx/builder/helpers'
Expand Down Expand Up @@ -58,6 +59,7 @@ export {
ChainNode,
Channel,
Crypto,
Keystore,
Chain,
GeneralizeAccount,
HdWallet,
Expand Down
8 changes: 4 additions & 4 deletions es/tx/builder/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export function formatSalt (salt) {
*/
export function produceNameId (name) {
const namespace = R.last(name.split('.'))
if (namespace === 'chain') return encode(hash(name.toLowerCase()), 'nm')
if (namespace === 'chain') return encode(hash(name), 'nm')
return encode(nameHash(name), 'nm')
}

Expand All @@ -115,7 +115,7 @@ export function produceNameId (name) {
*/
export function commitmentHash (name, salt = createSalt()) {
const namespace = R.last(name.split('.'))
if (namespace === 'chain') return `cm_${encodeBase58Check(hash(Buffer.concat([Buffer.from(name), formatSalt(salt)])))}`
if (namespace === 'chain') return `cm_${encodeBase58Check(hash(Buffer.concat([Buffer.from(name.toLowerCase()), formatSalt(salt)])))}`
return `cm_${encodeBase58Check(hash(Buffer.concat([nameHash(name.toLowerCase()), formatSalt(salt)])))}`
}

Expand Down Expand Up @@ -283,7 +283,7 @@ export function classify (s) {
* @return String the minimum fee for the domain auction
*/
export function getMinimumNameFee (domain) {
const nameLength = domain.replace('.aet', '').length
const nameLength = domain.replace('.chain', '').length
return NAME_BID_RANGES[nameLength >= NAME_BID_MAX_LENGTH ? NAME_BID_MAX_LENGTH : nameLength]
}

Expand All @@ -301,7 +301,7 @@ export function computeAuctionEndBlock (domain, claimHeight) {
[R.lt(8), R.always(NAME_BID_TIMEOUTS[4] + claimHeight)],
[R.lte(NAME_BID_MAX_LENGTH), R.always(NAME_BID_TIMEOUTS[8] + claimHeight)],
[R.T, R.always(claimHeight)]
])(domain.replace('.aet', '').length)
])(domain.replace('.chain', '').length)
}

export default {
Expand Down
3 changes: 2 additions & 1 deletion es/utils/keystore.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import { isHex } from './string'
* KeyStore module
* !!!Work only in node.js!!!
* @module @aeternity/aepp-sdk/es/utils/keystore
* @example import * as Crypto from '@aeternity/aepp-sdk/es/utils/keystore'
* @example import * as Keystore from '@aeternity/aepp-sdk/es/utils/keystore'
* @example const { Keystore } = require('@aeternity/aepp-sdk')
*/

const DEFAULTS = {
Expand Down
2 changes: 1 addition & 1 deletion examples/browser/vuejs/connect-two-ae/aepp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"author": "Enrico Icardi <enrico.icardi@gmail.com>",
"license": "ISC",
"dependencies": {
"@aeternity/aepp-sdk": "5.0.0",
"@aeternity/aepp-sdk": "6.0.0",
"purgecss-webpack-plugin": "^1.2.0",
"vue": "^2.5.16",
"vue-router": "^3.0.1",
Expand Down
8 changes: 4 additions & 4 deletions examples/browser/vuejs/connect-two-ae/aepp/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# yarn lockfile v1


"@aeternity/aepp-sdk@5.0.0":
version "5.0.0"
resolved "https://registry.yarnpkg.com/@aeternity/aepp-sdk/-/aepp-sdk-5.0.0.tgz#be402b9e5cbadba9e0e7c15b901a1ac55e0dc351"
integrity sha512-lKtPcGnh8US+tNHvQvvbSOcSHevRH/NJqjyPnVN79mgSRYLqsWAqpe/E3/ZnhwIvg+yAgm4gOGet7sDNoyffcQ==
"@aeternity/aepp-sdk@6.0.0":
version "6.0.0"
resolved "https://registry.yarnpkg.com/@aeternity/aepp-sdk/-/aepp-sdk-6.0.0.tgz#ea03ebd4334b6380366c66cf428789bc36597007"
integrity sha512-lXedsDwCIFClE1tuumVq14EFwOuvQurI1FHVRcCI6nzFEZlYk5Yrsn72aJT0EqoQQp3aT9jRU30fEcQS+V/5PA==
dependencies:
"@aeternity/bip39" "^0.1.0"
"@babel/runtime" "^7.6.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"author": "Enrico Icardi <enrico.icardi@gmail.com>",
"license": "ISC",
"dependencies": {
"@aeternity/aepp-sdk": "5.0.0",
"@aeternity/aepp-sdk": "6.0.0",
"purgecss-webpack-plugin": "^1.2.0",
"vue": "^2.5.16",
"vue-router": "^3.0.1",
Expand Down
8 changes: 4 additions & 4 deletions examples/browser/vuejs/connect-two-ae/identity/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# yarn lockfile v1


"@aeternity/aepp-sdk@5.0.0":
version "5.0.0"
resolved "https://registry.yarnpkg.com/@aeternity/aepp-sdk/-/aepp-sdk-5.0.0.tgz#be402b9e5cbadba9e0e7c15b901a1ac55e0dc351"
integrity sha512-lKtPcGnh8US+tNHvQvvbSOcSHevRH/NJqjyPnVN79mgSRYLqsWAqpe/E3/ZnhwIvg+yAgm4gOGet7sDNoyffcQ==
"@aeternity/aepp-sdk@6.0.0":
version "6.0.0"
resolved "https://registry.yarnpkg.com/@aeternity/aepp-sdk/-/aepp-sdk-6.0.0.tgz#ea03ebd4334b6380366c66cf428789bc36597007"
integrity sha512-lXedsDwCIFClE1tuumVq14EFwOuvQurI1FHVRcCI6nzFEZlYk5Yrsn72aJT0EqoQQp3aT9jRU30fEcQS+V/5PA==
dependencies:
"@aeternity/bip39" "^0.1.0"
"@babel/runtime" "^7.6.2"
Expand Down
20 changes: 10 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aeternity/aepp-sdk",
"version": "6.0.0",
"version": "6.0.1",
"description": "SDK for the æternity blockchain",
"main": "dist/aepp-sdk.js",
"browser": "dist/aepp-sdk.browser.js",
Expand Down Expand Up @@ -39,7 +39,7 @@
"bs58check": "^2.1.1",
"commander": "^3.0.0",
"joi-browser": "^13.4.0",
"libsodium-wrappers-sumo": "0.7.5",
"libsodium-wrappers-sumo": "0.7.6",
"ramda": "^0.26.1",
"rlp": "2.2.3",
"serialize-javascript": "^2.0.0",
Expand Down
6 changes: 3 additions & 3 deletions test/integration/aens.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import * as R from 'ramda'
import { generateKeyPair } from '../../es/utils/crypto'
import { computeAuctionEndBlock, computeBidFee } from '../../es/tx/builder/helpers'

function randomName (length, namespace = '.aet') {
return randomString(length).toLowerCase() + namespace
function randomName (length, namespace = '.chain') {
return randomString(length) + namespace
}

function randomString (len, charSet) {
Expand Down Expand Up @@ -109,7 +109,7 @@ describe('Aens', function () {
})
})

it('Spend by name', async () => {
it.skip('Spend by name', async () => {
const current = await aens.address()
const onAccount = aens.addresses().find(acc => acc !== current)
await aens.spend(100, name, { onAccount, verify: true })
Expand Down
2 changes: 1 addition & 1 deletion test/integration/channel.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function waitForChannel (channel) {
)
}

describe.skip('Channel', function () {
describe('Channel', function () {
configure(this)
this.timeout(120000)

Expand Down
7 changes: 6 additions & 1 deletion test/integration/oracle.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,12 @@ describe('Oracle', function () {
await oracle.postQuery("{'city': 'Berlin2'}")
await oracle.postQuery("{'city': 'Berlin3'}")
await oracle.postQuery("{'city': 'Berlin4'}")
setTimeout(() => stopPolling(), 500)
await (new Promise((resolve) => {
setTimeout(() => {
stopPolling()
resolve()
}, 1000)
}))
queries.length.should.be.equal(4)
})

Expand Down

0 comments on commit 4fdff75

Please sign in to comment.