@aeternity/aepp-sdk 13.2.1 → 13.3.0

package/es/utils/keystore.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"keystore.mjs","names":["nacl","v4","uuid","_aeternityArgon","hash","argon2id","getAddressFromPriv","InvalidPasswordError","DERIVED_KEY_FUNCTIONS","pass","salt","params","memlimit_kib","memoryCost","opslimit","timeCost","hashLength","type","CRYPTO_FUNCTIONS","encrypt","secretbox","decrypt","res","open","arguments","CRYPTO_DEFAULTS","secret_type","symmetric_alg","kdf","kdf_params","parallelism","plaintext","key","nonce","algo","length","undefined","ciphertext","deriveKey","password","kdfParams","recover","_ref","crypto","_Buffer","from","cipher_params","toString","dump","name","privateKey","randomBytes","options","opt","derivedKey","payload","version","public_key","id"],"sources":["../../src/utils/keystore.ts"],"sourcesContent":["import nacl from 'tweetnacl';\nimport { v4 as uuid } from '@aeternity/uuid';\nimport { hash, argon2id } from '@aeternity/argon2';\nimport { getAddressFromPriv } from './crypto';\nimport { InvalidPasswordError } from './errors';\n\nconst DERIVED_KEY_FUNCTIONS = {\n  async argon2id(\n    pass: string | Uint8Array,\n    salt: string | Uint8Array,\n    params: Partial<Keystore['crypto']['kdf_params']>,\n  ): Promise<Uint8Array> {\n    const { memlimit_kib: memoryCost, opslimit: timeCost } = params;\n\n    return hash(pass, {\n      hashLength: 32,\n      salt,\n      timeCost,\n      memoryCost,\n      type: argon2id,\n    });\n  },\n};\n\nconst CRYPTO_FUNCTIONS = {\n  'xsalsa20-poly1305': {\n    encrypt: nacl.secretbox,\n    decrypt(...args: Parameters<typeof nacl.secretbox.open>): Uint8Array {\n      const res = nacl.secretbox.open(...args);\n      if (res == null) throw new InvalidPasswordError();\n      return res;\n    },\n  },\n};\n\nexport interface Keystore {\n  name: string;\n  version: 1;\n  public_key: string;\n  id: string;\n  crypto: {\n    secret_type: 'ed25519';\n    symmetric_alg: keyof typeof CRYPTO_FUNCTIONS;\n    ciphertext: string;\n    cipher_params: {\n      nonce: string;\n    };\n    kdf: keyof typeof DERIVED_KEY_FUNCTIONS;\n    kdf_params: {\n      memlimit_kib: number;\n      opslimit: number;\n      parallelism: number;\n      salt: string;\n    };\n  };\n}\n\nconst CRYPTO_DEFAULTS = {\n  secret_type: 'ed25519',\n  symmetric_alg: 'xsalsa20-poly1305',\n  kdf: 'argon2id',\n  kdf_params: {\n    memlimit_kib: 65536,\n    opslimit: 3,\n    parallelism: 1,\n  },\n} as const;\n\n/**\n * Symmetric private key encryption using secret (derived) key.\n * @category keystore\n * @param plaintext - Data to be encrypted.\n * @param key - Secret key.\n * @param nonce - Randomly generated nonce.\n * @param algo - Encryption algorithm.\n * @returns Encrypted data.\n */\nfunction encrypt(\n  plaintext: Uint8Array,\n  key: Uint8Array,\n  nonce: Uint8Array,\n  algo: keyof typeof CRYPTO_FUNCTIONS = CRYPTO_DEFAULTS.symmetric_alg,\n): Uint8Array {\n  return CRYPTO_FUNCTIONS[algo].encrypt(plaintext, nonce, key);\n}\n\n/**\n * Symmetric private key decryption using secret (derived) key.\n * @category keystore\n * @param ciphertext - Data to be decrypted.\n * @param key - Secret key.\n * @param nonce - Nonce from key-object.\n * @param algo - Encryption algorithm.\n * @returns Decrypted data.\n */\nfunction decrypt(\n  ciphertext: Uint8Array,\n  key: Uint8Array,\n  nonce: Uint8Array,\n  algo: keyof typeof CRYPTO_FUNCTIONS = CRYPTO_DEFAULTS.symmetric_alg,\n): Uint8Array {\n  return CRYPTO_FUNCTIONS[algo].decrypt(ciphertext, nonce, key);\n}\n\n/**\n * Derive secret key from password with key derivation function.\n * @category keystore\n * @param password - User-supplied password.\n * @param nonce - Randomly generated nonce.\n * @param kdf - Key derivation function.\n * @param kdfParams - KDF parameters.\n * @returns Secret key derived from password.\n */\nasync function deriveKey(\n  password: string | Uint8Array,\n  nonce: string | Uint8Array,\n  kdf: Keystore['crypto']['kdf'],\n  kdfParams: Omit<Keystore['crypto']['kdf_params'], 'salt'>,\n): Promise<Uint8Array> {\n  return DERIVED_KEY_FUNCTIONS[kdf](password, nonce, kdfParams);\n}\n\n/**\n * Recover plaintext private key from secret-storage key object.\n * @category keystore\n * @param password - Keystore object password.\n * @param keystore - Keystore object.\n * @returns Plaintext private key.\n */\nexport async function recover(\n  password: string | Uint8Array,\n  { crypto }: Keystore,\n): Promise<string> {\n  const salt = Buffer.from(crypto.kdf_params.salt, 'hex');\n  return Buffer.from(decrypt(\n    Buffer.from(crypto.ciphertext, 'hex'),\n    await deriveKey(password, salt, crypto.kdf, crypto.kdf_params),\n    Buffer.from(crypto.cipher_params.nonce, 'hex'),\n    crypto.symmetric_alg,\n  )).toString('hex');\n}\n\n/**\n * Export private key to keystore secret-storage format.\n * @category keystore\n * @param name - Key name.\n * @param password - User-supplied password.\n * @param privateKey - Private key as hex-string or a Buffer.\n * @param nonce - Randomly generated 24byte nonce.\n * @param salt - Randomly generated 16byte salt.\n * @param options - Encryption parameters.\n * @param options.kdf - Key derivation function.\n * @param options.kdf_params - KDF parameters.\n */\nexport async function dump(\n  name: string,\n  password: string | Uint8Array,\n  privateKey: string | Uint8Array,\n  nonce: Uint8Array = nacl.randomBytes(24),\n  salt: Uint8Array = nacl.randomBytes(16),\n  options?: Partial<Keystore['crypto']>,\n): Promise<Keystore> {\n  const opt = { ...CRYPTO_DEFAULTS, ...options };\n  const derivedKey = await deriveKey(password, salt, opt.kdf, opt.kdf_params);\n  const payload = typeof privateKey === 'string' ? Buffer.from(privateKey, 'hex') : privateKey;\n  return {\n    name,\n    version: 1,\n    public_key: getAddressFromPriv(payload),\n    id: uuid(),\n    crypto: {\n      secret_type: opt.secret_type,\n      symmetric_alg: opt.symmetric_alg,\n      ciphertext: Buffer.from(\n        encrypt(payload, derivedKey, nonce, opt.symmetric_alg),\n      ).toString('hex'),\n      cipher_params: { nonce: Buffer.from(nonce).toString('hex') },\n      kdf: opt.kdf,\n      kdf_params: {\n        ...opt.kdf_params,\n        salt: Buffer.from(salt).toString('hex'),\n      },\n    },\n  };\n}\n"],"mappings":";;;;AAAA,OAAOA,IAAI,MAAM,WAAW;AAC5B,SAASC,EAAE,IAAIC,IAAI,QAAQ,iBAAiB;AAC5C,OAAAC,eAAA,MAA+B,mBAAmB;AAAC;EAAAC,IAAA;EAAAC;AAAA,IAAAF,eAAA;AAAA,SAC1CG,kBAAkB;AAAA,SAClBC,oBAAoB;AAE7B,MAAMC,qBAAqB,GAAG;EAC5B,MAAMH,QAAQA,CACZI,IAAyB,EACzBC,IAAyB,EACzBC,MAAiD,EAC5B;IACrB,MAAM;MAAEC,YAAY,EAAEC,UAAU;MAAEC,QAAQ,EAAEC;IAAS,CAAC,GAAGJ,MAAM;IAE/D,OAAOP,IAAI,CAACK,IAAI,EAAE;MAChBO,UAAU,EAAE,EAAE;MACdN,IAAI;MACJK,QAAQ;MACRF,UAAU;MACVI,IAAI,EAAEZ;IACR,CAAC,CAAC;EACJ;AACF,CAAC;AAED,MAAMa,gBAAgB,GAAG;EACvB,mBAAmB,EAAE;IACnBC,OAAO,EAAEnB,IAAI,CAACoB,SAAS;IACvBC,OAAOA,CAAA,EAA8D;MACnE,MAAMC,GAAG,GAAGtB,IAAI,CAACoB,SAAS,CAACG,IAAI,CAAC,GAAAC,SAAO,CAAC;MACxC,IAAIF,GAAG,IAAI,IAAI,EAAE,MAAM,IAAIf,oBAAoB,CAAC,CAAC;MACjD,OAAOe,GAAG;IACZ;EACF;AACF,CAAC;AAwBD,MAAMG,eAAe,GAAG;EACtBC,WAAW,EAAE,SAAS;EACtBC,aAAa,EAAE,mBAAmB;EAClCC,GAAG,EAAE,UAAU;EACfC,UAAU,EAAE;IACVjB,YAAY,EAAE,KAAK;IACnBE,QAAQ,EAAE,CAAC;IACXgB,WAAW,EAAE;EACf;AACF,CAAU;;AAEV;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASX,OAAOA,CACdY,SAAqB,EACrBC,GAAe,EACfC,KAAiB,EAEL;EAAA,IADZC,IAAmC,GAAAV,SAAA,CAAAW,MAAA,QAAAX,SAAA,QAAAY,SAAA,GAAAZ,SAAA,MAAGC,eAAe,CAACE,aAAa;EAEnE,OAAOT,gBAAgB,CAACgB,IAAI,CAAC,CAACf,OAAO,CAACY,SAAS,EAAEE,KAAK,EAAED,GAAG,CAAC;AAC9D;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASX,OAAOA,CACdgB,UAAsB,EACtBL,GAAe,EACfC,KAAiB,EAEL;EAAA,IADZC,IAAmC,GAAAV,SAAA,CAAAW,MAAA,QAAAX,SAAA,QAAAY,SAAA,GAAAZ,SAAA,MAAGC,eAAe,CAACE,aAAa;EAEnE,OAAOT,gBAAgB,CAACgB,IAAI,CAAC,CAACb,OAAO,CAACgB,UAAU,EAAEJ,KAAK,EAAED,GAAG,CAAC;AAC/D;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAeM,SAASA,CACtBC,QAA6B,EAC7BN,KAA0B,EAC1BL,GAA8B,EAC9BY,SAAyD,EACpC;EACrB,OAAOhC,qBAAqB,CAACoB,GAAG,CAAC,CAACW,QAAQ,EAAEN,KAAK,EAAEO,SAAS,CAAC;AAC/D;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeC,OAAOA,CAC3BF,QAA6B,EAAAG,IAAA,EAEZ;EAAA,IADjB;IAAEC;EAAiB,CAAC,GAAAD,IAAA;EAEpB,MAAMhC,IAAI,GAAGkC,OAAA,CAAOC,IAAI,CAACF,MAAM,CAACd,UAAU,CAACnB,IAAI,EAAE,KAAK,CAAC;EACvD,OAAOkC,OAAA,CAAOC,IAAI,CAACxB,OAAO,CACxBuB,OAAA,CAAOC,IAAI,CAACF,MAAM,CAACN,UAAU,EAAE,KAAK,CAAC,EACrC,MAAMC,SAAS,CAACC,QAAQ,EAAE7B,IAAI,EAAEiC,MAAM,CAACf,GAAG,EAAEe,MAAM,CAACd,UAAU,CAAC,EAC9De,OAAA,CAAOC,IAAI,CAACF,MAAM,CAACG,aAAa,CAACb,KAAK,EAAE,KAAK,CAAC,EAC9CU,MAAM,CAAChB,aACT,CAAC,CAAC,CAACoB,QAAQ,CAAC,KAAK,CAAC;AACpB;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeC,IAAIA,CACxBC,IAAY,EACZV,QAA6B,EAC7BW,UAA+B,EAIZ;EAAA,IAHnBjB,KAAiB,GAAAT,SAAA,CAAAW,MAAA,QAAAX,SAAA,QAAAY,SAAA,GAAAZ,SAAA,MAAGxB,IAAI,CAACmD,WAAW,CAAC,EAAE,CAAC;EAAA,IACxCzC,IAAgB,GAAAc,SAAA,CAAAW,MAAA,QAAAX,SAAA,QAAAY,SAAA,GAAAZ,SAAA,MAAGxB,IAAI,CAACmD,WAAW,CAAC,EAAE,CAAC;EAAA,IACvCC,OAAqC,GAAA5B,SAAA,CAAAW,MAAA,OAAAX,SAAA,MAAAY,SAAA;EAErC,MAAMiB,GAAG,GAAG;IAAE,GAAG5B,eAAe;IAAE,GAAG2B;EAAQ,CAAC;EAC9C,MAAME,UAAU,GAAG,MAAMhB,SAAS,CAACC,QAAQ,EAAE7B,IAAI,EAAE2C,GAAG,CAACzB,GAAG,EAAEyB,GAAG,CAACxB,UAAU,CAAC;EAC3E,MAAM0B,OAAO,GAAG,OAAOL,UAAU,KAAK,QAAQ,GAAGN,OAAA,CAAOC,IAAI,CAACK,UAAU,EAAE,KAAK,CAAC,GAAGA,UAAU;EAC5F,OAAO;IACLD,IAAI;IACJO,OAAO,EAAE,CAAC;IACVC,UAAU,EAAEnD,kBAAkB,CAACiD,OAAO,CAAC;IACvCG,EAAE,EAAExD,IAAI,CAAC,CAAC;IACVyC,MAAM,EAAE;MACNjB,WAAW,EAAE2B,GAAG,CAAC3B,WAAW;MAC5BC,aAAa,EAAE0B,GAAG,CAAC1B,aAAa;MAChCU,UAAU,EAAEO,OAAA,CAAOC,IAAI,CACrB1B,OAAO,CAACoC,OAAO,EAAED,UAAU,EAAErB,KAAK,EAAEoB,GAAG,CAAC1B,aAAa,CACvD,CAAC,CAACoB,QAAQ,CAAC,KAAK,CAAC;MACjBD,aAAa,EAAE;QAAEb,KAAK,EAAEW,OAAA,CAAOC,IAAI,CAACZ,KAAK,CAAC,CAACc,QAAQ,CAAC,KAAK;MAAE,CAAC;MAC5DnB,GAAG,EAAEyB,GAAG,CAACzB,GAAG;MACZC,UAAU,EAAE;QACV,GAAGwB,GAAG,CAACxB,UAAU;QACjBnB,IAAI,EAAEkC,OAAA,CAAOC,IAAI,CAACnC,IAAI,CAAC,CAACqC,QAAQ,CAAC,KAAK;MACxC;IACF;EACF,CAAC;AACH"}
+{"version":3,"file":"keystore.mjs","names":["nacl","v4","uuid","_aeternityArgon","hash","argon2id","getAddressFromPriv","InvalidPasswordError","DERIVED_KEY_FUNCTIONS","pass","salt","params","memlimit_kib","memoryCost","opslimit","timeCost","hashLength","type","CRYPTO_FUNCTIONS","encrypt","secretbox","decrypt","args","res","open","CRYPTO_DEFAULTS","secret_type","symmetric_alg","kdf","kdf_params","parallelism","plaintext","key","nonce","algo","ciphertext","deriveKey","password","kdfParams","recover","crypto","_Buffer","from","cipher_params","toString","dump","name","privateKey","randomBytes","options","opt","derivedKey","payload","version","public_key","id"],"sources":["../../src/utils/keystore.ts"],"sourcesContent":["import nacl from 'tweetnacl';\nimport { v4 as uuid } from '@aeternity/uuid';\nimport { hash, argon2id } from '@aeternity/argon2';\nimport { getAddressFromPriv } from './crypto';\nimport { InvalidPasswordError } from './errors';\n\nconst DERIVED_KEY_FUNCTIONS = {\n  async argon2id(\n    pass: string | Uint8Array,\n    salt: string | Uint8Array,\n    params: Partial<Keystore['crypto']['kdf_params']>,\n  ): Promise<Uint8Array> {\n    const { memlimit_kib: memoryCost, opslimit: timeCost } = params;\n\n    return hash(pass, {\n      hashLength: 32,\n      salt,\n      timeCost,\n      memoryCost,\n      type: argon2id,\n    });\n  },\n};\n\nconst CRYPTO_FUNCTIONS = {\n  'xsalsa20-poly1305': {\n    encrypt: nacl.secretbox,\n    decrypt(...args: Parameters<typeof nacl.secretbox.open>): Uint8Array {\n      const res = nacl.secretbox.open(...args);\n      if (res == null) throw new InvalidPasswordError();\n      return res;\n    },\n  },\n};\n\nexport interface Keystore {\n  name: string;\n  version: 1;\n  public_key: string;\n  id: string;\n  crypto: {\n    secret_type: 'ed25519';\n    symmetric_alg: keyof typeof CRYPTO_FUNCTIONS;\n    ciphertext: string;\n    cipher_params: {\n      nonce: string;\n    };\n    /**\n     * Key derivation function name.\n     */\n    kdf: keyof typeof DERIVED_KEY_FUNCTIONS;\n    /**\n     * Key derivation function parameters.\n     */\n    kdf_params: {\n      memlimit_kib: number;\n      opslimit: number;\n      parallelism: number;\n      salt: string;\n    };\n  };\n}\n\nconst CRYPTO_DEFAULTS = {\n  secret_type: 'ed25519',\n  symmetric_alg: 'xsalsa20-poly1305',\n  kdf: 'argon2id',\n  kdf_params: {\n    memlimit_kib: 65536,\n    opslimit: 3,\n    parallelism: 1,\n  },\n} as const;\n\n/**\n * Symmetric private key encryption using secret (derived) key.\n * @category keystore\n * @param plaintext - Data to be encrypted.\n * @param key - Secret key.\n * @param nonce - Randomly generated nonce.\n * @param algo - Encryption algorithm.\n * @returns Encrypted data.\n */\nfunction encrypt(\n  plaintext: Uint8Array,\n  key: Uint8Array,\n  nonce: Uint8Array,\n  algo: keyof typeof CRYPTO_FUNCTIONS = CRYPTO_DEFAULTS.symmetric_alg,\n): Uint8Array {\n  return CRYPTO_FUNCTIONS[algo].encrypt(plaintext, nonce, key);\n}\n\n/**\n * Symmetric private key decryption using secret (derived) key.\n * @category keystore\n * @param ciphertext - Data to be decrypted.\n * @param key - Secret key.\n * @param nonce - Nonce from key-object.\n * @param algo - Encryption algorithm.\n * @returns Decrypted data.\n */\nfunction decrypt(\n  ciphertext: Uint8Array,\n  key: Uint8Array,\n  nonce: Uint8Array,\n  algo: keyof typeof CRYPTO_FUNCTIONS = CRYPTO_DEFAULTS.symmetric_alg,\n): Uint8Array {\n  return CRYPTO_FUNCTIONS[algo].decrypt(ciphertext, nonce, key);\n}\n\n/**\n * Derive secret key from password with key derivation function.\n * @category keystore\n * @param password - User-supplied password.\n * @param nonce - Randomly generated nonce.\n * @param kdf - Key derivation function.\n * @param kdfParams - KDF parameters.\n * @returns Secret key derived from password.\n */\nasync function deriveKey(\n  password: string | Uint8Array,\n  nonce: string | Uint8Array,\n  kdf: Keystore['crypto']['kdf'],\n  kdfParams: Omit<Keystore['crypto']['kdf_params'], 'salt'>,\n): Promise<Uint8Array> {\n  return DERIVED_KEY_FUNCTIONS[kdf](password, nonce, kdfParams);\n}\n\n/**\n * Recover plaintext private key from secret-storage key object.\n * @category keystore\n * @param password - Keystore object password.\n * @param keystore - Keystore object.\n * @returns Plaintext private key.\n */\nexport async function recover(\n  password: string | Uint8Array,\n  { crypto }: Keystore,\n): Promise<string> {\n  const salt = Buffer.from(crypto.kdf_params.salt, 'hex');\n  return Buffer.from(decrypt(\n    Buffer.from(crypto.ciphertext, 'hex'),\n    await deriveKey(password, salt, crypto.kdf, crypto.kdf_params),\n    Buffer.from(crypto.cipher_params.nonce, 'hex'),\n    crypto.symmetric_alg,\n  )).toString('hex');\n}\n\n/**\n * Export private key to keystore secret-storage format.\n * @category keystore\n * @param name - Key name.\n * @param password - User-supplied password.\n * @param privateKey - Private key as hex-string or a Buffer.\n * @param nonce - Randomly generated 24byte nonce.\n * @param salt - Randomly generated 16byte salt.\n * @param options - Encryption parameters.\n */\nexport async function dump(\n  name: string,\n  password: string | Uint8Array,\n  privateKey: string | Uint8Array,\n  nonce: Uint8Array = nacl.randomBytes(24),\n  salt: Uint8Array = nacl.randomBytes(16),\n  options?: Partial<Keystore['crypto']>,\n): Promise<Keystore> {\n  const opt = { ...CRYPTO_DEFAULTS, ...options };\n  const derivedKey = await deriveKey(password, salt, opt.kdf, opt.kdf_params);\n  const payload = typeof privateKey === 'string' ? Buffer.from(privateKey, 'hex') : privateKey;\n  return {\n    name,\n    version: 1,\n    public_key: getAddressFromPriv(payload),\n    id: uuid(),\n    crypto: {\n      secret_type: opt.secret_type,\n      symmetric_alg: opt.symmetric_alg,\n      ciphertext: Buffer.from(\n        encrypt(payload, derivedKey, nonce, opt.symmetric_alg),\n      ).toString('hex'),\n      cipher_params: { nonce: Buffer.from(nonce).toString('hex') },\n      kdf: opt.kdf,\n      kdf_params: {\n        ...opt.kdf_params,\n        salt: Buffer.from(salt).toString('hex'),\n      },\n    },\n  };\n}\n"],"mappings":";;;;AAAA,OAAOA,IAAI,MAAM,WAAW;AAC5B,SAASC,EAAE,IAAIC,IAAI,QAAQ,iBAAiB;AAC5C,OAAAC,eAAA,MAA+B,mBAAmB;AAAC;EAAAC,IAAA;EAAAC;AAAA,IAAAF,eAAA;AAAA,SAC1CG,kBAAkB;AAAA,SAClBC,oBAAoB;AAE7B,MAAMC,qBAAqB,GAAG;EAC5B,MAAMH,QAAQA,CACZI,IAAyB,EACzBC,IAAyB,EACzBC,MAAiD,EAC5B;IACrB,MAAM;MAAEC,YAAY,EAAEC,UAAU;MAAEC,QAAQ,EAAEC;IAAS,CAAC,GAAGJ,MAAM;IAE/D,OAAOP,IAAI,CAACK,IAAI,EAAE;MAChBO,UAAU,EAAE,EAAE;MACdN,IAAI;MACJK,QAAQ;MACRF,UAAU;MACVI,IAAI,EAAEZ;IACR,CAAC,CAAC;EACJ;AACF,CAAC;AAED,MAAMa,gBAAgB,GAAG;EACvB,mBAAmB,EAAE;IACnBC,OAAO,EAAEnB,IAAI,CAACoB,SAAS;IACvBC,OAAOA,CAAC,GAAGC,IAA4C,EAAc;MACnE,MAAMC,GAAG,GAAGvB,IAAI,CAACoB,SAAS,CAACI,IAAI,CAAC,GAAGF,IAAI,CAAC;MACxC,IAAIC,GAAG,IAAI,IAAI,EAAE,MAAM,IAAIhB,oBAAoB,CAAC,CAAC;MACjD,OAAOgB,GAAG;IACZ;EACF;AACF,CAAC;AA8BD,MAAME,eAAe,GAAG;EACtBC,WAAW,EAAE,SAAS;EACtBC,aAAa,EAAE,mBAAmB;EAClCC,GAAG,EAAE,UAAU;EACfC,UAAU,EAAE;IACVjB,YAAY,EAAE,KAAK;IACnBE,QAAQ,EAAE,CAAC;IACXgB,WAAW,EAAE;EACf;AACF,CAAU;;AAEV;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASX,OAAOA,CACdY,SAAqB,EACrBC,GAAe,EACfC,KAAiB,EACjBC,IAAmC,GAAGT,eAAe,CAACE,aAAa,EACvD;EACZ,OAAOT,gBAAgB,CAACgB,IAAI,CAAC,CAACf,OAAO,CAACY,SAAS,EAAEE,KAAK,EAAED,GAAG,CAAC;AAC9D;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASX,OAAOA,CACdc,UAAsB,EACtBH,GAAe,EACfC,KAAiB,EACjBC,IAAmC,GAAGT,eAAe,CAACE,aAAa,EACvD;EACZ,OAAOT,gBAAgB,CAACgB,IAAI,CAAC,CAACb,OAAO,CAACc,UAAU,EAAEF,KAAK,EAAED,GAAG,CAAC;AAC/D;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAeI,SAASA,CACtBC,QAA6B,EAC7BJ,KAA0B,EAC1BL,GAA8B,EAC9BU,SAAyD,EACpC;EACrB,OAAO9B,qBAAqB,CAACoB,GAAG,CAAC,CAACS,QAAQ,EAAEJ,KAAK,EAAEK,SAAS,CAAC;AAC/D;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeC,OAAOA,CAC3BF,QAA6B,EAC7B;EAAEG;AAAiB,CAAC,EACH;EACjB,MAAM9B,IAAI,GAAG+B,OAAA,CAAOC,IAAI,CAACF,MAAM,CAACX,UAAU,CAACnB,IAAI,EAAE,KAAK,CAAC;EACvD,OAAO+B,OAAA,CAAOC,IAAI,CAACrB,OAAO,CACxBoB,OAAA,CAAOC,IAAI,CAACF,MAAM,CAACL,UAAU,EAAE,KAAK,CAAC,EACrC,MAAMC,SAAS,CAACC,QAAQ,EAAE3B,IAAI,EAAE8B,MAAM,CAACZ,GAAG,EAAEY,MAAM,CAACX,UAAU,CAAC,EAC9DY,OAAA,CAAOC,IAAI,CAACF,MAAM,CAACG,aAAa,CAACV,KAAK,EAAE,KAAK,CAAC,EAC9CO,MAAM,CAACb,aACT,CAAC,CAAC,CAACiB,QAAQ,CAAC,KAAK,CAAC;AACpB;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeC,IAAIA,CACxBC,IAAY,EACZT,QAA6B,EAC7BU,UAA+B,EAC/Bd,KAAiB,GAAGjC,IAAI,CAACgD,WAAW,CAAC,EAAE,CAAC,EACxCtC,IAAgB,GAAGV,IAAI,CAACgD,WAAW,CAAC,EAAE,CAAC,EACvCC,OAAqC,EAClB;EACnB,MAAMC,GAAG,GAAG;IAAE,GAAGzB,eAAe;IAAE,GAAGwB;EAAQ,CAAC;EAC9C,MAAME,UAAU,GAAG,MAAMf,SAAS,CAACC,QAAQ,EAAE3B,IAAI,EAAEwC,GAAG,CAACtB,GAAG,EAAEsB,GAAG,CAACrB,UAAU,CAAC;EAC3E,MAAMuB,OAAO,GAAG,OAAOL,UAAU,KAAK,QAAQ,GAAGN,OAAA,CAAOC,IAAI,CAACK,UAAU,EAAE,KAAK,CAAC,GAAGA,UAAU;EAC5F,OAAO;IACLD,IAAI;IACJO,OAAO,EAAE,CAAC;IACVC,UAAU,EAAEhD,kBAAkB,CAAC8C,OAAO,CAAC;IACvCG,EAAE,EAAErD,IAAI,CAAC,CAAC;IACVsC,MAAM,EAAE;MACNd,WAAW,EAAEwB,GAAG,CAACxB,WAAW;MAC5BC,aAAa,EAAEuB,GAAG,CAACvB,aAAa;MAChCQ,UAAU,EAAEM,OAAA,CAAOC,IAAI,CACrBvB,OAAO,CAACiC,OAAO,EAAED,UAAU,EAAElB,KAAK,EAAEiB,GAAG,CAACvB,aAAa,CACvD,CAAC,CAACiB,QAAQ,CAAC,KAAK,CAAC;MACjBD,aAAa,EAAE;QAAEV,KAAK,EAAEQ,OAAA,CAAOC,IAAI,CAACT,KAAK,CAAC,CAACW,QAAQ,CAAC,KAAK;MAAE,CAAC;MAC5DhB,GAAG,EAAEsB,GAAG,CAACtB,GAAG;MACZC,UAAU,EAAE;QACV,GAAGqB,GAAG,CAACrB,UAAU;QACjBnB,IAAI,EAAE+B,OAAA,CAAOC,IAAI,CAAChC,IAAI,CAAC,CAACkC,QAAQ,CAAC,KAAK;MACxC;IACF;EACF,CAAC;AACH"}

