@aeternity/aepp-sdk 13.3.1 → 13.3.3

package/es/utils/hd-wallet.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"hd-wallet.mjs","names":["nacl","_tweetnaclAuth","full","hmac","_bip32Path","fromString","aesjs","sha256hash","encode","Encoding","CryptographyError","concatBuffers","Ecb","ModeOfOperation","ecb","encryptKey","password","binaryData","hashedPasswordBytes","aesEcb","encrypt","decryptKey","encrypted","encryptedBytes","_Buffer","from","decrypt","DerivationError","constructor","message","name","ED25519_CURVE","HARDENED_OFFSET","deriveChild","secretKey","chainCode","index","indexBuffer","allocUnsafe","writeUInt32BE","data","alloc","I","IL","slice","IR","derivePathFromKey","path","key","segments","toPathArray","forEach","segment","i","reduce","parentKey","getMasterKeyFromSeed","seed","derivePathFromSeed","includes","masterKey","formatAccount","keys","publicKey","toString","AccountAddress","getKeyPair","sign","keyPair","fromSeed","generateSaveHDWalletFromSeed","walletKey","getSaveHDWalletAccounts","saveHDWallet","accountCount","Array","fill","undefined","map","_","idx","getHdWalletAccountFromSeed","accountIdx","derived"],"sources":["../../src/utils/hd-wallet.ts"],"sourcesContent":["import nacl from 'tweetnacl';\nimport { full as hmac } from 'tweetnacl-auth';\nimport { fromString } from 'bip32-path';\nimport aesjs from 'aes-js';\nimport { sha256hash, encode, Encoding } from './encoder';\nimport { CryptographyError } from './errors';\nimport { concatBuffers } from './other';\n\nconst Ecb = aesjs.ModeOfOperation.ecb;\n\n// TODO: use mnemonic encryption instead of AES\n/**\n * Encrypt given data using `password`\n * @param password - Password to encrypt with\n * @param binaryData - Data to encrypt\n * @returns Encrypted data\n */\nfunction encryptKey(password: string, binaryData: Uint8Array): Uint8Array {\n  const hashedPasswordBytes = sha256hash(password);\n  const aesEcb = new Ecb(hashedPasswordBytes);\n  return aesEcb.encrypt(binaryData);\n}\n\n/**\n * Decrypt given data using `password`\n * @param password - Password to decrypt with\n * @param encrypted - Data to decrypt\n * @returns Decrypted data\n */\nfunction decryptKey(password: string, encrypted: Uint8Array): Uint8Array {\n  const encryptedBytes = Buffer.from(encrypted);\n  const hashedPasswordBytes = sha256hash(password);\n  const aesEcb = new Ecb(hashedPasswordBytes);\n  return aesEcb.decrypt(encryptedBytes);\n}\n\n/**\n * @category exception\n */\nexport class DerivationError extends CryptographyError {\n  constructor(message: string) {\n    super(message);\n    this.name = 'DerivationError';\n  }\n}\n\nconst ED25519_CURVE = Buffer.from('ed25519 seed');\nconst HARDENED_OFFSET = 0x80000000;\n\ninterface KeyTreeNode {\n  secretKey: Uint8Array;\n  chainCode: Uint8Array;\n}\n\ninterface HDWallet {\n  secretKey: string;\n  chainCode: string;\n}\n\ninterface Account {\n  secretKey: string;\n  publicKey: string;\n}\n\ntype Dec<N extends number> = [-1, 0, 1, 2, 3, 4][N];\ntype Bip32PathT<MaxLen extends number, H extends 'H' | 'h' | '\\''> = MaxLen extends -1\n  ? `${number}${H}`\n  : Bip32PathT<Dec<MaxLen>, H> | `${Bip32PathT<Dec<MaxLen>, H>}/${number}${H}`;\ntype Bip32Path<MaxLen extends number> =\n  '' | Bip32PathT<MaxLen, 'H'> | Bip32PathT<MaxLen, 'h'> | Bip32PathT<MaxLen, '\\''>;\n\n/**\n * @category hd-wallet\n * @param keyTreeNode - A node of key tree\n * @param index - index of child node to derive\n */\nexport function deriveChild({ secretKey, chainCode }: KeyTreeNode, index: number): KeyTreeNode {\n  if (index < HARDENED_OFFSET) {\n    throw new DerivationError(`Segment ${index} is not hardened`);\n  }\n  const indexBuffer = Buffer.allocUnsafe(4);\n  indexBuffer.writeUInt32BE(index, 0);\n\n  const data = concatBuffers([Buffer.alloc(1, 0), secretKey, indexBuffer]);\n\n  const I = hmac(data, chainCode);\n  const IL = I.slice(0, 32);\n  const IR = I.slice(32);\n  return {\n    secretKey: IL,\n    chainCode: IR,\n  };\n}\n\n/**\n * @category hd-wallet\n */\nexport function derivePathFromKey(path: Bip32Path<5>, key: KeyTreeNode): KeyTreeNode {\n  const segments = path === '' ? [] : fromString(path).toPathArray();\n  segments.forEach((segment, i) => {\n    if (segment < HARDENED_OFFSET) {\n      throw new DerivationError(`Segment #${i + 1} is not hardened`);\n    }\n  });\n\n  return segments.reduce((parentKey, segment) => deriveChild(parentKey, segment), key);\n}\n\n/**\n * @category hd-wallet\n */\nexport function getMasterKeyFromSeed(seed: Uint8Array): KeyTreeNode {\n  const I = hmac(seed, ED25519_CURVE);\n  const IL = I.slice(0, 32);\n  const IR = I.slice(32);\n  return {\n    secretKey: IL,\n    chainCode: IR,\n  };\n}\n\n/**\n * @category hd-wallet\n */\nexport function derivePathFromSeed(path: 'm' | `m/${Bip32Path<5>}`, seed: Uint8Array): KeyTreeNode {\n  if (!['m', 'm/'].includes(path.slice(0, 2))) {\n    throw new DerivationError('Root element is required');\n  }\n  const masterKey = getMasterKeyFromSeed(seed);\n  return derivePathFromKey(path.slice(2) as Bip32Path<5>, masterKey);\n}\n\nfunction formatAccount(keys: nacl.SignKeyPair): Account {\n  const { secretKey, publicKey } = keys;\n  return {\n    secretKey: Buffer.from(secretKey).toString('hex'),\n    publicKey: encode(publicKey, Encoding.AccountAddress),\n  };\n}\n\n/**\n * @category hd-wallet\n */\nexport function getKeyPair(secretKey: Uint8Array): nacl.SignKeyPair {\n  return nacl.sign.keyPair.fromSeed(secretKey);\n}\n\n/**\n * @category hd-wallet\n */\nexport function generateSaveHDWalletFromSeed(seed: Uint8Array, password: string): HDWallet {\n  const walletKey = derivePathFromSeed('m/44h/457h', seed);\n  return {\n    secretKey: Buffer.from(encryptKey(password, walletKey.secretKey)).toString('hex'),\n    chainCode: Buffer.from(encryptKey(password, walletKey.chainCode)).toString('hex'),\n  };\n}\n\n/**\n * @category hd-wallet\n */\nexport function getSaveHDWalletAccounts(\n  saveHDWallet: HDWallet,\n  password: string,\n  accountCount: number,\n): Account[] {\n  const walletKey = {\n    secretKey: decryptKey(password, Buffer.from(saveHDWallet.secretKey, 'hex')),\n    chainCode: decryptKey(password, Buffer.from(saveHDWallet.chainCode, 'hex')),\n  };\n  return (new Array(accountCount)).fill(undefined)\n    .map((_, idx) => formatAccount(getKeyPair(derivePathFromKey(`${idx}h/0h/0h`, walletKey).secretKey)));\n}\n\n/**\n * @category hd-wallet\n */\nexport const getHdWalletAccountFromSeed = (\n  seed: Uint8Array,\n  accountIdx: number,\n): Account & { idx: number } => {\n  const walletKey = derivePathFromSeed('m/44h/457h', seed);\n  const derived = derivePathFromKey(`${accountIdx}h/0h/0h`, walletKey);\n  const keyPair = getKeyPair(derived.secretKey);\n  return {\n    ...formatAccount(keyPair),\n    idx: accountIdx,\n  };\n};\n"],"mappings":"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"}
+{"version":3,"file":"hd-wallet.mjs","names":["nacl","_tweetnaclAuth","full","hmac","_bip32Path","fromString","aesjs","sha256hash","encode","Encoding","CryptographyError","concatBuffers","Ecb","ModeOfOperation","ecb","encryptKey","password","binaryData","hashedPasswordBytes","aesEcb","encrypt","decryptKey","encrypted","encryptedBytes","_Buffer","from","decrypt","DerivationError","constructor","message","name","ED25519_CURVE","HARDENED_OFFSET","deriveChild","secretKey","chainCode","index","indexBuffer","allocUnsafe","writeUInt32BE","data","alloc","I","IL","slice","IR","derivePathFromKey","path","key","segments","toPathArray","forEach","segment","i","reduce","parentKey","getMasterKeyFromSeed","seed","derivePathFromSeed","includes","masterKey","formatAccount","keys","publicKey","toString","AccountAddress","getKeyPair","sign","keyPair","fromSeed","generateSaveHDWalletFromSeed","walletKey","getSaveHDWalletAccounts","saveHDWallet","accountCount","Array","fill","undefined","map","_","idx","getHdWalletAccountFromSeed","accountIdx","derived"],"sources":["../../src/utils/hd-wallet.ts"],"sourcesContent":["import nacl from 'tweetnacl';\nimport { full as hmac } from 'tweetnacl-auth';\nimport { fromString } from 'bip32-path';\nimport aesjs from 'aes-js';\nimport {\n  sha256hash, encode, Encoding, Encoded,\n} from './encoder';\nimport { CryptographyError } from './errors';\nimport { concatBuffers } from './other';\n\nconst Ecb = aesjs.ModeOfOperation.ecb;\n\n// TODO: use mnemonic encryption instead of AES\n/**\n * Encrypt given data using `password`\n * @param password - Password to encrypt with\n * @param binaryData - Data to encrypt\n * @returns Encrypted data\n */\nfunction encryptKey(password: string, binaryData: Uint8Array): Uint8Array {\n  const hashedPasswordBytes = sha256hash(password);\n  const aesEcb = new Ecb(hashedPasswordBytes);\n  return aesEcb.encrypt(binaryData);\n}\n\n/**\n * Decrypt given data using `password`\n * @param password - Password to decrypt with\n * @param encrypted - Data to decrypt\n * @returns Decrypted data\n */\nfunction decryptKey(password: string, encrypted: Uint8Array): Uint8Array {\n  const encryptedBytes = Buffer.from(encrypted);\n  const hashedPasswordBytes = sha256hash(password);\n  const aesEcb = new Ecb(hashedPasswordBytes);\n  return aesEcb.decrypt(encryptedBytes);\n}\n\n/**\n * @category exception\n */\nexport class DerivationError extends CryptographyError {\n  constructor(message: string) {\n    super(message);\n    this.name = 'DerivationError';\n  }\n}\n\nconst ED25519_CURVE = Buffer.from('ed25519 seed');\nconst HARDENED_OFFSET = 0x80000000;\n\ninterface KeyTreeNode {\n  secretKey: Uint8Array;\n  chainCode: Uint8Array;\n}\n\ninterface HDWallet {\n  secretKey: string;\n  chainCode: string;\n}\n\ninterface Account {\n  secretKey: string; // TODO: use Encoded.AccountSecretKey instead hex\n  publicKey: Encoded.AccountAddress;\n}\n\ntype Dec<N extends number> = [-1, 0, 1, 2, 3, 4][N];\ntype Bip32PathT<MaxLen extends number, H extends 'H' | 'h' | '\\''> = MaxLen extends -1\n  ? `${number}${H}`\n  : Bip32PathT<Dec<MaxLen>, H> | `${Bip32PathT<Dec<MaxLen>, H>}/${number}${H}`;\ntype Bip32Path<MaxLen extends number> =\n  '' | Bip32PathT<MaxLen, 'H'> | Bip32PathT<MaxLen, 'h'> | Bip32PathT<MaxLen, '\\''>;\n\n/**\n * @category hd-wallet\n * @param keyTreeNode - A node of key tree\n * @param index - index of child node to derive\n */\nexport function deriveChild({ secretKey, chainCode }: KeyTreeNode, index: number): KeyTreeNode {\n  if (index < HARDENED_OFFSET) {\n    throw new DerivationError(`Segment ${index} is not hardened`);\n  }\n  const indexBuffer = Buffer.allocUnsafe(4);\n  indexBuffer.writeUInt32BE(index, 0);\n\n  const data = concatBuffers([Buffer.alloc(1, 0), secretKey, indexBuffer]);\n\n  const I = hmac(data, chainCode);\n  const IL = I.slice(0, 32);\n  const IR = I.slice(32);\n  return {\n    secretKey: IL,\n    chainCode: IR,\n  };\n}\n\n/**\n * @category hd-wallet\n */\nexport function derivePathFromKey(path: Bip32Path<5>, key: KeyTreeNode): KeyTreeNode {\n  const segments = path === '' ? [] : fromString(path).toPathArray();\n  segments.forEach((segment, i) => {\n    if (segment < HARDENED_OFFSET) {\n      throw new DerivationError(`Segment #${i + 1} is not hardened`);\n    }\n  });\n\n  return segments.reduce((parentKey, segment) => deriveChild(parentKey, segment), key);\n}\n\n/**\n * @category hd-wallet\n */\nexport function getMasterKeyFromSeed(seed: Uint8Array): KeyTreeNode {\n  const I = hmac(seed, ED25519_CURVE);\n  const IL = I.slice(0, 32);\n  const IR = I.slice(32);\n  return {\n    secretKey: IL,\n    chainCode: IR,\n  };\n}\n\n/**\n * @category hd-wallet\n */\nexport function derivePathFromSeed(path: 'm' | `m/${Bip32Path<5>}`, seed: Uint8Array): KeyTreeNode {\n  if (!['m', 'm/'].includes(path.slice(0, 2))) {\n    throw new DerivationError('Root element is required');\n  }\n  const masterKey = getMasterKeyFromSeed(seed);\n  return derivePathFromKey(path.slice(2) as Bip32Path<5>, masterKey);\n}\n\nfunction formatAccount(keys: nacl.SignKeyPair): Account {\n  const { secretKey, publicKey } = keys;\n  return {\n    secretKey: Buffer.from(secretKey).toString('hex'),\n    publicKey: encode(publicKey, Encoding.AccountAddress),\n  };\n}\n\n/**\n * @category hd-wallet\n */\nexport function getKeyPair(secretKey: Uint8Array): nacl.SignKeyPair {\n  return nacl.sign.keyPair.fromSeed(secretKey);\n}\n\n/**\n * @category hd-wallet\n */\nexport function generateSaveHDWalletFromSeed(seed: Uint8Array, password: string): HDWallet {\n  const walletKey = derivePathFromSeed('m/44h/457h', seed);\n  return {\n    secretKey: Buffer.from(encryptKey(password, walletKey.secretKey)).toString('hex'),\n    chainCode: Buffer.from(encryptKey(password, walletKey.chainCode)).toString('hex'),\n  };\n}\n\n/**\n * @category hd-wallet\n */\nexport function getSaveHDWalletAccounts(\n  saveHDWallet: HDWallet,\n  password: string,\n  accountCount: number,\n): Account[] {\n  const walletKey = {\n    secretKey: decryptKey(password, Buffer.from(saveHDWallet.secretKey, 'hex')),\n    chainCode: decryptKey(password, Buffer.from(saveHDWallet.chainCode, 'hex')),\n  };\n  return (new Array(accountCount)).fill(undefined)\n    .map((_, idx) => formatAccount(getKeyPair(derivePathFromKey(`${idx}h/0h/0h`, walletKey).secretKey)));\n}\n\n/**\n * @category hd-wallet\n */\nexport const getHdWalletAccountFromSeed = (\n  seed: Uint8Array,\n  accountIdx: number,\n): Account & { idx: number } => {\n  const walletKey = derivePathFromSeed('m/44h/457h', seed);\n  const derived = derivePathFromKey(`${accountIdx}h/0h/0h`, walletKey);\n  const keyPair = getKeyPair(derived.secretKey);\n  return {\n    ...formatAccount(keyPair),\n    idx: accountIdx,\n  };\n};\n"],"mappings":"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"}

