Merge pull request #1462 from aeternity/release/11.0.1

Release 11.0.1

Author: marc0olo

.eslintrc.js

@@ -23,6 +23,7 @@ module.exports = {
       ignoreRegExpLiterals: true,
       ignoreStrings: true,
       ignoreTemplateLiterals: true
-    }]
+    }],
+    'import/no-cycle': 2
   }
 }

docs/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [11.0.1](https://github.com/aeternity/aepp-sdk-js/compare/v11.0.0...v11.0.1) (2022-04-07)
+
+
+### Bug Fixes
+
+* **contract:** do not check payable if contract call is init ([c09fc0c](https://github.com/aeternity/aepp-sdk-js/commit/c09fc0c40bef8668066697567182a75f7a484886))
+* importing in mjs ([01d493b](https://github.com/aeternity/aepp-sdk-js/commit/01d493b0556897bdeb3bd04796f482702b175b36))
+* **oracle:** do not include address for oracle respond signature ([ad4bddc](https://github.com/aeternity/aepp-sdk-js/commit/ad4bddc43f139e44f33fcde8051ad64f52a734c2))
+
 ## [11.0.0](https://github.com/aeternity/aepp-sdk-js/compare/v10.0.0...v11.0.0) (2022-03-18)
 
 ### Request batching: SDK now supports [batching transactions](guides/batch-requests.md)

docs/requirements.txt

@@ -1,4 +1,4 @@
-mkdocs==1.2.3
+mkdocs==1.2.4
 mkdocs-simple-hooks==0.1.3
 mkdocs-material==7.1.9
 mike==1.0.1

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeternity/aepp-sdk",
-  "version": "11.0.0",
+  "version": "11.0.1",
   "description": "SDK for the æternity blockchain",
   "main": "dist/aepp-sdk.js",
   "types": "es/index.d.ts",
@@ -22,7 +22,7 @@
     "test:watch": "mocha './test/unit/' './test/integration/' --watch",
     "prepare": "npm run build",
     "prepublishOnly": "npm run docs:examples",
-    "release": "standard-version --skip.tag"
+    "release": "standard-version --skip.tag --infile docs/CHANGELOG.md"
   },
   "license": "ISC",
   "keywords": [
@@ -70,9 +70,11 @@
     "@commitlint/cli": "^16.1.0",
     "@commitlint/config-conventional": "^16.0.0",
     "@types/bn.js": "^5.1.0",
+    "@types/bs58": "^4.0.1",
     "@types/chai": "^4.3.0",
     "@types/mocha": "^9.1.0",
     "@types/node": "^17.0.17",
+    "@types/sha.js": "^2.4.0",
     "@typescript-eslint/eslint-plugin": "^5.11.0",
     "@typescript-eslint/parser": "^5.11.0",
     "babel-loader": "^8.2.3",

package.json

@@ -106,7 +106,7 @@ async function createAensDelegationSignature ({ contractId, name }, opt = {}) {
  * const respondSig = await contract.createOracleDelegationSignature(params, queryId)
  */
 async function createOracleDelegationSignature ({ contractId, queryId }, opt = {}) {
-  return this.delegateSignatureCommon([...queryId ? [queryId] : [], contractId], opt)
+  return this.delegateSignatureCommon([queryId ?? await this.address(opt), contractId], opt)
 }
 
 /**

src/ae/contract.js

@@ -863,7 +863,12 @@ async function reconnect (options, txParams) {
  */
 const Channel = AsyncInit.compose({
   async init (options) {
-    initialize(this, options)
+    await initialize(
+      this,
+      options.existingFsmId ? handlers.awaitingReconnection : handlers.awaitingConnection,
+      handlers.channelOpen,
+      options
+    )
   },
   methods: {
     on,

src/channel/index.js

@@ -19,7 +19,6 @@ import { w3cwebsocket as W3CWebSocket } from 'websocket'
 import { EventEmitter } from 'events'
 import JsonBig from '../utils/json-big'
 import { pascalToSnake } from '../utils/string'
-import { awaitingConnection, awaitingReconnection, channelOpen } from './handlers'
 import { ChannelCallError, ChannelPingTimedOutError, UnknownChannelStateError } from '../utils/errors'
 
 // Send ping message every 10 seconds
@@ -196,11 +195,11 @@ export function disconnect (channel) {
   clearTimeout(pongTimeoutId.get(channel))
 }
 
-export async function initialize (channel, { url, ...channelOptions }) {
+export async function initialize (
+  channel, connectionHandler, openHandler, { url, ...channelOptions }
+) {
   options.set(channel, channelOptions)
-  fsm.set(channel, {
-    handler: channelOptions.existingFsmId ? awaitingReconnection : awaitingConnection
-  })
+  fsm.set(channel, { handler: connectionHandler })
   eventEmitters.set(channel, new EventEmitter())
   sequence.set(channel, 0)
   rpcCallbacks.set(channel, new Map())
@@ -219,7 +218,7 @@ export async function initialize (channel, { url, ...channelOptions }) {
       resolve()
       changeStatus(channel, 'connected')
       if (channelOptions.reconnectTx) {
-        enterState(channel, { handler: channelOpen })
+        enterState(channel, { handler: openHandler })
         setTimeout(async () => changeState(channel,
           (await call(channel, 'channels.get.offchain_state', {})).signed_tx
         ))

src/channel/internal.js

@@ -235,7 +235,7 @@ export default async function getContractInstance ({
     if (!fn) throw new MissingFunctionNameError()
     if (fn === 'init' && !opt.callStatic) throw new InvalidMethodInvocationError('"init" can be called only via dryRun')
     if (!contractId && fn !== 'init') throw new InvalidMethodInvocationError('You need to deploy contract before calling!')
-    if (opt.amount > 0 && fnACI.payable === false) throw new NotPayableFunctionError(`You try to pay "${opt.amount}" to function "${fn}" which is not payable. Only payable function can accept coins`)
+    if (fn !== 'init' && opt.amount > 0 && fnACI.payable === false) throw new NotPayableFunctionError(`You try to pay "${opt.amount}" to function "${fn}" which is not payable. Only payable function can accept coins`)
 
     const callerId = await this.address(opt).catch(error => {
       if (opt.callStatic) return DRY_RUN_ACCOUNT.pub

src/contract/aci.js

@@ -0,0 +1,100 @@
+import BigNumber from 'bignumber.js'
+import { mapObject } from '../../utils/other'
+
+// # AENS
+export const NAME_TTL = 180000
+// # max number of block into the future that the name is going to be available
+// # https://github.com/aeternity/protocol/blob/epoch-v0.22.0/AENS.md#update
+// # https://github.com/aeternity/protocol/blob/44a93d3aab957ca820183c3520b9daf6b0fedff4/AENS.md#aens-entry
+export const NAME_MAX_TTL = 36000
+export const NAME_MAX_CLIENT_TTL = 84600
+export const CLIENT_TTL = NAME_MAX_CLIENT_TTL
+// # see https://github.com/aeternity/aeternity/blob/72e440b8731422e335f879a31ecbbee7ac23a1cf/apps/aecore/src/aec_governance.erl#L67
+export const NAME_FEE_MULTIPLIER = 1e14 // 100000000000000
+export const NAME_FEE_BID_INCREMENT = 0.05 // # the increment is in percentage
+// # see https://github.com/aeternity/aeternity/blob/72e440b8731422e335f879a31ecbbee7ac23a1cf/apps/aecore/src/aec_governance.erl#L272
+export const NAME_BID_TIMEOUT_BLOCKS = 480 // # ~1 day
+// # this is the max length for a domain that requires a base fee to be paid
+export const NAME_MAX_LENGTH_FEE = 31
+export const NAME_BID_MAX_LENGTH = 12 // # this is the max length for a domain to be part of a bid
+export const POINTER_KEY_BY_PREFIX = {
+  ak: 'account_pubkey',
+  ok: 'oracle_pubkey',
+  ct: 'contract_pubkey',
+  ch: 'channel'
+}
+// # https://github.com/aeternity/aeternity/blob/72e440b8731422e335f879a31ecbbee7ac23a1cf/apps/aecore/src/aec_governance.erl#L290
+// # https://github.com/aeternity/protocol/blob/master/AENS.md#protocol-fees-and-protection-times
+// # bid ranges:
+export const NAME_BID_RANGES = mapObject({
+  31: 3,
+  30: 5,
+  29: 8,
+  28: 13,
+  27: 21,
+  26: 34,
+  25: 55,
+  24: 89,
+  23: 144,
+  22: 233,
+  21: 377,
+  20: 610,
+  19: 987,
+  18: 1597,
+  17: 2584,
+  16: 4181,
+  15: 6765,
+  14: 10946,
+  13: 17711,
+  12: 28657,
+  11: 46368,
+  10: 75025,
+  9: 121393,
+  8: 196418,
+  7: 317811,
+  6: 514229,
+  5: 832040,
+  4: 1346269,
+  3: 2178309,
+  2: 3524578,
+  1: 5702887
+}, ([key, value]) => [key, new BigNumber(value).times(NAME_FEE_MULTIPLIER)])
+
+// # ref: https://github.com/aeternity/aeternity/blob/72e440b8731422e335f879a31ecbbee7ac23a1cf/apps/aecore/src/aec_governance.erl#L273
+// # name bid timeouts
+export const NAME_BID_TIMEOUTS = {
+  13: BigNumber(0),
+  12: BigNumber(NAME_BID_TIMEOUT_BLOCKS), // # 480 blocks
+  8: BigNumber(31).times(NAME_BID_TIMEOUT_BLOCKS), // # 14880 blocks
+  4: BigNumber(62).times(NAME_BID_TIMEOUT_BLOCKS) // # 29760 blocks
+}
+
+// # Tag constant for ids (type uint8)
+// # see https://github.com/aeternity/protocol/blob/master/serializations.md#the-id-type
+// # <<Tag:1/unsigned-integer-unit:8, Hash:32/binary-unit:8>>
+const ID_TAG_ACCOUNT = 1
+const ID_TAG_NAME = 2
+const ID_TAG_COMMITMENT = 3
+const ID_TAG_ORACLE = 4
+const ID_TAG_CONTRACT = 5
+const ID_TAG_CHANNEL = 6
+
+export const ID_TAG = {
+  account: ID_TAG_ACCOUNT,
+  name: ID_TAG_NAME,
+  commitment: ID_TAG_COMMITMENT,
+  oracle: ID_TAG_ORACLE,
+  contract: ID_TAG_CONTRACT,
+  channel: ID_TAG_CHANNEL
+}
+
+export const PREFIX_ID_TAG = {
+  ak: ID_TAG.account,
+  nm: ID_TAG.name,
+  cm: ID_TAG.commitment,
+  ok: ID_TAG.oracle,
+  ct: ID_TAG.contract,
+  ch: ID_TAG.channel
+}
+
+export const ID_TAG_PREFIX = mapObject(PREFIX_ID_TAG, ([key, value]) => [value, key])