package/es/utils/typed-data.d.ts

@@ -36,8 +36,6 @@ export interface Domain {
     networkId?: string;
     contractAddress?: Encoded.ContractAddress;
 }
-export declare function encodeFateValue(value: unknown, aci: AciValue): Encoded.ContractBytearray;
-export declare function decodeFateValue(value: Encoded.ContractBytearray, aci: AciValue): Encoded.ContractBytearray;
 /**
  * Hashes domain object, can be used to inline domain hash to contract source code
  */

package/es/utils/typed-data.mjs

@@ -1,10 +1,8 @@
-// js extension is required for mjs build
-// @ts-expect-error see https://github.com/aeternity/aepp-calldata-js/issues/216
-// eslint-disable-next-line import/extensions
-import ContractByteArrayEncoder from '@aeternity/aepp-calldata/src/ContractByteArrayEncoder.js';
-// @ts-expect-error see https://github.com/aeternity/aepp-calldata-js/issues/216
-// eslint-disable-next-line import/extensions
-import AciTypeResolver from '@aeternity/aepp-calldata/src/AciTypeResolver.js';
+import _aeternityAeppCalldata from '@aeternity/aepp-calldata';
+const {
+  TypeResolver,
+  ContractByteArrayEncoder
+} = _aeternityAeppCalldata;
 import canonicalize from 'canonicalize';
 import { decode } from "./encoder.mjs";
 import { hash, messagePrefixLength } from "./crypto.mjs";
