quantumcoin 6.14.1 → 6.14.2

package/lib.esm/wallet/json-keystore.js

@@ -8,14 +8,14 @@
  *
  *  @_subsection: api/wallet:JSON Wallets  [json-wallets]
  */
-import { CTR } from "aes-js";
-import { getAddress } from "../address/index.js";
-import { keccak256, pbkdf2, randomBytes, scrypt, scryptSync } from "../crypto/index.js";
-import { computeAddress } from "../transaction/index.js";
-import { concat, getBytes, hexlify, uuidV4, assert, assertArgument } from "../utils/index.js";
-import { getPassword, spelunk, zpad } from "./utils.js";
-import { version } from "../_version.js";
-const defaultPath = "m/44'/60'/0'/0/0";
+//import { CTR } from "aes-js";
+//import { getAddress } from "../address/index.js";
+//randomBytes, scrypt, scryptSync, uuidV4
+//import { keccak256  } from "../crypto/index.js";
+//import { computeAddress } from "../transaction/index.js";
+//concat, assert, assertArgument,
+import { getBytes, hexlify, toUtf8String } from "../utils/index.js";
+import { SigningKey } from "../crypto/signing-key";
 /**
  *  Returns true if %%json%% is a valid JSON Keystore Wallet.
  */
@@ -30,104 +30,6 @@ export function isKeystoreJson(json) {
     catch (error) { }
     return false;
 }
-function decrypt(data, key, ciphertext) {
-    const cipher = spelunk(data, "crypto.cipher:string");
-    if (cipher === "aes-128-ctr") {
-        const iv = spelunk(data, "crypto.cipherparams.iv:data!");
-        const aesCtr = new CTR(key, iv);
-        return hexlify(aesCtr.decrypt(ciphertext));
-    }
-    assert(false, "unsupported cipher", "UNSUPPORTED_OPERATION", {
-        operation: "decrypt"
-    });
-}
-function getAccount(data, _key) {
-    const key = getBytes(_key);
-    const ciphertext = spelunk(data, "crypto.ciphertext:data!");
-    const computedMAC = hexlify(keccak256(concat([key.slice(16, 32), ciphertext]))).substring(2);
-    assertArgument(computedMAC === spelunk(data, "crypto.mac:string!").toLowerCase(), "incorrect password", "password", "[ REDACTED ]");
-    const privateKey = decrypt(data, key.slice(0, 16), ciphertext);
-    const address = computeAddress(privateKey);
-    if (data.address) {
-        let check = data.address.toLowerCase();
-        if (!check.startsWith("0x")) {
-            check = "0x" + check;
-        }
-        assertArgument(getAddress(check) === address, "keystore address/privateKey mismatch", "address", data.address);
-    }
-    const account = { address, privateKey };
-    // Version 0.1 x-ethers metadata must contain an encrypted mnemonic phrase
-    const version = spelunk(data, "x-ethers.version:string");
-    if (version === "0.1") {
-        const mnemonicKey = key.slice(32, 64);
-        const mnemonicCiphertext = spelunk(data, "x-ethers.mnemonicCiphertext:data!");
-        const mnemonicIv = spelunk(data, "x-ethers.mnemonicCounter:data!");
-        const mnemonicAesCtr = new CTR(mnemonicKey, mnemonicIv);
-        account.mnemonic = {
-            path: (spelunk(data, "x-ethers.path:string") || defaultPath),
-            locale: (spelunk(data, "x-ethers.locale:string") || "en"),
-            entropy: hexlify(getBytes(mnemonicAesCtr.decrypt(mnemonicCiphertext)))
-        };
-    }
-    return account;
-}
-function getDecryptKdfParams(data) {
-    const kdf = spelunk(data, "crypto.kdf:string");
-    if (kdf && typeof (kdf) === "string") {
-        if (kdf.toLowerCase() === "scrypt") {
-            const salt = spelunk(data, "crypto.kdfparams.salt:data!");
-            const N = spelunk(data, "crypto.kdfparams.n:int!");
-            const r = spelunk(data, "crypto.kdfparams.r:int!");
-            const p = spelunk(data, "crypto.kdfparams.p:int!");
-            // Make sure N is a power of 2
-            assertArgument(N > 0 && (N & (N - 1)) === 0, "invalid kdf.N", "kdf.N", N);
-            assertArgument(r > 0 && p > 0, "invalid kdf", "kdf", kdf);
-            const dkLen = spelunk(data, "crypto.kdfparams.dklen:int!");
-            assertArgument(dkLen === 32, "invalid kdf.dklen", "kdf.dflen", dkLen);
-            return { name: "scrypt", salt, N, r, p, dkLen: 64 };
-        }
-        else if (kdf.toLowerCase() === "pbkdf2") {
-            const salt = spelunk(data, "crypto.kdfparams.salt:data!");
-            const prf = spelunk(data, "crypto.kdfparams.prf:string!");
-            const algorithm = prf.split("-").pop();
-            assertArgument(algorithm === "sha256" || algorithm === "sha512", "invalid kdf.pdf", "kdf.pdf", prf);
-            const count = spelunk(data, "crypto.kdfparams.c:int!");
-            const dkLen = spelunk(data, "crypto.kdfparams.dklen:int!");
-            assertArgument(dkLen === 32, "invalid kdf.dklen", "kdf.dklen", dkLen);
-            return { name: "pbkdf2", salt, count, dkLen, algorithm };
-        }
-    }
-    assertArgument(false, "unsupported key-derivation function", "kdf", kdf);
-}
-/**
- *  Returns the account details for the JSON Keystore Wallet %%json%%
- *  using %%password%%.
- *
- *  It is preferred to use the [async version](decryptKeystoreJson)
- *  instead, which allows a [[ProgressCallback]] to keep the user informed
- *  as to the decryption status.
- *
- *  This method will block the event loop (freezing all UI) until decryption
- *  is complete, which can take quite some time, depending on the wallet
- *  paramters and platform.
- */
-export function decryptKeystoreJsonSync(json, _password) {
-    const data = JSON.parse(json);
-    const password = getPassword(_password);
-    const params = getDecryptKdfParams(data);
-    if (params.name === "pbkdf2") {
-        const { salt, count, dkLen, algorithm } = params;
-        const key = pbkdf2(password, salt, count, dkLen, algorithm);
-        return getAccount(data, key);
-    }
-    assert(params.name === "scrypt", "cannot be reached", "UNKNOWN_ERROR", { params });
-    const { salt, N, r, p, dkLen } = params;
-    const key = scryptSync(password, salt, N, r, p, dkLen);
-    return getAccount(data, key);
-}
-function stall(duration) {
-    return new Promise((resolve) => { setTimeout(() => { resolve(); }, duration); });
-}
 /**
  *  Resolves to the decrypted JSON Keystore Wallet %%json%% using the
  *  %%password%%.
@@ -135,136 +37,22 @@ function stall(duration) {
  *  If provided, %%progress%% will be called periodically during the
  *  decrpytion to provide feedback, and if the function returns
  *  ``false`` will halt decryption.
- *
- *  The %%progressCallback%% will **always** receive ``0`` before
- *  decryption begins and ``1`` when complete.
  */