package/es/utils/semver-satisfies.d.ts

@@ -1 +1 @@
-export default function semverSatisfies(version: string, geVersion: string, ltVersion: string): boolean;
+export default function semverSatisfies(version: string, geVersion: string, ltVersion?: string): boolean;

package/es/utils/semver-satisfies.mjs

@@ -1,13 +1,12 @@
-export default function semverSatisfies(version, geVersion, ltVersion) {
+function verCmp(a, b) {
   const getComponents = v => v.split(/[-+]/)[0].split('.').map(i => +i);
-  const versionComponents = getComponents(version);
-  const geComponents = getComponents(geVersion);
-  const ltComponents = getComponents(ltVersion);
-  const base = Math.max(...versionComponents, ...geComponents, ...ltComponents) + 1;
+  const aComponents = getComponents(a);
+  const bComponents = getComponents(b);
+  const base = Math.max(...aComponents, ...bComponents) + 1;
   const componentsToNumber = components => components.reverse().reduce((acc, n, idx) => acc + n * base ** idx, 0);
-  const vNumber = componentsToNumber(versionComponents);
-  const geNumber = componentsToNumber(geComponents);
-  const ltNumber = componentsToNumber(ltComponents);
-  return vNumber >= geNumber && vNumber < ltNumber;
+  return componentsToNumber(aComponents) - componentsToNumber(bComponents);
+}
+export default function semverSatisfies(version, geVersion, ltVersion) {
+  return verCmp(version, geVersion) >= 0 && (ltVersion == null || verCmp(version, ltVersion) < 0);
 }
 //# sourceMappingURL=semver-satisfies.mjs.map

package/es/utils/semver-satisfies.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"semver-satisfies.mjs","names":["semverSatisfies","version","geVersion","ltVersion","getComponents","v","split","map","i","versionComponents","geComponents","ltComponents","base","Math","max","componentsToNumber","components","reverse","reduce","acc","n","idx","vNumber","geNumber","ltNumber"],"sources":["../../src/utils/semver-satisfies.ts"],"sourcesContent":["export default function semverSatisfies(\n  version: string,\n  geVersion: string,\n  ltVersion: string,\n): boolean {\n  const getComponents = (v: string): number[] => v\n    .split(/[-+]/)[0].split('.').map((i) => +i);\n\n  const versionComponents = getComponents(version);\n  const geComponents = getComponents(geVersion);\n  const ltComponents = getComponents(ltVersion);\n\n  const base = Math.max(...versionComponents, ...geComponents, ...ltComponents) + 1;\n  const componentsToNumber = (components: number[]): number => components.reverse()\n    .reduce((acc, n, idx) => acc + n * base ** idx, 0);\n\n  const vNumber = componentsToNumber(versionComponents);\n  const geNumber = componentsToNumber(geComponents);\n  const ltNumber = componentsToNumber(ltComponents);\n  return vNumber >= geNumber && vNumber < ltNumber;\n}\n"],"mappings":"AAAA,eAAe,SAASA,eAAeA,CACrCC,OAAe,EACfC,SAAiB,EACjBC,SAAiB,EACR;EACT,MAAMC,aAAa,GAAIC,CAAS,IAAeA,CAAC,CAC7CC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAACA,KAAK,CAAC,GAAG,CAAC,CAACC,GAAG,CAAEC,CAAC,IAAK,CAACA,CAAC,CAAC;EAE7C,MAAMC,iBAAiB,GAAGL,aAAa,CAACH,OAAO,CAAC;EAChD,MAAMS,YAAY,GAAGN,aAAa,CAACF,SAAS,CAAC;EAC7C,MAAMS,YAAY,GAAGP,aAAa,CAACD,SAAS,CAAC;EAE7C,MAAMS,IAAI,GAAGC,IAAI,CAACC,GAAG,CAAC,GAAGL,iBAAiB,EAAE,GAAGC,YAAY,EAAE,GAAGC,YAAY,CAAC,GAAG,CAAC;EACjF,MAAMI,kBAAkB,GAAIC,UAAoB,IAAaA,UAAU,CAACC,OAAO,CAAC,CAAC,CAC9EC,MAAM,CAAC,CAACC,GAAG,EAAEC,CAAC,EAAEC,GAAG,KAAKF,GAAG,GAAGC,CAAC,GAAGR,IAAI,IAAIS,GAAG,EAAE,CAAC,CAAC;EAEpD,MAAMC,OAAO,GAAGP,kBAAkB,CAACN,iBAAiB,CAAC;EACrD,MAAMc,QAAQ,GAAGR,kBAAkB,CAACL,YAAY,CAAC;EACjD,MAAMc,QAAQ,GAAGT,kBAAkB,CAACJ,YAAY,CAAC;EACjD,OAAOW,OAAO,IAAIC,QAAQ,IAAID,OAAO,GAAGE,QAAQ;AAClD"}
+{"version":3,"file":"semver-satisfies.mjs","names":["verCmp","a","b","getComponents","v","split","map","i","aComponents","bComponents","base","Math","max","componentsToNumber","components","reverse","reduce","acc","n","idx","semverSatisfies","version","geVersion","ltVersion"],"sources":["../../src/utils/semver-satisfies.ts"],"sourcesContent":["function verCmp(a: string, b: string): number {\n  const getComponents = (v: string): number[] => v\n    .split(/[-+]/)[0].split('.').map((i) => +i);\n\n  const aComponents = getComponents(a);\n  const bComponents = getComponents(b);\n\n  const base = Math.max(...aComponents, ...bComponents) + 1;\n  const componentsToNumber = (components: number[]): number => components.reverse()\n    .reduce((acc, n, idx) => acc + n * base ** idx, 0);\n\n  return componentsToNumber(aComponents) - componentsToNumber(bComponents);\n}\n\nexport default function semverSatisfies(\n  version: string,\n  geVersion: string,\n  ltVersion?: string,\n): boolean {\n  return verCmp(version, geVersion) >= 0\n    && (ltVersion == null || verCmp(version, ltVersion) < 0);\n}\n"],"mappings":"AAAA,SAASA,MAAMA,CAACC,CAAS,EAAEC,CAAS,EAAU;EAC5C,MAAMC,aAAa,GAAIC,CAAS,IAAeA,CAAC,CAC7CC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAACA,KAAK,CAAC,GAAG,CAAC,CAACC,GAAG,CAAEC,CAAC,IAAK,CAACA,CAAC,CAAC;EAE7C,MAAMC,WAAW,GAAGL,aAAa,CAACF,CAAC,CAAC;EACpC,MAAMQ,WAAW,GAAGN,aAAa,CAACD,CAAC,CAAC;EAEpC,MAAMQ,IAAI,GAAGC,IAAI,CAACC,GAAG,CAAC,GAAGJ,WAAW,EAAE,GAAGC,WAAW,CAAC,GAAG,CAAC;EACzD,MAAMI,kBAAkB,GAAIC,UAAoB,IAAaA,UAAU,CAACC,OAAO,CAAC,CAAC,CAC9EC,MAAM,CAAC,CAACC,GAAG,EAAEC,CAAC,EAAEC,GAAG,KAAKF,GAAG,GAAGC,CAAC,GAAGR,IAAI,IAAIS,GAAG,EAAE,CAAC,CAAC;EAEpD,OAAON,kBAAkB,CAACL,WAAW,CAAC,GAAGK,kBAAkB,CAACJ,WAAW,CAAC;AAC1E;AAEA,eAAe,SAASW,eAAeA,CACrCC,OAAe,EACfC,SAAiB,EACjBC,SAAkB,EACT;EACT,OAAOvB,MAAM,CAACqB,OAAO,EAAEC,SAAS,CAAC,IAAI,CAAC,KAChCC,SAAS,IAAI,IAAI,IAAIvB,MAAM,CAACqB,OAAO,EAAEE,SAAS,CAAC,GAAG,CAAC,CAAC;AAC5D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeternity/aepp-sdk",
-  "version": "13.3.1",
+  "version": "13.3.3",
   "description": "SDK for the æternity blockchain",
   "main": "dist/aepp-sdk.js",
   "types": "es/index.d.ts",
@@ -79,9 +79,10 @@
     "@aeternity/argon2": "^0.0.1",
     "@aeternity/uuid": "^0.0.1",
     "@azure/core-client": "^1.8.0",
-    "@azure/core-rest-pipeline": "^1.14.0",
+    "@azure/core-rest-pipeline": "~1.14.0",
+    "@azure/logger": "~1.0.4",
     "@babel/runtime-corejs3": "^7.24.0",
-    "@ledgerhq/hw-transport": "^6.30.4",
+    "@ledgerhq/hw-transport": "~6.30.6",
     "@types/aes-js": "^3.1.4",
     "@types/json-bigint": "^1.0.4",
     "@types/node": "~18.13",
@@ -111,7 +112,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/aeternity/aepp-sdk-js"
+    "url": "git+https://github.com/aeternity/aepp-sdk-js.git"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.9",

package/src/AeSdkAepp.ts

@@ -146,7 +146,7 @@ export default class AeSdkAepp extends AeSdkBase {
    * @returns Addresses from wallet
    */
   async askAddresses(): Promise<Encoded.AccountAddress[]> {
-    this._ensureAccountAccess();
+    this._ensureConnected();
     return this.rpcClient.request(METHODS.address, undefined);
   }
 

package/src/AeSdkWallet.ts

@@ -358,11 +358,12 @@ export default class AeSdkWallet extends AeSdk {
    * @returns Object with wallet information
    */
   async getWalletInfo(): Promise<WalletInfo> {
+    const { origin } = window.location;
     return {
       id: this.id,
       name: this.name,
       networkId: await this.api.getNetworkId(),
-      origin: window.location.origin,
+      origin: origin === 'file://' ? '*' : origin,
       type: this._type,
     };
   }

package/src/chain.ts

@@ -21,15 +21,25 @@ import {
  * @param type - Type
  * @param options - Options
  */
-export function _getPollInterval(
-  type: 'block' | 'microblock', // TODO: rename to 'key-block' | 'micro-block'
-  { _expectedMineRate = 180000, _microBlockCycle = 3000 }:
-  { _expectedMineRate?: number; _microBlockCycle?: number },
-): number {
-  const base = {
-    block: _expectedMineRate,
-    microblock: _microBlockCycle,
-  }[type];
+export async function _getPollInterval(
+  type: 'key-block' | 'micro-block',
+  { _expectedMineRate, _microBlockCycle, onNode }:
+  { _expectedMineRate?: number; _microBlockCycle?: number; onNode: Node },
+): Promise<number> {
+  const getVal = async (
+    t: string,
+    val: number | undefined,
+    devModeDef: number,
+    def: number,
+  ): Promise<number | null> => {
+    if (t !== type) return null;
+    if (val != null) return val;
+    return await onNode?.getNetworkId() === 'ae_dev' ? devModeDef : def;
+  };
+
+  const base = await getVal('key-block', _expectedMineRate, 0, 180000)
+    ?? await getVal('micro-block', _microBlockCycle, 0, 3000)
+    ?? (() => { throw new InternalError(`Unknown type: ${type}`); })();
   return Math.floor(base / 3);
 }
 
@@ -53,7 +63,7 @@ export async function getHeight(
   const onNode = unwrapProxy(options.onNode);
   if (cached) {
     const cache = heightCache.get(onNode);
-    if (cache != null && cache.time > Date.now() - _getPollInterval('block', options)) {
+    if (cache != null && cache.time > Date.now() - await _getPollInterval('key-block', options)) {
       return cache.height;
     }
   }
@@ -77,21 +87,21 @@ export async function getHeight(
 export async function poll(
   th: Encoded.TxHash,
   {
-    blocks = 5, interval, onNode, ...options
+    blocks = 5, interval, ...options
   }:
   { blocks?: number; interval?: number; onNode: Node } & Parameters<typeof _getPollInterval>[1],
 ): Promise<TransformNodeType<SignedTx>> {
-  interval ??= _getPollInterval('microblock', options);
+  interval ??= await _getPollInterval('micro-block', options);
   let max;
   do {
-    const tx = await onNode.getTransactionByHash(th);
+    const tx = await options.onNode.getTransactionByHash(th);
     if (tx.blockHeight !== -1) return tx;
     if (max == null) {
       max = tx.tx.ttl !== 0 ? -1
-        : await getHeight({ ...options, onNode, cached: true }) + blocks;
+        : await getHeight({ ...options, cached: true }) + blocks;
     }
     await pause(interval);
-  } while (max === -1 ? true : await getHeight({ ...options, onNode, cached: true }) < max);
+  } while (max === -1 ? true : await getHeight({ ...options, cached: true }) < max);
   throw new TxTimedOutError(blocks, th);
 }
 
@@ -106,14 +116,14 @@ export async function poll(
  */
 export async function awaitHeight(
   height: number,
-  { interval, onNode, ...options }:
+  { interval, ...options }:
   { interval?: number; onNode: Node } & Parameters<typeof _getPollInterval>[1],
 ): Promise<number> {
-  interval ??= Math.min(_getPollInterval('block', options), 5000);
+  interval ??= Math.min(await _getPollInterval('key-block', options), 5000);
   let currentHeight;
   do {
     if (currentHeight != null) await pause(interval);
-    currentHeight = await getHeight({ onNode });
+    currentHeight = await getHeight(options);
   } while (currentHeight < height);
   return currentHeight;
 }

package/src/channel/Base.ts

@@ -257,7 +257,7 @@ export default class Channel {
    * })
    * ```
    */
-  async leave(): Promise<{ channelId: Encoded.Bytearray; signedTx: Encoded.Transaction }> {
+  async leave(): Promise<{ channelId: Encoded.Channel; signedTx: Encoded.Transaction }> {
     return this.enqueueAction(() => {
       notify(this, 'channels.leave');
       return { handler: handlers.awaitingLeave };

package/src/channel/internal.ts

@@ -52,7 +52,7 @@ export type SignTx = (tx: Encoded.Transaction, options?: SignOptions) => (
 /**
  * @see {@link https://github.com/aeternity/protocol/blob/6734de2e4c7cce7e5e626caa8305fb535785131d/node/api/channels_api_usage.md#channel-establishing-parameters}
  */
-export interface ChannelOptions {
+interface CommonChannelOptions {
   existingFsmId?: Encoded.Bytearray;
   /**
    * Channel url (for example: "ws://localhost:3001")
@@ -74,7 +74,7 @@ export interface ChannelOptions {
   /**
    * Initial deposit in favour of the responder by the initiator
    */
-  pushAmount: number;
+  pushAmount: BigNumber | number;
   /**
    * Amount of coins the initiator has committed to the channel
    */
@@ -92,17 +92,9 @@ export interface ChannelOptions {
    */
   ttl?: number;
   /**
-   * Host of the responder's node
-   */
-  host: string;
-  /**
-   * The port of the responders node
+   * The port of the responder's node
    */
   port: number;
-  /**
-   * Participant role
-   */
-  role: 'initiator' | 'responder';
   /**
    * How to calculate minimum depth (default: txfee)
    */
@@ -120,16 +112,16 @@ export interface ChannelOptions {
    */
   gasPrice?: BigNumber | number;
 
-  signedTx?: string;
+  signedTx?: Encoded.Transaction;
   /**
    * Existing channel id (required if reestablishing a channel)
    */
-  existingChannelId?: string;
+  existingChannelId?: Encoded.Channel;
   /**
    * Offchain transaction (required if reestablishing a channel)
    */
-  offChainTx?: string;
-  reconnectTx?: string;
+  offChainTx?: Encoded.Transaction;
+  reconnectTx?: Encoded.Transaction;
   /**
    * The time waiting for a new event to be initiated (default: 600000)
    */
@@ -174,7 +166,6 @@ export interface ChannelOptions {
    * Applicable only for responder (default: timeout_idle's value)
    */
   timeoutAwaitingOpen?: number;
-  statePassword?: string;
   /**
    * Log websocket communication and state changes
    */
@@ -183,9 +174,25 @@ export interface ChannelOptions {
    * Function which verifies and signs transactions
    */
   sign: SignTxWithTag;
-  offchainTx?: string;
+  offchainTx?: Encoded.Transaction;
 }
 
+export type ChannelOptions = CommonChannelOptions & ({
+  /**
+   * Participant role
+   */
+  role: 'initiator';
+  /**
+   * Host of the responder's node
+   */
+  host: string;
+} | {
+  /**
+   * Participant role
+   */
+  role: 'responder';
+});
+
 export interface ChannelHandler extends Function {
   enter?: Function;
 }

package/src/contract/Contract.ts

@@ -171,6 +171,9 @@ class Contract<M extends ContractMethodsBase> {
         break;
       case 'error':
         message = decode(returnValue).toString();
+        if (/Expected \d+ arguments, got \d+/.test(message)) {
+          throw new ContractError(`ACI doesn't match called contract. Error provided by node: ${message}`);
+        }
         break;
       default:
         throw new InternalError(`Unknown return type: ${returnType}`);

package/src/oracle.ts

@@ -34,13 +34,12 @@ type OracleQueries = Awaited<ReturnType<Node['getOracleQueriesByPubkey']>>['orac
 export function pollForQueries(
   oracleId: Encoded.OracleAddress,
   onQuery: (query: OracleQueries[number]) => void,
-  { interval, onNode, ...options }: { interval?: number; onNode: Node }
+  { interval, ...options }: { interval?: number; onNode: Node }
   & Parameters<typeof _getPollInterval>[1],
 ): () => void {
-  interval ??= _getPollInterval('microblock', options);
   const knownQueryIds = new Set();
   const checkNewQueries = async (): Promise<void> => {
-    const queries = ((await onNode.getOracleQueriesByPubkey(oracleId)).oracleQueries ?? [])
+    const queries = ((await options.onNode.getOracleQueriesByPubkey(oracleId)).oracleQueries ?? [])
       .filter(({ id }) => !knownQueryIds.has(id));
     queries.forEach((query) => {
       knownQueryIds.add(query.id);
@@ -52,6 +51,7 @@ export function pollForQueries(
 
   // eslint-disable-next-line @typescript-eslint/no-floating-promises
   (async () => {
+    interval ??= await _getPollInterval('micro-block', options);
     while (!stopped) { // eslint-disable-line no-unmodified-loop-condition
       // TODO: allow to handle this error somehow
       await checkNewQueries().catch(console.error);
@@ -74,19 +74,19 @@ export function pollForQueries(
 export async function pollForQueryResponse(
   oracleId: Encoded.OracleAddress,
   queryId: Encoded.OracleQueryId,
-  { interval, onNode, ...options }:
+  { interval, ...options }:
   { interval?: number; onNode: Node } & Parameters<typeof _getPollInterval>[1],
 ): Promise<string> {
-  interval ??= _getPollInterval('microblock', options);
+  interval ??= await _getPollInterval('micro-block', options);
   let height;
   let ttl;
   let response;
   do {
-    ({ response, ttl } = await onNode.getOracleQueryByPubkeyAndQueryId(oracleId, queryId));
+    ({ response, ttl } = await options.onNode.getOracleQueryByPubkeyAndQueryId(oracleId, queryId));
     const responseBuffer = decode(response as Encoded.OracleResponse);
     if (responseBuffer.length > 0) return responseBuffer.toString();
     await pause(interval);
-    height = await getHeight({ ...options, onNode, cached: true });
+    height = await getHeight({ ...options, cached: true });
   } while (ttl >= height);
   throw new RequestTimedOutError(height);
 }

package/src/tx/builder/field-types/gas-price.ts

@@ -1,70 +1,67 @@
-import BigNumber from 'bignumber.js';
-import coinAmount from './coin-amount';
-import { ArgumentError, IllegalArgumentError } from '../../../utils/errors';
-import { Int, MIN_GAS_PRICE } from '../constants';
-import Node from '../../../Node';
-import { AE_AMOUNT_FORMATS, formatAmount } from '../../../utils/amount-formatter';
-import semverSatisfies from '../../../utils/semver-satisfies';
-
-const gasPriceCache: WeakMap<Node, { time: number; gasPrice: bigint }> = new WeakMap();
-
-export async function getCachedIncreasedGasPrice(node: Node): Promise<bigint> {
-  const cache = gasPriceCache.get(node);
-  if (cache != null && cache.time > Date.now() - 20 * 1000) {
-    return cache.gasPrice;
-  }
-
-  // TODO: remove after requiring node@6.13.0
-  const { nodeVersion } = await node._getCachedStatus();
-  // TODO: remove remove '6.12.0+' check after releasing 6.13.0
-  if (!nodeVersion.startsWith('6.12.0+') && !semverSatisfies(nodeVersion, '6.13.0', '8.0.0')) {
-    return 0n;
-  }
-
-  const { minGasPrice, utilization } = (await node.getRecentGasPrices())[0];
-  let gasPrice = utilization < 70 ? 0n : BigInt(
-    new BigNumber(minGasPrice.toString()).times(1.01).integerValue().toFixed(),
-  );
-
-  const maxSafeGasPrice = BigInt(MIN_GAS_PRICE) * 100000n; // max microblock fee is 600ae or 35usd
-  if (gasPrice > maxSafeGasPrice) {
-    console.warn([
-      `Estimated gas price ${gasPrice} exceeds the maximum safe value for unknown reason.`,
-      `It will be limited to ${maxSafeGasPrice}.`,
-      'To overcome this restriction provide `gasPrice`/`fee` in options.',
-    ].join(' '));
-    gasPrice = maxSafeGasPrice;
-  }
-
-  gasPriceCache.set(node, { gasPrice, time: Date.now() });
-  return gasPrice;
-}
-
-// TODO: use withFormatting after using a single type for coins representation
-export default {
-  ...coinAmount,
-
-  async prepare(
-    value: Int | undefined,
-    params: {},
-    { onNode, denomination }: {
-      onNode?: Node;
-      denomination?: AE_AMOUNT_FORMATS;
-    },
-  ): Promise<Int | undefined> {
-    if (value != null) return value;
-    if (onNode == null) {
-      throw new ArgumentError('onNode', 'provided (or provide `gasPrice` instead)', onNode);
-    }
-    const gasPrice = await getCachedIncreasedGasPrice(onNode);
-    if (gasPrice === 0n) return undefined;
-    return formatAmount(gasPrice, { targetDenomination: denomination });
-  },
-
-  serializeAettos(value: string | undefined = MIN_GAS_PRICE.toString()): string {
-    if (+value < MIN_GAS_PRICE) {
-      throw new IllegalArgumentError(`Gas price ${value.toString()} must be bigger than ${MIN_GAS_PRICE}`);
-    }
-    return value;
-  },
-};
+import BigNumber from 'bignumber.js';
+import coinAmount from './coin-amount';
+import { ArgumentError, IllegalArgumentError } from '../../../utils/errors';
+import { Int, MIN_GAS_PRICE } from '../constants';
+import Node from '../../../Node';
+import { AE_AMOUNT_FORMATS, formatAmount } from '../../../utils/amount-formatter';
+import semverSatisfies from '../../../utils/semver-satisfies';
+
+const gasPriceCache: WeakMap<Node, { time: number; gasPrice: bigint }> = new WeakMap();
+
+export async function getCachedIncreasedGasPrice(node: Node): Promise<bigint> {
+  const cache = gasPriceCache.get(node);
+  if (cache != null && cache.time > Date.now() - 20 * 1000) {
+    return cache.gasPrice;
+  }
+
+  // TODO: remove after requiring node@6.13.0
+  const { nodeVersion } = await node._getCachedStatus();
+  if (!semverSatisfies(nodeVersion, '6.13.0')) return 0n;
+
+  const { minGasPrice, utilization } = (await node.getRecentGasPrices())[0];
+  let gasPrice = utilization < 70 ? 0n : BigInt(
+    new BigNumber(minGasPrice.toString()).times(1.01).integerValue().toFixed(),
+  );
+
+  const maxSafeGasPrice = BigInt(MIN_GAS_PRICE) * 100000n; // max microblock fee is 600ae or 35usd
+  if (gasPrice > maxSafeGasPrice) {
+    console.warn([
+      `Estimated gas price ${gasPrice} exceeds the maximum safe value for unknown reason.`,
+      `It will be limited to ${maxSafeGasPrice}.`,
+      'To overcome this restriction provide `gasPrice`/`fee` in options.',
+    ].join(' '));
+    gasPrice = maxSafeGasPrice;
+  }
+
+  gasPriceCache.set(node, { gasPrice, time: Date.now() });
+  return gasPrice;
+}
+
+// TODO: use withFormatting after using a single type for coins representation
+export default {
+  ...coinAmount,
+
+  async prepare(
+    value: Int | undefined,
+    params: {},
+    { onNode, denomination }: {
+      onNode?: Node;
+      denomination?: AE_AMOUNT_FORMATS;
+    },
+  ): Promise<Int | undefined> {
+    if (value != null) return value;
+    if (onNode == null) {
+      throw new ArgumentError('onNode', 'provided (or provide `gasPrice` instead)', onNode);
+    }
+    const gasPrice = await getCachedIncreasedGasPrice(onNode);
+    if (gasPrice === 0n) return undefined;
+    return formatAmount(gasPrice, { targetDenomination: denomination });
+  },
+
+  serializeAettos(value: string | undefined = MIN_GAS_PRICE.toString()): string {
+    if (+value < MIN_GAS_PRICE) {
+      throw new IllegalArgumentError(`Gas price ${value.toString()} must be bigger than ${MIN_GAS_PRICE}`);
+    }
+    return value;
+  },
+};

package/src/tx/builder/field-types/ttl.ts

@@ -23,7 +23,7 @@ export default {
       onNode?: Node;
       absoluteTtl?: boolean;
       _isInternalBuild?: boolean;
-    } & Parameters<typeof _getPollInterval>[1],
+    } & Omit<Parameters<typeof _getPollInterval>[1], 'onNode'>,
   ) {
     if (absoluteTtl !== true && value !== 0 && (value != null || _isInternalBuild === true)) {
       if (onNode == null) throw new ArgumentError('onNode', 'provided', onNode);

package/src/tx/builder/helpers.ts

@@ -70,6 +70,15 @@ export function nameToPunycode(maybeName: string): AensName {
   if (/\p{Emoji_Presentation}/u.test(name)) {
     throw new ArgumentError('aens name', 'not containing emoji', maybeName);
   }
+  if (name[2] === '-' && name[3] === '-') {
+    throw new ArgumentError('aens name', 'without "-" char in both the third and fourth positions', maybeName);
+  }
+  if (name[0] === '-') {
+    throw new ArgumentError('aens name', 'starting with no "-" char', maybeName);
+  }
+  if (name.at(-1) === '-') {
+    throw new ArgumentError('aens name', 'ending with no "-" char', maybeName);
+  }
   let punycode;
   try {
     const u = new URL(`http://${name}.${suffix}`);

package/src/utils/hd-wallet.ts

@@ -2,7 +2,9 @@ import nacl from 'tweetnacl';
 import { full as hmac } from 'tweetnacl-auth';
 import { fromString } from 'bip32-path';
 import aesjs from 'aes-js';
-import { sha256hash, encode, Encoding } from './encoder';
+import {
+  sha256hash, encode, Encoding, Encoded,
+} from './encoder';
 import { CryptographyError } from './errors';
 import { concatBuffers } from './other';
 
@@ -58,8 +60,8 @@ interface HDWallet {
 }
 
 interface Account {
-  secretKey: string;
-  publicKey: string;
+  secretKey: string; // TODO: use Encoded.AccountSecretKey instead hex
+  publicKey: Encoded.AccountAddress;
 }
 
 type Dec<N extends number> = [-1, 0, 1, 2, 3, 4][N];

package/src/utils/semver-satisfies.ts

@@ -1,21 +1,22 @@
-export default function semverSatisfies(
-  version: string,
-  geVersion: string,
-  ltVersion: string,
-): boolean {
+function verCmp(a: string, b: string): number {
   const getComponents = (v: string): number[] => v
     .split(/[-+]/)[0].split('.').map((i) => +i);
 
-  const versionComponents = getComponents(version);
-  const geComponents = getComponents(geVersion);
-  const ltComponents = getComponents(ltVersion);
+  const aComponents = getComponents(a);
+  const bComponents = getComponents(b);
 
-  const base = Math.max(...versionComponents, ...geComponents, ...ltComponents) + 1;
+  const base = Math.max(...aComponents, ...bComponents) + 1;
   const componentsToNumber = (components: number[]): number => components.reverse()
     .reduce((acc, n, idx) => acc + n * base ** idx, 0);
 
-  const vNumber = componentsToNumber(versionComponents);
-  const geNumber = componentsToNumber(geComponents);
-  const ltNumber = componentsToNumber(ltComponents);
-  return vNumber >= geNumber && vNumber < ltNumber;
+  return componentsToNumber(aComponents) - componentsToNumber(bComponents);
+}
+
+export default function semverSatisfies(
+  version: string,
+  geVersion: string,
+  ltVersion?: string,
+): boolean {
+  return verCmp(version, geVersion) >= 0
+    && (ltVersion == null || verCmp(version, ltVersion) < 0);
 }