@@ -19,21 +17,6 @@ export function hashJson(data) {
 
 // TODO: move this type to calldata library https://github.com/aeternity/aepp-calldata-js/issues/215
 // based on https://github.com/aeternity/aepp-calldata-js/blob/82b5a98f9b308482627da8d7484d213e9cf87151/src/AciTypeResolver.js#L129
-// TODO: replace with api on calldata side https://github.com/aeternity/aepp-calldata-js/issues/216
-export function encodeFateValue(value, aci) {
-  const contractByteArrayEncoder = new ContractByteArrayEncoder();
-  const aciTypeResolver = new AciTypeResolver([]);
-  aciTypeResolver.isCustomType = () => false;
-  return contractByteArrayEncoder.encode(aciTypeResolver.resolveType(aci), value);
-}
-
-// TODO: replace with api on calldata side https://github.com/aeternity/aepp-calldata-js/issues/216
-export function decodeFateValue(value, aci) {
-  const contractByteArrayEncoder = new ContractByteArrayEncoder();
-  const aciTypeResolver = new AciTypeResolver([]);
-  aciTypeResolver.isCustomType = () => false;
-  return contractByteArrayEncoder.decodeWithType(value, aciTypeResolver.resolveType(aci));
-}
 
 /**
  * Hashes domain object, can be used to inline domain hash to contract source code
@@ -62,7 +45,9 @@ export function hashDomain(domain) {
       }
     }]
   };
-  return hash(decode(encodeFateValue(domain, domainAci)));
+  const domainType = new TypeResolver().resolveType(domainAci, {});
+  const fateValue = new ContractByteArrayEncoder().encodeWithType(domain, domainType);
+  return hash(decode(fateValue));
 }
 export function hashTypedData(data, aci, domain) {
   return hash(concatBuffers([messagePrefixLength, new Uint8Array([0]), hashDomain(domain), hashJson(aci), hash(decode(data))]));

package/es/utils/typed-data.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"typed-data.mjs","names":["ContractByteArrayEncoder","AciTypeResolver","canonicalize","decode","hash","messagePrefixLength","concatBuffers","hashJson","data","_canonicalize","encodeFateValue","value","aci","contractByteArrayEncoder","aciTypeResolver","isCustomType","encode","resolveType","decodeFateValue","decodeWithType","hashDomain","domain","domainAci","record","name","type","option","hashTypedData","Uint8Array"],"sources":["../../src/utils/typed-data.ts"],"sourcesContent":["// js extension is required for mjs build\n// @ts-expect-error see https://github.com/aeternity/aepp-calldata-js/issues/216\n// eslint-disable-next-line import/extensions\nimport ContractByteArrayEncoder from '@aeternity/aepp-calldata/src/ContractByteArrayEncoder.js';\n// @ts-expect-error see https://github.com/aeternity/aepp-calldata-js/issues/216\n// eslint-disable-next-line import/extensions\nimport AciTypeResolver from '@aeternity/aepp-calldata/src/AciTypeResolver.js';\nimport canonicalize from 'canonicalize';\nimport { Encoded, decode } from './encoder';\nimport { hash, messagePrefixLength } from './crypto';\nimport { concatBuffers } from './other';\n\n/**\n * Hashes arbitrary object, can be used to inline the aci hash to contract source code\n */\nexport function hashJson(data: unknown): Buffer {\n  return hash(canonicalize(data) ?? '');\n}\n\n// TODO: move this type to calldata library https://github.com/aeternity/aepp-calldata-js/issues/215\n// based on https://github.com/aeternity/aepp-calldata-js/blob/82b5a98f9b308482627da8d7484d213e9cf87151/src/AciTypeResolver.js#L129\nexport type AciValue = 'void' | 'unit' | 'int' | 'bool' | 'string' | 'bits' | 'hash' | 'signature'\n| 'address' | 'contract_pubkey' | 'Chain.ttl' | 'Chain.ga_meta_tx' | 'Chain.paying_for_tx'\n| 'Chain.base_tx' | 'AENS.pointee' | 'AENS.name' | 'MCL_BLS12_381.fr' | 'MCL_BLS12_381.fp'\n| { 'Set.set': readonly [AciValue] }\n| { bytes: number }\n| { list: readonly [AciValue] }\n| { map: readonly [AciValue, AciValue] }\n| { tuple: readonly AciValue[] }\n| { record: ReadonlyArray<{ name: string; type: AciValue }> }\n| { variant: ReadonlyArray<{ [key: string]: readonly AciValue[] }> }\n| { option: readonly [AciValue] }\n| { oracle: readonly [AciValue, AciValue] }\n| { oracle_query: readonly [AciValue, AciValue] };\n\nexport interface Domain {\n  name?: string;\n  version?: number;\n  networkId?: string;\n  contractAddress?: Encoded.ContractAddress;\n}\n\n// TODO: replace with api on calldata side https://github.com/aeternity/aepp-calldata-js/issues/216\nexport function encodeFateValue(\n  value: unknown,\n  aci: AciValue,\n): Encoded.ContractBytearray {\n  const contractByteArrayEncoder = new ContractByteArrayEncoder();\n  const aciTypeResolver = new AciTypeResolver([]);\n  aciTypeResolver.isCustomType = () => false;\n  return contractByteArrayEncoder.encode(aciTypeResolver.resolveType(aci), value);\n}\n\n// TODO: replace with api on calldata side https://github.com/aeternity/aepp-calldata-js/issues/216\nexport function decodeFateValue(\n  value: Encoded.ContractBytearray,\n  aci: AciValue,\n): Encoded.ContractBytearray {\n  const contractByteArrayEncoder = new ContractByteArrayEncoder();\n  const aciTypeResolver = new AciTypeResolver([]);\n  aciTypeResolver.isCustomType = () => false;\n  return contractByteArrayEncoder.decodeWithType(value, aciTypeResolver.resolveType(aci));\n}\n\n/**\n * Hashes domain object, can be used to inline domain hash to contract source code\n */\nexport function hashDomain(domain: Domain): Buffer {\n  const domainAci = {\n    record: [{\n      name: 'name',\n      type: { option: ['string'] },\n    }, {\n      name: 'version',\n      type: { option: ['int'] },\n    }, {\n      name: 'networkId',\n      type: { option: ['string'] },\n    }, {\n      name: 'contractAddress',\n      type: { option: ['contract_pubkey'] },\n    }],\n  } as const;\n  return hash(decode(encodeFateValue(domain, domainAci)));\n}\n\nexport function hashTypedData(\n  data: Encoded.ContractBytearray,\n  aci: AciValue,\n  domain: Domain,\n): Buffer {\n  return hash(concatBuffers([\n    messagePrefixLength, new Uint8Array([0]), hashDomain(domain), hashJson(aci), hash(decode(data)),\n  ]));\n}\n"],"mappings":"AAAA;AACA;AACA;AACA,OAAOA,wBAAwB,MAAM,0DAA0D;AAC/F;AACA;AACA,OAAOC,eAAe,MAAM,iDAAiD;AAC7E,OAAOC,YAAY,MAAM,cAAc;AAAC,SACtBC,MAAM;AAAA,SACfC,IAAI,EAAEC,mBAAmB;AAAA,SACzBC,aAAa;AAEtB;AACA;AACA;AACA,OAAO,SAASC,QAAQA,CAACC,IAAa,EAAU;EAAA,IAAAC,aAAA;EAC9C,OAAOL,IAAI,EAAAK,aAAA,GAACP,YAAY,CAACM,IAAI,CAAC,cAAAC,aAAA,cAAAA,aAAA,GAAI,EAAE,CAAC;AACvC;;AAEA;AACA;AAsBA;AACA,OAAO,SAASC,eAAeA,CAC7BC,KAAc,EACdC,GAAa,EACc;EAC3B,MAAMC,wBAAwB,GAAG,IAAIb,wBAAwB,CAAC,CAAC;EAC/D,MAAMc,eAAe,GAAG,IAAIb,eAAe,CAAC,EAAE,CAAC;EAC/Ca,eAAe,CAACC,YAAY,GAAG,MAAM,KAAK;EAC1C,OAAOF,wBAAwB,CAACG,MAAM,CAACF,eAAe,CAACG,WAAW,CAACL,GAAG,CAAC,EAAED,KAAK,CAAC;AACjF;;AAEA;AACA,OAAO,SAASO,eAAeA,CAC7BP,KAAgC,EAChCC,GAAa,EACc;EAC3B,MAAMC,wBAAwB,GAAG,IAAIb,wBAAwB,CAAC,CAAC;EAC/D,MAAMc,eAAe,GAAG,IAAIb,eAAe,CAAC,EAAE,CAAC;EAC/Ca,eAAe,CAACC,YAAY,GAAG,MAAM,KAAK;EAC1C,OAAOF,wBAAwB,CAACM,cAAc,CAACR,KAAK,EAAEG,eAAe,CAACG,WAAW,CAACL,GAAG,CAAC,CAAC;AACzF;;AAEA;AACA;AACA;AACA,OAAO,SAASQ,UAAUA,CAACC,MAAc,EAAU;EACjD,MAAMC,SAAS,GAAG;IAChBC,MAAM,EAAE,CAAC;MACPC,IAAI,EAAE,MAAM;MACZC,IAAI,EAAE;QAAEC,MAAM,EAAE,CAAC,QAAQ;MAAE;IAC7B,CAAC,EAAE;MACDF,IAAI,EAAE,SAAS;MACfC,IAAI,EAAE;QAAEC,MAAM,EAAE,CAAC,KAAK;MAAE;IAC1B,CAAC,EAAE;MACDF,IAAI,EAAE,WAAW;MACjBC,IAAI,EAAE;QAAEC,MAAM,EAAE,CAAC,QAAQ;MAAE;IAC7B,CAAC,EAAE;MACDF,IAAI,EAAE,iBAAiB;MACvBC,IAAI,EAAE;QAAEC,MAAM,EAAE,CAAC,iBAAiB;MAAE;IACtC,CAAC;EACH,CAAU;EACV,OAAOtB,IAAI,CAACD,MAAM,CAACO,eAAe,CAACW,MAAM,EAAEC,SAAS,CAAC,CAAC,CAAC;AACzD;AAEA,OAAO,SAASK,aAAaA,CAC3BnB,IAA+B,EAC/BI,GAAa,EACbS,MAAc,EACN;EACR,OAAOjB,IAAI,CAACE,aAAa,CAAC,CACxBD,mBAAmB,EAAE,IAAIuB,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,EAAER,UAAU,CAACC,MAAM,CAAC,EAAEd,QAAQ,CAACK,GAAG,CAAC,EAAER,IAAI,CAACD,MAAM,CAACK,IAAI,CAAC,CAAC,CAChG,CAAC,CAAC;AACL"}
+{"version":3,"file":"typed-data.mjs","names":["_aeternityAeppCalldata","TypeResolver","ContractByteArrayEncoder","canonicalize","decode","hash","messagePrefixLength","concatBuffers","hashJson","data","_canonicalize","hashDomain","domain","domainAci","record","name","type","option","domainType","resolveType","fateValue","encodeWithType","hashTypedData","aci","Uint8Array"],"sources":["../../src/utils/typed-data.ts"],"sourcesContent":["import { TypeResolver, ContractByteArrayEncoder } from '@aeternity/aepp-calldata';\nimport canonicalize from 'canonicalize';\nimport { Encoded, decode } from './encoder';\nimport { hash, messagePrefixLength } from './crypto';\nimport { concatBuffers } from './other';\n\n/**\n * Hashes arbitrary object, can be used to inline the aci hash to contract source code\n */\nexport function hashJson(data: unknown): Buffer {\n  return hash(canonicalize(data) ?? '');\n}\n\n// TODO: move this type to calldata library https://github.com/aeternity/aepp-calldata-js/issues/215\n// based on https://github.com/aeternity/aepp-calldata-js/blob/82b5a98f9b308482627da8d7484d213e9cf87151/src/AciTypeResolver.js#L129\nexport type AciValue = 'void' | 'unit' | 'int' | 'bool' | 'string' | 'bits' | 'hash' | 'signature'\n| 'address' | 'contract_pubkey' | 'Chain.ttl' | 'Chain.ga_meta_tx' | 'Chain.paying_for_tx'\n| 'Chain.base_tx' | 'AENS.pointee' | 'AENS.name' | 'MCL_BLS12_381.fr' | 'MCL_BLS12_381.fp'\n| { 'Set.set': readonly [AciValue] }\n| { bytes: number }\n| { list: readonly [AciValue] }\n| { map: readonly [AciValue, AciValue] }\n| { tuple: readonly AciValue[] }\n| { record: ReadonlyArray<{ name: string; type: AciValue }> }\n| { variant: ReadonlyArray<{ [key: string]: readonly AciValue[] }> }\n| { option: readonly [AciValue] }\n| { oracle: readonly [AciValue, AciValue] }\n| { oracle_query: readonly [AciValue, AciValue] };\n\nexport interface Domain {\n  name?: string;\n  version?: number;\n  networkId?: string;\n  contractAddress?: Encoded.ContractAddress;\n}\n\n/**\n * Hashes domain object, can be used to inline domain hash to contract source code\n */\nexport function hashDomain(domain: Domain): Buffer {\n  const domainAci = {\n    record: [{\n      name: 'name',\n      type: { option: ['string'] },\n    }, {\n      name: 'version',\n      type: { option: ['int'] },\n    }, {\n      name: 'networkId',\n      type: { option: ['string'] },\n    }, {\n      name: 'contractAddress',\n      type: { option: ['contract_pubkey'] },\n    }],\n  } as const;\n  const domainType = new TypeResolver().resolveType(domainAci, {});\n  const fateValue = new ContractByteArrayEncoder().encodeWithType(domain, domainType);\n  return hash(decode(fateValue));\n}\n\nexport function hashTypedData(\n  data: Encoded.ContractBytearray,\n  aci: AciValue,\n  domain: Domain,\n): Buffer {\n  return hash(concatBuffers([\n    messagePrefixLength, new Uint8Array([0]), hashDomain(domain), hashJson(aci), hash(decode(data)),\n  ]));\n}\n"],"mappings":"AAAA,OAAAA,sBAAA,MAAuD,0BAA0B;AAAC;EAAAC,YAAA;EAAAC;AAAA,IAAAF,sBAAA;AAClF,OAAOG,YAAY,MAAM,cAAc;AAAC,SACtBC,MAAM;AAAA,SACfC,IAAI,EAAEC,mBAAmB;AAAA,SACzBC,aAAa;AAEtB;AACA;AACA;AACA,OAAO,SAASC,QAAQA,CAACC,IAAa,EAAU;EAAA,IAAAC,aAAA;EAC9C,OAAOL,IAAI,EAAAK,aAAA,GAACP,YAAY,CAACM,IAAI,CAAC,cAAAC,aAAA,cAAAA,aAAA,GAAI,EAAE,CAAC;AACvC;;AAEA;AACA;;AAsBA;AACA;AACA;AACA,OAAO,SAASC,UAAUA,CAACC,MAAc,EAAU;EACjD,MAAMC,SAAS,GAAG;IAChBC,MAAM,EAAE,CAAC;MACPC,IAAI,EAAE,MAAM;MACZC,IAAI,EAAE;QAAEC,MAAM,EAAE,CAAC,QAAQ;MAAE;IAC7B,CAAC,EAAE;MACDF,IAAI,EAAE,SAAS;MACfC,IAAI,EAAE;QAAEC,MAAM,EAAE,CAAC,KAAK;MAAE;IAC1B,CAAC,EAAE;MACDF,IAAI,EAAE,WAAW;MACjBC,IAAI,EAAE;QAAEC,MAAM,EAAE,CAAC,QAAQ;MAAE;IAC7B,CAAC,EAAE;MACDF,IAAI,EAAE,iBAAiB;MACvBC,IAAI,EAAE;QAAEC,MAAM,EAAE,CAAC,iBAAiB;MAAE;IACtC,CAAC;EACH,CAAU;EACV,MAAMC,UAAU,GAAG,IAAIjB,YAAY,CAAC,CAAC,CAACkB,WAAW,CAACN,SAAS,EAAE,CAAC,CAAC,CAAC;EAChE,MAAMO,SAAS,GAAG,IAAIlB,wBAAwB,CAAC,CAAC,CAACmB,cAAc,CAACT,MAAM,EAAEM,UAAU,CAAC;EACnF,OAAOb,IAAI,CAACD,MAAM,CAACgB,SAAS,CAAC,CAAC;AAChC;AAEA,OAAO,SAASE,aAAaA,CAC3Bb,IAA+B,EAC/Bc,GAAa,EACbX,MAAc,EACN;EACR,OAAOP,IAAI,CAACE,aAAa,CAAC,CACxBD,mBAAmB,EAAE,IAAIkB,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,EAAEb,UAAU,CAACC,MAAM,CAAC,EAAEJ,QAAQ,CAACe,GAAG,CAAC,EAAElB,IAAI,CAACD,MAAM,CAACK,IAAI,CAAC,CAAC,CAChG,CAAC,CAAC;AACL"}

package/es/utils/wrap-proxy.d.ts

@@ -0,0 +1,2 @@
+export declare function wrapWithProxy<Value extends object | undefined>(valueCb: () => Value): NonNullable<Value>;
+export declare function unwrapProxy<Value extends object>(value: Value): Value;

package/es/utils/wrap-proxy.mjs

@@ -0,0 +1,15 @@
+import { ArgumentError } from "./errors.mjs";
+export function wrapWithProxy(valueCb) {
+  return new Proxy({}, Object.fromEntries(['apply', 'construct', 'defineProperty', 'deleteProperty', 'getOwnPropertyDescriptor', 'getPrototypeOf', 'isExtensible', 'ownKeys', 'preventExtensions', 'set', 'setPrototypeOf', 'get', 'has'].map(name => [name, (t, ...args) => {
+    const target = valueCb();
+    if (target == null) throw new ArgumentError('wrapped value', 'defined', target);
+    if (name === 'get' && args[0] === '_wrappedValue') return target;
+    const res = Reflect[name](target, ...args);
+    return typeof res === 'function' && name === 'get' ? res.bind(target) : res;
+  }])));
+}
+export function unwrapProxy(value) {
+  var _wrappedValue;
+  return (_wrappedValue = value._wrappedValue) !== null && _wrappedValue !== void 0 ? _wrappedValue : value;
+}
+//# sourceMappingURL=wrap-proxy.mjs.map

package/es/utils/wrap-proxy.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"wrap-proxy.mjs","names":["ArgumentError","wrapWithProxy","valueCb","Proxy","Object","fromEntries","map","name","t","args","target","res","Reflect","bind","unwrapProxy","value","_wrappedValue"],"sources":["../../src/utils/wrap-proxy.ts"],"sourcesContent":["import { ArgumentError } from './errors';\n\nexport function wrapWithProxy<Value extends object | undefined>(\n  valueCb: () => Value,\n): NonNullable<Value> {\n  return new Proxy(\n    {},\n    Object.fromEntries(([\n      'apply', 'construct', 'defineProperty', 'deleteProperty', 'getOwnPropertyDescriptor',\n      'getPrototypeOf', 'isExtensible', 'ownKeys', 'preventExtensions', 'set', 'setPrototypeOf',\n      'get', 'has',\n    ] as const).map((name) => [name, (t: {}, ...args: unknown[]) => {\n      const target = valueCb();\n      if (target == null) throw new ArgumentError('wrapped value', 'defined', target);\n      if (name === 'get' && args[0] === '_wrappedValue') return target;\n      const res = (Reflect[name] as any)(target, ...args);\n      return typeof res === 'function' && name === 'get' ? res.bind(target) : res;\n    }])),\n  ) as NonNullable<Value>;\n}\n\nexport function unwrapProxy<Value extends object>(value: Value): Value {\n  return (value as { _wrappedValue?: Value })._wrappedValue ?? value;\n}\n"],"mappings":"SAASA,aAAa;AAEtB,OAAO,SAASC,aAAaA,CAC3BC,OAAoB,EACA;EACpB,OAAO,IAAIC,KAAK,CACd,CAAC,CAAC,EACFC,MAAM,CAACC,WAAW,CAAE,CAClB,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,0BAA0B,EACpF,gBAAgB,EAAE,cAAc,EAAE,SAAS,EAAE,mBAAmB,EAAE,KAAK,EAAE,gBAAgB,EACzF,KAAK,EAAE,KAAK,CACb,CAAWC,GAAG,CAAEC,IAAI,IAAK,CAACA,IAAI,EAAE,CAACC,CAAK,EAAE,GAAGC,IAAe,KAAK;IAC9D,MAAMC,MAAM,GAAGR,OAAO,CAAC,CAAC;IACxB,IAAIQ,MAAM,IAAI,IAAI,EAAE,MAAM,IAAIV,aAAa,CAAC,eAAe,EAAE,SAAS,EAAEU,MAAM,CAAC;IAC/E,IAAIH,IAAI,KAAK,KAAK,IAAIE,IAAI,CAAC,CAAC,CAAC,KAAK,eAAe,EAAE,OAAOC,MAAM;IAChE,MAAMC,GAAG,GAAIC,OAAO,CAACL,IAAI,CAAC,CAASG,MAAM,EAAE,GAAGD,IAAI,CAAC;IACnD,OAAO,OAAOE,GAAG,KAAK,UAAU,IAAIJ,IAAI,KAAK,KAAK,GAAGI,GAAG,CAACE,IAAI,CAACH,MAAM,CAAC,GAAGC,GAAG;EAC7E,CAAC,CAAC,CAAC,CACL,CAAC;AACH;AAEA,OAAO,SAASG,WAAWA,CAAuBC,KAAY,EAAS;EAAA,IAAAC,aAAA;EACrE,QAAAA,aAAA,GAAQD,KAAK,CAA+BC,aAAa,cAAAA,aAAA,cAAAA,aAAA,GAAID,KAAK;AACpE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeternity/aepp-sdk",
-  "version": "13.2.1",
+  "version": "13.3.0",
   "description": "SDK for the æternity blockchain",
   "main": "dist/aepp-sdk.js",
   "types": "es/index.d.ts",
@@ -43,7 +43,7 @@
   },
   "sideEffects": false,
   "scripts": {
-    "build:assets": "node tooling/fetch-aesophia-cli.mjs",
+    "build:assets": "node tooling/fetch-aesophia-cli.mjs && node tooling/fetch-aesophia-cli-8.mjs",
     "build:types": "tsc && node tooling/downlevel/run.mjs",
     "build:es": "babel src --config-file ./babel.esm.config.js --out-dir es --extensions .js,.ts --out-file-extension .mjs --source-maps true",
     "build:api:node": "autorest tooling/autorest/node.yaml",
@@ -75,23 +75,23 @@
     "SDK"
   ],
   "dependencies": {
-    "@aeternity/aepp-calldata": "^1.4.0",
+    "@aeternity/aepp-calldata": "^1.7.0",
     "@aeternity/argon2": "^0.0.1",
     "@aeternity/uuid": "^0.0.1",
-    "@azure/core-client": "1.6.0",
-    "@azure/core-rest-pipeline": "^1.11.0",
-    "@babel/runtime-corejs3": "^7.22.6",
-    "@ledgerhq/hw-transport": "^6.28.6",
-    "@types/aes-js": "^3.1.1",
-    "@types/json-bigint": "^1.0.1",
-    "@types/node": "~18.11.9",
-    "@types/sha.js": "^2.4.1",
-    "@types/uuid": "^9.0.2",
-    "@types/webextension-polyfill": "^0.10.1",
-    "@types/websocket": "^1.0.5",
-    "@types/ws": "^8.5.5",
+    "@azure/core-client": "^1.8.0",
+    "@azure/core-rest-pipeline": "^1.14.0",
+    "@babel/runtime-corejs3": "^7.24.0",
+    "@ledgerhq/hw-transport": "^6.30.4",
+    "@types/aes-js": "^3.1.4",
+    "@types/json-bigint": "^1.0.4",
+    "@types/node": "~18.13",
+    "@types/sha.js": "^2.4.4",
+    "@types/uuid": "^9.0.8",
+    "@types/webextension-polyfill": "^0.10.7",
+    "@types/websocket": "^1.0.10",
+    "@types/ws": "^8.5.10",
     "aes-js": "^3.1.2",
-    "bignumber.js": "^9.1.1",
+    "bignumber.js": "^9.1.2",
     "bip32-path": "^0.4.2",
     "blakejs": "^1.2.1",
     "bs58": "^5.0.0",
@@ -107,58 +107,58 @@
     "tweetnacl-auth": "^1.0.1",
     "varuint-bitcoin": "^1.1.2",
     "websocket": "^1.0.34",
-    "ws": "^8.13.0"
+    "ws": "^8.16.0"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/aeternity/aepp-sdk-js"
   },
   "devDependencies": {
-    "@babel/cli": "^7.22.9",
-    "@babel/core": "^7.22.9",
-    "@babel/node": "^7.22.6",
-    "@babel/plugin-transform-runtime": "^7.22.9",
-    "@babel/preset-env": "^7.22.9",
-    "@babel/preset-typescript": "^7.22.5",
-    "@babel/register": "^7.22.5",
-    "@commitlint/cli": "^17.6.7",
-    "@commitlint/config-conventional": "^17.6.7",
-    "@ledgerhq/hw-transport-mocker": "^6.27.17",
-    "@ledgerhq/hw-transport-node-hid-singleton": "^6.28.16",
-    "@ledgerhq/hw-transport-webusb": "^6.27.17",
-    "@types/chai": "^4.3.5",
-    "@types/chai-as-promised": "^7.1.5",
-    "@types/mocha": "^10.0.1",
-    "@types/node-hid": "^1.3.1",
-    "@types/sinon": "^10.0.15",
-    "@typescript-eslint/eslint-plugin": "^6.2.0",
-    "@typescript-eslint/parser": "^6.2.0",
-    "autorest": "^3.6.3",
+    "@babel/cli": "^7.23.9",
+    "@babel/core": "^7.24.0",
+    "@babel/node": "^7.23.9",
+    "@babel/plugin-transform-runtime": "^7.24.0",
+    "@babel/preset-env": "^7.24.0",
+    "@babel/preset-typescript": "^7.23.3",
+    "@babel/register": "^7.23.7",
+    "@commitlint/cli": "^19.0.3",
+    "@commitlint/config-conventional": "^19.0.3",
+    "@ledgerhq/hw-transport-mocker": "^6.28.4",
+    "@ledgerhq/hw-transport-node-hid-singleton": "^6.30.4",
+    "@ledgerhq/hw-transport-webusb": "^6.28.4",
+    "@types/chai": "^4.3.12",
+    "@types/chai-as-promised": "^7.1.8",
+    "@types/mocha": "^10.0.6",
+    "@types/node-hid": "^1.3.4",
+    "@types/sinon": "^17.0.3",
+    "@typescript-eslint/eslint-plugin": "^7.1.1",
+    "@typescript-eslint/parser": "^7.1.1",
+    "autorest": "^3.7.1",
     "babel-loader": "^9.1.3",
     "babel-plugin-add-import-extension": "^1.6.0",
     "babel-plugin-import-globals": "^2.0.0",
     "babel-plugin-transform-default-named-imports": "^1.2.2",
-    "babel-plugin-transform-import-meta": "^2.2.0",
-    "chai": "^4.3.7",
+    "babel-plugin-transform-import-meta": "^2.2.1",
+    "chai": "^4.4.1",
     "chai-as-promised": "^7.1.1",
     "downlevel-dts": "github:aeternity/downlevel-dts",
-    "eslint": "^8.45.0",
+    "eslint": "^8.57.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-airbnb-typescript": "^17.1.0",
+    "eslint-config-airbnb-typescript": "^18.0.0",
     "eslint-plugin-rulesdir": "^0.2.2",
     "eslint-plugin-tsdoc": "^0.2.17",
-    "html-webpack-plugin": "^5.5.3",
-    "mocha": "^10.2.0",
+    "html-webpack-plugin": "^5.6.0",
+    "mocha": "^10.3.0",
     "nyc": "^15.1.0",
-    "sinon": "^15.2.0",
+    "sinon": "^17.0.1",
     "source-map": "^0.7.4",
     "standard-version": "^9.5.0",
-    "ts-node": "^10.9.1",
-    "typedoc": "^0.24.8",
-    "typedoc-plugin-missing-exports": "^2.0.0",
-    "typescript": "^5.1.6",
-    "webpack": "^5.88.2",
-    "webpack-bundle-analyzer": "^4.9.0",
+    "ts-node": "^10.9.2",
+    "typedoc": "^0.25.11",
+    "typedoc-plugin-missing-exports": "^2.2.0",
+    "typescript": "^5.3.3",
+    "webpack": "^5.90.3",
+    "webpack-bundle-analyzer": "^4.10.1",
     "webpack-cli": "^5.1.4"
   },
   "files": [
@@ -189,5 +189,11 @@
   "engines": {
     "node": ">=14.19.0"
   },
-  "packageManager": "npm@8.19.3"
+  "packageManager": "npm@8.19.3",
+  "contributors": [
+    "Till Kolter <till.kolter@gmail.com>",
+    "Alexander Kahl <ak@sodosopa.io>",
+    "Nazar Duchak <omelko39@gmail.com>",
+    "Denis Davidyuk <denis_davidyuk@hotmail.com>"
+  ]
 }