-export async function decryptKeystoreJson(json, _password, progress) {
-    const data = JSON.parse(json);
-    const password = getPassword(_password);
-    const params = getDecryptKdfParams(data);
-    if (params.name === "pbkdf2") {
-        if (progress) {
-            progress(0);
-            await stall(0);
-        }
-        const { salt, count, dkLen, algorithm } = params;
-        const key = pbkdf2(password, salt, count, dkLen, algorithm);
-        if (progress) {
-            progress(1);
-            await stall(0);
-        }
-        return getAccount(data, key);
+export function decryptKeystoreJsonSync(json, _password) {
+    let pass;
+    if (typeof _password === 'string') {
+        pass = _password;
     }
-    assert(params.name === "scrypt", "cannot be reached", "UNKNOWN_ERROR", { params });
-    const { salt, N, r, p, dkLen } = params;
-    const key = await scrypt(password, salt, N, r, p, dkLen, progress);
-    return getAccount(data, key);
-}
-function getEncryptKdfParams(options) {
-    // Check/generate the salt
-    const salt = (options.salt != null) ? getBytes(options.salt, "options.salt") : randomBytes(32);
-    // Override the scrypt password-based key derivation function parameters
-    let N = (1 << 17), r = 8, p = 1;
-    if (options.scrypt) {
-        if (options.scrypt.N) {
-            N = options.scrypt.N;
-        }
-        if (options.scrypt.r) {
-            r = options.scrypt.r;
-        }
-        if (options.scrypt.p) {
-            p = options.scrypt.p;
-        }
+    else {
+        pass = toUtf8String(_password);
     }
-    assertArgument(typeof (N) === "number" && N > 0 && Number.isSafeInteger(N) && (BigInt(N) & BigInt(N - 1)) === BigInt(0), "invalid scrypt N parameter", "options.N", N);
-    assertArgument(typeof (r) === "number" && r > 0 && Number.isSafeInteger(r), "invalid scrypt r parameter", "options.r", r);
-    assertArgument(typeof (p) === "number" && p > 0 && Number.isSafeInteger(p), "invalid scrypt p parameter", "options.p", p);
-    return { name: "scrypt", dkLen: 32, salt, N, r, p };
-}
-function _encryptKeystore(key, kdf, account, options) {
-    const privateKey = getBytes(account.privateKey, "privateKey");
-    // Override initialization vector
-    const iv = (options.iv != null) ? getBytes(options.iv, "options.iv") : randomBytes(16);
-    assertArgument(iv.length === 16, "invalid options.iv length", "options.iv", options.iv);
-    // Override the uuid
-    const uuidRandom = (options.uuid != null) ? getBytes(options.uuid, "options.uuid") : randomBytes(16);
-    assertArgument(uuidRandom.length === 16, "invalid options.uuid length", "options.uuid", options.iv);
-    // This will be used to encrypt the wallet (as per Web3 secret storage)
-    // - 32 bytes   As normal for the Web3 secret storage (derivedKey, macPrefix)
-    // - 32 bytes   AES key to encrypt mnemonic with (required here to be Ethers Wallet)
-    const derivedKey = key.slice(0, 16);
-    const macPrefix = key.slice(16, 32);
-    // Encrypt the private key
-    const aesCtr = new CTR(derivedKey, iv);
-    const ciphertext = getBytes(aesCtr.encrypt(privateKey));
-    // Compute the message authentication code, used to check the password
-    const mac = keccak256(concat([macPrefix, ciphertext]));
-    // See: https://github.com/ethereum/wiki/wiki/Web3-Secret-Storage-Definition
-    const data = {
-        address: account.address.substring(2).toLowerCase(),
-        id: uuidV4(uuidRandom),
-        version: 3,
-        Crypto: {
-            cipher: "aes-128-ctr",
-            cipherparams: {
-                iv: hexlify(iv).substring(2),
-            },
-            ciphertext: hexlify(ciphertext).substring(2),
-            kdf: "scrypt",
-            kdfparams: {
-                salt: hexlify(kdf.salt).substring(2),
-                n: kdf.N,
-                dklen: 32,
-                p: kdf.p,
-                r: kdf.r
-            },
-            mac: mac.substring(2)
-        }
+    let wal = qcsdk.deserializeEncryptedWallet(json, pass);
+    let privKey = wal.privateKey;
+    let ks = {
+        address: wal.address,
+        privateKey: hexlify(privKey)
     };
-    // If we have a mnemonic, encrypt it into the JSON wallet
-    if (account.mnemonic) {
-        const client = (options.client != null) ? options.client : `ethers/${version}`;
-        const path = account.mnemonic.path || defaultPath;
-        const locale = account.mnemonic.locale || "en";
-        const mnemonicKey = key.slice(32, 64);
-        const entropy = getBytes(account.mnemonic.entropy, "account.mnemonic.entropy");
-        const mnemonicIv = randomBytes(16);
-        const mnemonicAesCtr = new CTR(mnemonicKey, mnemonicIv);
-        const mnemonicCiphertext = getBytes(mnemonicAesCtr.encrypt(entropy));
-        const now = new Date();
-        const timestamp = (now.getUTCFullYear() + "-" +
-            zpad(now.getUTCMonth() + 1, 2) + "-" +
-            zpad(now.getUTCDate(), 2) + "T" +
-            zpad(now.getUTCHours(), 2) + "-" +
-            zpad(now.getUTCMinutes(), 2) + "-" +
-            zpad(now.getUTCSeconds(), 2) + ".0Z");
-        const gethFilename = ("UTC--" + timestamp + "--" + data.address);
-        data["x-ethers"] = {
-            client, gethFilename, path, locale,
-            mnemonicCounter: hexlify(mnemonicIv).substring(2),
-            mnemonicCiphertext: hexlify(mnemonicCiphertext).substring(2),
-            version: "0.1"
-        };
-    }
-    return JSON.stringify(data);
-}
-/**
- *  Return the JSON Keystore Wallet for %%account%% encrypted with
- *  %%password%%.
- *
- *  The %%options%% can be used to tune the password-based key
- *  derivation function parameters, explicitly set the random values
- *  used. Any provided [[ProgressCallback]] is ignord.
- */
-export function encryptKeystoreJsonSync(account, password, options) {
-    if (options == null) {
-        options = {};
-    }
-    const passwordBytes = getPassword(password);
-    const kdf = getEncryptKdfParams(options);
-    const key = scryptSync(passwordBytes, kdf.salt, kdf.N, kdf.r, kdf.p, 64);
-    return _encryptKeystore(getBytes(key), kdf, account, options);
+    return ks;
 }
 /**
  *  Resolved to the JSON Keystore Wallet for %%account%% encrypted
@@ -272,16 +60,19 @@ export function encryptKeystoreJsonSync(account, password, options) {
  *
  *  The %%options%% can be used to tune the password-based key
  *  derivation function parameters, explicitly set the random values
- *  used and provide a [[ProgressCallback]] to receive periodic updates
- *  on the completion status..
+ *  used.
  */
-export async function encryptKeystoreJson(account, password, options) {
-    if (options == null) {
-        options = {};
+export function encryptKeystoreJsonSync(account, password) {
+    const signingKey = new SigningKey(account.privateKey);
+    const privateKey = getBytes(signingKey.privateKey);
+    const publicKey = getBytes(signingKey.publicKey);
+    const wal = new qcsdk.Wallet(account.address, privateKey, publicKey);
+    if (typeof password === 'string') {
+        return qcsdk.serializeEncryptedWallet(wal, password);
+    }
+    else {
+        let passPhrase = toUtf8String(password);
+        return qcsdk.serializeEncryptedWallet(wal, passPhrase);
     }
-    const passwordBytes = getPassword(password);
-    const kdf = getEncryptKdfParams(options);
-    const key = await scrypt(passwordBytes, kdf.salt, kdf.N, kdf.r, kdf.p, 64, options.progressCallback);
-    return _encryptKeystore(getBytes(key), kdf, account, options);
 }
 //# sourceMappingURL=json-keystore.js.map

package/lib.esm/wallet/json-keystore.js.map

@@ -1 +1 @@
-{"version":3,"file":"json-keystore.js","sourceRoot":"","sources":["../../src.ts/wallet/json-keystore.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"json-keystore.js","sourceRoot":"","sources":["../../src.ts/wallet/json-keystore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,+BAA+B;AAE/B,mDAAmD;AACnD,yCAAyC;AACzC,kDAAkD;AAClD,2DAA2D;AAC3D,iCAAiC;AACjC,OAAO,EACH,QAAQ,EAAE,OAAO,EAAE,YAAY,EAClC,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAuBhD;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,IAAY;IACvC,IAAI;QACA,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9B,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC,CAAC;QACrE,IAAI,OAAO,KAAK,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;SAAE;KACtC;IAAC,OAAO,KAAK,EAAE,GAAG;IACnB,OAAO,KAAK,CAAC;AACjB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,uBAAuB,CAAC,IAAY,EAAE,SAA8B;IAChF,IAAI,IAAY,CAAC;IACjB,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;QAC/B,IAAI,GAAG,SAAS,CAAC;KACpB;SAAM;QACH,IAAI,GAAI,YAAY,CAAC,SAAS,CAAC,CAAC;KACnC;IAED,IAAI,GAAG,GAAG,KAAK,CAAC,0BAA0B,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACvD,IAAI,OAAO,GAAQ,GAAG,CAAC,UAAU,CAAC;IAElC,IAAI,EAAE,GAAoB;QACtB,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC;KAC/B,CAAC;IAEF,OAAO,EAAE,CAAC;AACd,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,uBAAuB,CAAC,OAAwB,EAAE,QAA6B;IAC3F,MAAM,UAAU,GAAe,IAAI,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAClE,MAAM,UAAU,GAAQ,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IACxD,MAAM,SAAS,GAAQ,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACtD,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;IAErE,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;QAC9B,OAAO,KAAK,CAAC,wBAAwB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;KACxD;SAAM;QACH,IAAI,UAAU,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;QACxC,OAAO,KAAK,CAAC,wBAAwB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;KAC1D;AACL,CAAC"}

package/lib.esm/wallet/seedwallet.d.ts

@@ -0,0 +1,4 @@
+import { BaseWallet } from "./base-wallet.js";
+export declare class HDNodeWallet extends BaseWallet {
+}
+//# sourceMappingURL=seedwallet.d.ts.map

package/lib.esm/wallet/seedwallet.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"seedwallet.d.ts","sourceRoot":"","sources":["../../src.ts/wallet/seedwallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,qBAAa,YAAa,SAAQ,UAAU;CAE3C"}

package/lib.esm/wallet/seedwallet.js

@@ -0,0 +1,4 @@
+import { BaseWallet } from "./base-wallet.js";
+export class HDNodeWallet extends BaseWallet {
+}
+//# sourceMappingURL=seedwallet.js.map

package/lib.esm/wallet/seedwallet.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"seedwallet.js","sourceRoot":"","sources":["../../src.ts/wallet/seedwallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,OAAO,YAAa,SAAQ,UAAU;CAE3C"}

package/lib.esm/wallet/wallet.d.ts

@@ -1,7 +1,5 @@
 import { SigningKey } from "../crypto/index.js";
 import { BaseWallet } from "./base-wallet.js";
-import { HDNodeWallet } from "./hdwallet.js";
-import type { ProgressCallback } from "../crypto/index.js";
 import type { Provider } from "../providers/index.js";
 /**
  *  A **Wallet** manages a single private key which is used to sign
@@ -28,7 +26,7 @@ export declare class Wallet extends BaseWallet {
      *  If %%progressCallback%% is specified, it will receive periodic
      *  updates as the encryption process progreses.
      */
-    encrypt(password: Uint8Array | string, progressCallback?: ProgressCallback): Promise<string>;
+    encrypt(password: Uint8Array | string): Promise<string>;
     /**
      *  Returns a [JSON Keystore Wallet](json-wallets) encryped with
      *  %%password%%.
@@ -43,11 +41,8 @@ export declare class Wallet extends BaseWallet {
     /**
      *  Creates (asynchronously) a **Wallet** by decrypting the %%json%%
      *  with %%password%%.
-     *
-     *  If %%progress%% is provided, it is called periodically during
-     *  decryption so that any UI can be updated.
      */
-    static fromEncryptedJson(json: string, password: Uint8Array | string, progress?: ProgressCallback): Promise<HDNodeWallet | Wallet>;
+    static fromEncryptedJson(json: string, password: Uint8Array | string): Promise<Wallet>;
     /**
      *  Creates a **Wallet** by decrypting the %%json%% with %%password%%.
      *
@@ -55,17 +50,13 @@ export declare class Wallet extends BaseWallet {
      *  will lock up and freeze the UI during decryption, which may take
      *  some time.
      */
-    static fromEncryptedJsonSync(json: string, password: Uint8Array | string): HDNodeWallet | Wallet;
+    static fromEncryptedJsonSync(json: string, password: Uint8Array | string): Wallet;
     /**
-     *  Creates a new random [[HDNodeWallet]] using the available
+     *  Creates a new random [[Wallet]] using the available
      *  [cryptographic random source](randomBytes).
      *
      *  If there is no crytographic random source, this will throw.
      */
-    static createRandom(provider?: null | Provider): HDNodeWallet;
-    /**
-     *  Creates a [[HDNodeWallet]] for %%phrase%%.
-     */
-    static fromPhrase(phrase: string, provider?: Provider): HDNodeWallet;
+    static createRandom(provider?: null | Provider): Wallet;
 }
 //# sourceMappingURL=wallet.d.ts.map

package/lib.esm/wallet/wallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../src.ts/wallet/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAS7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAUtD;;;;;;;;;GASG;AACH,qBAAa,MAAO,SAAQ,UAAU;;IAElC;;;OAGG;gBACS,GAAG,EAAE,MAAM,GAAG,UAAU,EAAE,QAAQ,CAAC,EAAE,IAAI,GAAG,QAAQ;IAShE,OAAO,CAAC,QAAQ,EAAE,IAAI,GAAG,QAAQ,GAAG,MAAM;IAI1C;;;;;;OAMG;IACG,OAAO,CAAC,QAAQ,EAAE,UAAU,GAAG,MAAM,EAAE,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;IAKlG;;;;;;;;;OASG;IACH,WAAW,CAAC,QAAQ,EAAE,UAAU,GAAG,MAAM,GAAG,MAAM;IAyBlD;;;;;;OAMG;WACU,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,GAAG,MAAM,EAAE,QAAQ,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC;IAexI;;;;;;OAMG;IACH,MAAM,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,MAAM;IAahG;;;;;OAKG;IACH,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,IAAI,GAAG,QAAQ,GAAG,YAAY;IAM7D;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,YAAY;CAKvE"}
+{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../src.ts/wallet/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAW9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAKtD;;;;;;;;;GASG;AACH,qBAAa,MAAO,SAAQ,UAAU;;IAElC;;;OAGG;gBACS,GAAG,EAAE,MAAM,GAAG,UAAU,EAAE,QAAQ,CAAC,EAAE,IAAI,GAAG,QAAQ;IAShE,OAAO,CAAC,QAAQ,EAAE,IAAI,GAAG,QAAQ,GAAG,MAAM;IAI1C;;;;;;OAMG;IACG,OAAO,CAAC,QAAQ,EAAE,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK7D;;;;;;;;;OASG;IACH,WAAW,CAAC,QAAQ,EAAE,UAAU,GAAG,MAAM,GAAG,MAAM;IAgBlD;;;OAGG;WACU,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAU5F;;;;;;OAMG;IACH,MAAM,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,GAAG,MAAM,GAAG,MAAM;IAWjF;;;;;OAKG;IACH,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,IAAI,GAAG,QAAQ,GAAG,MAAM;CAc1D"}

package/lib.esm/wallet/wallet.js

@@ -1,13 +1,9 @@
 import { SigningKey } from "../crypto/index.js";
-import { assertArgument } from "../utils/index.js";
+import { assertArgument, hexlify } from "../utils/index.js";
 import { BaseWallet } from "./base-wallet.js";
-import { HDNodeWallet } from "./hdwallet.js";
-import { decryptCrowdsaleJson, isCrowdsaleJson } from "./json-crowdsale.js";
-import { decryptKeystoreJson, decryptKeystoreJsonSync, encryptKeystoreJson, encryptKeystoreJsonSync, isKeystoreJson } from "./json-keystore.js";
-import { Mnemonic } from "./mnemonic.js";
-function stall(duration) {
-    return new Promise((resolve) => { setTimeout(() => { resolve(); }, duration); });
-}
+//import { decryptCrowdsaleJson, isCrowdsaleJson  } from "./json-crowdsale.js";
+import { decryptKeystoreJsonSync, encryptKeystoreJsonSync, isKeystoreJson } from "./json-keystore.js";
+//import {newWallet} from "quantum-coin-js-sdk";
 /**
  *  A **Wallet** manages a single private key which is used to sign
  *  transactions, messages and other common payloads.
@@ -40,9 +36,9 @@ export class Wallet extends BaseWallet {
      *  If %%progressCallback%% is specified, it will receive periodic
      *  updates as the encryption process progreses.
      */
-    async encrypt(password, progressCallback) {
+    async encrypt(password) {
         const account = { address: this.address, privateKey: this.privateKey };
-        return await encryptKeystoreJson(account, password, { progressCallback });
+        return encryptKeystoreJsonSync(account, password);
     }
     /**
      *  Returns a [JSON Keystore Wallet](json-wallets) encryped with
@@ -60,14 +56,6 @@ export class Wallet extends BaseWallet {
     }
     static #fromAccount(account) {
         assertArgument(account, "invalid JSON wallet", "json", "[ REDACTED ]");
-        if ("mnemonic" in account && account.mnemonic && account.mnemonic.locale === "en") {
-            const mnemonic = Mnemonic.fromEntropy(account.mnemonic.entropy);
-            const wallet = HDNodeWallet.fromMnemonic(mnemonic, account.mnemonic.path);
-            if (wallet.address === account.address && wallet.privateKey === account.privateKey) {
-                return wallet;
-            }
-            console.log("WARNING: JSON mismatch address/privateKey != mnemonic; fallback onto private key");
-        }
         const wallet = new Wallet(account.privateKey);
         assertArgument(wallet.address === account.address, "address/privateKey mismatch", "json", "[ REDACTED ]");
         return wallet;
@@ -75,25 +63,11 @@ export class Wallet extends BaseWallet {
     /**
      *  Creates (asynchronously) a **Wallet** by decrypting the %%json%%
      *  with %%password%%.
-     *
-     *  If %%progress%% is provided, it is called periodically during
-     *  decryption so that any UI can be updated.
      */
-    static async fromEncryptedJson(json, password, progress) {
+    static async fromEncryptedJson(json, password) {
         let account = null;
         if (isKeystoreJson(json)) {
-            account = await decryptKeystoreJson(json, password, progress);
-        }
-        else if (isCrowdsaleJson(json)) {
-            if (progress) {
-                progress(0);
-                await stall(0);
-            }
-            account = decryptCrowdsaleJson(json, password);
-            if (progress) {
-                progress(1);
-                await stall(0);
-            }
+            account = decryptKeystoreJsonSync(json, password);
         }
         return Wallet.#fromAccount(account);
     }
@@ -109,36 +83,21 @@ export class Wallet extends BaseWallet {
         if (isKeystoreJson(json)) {
             account = decryptKeystoreJsonSync(json, password);
         }
-        else if (isCrowdsaleJson(json)) {
-            account = decryptCrowdsaleJson(json, password);
-        }
         else {
             assertArgument(false, "invalid JSON wallet", "json", "[ REDACTED ]");
         }
         return Wallet.#fromAccount(account);
     }
     /**
-     *  Creates a new random [[HDNodeWallet]] using the available
+     *  Creates a new random [[Wallet]] using the available
      *  [cryptographic random source](randomBytes).
      *
      *  If there is no crytographic random source, this will throw.
      */
     static createRandom(provider) {
-        const wallet = HDNodeWallet.createRandom();
-        if (provider) {
-            return wallet.connect(provider);
-        }
-        return wallet;
-    }
-    /**
-     *  Creates a [[HDNodeWallet]] for %%phrase%%.
-     */
-    static fromPhrase(phrase, provider) {
-        const wallet = HDNodeWallet.fromPhrase(phrase);
-        if (provider) {
-            return wallet.connect(provider);
-        }
-        return wallet;
+        let wal = qcsdk.newWallet();
+        let privKey = wal.privateKey;
+        return new Wallet(hexlify(privKey));
     }
 }
 //# sourceMappingURL=wallet.js.map

package/lib.esm/wallet/wallet.js.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../src.ts/wallet/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAG,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EACH,mBAAmB,EAAE,uBAAuB,EAC5C,mBAAmB,EAAE,uBAAuB,EAC5C,cAAc,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AASzC,SAAS,KAAK,CAAC,QAAgB;IAC3B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACrF,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,OAAO,MAAO,SAAQ,UAAU;IAElC;;;OAGG;IACH,YAAY,GAAwB,EAAE,QAA0B;QAC5D,IAAI,OAAM,CAAC,GAAG,CAAC,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACnD,GAAG,GAAG,IAAI,GAAG,GAAG,CAAC;SACpB;QAED,IAAI,UAAU,GAAG,CAAC,OAAM,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,GAAG,CAAC,CAAA,CAAC,CAAC,GAAG,CAAC;QACvE,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,CAAC,QAAyB;QAC7B,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACjD,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,OAAO,CAAC,QAA6B,EAAE,gBAAmC;QAC5E,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC;QACvE,OAAO,MAAM,mBAAmB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED;;;;;;;;;OASG;IACH,WAAW,CAAC,QAA6B;QACrC,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC;QACvE,OAAO,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,OAAkD;QAClE,cAAc,CAAC,OAAO,EAAE,qBAAqB,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QAEvE,IAAI,UAAU,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,IAAI,EAAE;YAC/E,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAChE,MAAM,MAAM,GAAG,YAAY,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC1E,IAAI,MAAM,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,UAAU,KAAK,OAAO,CAAC,UAAU,EAAE;gBAChF,OAAO,MAAM,CAAC;aACjB;YACD,OAAO,CAAC,GAAG,CAAC,kFAAkF,CAAC,CAAC;SACnG;QAED,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAE9C,cAAc,CAAC,MAAM,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO,EAC7C,6BAA6B,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QAE3D,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAY,EAAE,QAA6B,EAAE,QAA2B;QACnG,IAAI,OAAO,GAA8C,IAAI,CAAC;QAC9D,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE;YACtB,OAAO,GAAG,MAAM,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;SAEjE;aAAM,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;YAC9B,IAAI,QAAQ,EAAE;gBAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;gBAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC;aAAE;YAC9C,OAAO,GAAG,oBAAoB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC/C,IAAI,QAAQ,EAAE;gBAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;gBAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC;aAAE;SAEjD;QAED,OAAO,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,qBAAqB,CAAC,IAAY,EAAE,QAA6B;QACpE,IAAI,OAAO,GAA8C,IAAI,CAAC;QAC9D,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE;YACtB,OAAO,GAAG,uBAAuB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;SACrD;aAAM,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;YAC9B,OAAO,GAAG,oBAAoB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;SAClD;aAAM;YACH,cAAc,CAAC,KAAK,EAAE,qBAAqB,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;SACxE;QAED,OAAO,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,YAAY,CAAC,QAA0B;QAC1C,MAAM,MAAM,GAAG,YAAY,CAAC,YAAY,EAAE,CAAC;QAC3C,IAAI,QAAQ,EAAE;YAAE,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;SAAE;QAClD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,MAAc,EAAE,QAAmB;QACjD,MAAM,MAAM,GAAG,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC/C,IAAI,QAAQ,EAAE;YAAE,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;SAAE;QAClD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}
+{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../src.ts/wallet/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAC,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,+EAA+E;AAC/E,OAAO,EACH,uBAAuB,EACvB,uBAAuB,EACvB,cAAc,EACjB,MAAM,oBAAoB,CAAC;AAO5B,gDAAgD;AAEhD;;;;;;;;;GASG;AACH,MAAM,OAAO,MAAO,SAAQ,UAAU;IAElC;;;OAGG;IACH,YAAY,GAAwB,EAAE,QAA0B;QAC5D,IAAI,OAAM,CAAC,GAAG,CAAC,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACnD,GAAG,GAAG,IAAI,GAAG,GAAG,CAAC;SACpB;QAED,IAAI,UAAU,GAAG,CAAC,OAAM,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,GAAG,CAAC,CAAA,CAAC,CAAC,GAAG,CAAC;QACvE,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,CAAC,QAAyB;QAC7B,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACjD,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,OAAO,CAAC,QAA6B;QACvC,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC;QACvE,OAAO,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACtD,CAAC;IAED;;;;;;;;;OASG;IACH,WAAW,CAAC,QAA6B;QACrC,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC;QACvE,OAAO,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,OAA+B;QAC/C,cAAc,CAAC,OAAO,EAAE,qBAAqB,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QAEvE,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAE9C,cAAc,CAAC,MAAM,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO,EAC7C,6BAA6B,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QAE3D,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAY,EAAE,QAA6B;QACtE,IAAI,OAAO,GAA2B,IAAI,CAAC;QAC3C,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE;YACtB,OAAO,GAAG,uBAAuB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;SAErD;QAED,OAAO,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,qBAAqB,CAAC,IAAY,EAAE,QAA6B;QACpE,IAAI,OAAO,GAA2B,IAAI,CAAC;QAC3C,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE;YACtB,OAAO,GAAG,uBAAuB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;SACrD;aAAM;YACH,cAAc,CAAC,KAAK,EAAE,qBAAqB,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;SACxE;QAED,OAAO,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,YAAY,CAAC,QAA0B;QAC1C,IAAI,GAAG,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QAC5B,IAAI,OAAO,GAAQ,GAAG,CAAC,UAAU,CAAC;QAClC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IACxC,CAAC;CAUJ"}

package/package.json

@@ -14,6 +14,7 @@
     "@noble/hashes": "1.3.2",
     "@types/node": "22.7.5",
     "aes-js": "4.0.0-beta.5",
+    "seed-words": "^1.0.2",
     "tslib": "2.7.0",
     "ws": "8.17.1"
   },
@@ -24,6 +25,8 @@
     "@types/semver": "7.5.8",
     "c8": "7.12.0",
     "mocha": "10.7.3",
+    "quantum-coin-pqc-js-sdk": "^1.0.5",
+    "quantum-coin-js-sdk": "^1.0.20",
     "rollup": "4.24.0",
     "semver": "7.6.3",
     "typescript": "5.0.4",
@@ -105,7 +108,7 @@
   },
   "scripts": {
     "_build-dist": "rollup -c && uglifyjs ./dist/quantumcoin.js -o ./dist/quantumcoin.min.js && uglifyjs ./dist/quantumcoin.umd.js -o ./dist/quantumcoin.umd.min.js && uglifyjs ./dist/wordlists-extra.js -o ./dist/wordlists-extra.min.js",
-    "_dist-stats": "gzip -k9f -S '.gz' ./dist/quantumcoin.min.js && gzip -k9f -S '.gz' ./dist/quantumcoin.umd.min.js && gzip -k9f -S '.gz' ./dist/wordlists-extra.min.js && du -hs ./dist/*.gz && echo '' && du -hs ./dist/*.js",
+    "_dist-stats": "gzip -k9f -S '.gz' ./dist/quantumcoin.min.js && gzip -k9f -S '.gz' ./dist/quantumcoin.umd.min.js && gzip -k9f -S '.gz' ./dist/wordlists-extra.min.js",
     "auto-build": "npm run build -- -w",
     "build": "tsc --project tsconfig.esm.json",
     "build-all": "npm run build && npm run build-commonjs",
@@ -122,5 +125,5 @@
     "test-esm": "mocha --trace-warnings --reporter ./reporter.cjs ./lib.esm/_tests/test-*.js"
   },
   "sideEffects": false,
-  "version": "6.14.1"
+  "version": "6.14.2"
 }

package/src.ts/address/address.ts

@@ -1,7 +1,6 @@
 import { keccak256 } from "../crypto/index.js";
 import { getBytes, assertArgument } from "../utils/index.js";
 
-
 const BN_0 = BigInt(0);
 const BN_36 = BigInt(36);
 
@@ -83,8 +82,7 @@ function fromBase36(value: string): bigint {
 
 /**
  *  Returns a normalized and checksumed address for %%address%%.
- *  This accepts non-checksum addresses, checksum addresses and
- *  [[getIcapAddress]] formats.
+ *  This accepts non-checksum addresses, checksum addresses formats.
  *
  *  The checksum in Ethereum uses the capitalization (upper-case
  *  vs lower-case) of the characters within an address to encode
@@ -147,27 +145,4 @@ export function getAddress(address: string): string {
     assertArgument(false, "invalid address", "address", address);
 }
 
-/**
- *  The [ICAP Address format](link-icap) format is an early checksum
- *  format which attempts to be compatible with the banking
- *  industry [IBAN format](link-wiki-iban) for bank accounts.
- *
- *  It is no longer common or a recommended format.
- *
- *  @example:
- *    getIcapAddress("0x8ba1f109551bd432803012645ac136ddd64dba72");
- *    //_result:
- *
- *    getIcapAddress("XE65GB6LDNXYOFTX0NSV3FUWKOWIXAMJK36");
- *    //_result:
- *
- *    // Throws an error if the ICAP checksum is wrong
- *    getIcapAddress("XE65GB6LDNXYOFTX0NSV3FUWKOWIXAMJK37");
- *    //_error:
- */
-export function getIcapAddress(address: string): string {
-    //let base36 = _base16To36(getAddress(address).substring(2)).toUpperCase();
-    let base36 = BigInt(getAddress(address)).toString(36).toUpperCase();
-    while (base36.length < 30) { base36 = "0" + base36; }
-    return "XE" + ibanChecksum("XE00" + base36) + base36;
-}
+

package/src.ts/address/index.ts

@@ -49,7 +49,7 @@ export interface NameResolver {
     resolveName(name: string): Promise<null | string>;
 }
 
-export { getAddress, getIcapAddress } from "./address.js";
+export { getAddress } from "./address.js";
 
 export { getCreateAddress, getCreate2Address } from "./contract-address.js";