@aztec/aztec.js 0.0.1-commit.c7c42ec → 0.0.1-commit.f295ac2

package/dest/deployment/publish_instance.js

@@ -1,10 +1,10 @@
-import { getInstanceRegistryContract } from '../contract/protocol_contracts.js';
+import { ContractInstanceRegistryContract } from '../contract/protocol_contracts/contract-instance-registry.js';
 /**
  * Sets up a call to the canonical contract instance registry to publish a contract instance.
  * @param wallet - The wallet to use for the publication (setup) tx.
  * @param instance - The instance to publish.
- */ export async function publishInstance(wallet, instance) {
-    const contractInstanceRegistry = await getInstanceRegistryContract(wallet);
+ */ export function publishInstance(wallet, instance) {
+    const contractInstanceRegistry = ContractInstanceRegistryContract.at(wallet);
     const { salt, currentContractClassId: contractClassId, publicKeys, deployer: instanceDeployer } = instance;
     const isUniversalDeploy = instanceDeployer.isZero();
     return contractInstanceRegistry.methods.publish_for_public_execution(salt, contractClassId, instance.initializationHash, publicKeys, isUniversalDeploy);

package/dest/ethereum/portal_manager.d.ts

@@ -1,4 +1,5 @@
 import type { ExtendedViemWalletClient, ViemContract } from '@aztec/ethereum/types';
+import type { EpochNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { Logger } from '@aztec/foundation/log';
@@ -30,7 +31,9 @@ export type L2AmountClaimWithRecipient = L2AmountClaim & {
 export declare function generateClaimSecret(logger?: Logger): Promise<[Fr, Fr]>;
 /** Helper for managing an ERC20 on L1. */
 export declare class L1TokenManager {
+    /** Address of the ERC20 contract. */
     readonly tokenAddress: EthAddress;
+    /** Address of the handler/faucet contract. */
     readonly handlerAddress: EthAddress | undefined;
     private readonly extendedClient;
     private logger;
@@ -121,11 +124,11 @@ export declare class L1TokenPortalManager extends L1ToL2TokenPortalManager {
      * Withdraws funds from the portal by consuming an L2 to L1 message. Returns once the tx is mined on L1.
      * @param amount - Amount to withdraw.
      * @param recipient - Who will receive the funds.
-     * @param blockNumber - L2 block number of the message.
+     * @param epochNumber - Epoch number of the message.
      * @param messageIndex - Index of the message.
      * @param siblingPath - Sibling path of the message.
      */
-    withdrawFunds(amount: bigint, recipient: EthAddress, blockNumber: bigint, messageIndex: bigint, siblingPath: SiblingPath<number>): Promise<void>;
+    withdrawFunds(amount: bigint, recipient: EthAddress, epochNumber: EpochNumber, messageIndex: bigint, siblingPath: SiblingPath<number>): Promise<void>;
     /**
      * Computes the L2 to L1 message leaf for the given parameters.
      * @param amount - Amount to bridge.
@@ -135,4 +138,4 @@ export declare class L1TokenPortalManager extends L1ToL2TokenPortalManager {
      */
     getL2ToL1MessageLeaf(amount: bigint, recipient: EthAddress, l2Bridge: AztecAddress, callerOnL1?: EthAddress): Promise<Fr>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9ydGFsX21hbmFnZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ldGhlcmV1bS9wb3J0YWxfbWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUdwRixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBSzNELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUNwRSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUdqRSxPQUFPLEVBQUUsS0FBSyxHQUFHLEVBQW1DLE1BQU0sTUFBTSxDQUFDO0FBRWpFLCtDQUErQztBQUMvQyxNQUFNLE1BQU0sT0FBTyxHQUFHO0lBQ3BCLDJCQUEyQjtJQUMzQixXQUFXLEVBQUUsRUFBRSxDQUFDO0lBQ2hCLHVDQUF1QztJQUN2QyxlQUFlLEVBQUUsRUFBRSxDQUFDO0lBQ3BCLDJCQUEyQjtJQUMzQixXQUFXLEVBQUUsR0FBRyxDQUFDO0lBQ2pCLCtDQUErQztJQUMvQyxnQkFBZ0IsRUFBRSxNQUFNLENBQUM7Q0FDMUIsQ0FBQztBQUVGLG9FQUFvRTtBQUNwRSxNQUFNLE1BQU0sYUFBYSxHQUFHLE9BQU8sR0FBRztJQUF5QixXQUFXLEVBQUUsTUFBTSxDQUFBO0NBQUUsQ0FBQztBQUVyRiw4RkFBOEY7QUFDOUYsTUFBTSxNQUFNLDBCQUEwQixHQUFHLGFBQWEsR0FB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9ydGFsX21hbmFnZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ldGhlcmV1bS9wb3J0YWxfbWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRixPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVuRSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBSzNELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUNwRSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUdqRSxPQUFPLEVBQUUsS0FBSyxHQUFHLEVBQW1DLE1BQU0sTUFBTSxDQUFDO0FBRWpFLCtDQUErQztBQUMvQyxNQUFNLE1BQU0sT0FBTyxHQUFHO0lBQ3BCLDJCQUEyQjtJQUMzQixXQUFXLEVBQUUsRUFBRSxDQUFDO0lBQ2hCLHVDQUF1QztJQUN2QyxlQUFlLEVBQUUsRUFBRSxDQUFDO0lBQ3BCLDJCQUEyQjtJQUMzQixXQUFXLEVBQUUsR0FBRyxDQUFDO0lBQ2pCLCtDQUErQztJQUMvQyxnQkFBZ0IsRUFBRSxNQUFNLENBQUM7Q0FDMUIsQ0FBQztBQUVGLG9FQUFvRTtBQUNwRSxNQUFNLE1BQU0sYUFBYSxHQUFHLE9BQU8sR0FBRztJQUF5QixXQUFXLEVBQUUsTUFBTSxDQUFBO0NBQUUsQ0FBQztB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

package/dest/ethereum/portal_manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"portal_manager.d.ts","sourceRoot":"","sources":["../../src/ethereum/portal_manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"portal_manager.d.ts","sourceRoot":"","sources":["../../src/ethereum/portal_manager.ts"],"names":[],"mappings":"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"}

package/dest/ethereum/portal_manager.js

@@ -284,40 +284,40 @@ import { getContract, toFunctionSelector } from 'viem';
    * Withdraws funds from the portal by consuming an L2 to L1 message. Returns once the tx is mined on L1.
    * @param amount - Amount to withdraw.
    * @param recipient - Who will receive the funds.
-   * @param blockNumber - L2 block number of the message.
+   * @param epochNumber - Epoch number of the message.
    * @param messageIndex - Index of the message.
    * @param siblingPath - Sibling path of the message.
-   */ async withdrawFunds(amount, recipient, blockNumber, messageIndex, siblingPath) {
-        this.logger.info(`Sending L1 tx to consume message at block ${blockNumber} index ${messageIndex} to withdraw ${amount}`);
+   */ async withdrawFunds(amount, recipient, epochNumber, messageIndex, siblingPath) {
+        this.logger.info(`Sending L1 tx to consume message at epoch ${epochNumber} index ${messageIndex} to withdraw ${amount}`);
         const messageLeafId = getL2ToL1MessageLeafId({
             leafIndex: messageIndex,
             siblingPath
         });
-        const isConsumedBefore = await this.outbox.read.hasMessageBeenConsumedAtCheckpoint([
-            blockNumber,
+        const isConsumedBefore = await this.outbox.read.hasMessageBeenConsumedAtEpoch([
+            BigInt(epochNumber),
             messageLeafId
         ]);
         if (isConsumedBefore) {
-            throw new Error(`L1 to L2 message at block ${blockNumber} index ${messageIndex} height ${siblingPath.pathSize} has already been consumed`);
+            throw new Error(`L2 to L1 message at epoch ${epochNumber} index ${messageIndex} height ${siblingPath.pathSize} has already been consumed`);
         }
         // Call function on L1 contract to consume the message
         const { request: withdrawRequest } = await this.portal.simulate.withdraw([
             recipient.toString(),
             amount,
             false,
-            BigInt(blockNumber),
+            BigInt(epochNumber),
             messageIndex,
             siblingPath.toBufferArray().map((buf)=>`0x${buf.toString('hex')}`)
         ]);
         await this.extendedClient.waitForTransactionReceipt({
             hash: await this.extendedClient.writeContract(withdrawRequest)
         });
-        const isConsumedAfter = await this.outbox.read.hasMessageBeenConsumedAtCheckpoint([
-            blockNumber,
+        const isConsumedAfter = await this.outbox.read.hasMessageBeenConsumedAtEpoch([
+            BigInt(epochNumber),
             messageLeafId
         ]);
         if (!isConsumedAfter) {
-            throw new Error(`L1 to L2 message at block ${blockNumber} index ${messageIndex} height ${siblingPath.pathSize} not consumed after withdrawal`);
+            throw new Error(`L2 to L1 message at epoch ${epochNumber} index ${messageIndex} height ${siblingPath.pathSize} not consumed after withdrawal`);
         }
     }
     /**

package/dest/scripts/generate_protocol_contract_types.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdGVfcHJvdG9jb2xfY29udHJhY3RfdHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zY3JpcHRzL2dlbmVyYXRlX3Byb3RvY29sX2NvbnRyYWN0X3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==

package/dest/scripts/generate_protocol_contract_types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate_protocol_contract_types.d.ts","sourceRoot":"","sources":["../../src/scripts/generate_protocol_contract_types.ts"],"names":[],"mappings":""}

package/dest/scripts/generate_protocol_contract_types.js

@@ -0,0 +1,120 @@
+/**
+ * Generates type-safe contract wrappers for protocol contracts.
+ * These wrappers use a minimal artifact (without bytecode) since PXE already has the full artifacts registered.
+ */ import { generateTypescriptContractInterface } from '@aztec/builder/codegen';
+import { FunctionType, getAllFunctionAbis, loadContractArtifact } from '@aztec/stdlib/abi';
+import { promises as fs } from 'fs';
+import path from 'path';
+const log = console.log;
+const noirContractsRoot = path.join(import.meta.dirname, '../../../../noir-projects/noir-contracts');
+const srcPath = path.join(noirContractsRoot, 'target');
+const outputDir = path.join(import.meta.dirname, '../contract/protocol_contracts');
+function toKebabCase(str) {
+    return str.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+}
+function functionTypeToEnum(type) {
+    switch(type){
+        case FunctionType.PRIVATE:
+            return 'FunctionType.PRIVATE';
+        case FunctionType.PUBLIC:
+            return 'FunctionType.PUBLIC';
+        case FunctionType.UTILITY:
+            return 'FunctionType.UTILITY';
+    }
+}
+function generateFunctionAbiJson(abi) {
+    const baseObj = {
+        name: abi.name,
+        isOnlySelf: abi.isOnlySelf,
+        isStatic: abi.isStatic,
+        isInitializer: abi.isInitializer,
+        parameters: abi.parameters,
+        returnTypes: abi.returnTypes,
+        errorTypes: abi.errorTypes
+    };
+    const jsonStr = JSON.stringify(baseObj);
+    return jsonStr.replace('{', `{ functionType: ${functionTypeToEnum(abi.functionType)},`);
+}
+function generateProtocolContractArtifact(input) {
+    const allAbis = getAllFunctionAbis(input);
+    const functionAbis = input.functions.map((f)=>allAbis.find((abi)=>abi.name === f.name));
+    const nonDispatchAbis = input.nonDispatchPublicFunctions;
+    const functionsArray = functionAbis.map((abi)=>`{ ...${generateFunctionAbiJson(abi)}, bytecode: Buffer.from([]), debugSymbols: '' }`).join(',\n    ');
+    const nonDispatchArray = nonDispatchAbis.map((abi)=>generateFunctionAbiJson(abi)).join(',\n    ');
+    return `{
+  name: '${input.name}',
+  functions: [
+    ${functionsArray}
+  ],
+  nonDispatchPublicFunctions: [
+    ${nonDispatchArray}
+  ],
+  outputs: { structs: {}, globals: {} },
+  storageLayout: {},
+  fileMap: {},
+}`;
+}
+async function generateProtocolContractInterface(input, protocolContractName) {
+    const baseInterface = await generateTypescriptContractInterface(input);
+    // Match everything between "public declare methods: {" and the closing "};"
+    const methodsMatch = baseInterface.match(/public declare methods: \{([\s\S]*?)\n  \};/);
+    if (!methodsMatch) {
+        throw new Error('Could not extract methods from generated interface');
+    }
+    const artifactCode = generateProtocolContractArtifact(input);
+    const contractName = `${input.name}Contract`;
+    return `
+/* Autogenerated file, do not edit! */
+
+/* eslint-disable */
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { FunctionType } from '@aztec/stdlib/abi';
+
+import type { ContractArtifact } from '../../api/abi.js';
+import { PublicKeys } from '../../api/keys.js';
+import type { AztecAddressLike, EthAddressLike, FieldLike, FunctionSelectorLike, WrappedFieldLike } from '../../utils/abi_types.js';
+import { ContractBase, type ContractMethod } from '../contract_base.js';
+import { ContractFunctionInteraction } from '../contract_function_interaction.js';
+import type { Wallet } from '../../wallet/wallet.js';
+
+const ${contractName}Artifact: ContractArtifact = ${artifactCode};
+
+export class ${contractName} extends ContractBase {
+  private constructor(wallet: Wallet) {
+    super(ProtocolContractAddress.${protocolContractName}, ${contractName}Artifact, wallet);
+  }
+
+  public static at(wallet: Wallet): ${contractName} {
+    return new ${contractName}(wallet);
+  }
+
+  public declare methods: {${methodsMatch[1]}
+  };
+}
+`;
+}
+async function main() {
+    await fs.rm(outputDir, {
+        recursive: true,
+        force: true
+    });
+    await fs.mkdir(outputDir, {
+        recursive: true
+    });
+    const srcNames = JSON.parse(await fs.readFile(path.join(noirContractsRoot, 'protocol_contracts.json'), 'utf8'));
+    for (const srcName of srcNames){
+        // srcName is like "auth_registry_contract-AuthRegistry", split to get the contract name
+        const name = srcName.split('-')[1];
+        const artifactPath = path.join(srcPath, `${srcName}.json`);
+        const json = JSON.parse(await fs.readFile(artifactPath, 'utf8'));
+        const contractArtifact = loadContractArtifact(json);
+        const content = await generateProtocolContractInterface(contractArtifact, name);
+        const fileName = `${toKebabCase(name)}.ts`;
+        await fs.writeFile(path.join(outputDir, fileName), content);
+        log(`Generated ${fileName}`);
+    }
+}
+main().catch((err)=>{
+    console.error('Error generating protocol contract types:', err);
+    process.exit(1);
+});

package/dest/wallet/account_manager.d.ts

@@ -15,6 +15,9 @@ export declare class AccountManager {
     private secretKey;
     private accountContract;
     private instance;
+    /**
+     * Contract instantiation salt for the account contract
+     */
     readonly salt: Salt;
     private constructor();
     static create(wallet: Wallet, secretKey: Fr, accountContract: AccountContract, salt?: Salt): Promise<AccountManager>;
@@ -35,7 +38,7 @@ export declare class AccountManager {
      * Returns the secret key used to derive the rest of the privacy keys for this contract
      */
     getSecretKey(): Fr;
-    get address(): import("../api/addresses.js").AztecAddress;
+    get address(): import("@aztec/stdlib/aztec-address").AztecAddress;
     /**
      * Returns the contract instance definition associated with this account.
      * Does not require the account to have been published for public execution.
@@ -63,4 +66,4 @@ export declare class AccountManager {
      */
     hasInitializer(): Promise<boolean>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9tYW5hZ2VyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FsbGV0L2FjY291bnRfbWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUNMLGVBQWUsRUFDZixLQUFLLDJCQUEyQixFQUVqQyxNQUFNLHdCQUF3QixDQUFDO0FBR2hDLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3RFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQzdFLE9BQU8sS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFaEUsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRTFDOzs7R0FHRztBQUNILHFCQUFhLGNBQWM7SUFFdkIsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsZUFBZTtJQUN2QixPQUFPLENBQUMsUUFBUTthQUlBLElBQUksRUFBRSxJQUFJO0lBUjVCLE9BQU8sZUFTSDtJQUVKLE9BQWEsTUFBTSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLEVBQUUsRUFBRSxlQUFlLEVBQUUsZUFBZSxFQUFFLElBQUksQ0FBQyxFQUFFLElBQUksMkJBa0IvRjtJQUVELFNBQVMsQ0FBQyxhQUFhLDRDQUV0QjtJQUVELFNBQVMsQ0FBQyxpQkFBaUIscUJBRTFCO0lBRUQ7OztPQUdHO0lBQ1UsbUJBQW1CLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBSTVEO0lBRUQ7Ozs7T0FJRztJQUNJLGtCQUFrQixJQUFJLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FFcEQ7SUFFRDs7T0FFRztJQUNJLFlBQVksT0FFbEI7SUFFRCxJQUFJLE9BQU8sK0NBRVY7SUFFRDs7OztPQUlHO0lBQ0ksV0FBVyxJQUFJLDJCQUEyQixDQUVoRDtJQUVEOzs7O09BSUc7SUFDVSxVQUFVLElBQUksT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBR3ZEO0lBRUQ7OztPQUdHO0lBQ0gsa0JBQWtCLElBQUksZUFBZSxDQUVwQztJQUVEOzs7T0FHRztJQUNVLGVBQWUsSUFBSSxPQUFPLENBQUMsbUJBQW1CLENBQUMsQ0F3QjNEO0lBRUQ7O09BRUc7SUFDVSxjQUFjLHFCQUUxQjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9tYW5hZ2VyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FsbGV0L2FjY291bnRfbWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUNMLGVBQWUsRUFDZixLQUFLLDJCQUEyQixFQUVqQyxNQUFNLHdCQUF3QixDQUFDO0FBR2hDLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3RFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQzdFLE9BQU8sS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFaEUsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRTFDOzs7R0FHRztBQUNILHFCQUFhLGNBQWM7SUFFdkIsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsZUFBZTtJQUN2QixPQUFPLENBQUMsUUFBUTtJQUNoQjs7T0FFRzthQUNhLElBQUksRUFBRSxJQUFJO0lBUjVCLE9BQU8sZUFTSDtJQUVKLE9BQWEsTUFBTSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLEVBQUUsRUFBRSxlQUFlLEVBQUUsZUFBZSxFQUFFLElBQUksQ0FBQyxFQUFFLElBQUksMkJBa0IvRjtJQUVELFNBQVMsQ0FBQyxhQUFhLDRDQUV0QjtJQUVELFNBQVMsQ0FBQyxpQkFBaUIscUJBRTFCO0lBRUQ7OztPQUdHO0lBQ1UsbUJBQW1CLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBSTVEO0lBRUQ7Ozs7T0FJRztJQUNJLGtCQUFrQixJQUFJLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FFcEQ7SUFFRDs7T0FFRztJQUNJLFlBQVksT0FFbEI7SUFFRCxJQUFJLE9BQU8sdURBRVY7SUFFRDs7OztPQUlHO0lBQ0ksV0FBVyxJQUFJLDJCQUEyQixDQUVoRDtJQUVEOzs7O09BSUc7SUFDVSxVQUFVLElBQUksT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBR3ZEO0lBRUQ7OztPQUdHO0lBQ0gsa0JBQWtCLElBQUksZUFBZSxDQUVwQztJQUVEOzs7T0FHRztJQUNVLGVBQWUsSUFBSSxPQUFPLENBQUMsbUJBQW1CLENBQUMsQ0F3QjNEO0lBRUQ7O09BRUc7SUFDVSxjQUFjLHFCQUUxQjtDQUNGIn0=

package/dest/wallet/account_manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account_manager.d.ts","sourceRoot":"","sources":["../../src/wallet/account_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EACL,eAAe,EACf,KAAK,2BAA2B,EAEjC,MAAM,wBAAwB,CAAC;AAGhC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C;;;GAGG;AACH,qBAAa,cAAc;IAEvB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,QAAQ;aAIA,IAAI,EAAE,IAAI;IAR5B,OAAO,eASH;IAEJ,OAAa,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,eAAe,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,IAAI,2BAkB/F;IAED,SAAS,CAAC,aAAa,4CAEtB;IAED,SAAS,CAAC,iBAAiB,qBAE1B;IAED;;;OAGG;IACU,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAI5D;IAED;;;;OAIG;IACI,kBAAkB,IAAI,OAAO,CAAC,eAAe,CAAC,CAEpD;IAED;;OAEG;IACI,YAAY,OAElB;IAED,IAAI,OAAO,+CAEV;IAED;;;;OAIG;IACI,WAAW,IAAI,2BAA2B,CAEhD;IAED;;;;OAIG;IACU,UAAU,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAGvD;IAED;;;OAGG;IACH,kBAAkB,IAAI,eAAe,CAEpC;IAED;;;OAGG;IACU,eAAe,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAwB3D;IAED;;OAEG;IACU,cAAc,qBAE1B;CACF"}
+{"version":3,"file":"account_manager.d.ts","sourceRoot":"","sources":["../../src/wallet/account_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EACL,eAAe,EACf,KAAK,2BAA2B,EAEjC,MAAM,wBAAwB,CAAC;AAGhC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C;;;GAGG;AACH,qBAAa,cAAc;IAEvB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,QAAQ;IAChB;;OAEG;aACa,IAAI,EAAE,IAAI;IAR5B,OAAO,eASH;IAEJ,OAAa,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,eAAe,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,IAAI,2BAkB/F;IAED,SAAS,CAAC,aAAa,4CAEtB;IAED,SAAS,CAAC,iBAAiB,qBAE1B;IAED;;;OAGG;IACU,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAI5D;IAED;;;;OAIG;IACI,kBAAkB,IAAI,OAAO,CAAC,eAAe,CAAC,CAEpD;IAED;;OAEG;IACI,YAAY,OAElB;IAED,IAAI,OAAO,uDAEV;IAED;;;;OAIG;IACI,WAAW,IAAI,2BAA2B,CAEhD;IAED;;;;OAIG;IACU,UAAU,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAGvD;IAED;;;OAGG;IACH,kBAAkB,IAAI,eAAe,CAEpC;IAED;;;OAGG;IACU,eAAe,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAwB3D;IAED;;OAEG;IACU,cAAc,qBAE1B;CACF"}