package/src/AeSdk.ts

@@ -9,6 +9,9 @@ export default class AeSdk extends AeSdkBase {
 
   selectedAddress?: Encoded.AccountAddress;
 
+  /**
+   * @param options - Options
+   */
   constructor(
     { accounts, ...options }: { accounts?: AccountBase[] }
     & ConstructorParameters<typeof AeSdkBase>[0] = {},

package/src/AeSdkAepp.ts

@@ -88,7 +88,6 @@ export default class AeSdkAepp extends AeSdkBase {
    * @param options - Options
    * @param options.connectNode - Request wallet to bind node
    * @param options.name - Node name
-   * @param options.select - Select this node as current
    */
   async connectToWallet(
     connection: BrowserConnection,

package/src/AeSdkBase.ts

@@ -4,8 +4,9 @@ import {
   CompilerError, DuplicateNodeError, NodeNotFoundError, NotImplementedError, TypeError,
 } from './utils/errors';
 import { Encoded } from './utils/encoder';
+import { wrapWithProxy } from './utils/wrap-proxy';
 import CompilerBase from './contract/compiler/Base';
-import AeSdkMethods, { OnAccount, getValueOrErrorProxy, AeSdkMethodsOptions } from './AeSdkMethods';
+import AeSdkMethods, { OnAccount, AeSdkMethodsOptions, WrappedOptions } from './AeSdkMethods';
 import { AensName } from './tx/builder/constants';
 
 type NodeInfo = Awaited<ReturnType<Node['getNodeInfo']>> & { name: string };
@@ -21,6 +22,8 @@ export default class AeSdkBase extends AeSdkMethods {
 
   selectedNodeName?: string;
 
+  readonly #wrappedOptions: WrappedOptions;
+
   /**
    * @param options - Options
    * @param options.nodes - Array of nodes
@@ -33,6 +36,12 @@ export default class AeSdkBase extends AeSdkMethods {
     super(options);
 
     nodes.forEach(({ name, instance }, i) => this.addNode(name, instance, i === 0));
+
+    this.#wrappedOptions = {
+      onNode: wrapWithProxy(() => this.api),
+      onCompiler: wrapWithProxy(() => this.compilerApi),
+      onAccount: wrapWithProxy(() => this._resolveAccount()),
+    };
   }
 
   // TODO: consider dropping this getter, because:
@@ -147,6 +156,11 @@ export default class AeSdkBase extends AeSdkMethods {
     return this._resolveAccount().address;
   }
 
+  /**
+   * Sign data blob
+   * @param data - Data to sign
+   * @param options - Options
+   */
   async sign(
     data: string | Uint8Array,
     { onAccount, ...options }: { onAccount?: OnAccount } = {},
@@ -154,6 +168,11 @@ export default class AeSdkBase extends AeSdkMethods {
     return this._resolveAccount(onAccount).sign(data, options);
   }
 
+  /**
+   * Sign encoded transaction
+   * @param tx - Transaction to sign
+   * @param options - Options
+   */
   async signTransaction(
     tx: Encoded.Transaction,
     { onAccount, ...options }: { onAccount?: OnAccount } & Parameters<AccountBase['signTransaction']>[1] = {},
@@ -162,6 +181,11 @@ export default class AeSdkBase extends AeSdkMethods {
     return this._resolveAccount(onAccount).signTransaction(tx, { networkId, ...options });
   }
 
+  /**
+   * Sign message
+   * @param message - Message to sign
+   * @param options - Options
+   */
   async signMessage(
     message: string,
     { onAccount, ...options }: { onAccount?: OnAccount } & Parameters<AccountBase['signMessage']>[1] = {},
@@ -169,6 +193,12 @@ export default class AeSdkBase extends AeSdkMethods {
     return this._resolveAccount(onAccount).signMessage(message, options);
   }
 
+  /**
+   * Sign typed data
+   * @param data - Encoded data to sign
+   * @param aci - Type of data to sign
+   * @param options - Options
+   */
   async signTypedData(
     data: Encoded.ContractBytearray,
     aci: Parameters<AccountBase['signTypedData']>[1],
@@ -177,6 +207,11 @@ export default class AeSdkBase extends AeSdkMethods {
     return this._resolveAccount(onAccount).signTypedData(data, aci, options);
   }
 
+  /**
+   * @deprecated use AeSdkBase:signDelegation in Ceres
+   * @param contractAddress - Contract address
+   * @param options - Options
+   */
   async signDelegationToContract(
     contractAddress: Encoded.ContractAddress,
     { onAccount, ...options }: { onAccount?: OnAccount }
@@ -184,10 +219,18 @@ export default class AeSdkBase extends AeSdkMethods {
   ): Promise<Encoded.Signature> {
     options.networkId ??= this.selectedNodeName !== null
       ? await this.api.getNetworkId() : undefined;
+    options.consensusProtocolVersion ??= this.selectedNodeName !== null
+      ? (await this.api.getNodeInfo()).consensusProtocolVersion : undefined;
     return this._resolveAccount(onAccount)
       .signDelegationToContract(contractAddress, options);
   }
 
+  /**
+   * @deprecated use AeSdkBase:signDelegation in Ceres
+   * @param contractAddress - Contract address
+   * @param name - AENS name
+   * @param options - Options
+   */
   async signNameDelegationToContract(
     contractAddress: Encoded.ContractAddress,
     name: AensName,
@@ -196,10 +239,36 @@ export default class AeSdkBase extends AeSdkMethods {
   ): Promise<Encoded.Signature> {
     options.networkId ??= this.selectedNodeName !== null
       ? await this.api.getNetworkId() : undefined;
+    options.consensusProtocolVersion ??= this.selectedNodeName !== null
+      ? (await this.api.getNodeInfo()).consensusProtocolVersion : undefined;
     return this._resolveAccount(onAccount)
       .signNameDelegationToContract(contractAddress, name, options);
   }
 
+  /**
+   * @deprecated use AeSdkBase:signDelegation in Ceres
+   * @param contractAddress - Contract address
+   * @param options - Options
+   */
+  async signAllNamesDelegationToContract(
+    contractAddress: Encoded.ContractAddress,
+    { onAccount, ...options }: { onAccount?: OnAccount }
+    & Parameters<AccountBase['signAllNamesDelegationToContract']>[1] = {},
+  ): Promise<Encoded.Signature> {
+    options.networkId ??= this.selectedNodeName !== null
+      ? await this.api.getNetworkId() : undefined;
+    options.consensusProtocolVersion ??= this.selectedNodeName !== null
+      ? (await this.api.getNodeInfo()).consensusProtocolVersion : undefined;
+    return this._resolveAccount(onAccount)
+      .signAllNamesDelegationToContract(contractAddress, options);
+  }
+
+  /**
+   * @deprecated use AeSdkBase:signDelegation in Ceres
+   * @param contractAddress - Contract address
+   * @param oracleQueryId - Oracle query id
+   * @param options - Options
+   */
   async signOracleQueryDelegationToContract(
     contractAddress: Encoded.ContractAddress,
     oracleQueryId: Encoded.OracleQueryId,
@@ -208,21 +277,39 @@ export default class AeSdkBase extends AeSdkMethods {
   ): Promise<Encoded.Signature> {
     options.networkId ??= this.selectedNodeName !== null
       ? await this.api.getNetworkId() : undefined;
+    options.consensusProtocolVersion ??= this.selectedNodeName !== null
+      ? (await this.api.getNodeInfo()).consensusProtocolVersion : undefined;
     return this._resolveAccount(onAccount)
       .signOracleQueryDelegationToContract(contractAddress, oracleQueryId, options);
   }
 
-  override _getOptions(callOptions: AeSdkMethodsOptions = {}): {
-    onNode: Node;
-    onAccount: AccountBase;
-    onCompiler: CompilerBase;
-  } {
+  /**
+   * Sign delegation, works only in Ceres
+   * @param delegation - Delegation to sign
+   * @param options - Options
+   */
+  async signDelegation(
+    delegation: Encoded.Bytearray,
+    { onAccount, ...options }: { onAccount?: OnAccount }
+    & Parameters<AccountBase['signDelegation']>[1] = {},
+  ): Promise<Encoded.Signature> {
+    options.networkId ??= this.selectedNodeName !== null
+      ? await this.api.getNetworkId() : undefined;
+    return this._resolveAccount(onAccount).signDelegation(delegation, options);
+  }
+
+  /**
+   * The same as AeSdkMethods:getContext, but it would resolve ak_-prefixed address in
+   * `mergeWith.onAccount` to AccountBase.
+   */
+  override getContext(mergeWith: AeSdkMethodsOptions = {}): AeSdkMethodsOptions & WrappedOptions {
     return {
       ...this._options,
-      onNode: getValueOrErrorProxy(() => this.api),
-      onCompiler: getValueOrErrorProxy(() => this.compilerApi),
-      ...callOptions,
-      onAccount: getValueOrErrorProxy(() => this._resolveAccount(callOptions.onAccount)),
+      ...this.#wrappedOptions,
+      ...mergeWith,
+      ...mergeWith.onAccount != null && {
+        onAccount: this._resolveAccount(mergeWith.onAccount),
+      },
     };
   }
 }