@aztec/pxe 0.0.0-test.1 → 0.0.1-commit.5476d83

package/dest/storage/address_data_provider/address_data_provider.d.ts

@@ -1,13 +1,11 @@
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { CompleteAddress } from '@aztec/stdlib/contract';
-import type { DataProvider } from '../data_provider.js';
-export declare class AddressDataProvider implements DataProvider {
+export declare class AddressDataProvider {
     #private;
     constructor(store: AztecAsyncKVStore);
     addCompleteAddress(completeAddress: CompleteAddress): Promise<boolean>;
     getCompleteAddress(account: AztecAddress): Promise<CompleteAddress | undefined>;
     getCompleteAddresses(): Promise<CompleteAddress[]>;
-    getSize(): Promise<number>;
 }
-//# sourceMappingURL=address_data_provider.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRkcmVzc19kYXRhX3Byb3ZpZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RvcmFnZS9hZGRyZXNzX2RhdGFfcHJvdmlkZXIvYWRkcmVzc19kYXRhX3Byb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFtQixpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUN6RixPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFekQscUJBQWEsbUJBQW1COztJQUs5QixZQUFZLEtBQUssRUFBRSxpQkFBaUIsRUFLbkM7SUFFRCxrQkFBa0IsQ0FBQyxlQUFlLEVBQUUsZUFBZSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0EwQnJFO0lBWUQsa0JBQWtCLENBQUMsT0FBTyxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsZUFBZSxHQUFHLFNBQVMsQ0FBQyxDQUU5RTtJQUVLLG9CQUFvQixJQUFJLE9BQU8sQ0FBQyxlQUFlLEVBQUUsQ0FBQyxDQUl2RDtDQUNGIn0=

package/dest/storage/address_data_provider/address_data_provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"address_data_provider.d.ts","sourceRoot":"","sources":["../../../src/storage/address_data_provider/address_data_provider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAmB,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACzF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,qBAAa,mBAAoB,YAAW,YAAY;;gBAK1C,KAAK,EAAE,iBAAiB;IAOpC,kBAAkB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;IAsCtE,kBAAkB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAIzE,oBAAoB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAMlD,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CAGjC"}
+{"version":3,"file":"address_data_provider.d.ts","sourceRoot":"","sources":["../../../src/storage/address_data_provider/address_data_provider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAmB,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACzF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,qBAAa,mBAAmB;;IAK9B,YAAY,KAAK,EAAE,iBAAiB,EAKnC;IAED,kBAAkB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CA0BrE;IAYD,kBAAkB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAE9E;IAEK,oBAAoB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC,CAIvD;CACF"}

package/dest/storage/address_data_provider/address_data_provider.js

@@ -44,7 +44,4 @@ export class AddressDataProvider {
     async getCompleteAddresses() {
         return await Promise.all((await toArray(this.#completeAddresses.valuesAsync())).map((v)=>CompleteAddress.fromBuffer(v)));
     }
-    async getSize() {
-        return await this.#completeAddresses.lengthAsync() * CompleteAddress.SIZE_IN_BYTES;
-    }
 }

package/dest/storage/address_data_provider/index.d.ts

@@ -1,2 +1,2 @@
 export { AddressDataProvider } from './address_data_provider.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL2FkZHJlc3NfZGF0YV9wcm92aWRlci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQyJ9

package/dest/storage/capsule_data_provider/capsule_data_provider.d.ts

@@ -1,16 +1,25 @@
 import { Fr } from '@aztec/foundation/fields';
-import { type LogFn } from '@aztec/foundation/log';
+import { type Logger } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { DataProvider } from '../data_provider.js';
-export declare class CapsuleDataProvider implements DataProvider {
+export declare class CapsuleDataProvider {
     #private;
-    debug: LogFn;
+    logger: Logger;
     constructor(store: AztecAsyncKVStore);
     storeCapsule(contractAddress: AztecAddress, slot: Fr, capsule: Fr[]): Promise<void>;
     loadCapsule(contractAddress: AztecAddress, slot: Fr): Promise<Fr[] | null>;
     deleteCapsule(contractAddress: AztecAddress, slot: Fr): Promise<void>;
     copyCapsule(contractAddress: AztecAddress, srcSlot: Fr, dstSlot: Fr, numEntries: number): Promise<void>;
-    getSize(): Promise<number>;
+    /**
+     * Appends multiple capsules to a capsule array stored at the base slot.
+     * The array length is stored at the base slot, and elements are stored in consecutive slots after it.
+     * All operations are performed in a single transaction.
+     * @param contractAddress - The contract address that owns the capsule array
+     * @param baseSlot - The slot where the array length is stored
+     * @param content - Array of capsule data to append
+     */
+    appendToCapsuleArray(contractAddress: AztecAddress, baseSlot: Fr, content: Fr[][]): Promise<void>;
+    readCapsuleArray(contractAddress: AztecAddress, baseSlot: Fr): Promise<Fr[][]>;
+    setCapsuleArray(contractAddress: AztecAddress, baseSlot: Fr, content: Fr[][]): Promise<void>;
 }
-//# sourceMappingURL=capsule_data_provider.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2Fwc3VsZV9kYXRhX3Byb3ZpZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RvcmFnZS9jYXBzdWxlX2RhdGFfcHJvdmlkZXIvY2Fwc3VsZV9kYXRhX3Byb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM5QyxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFaEUscUJBQWEsbUJBQW1COztJQU05QixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBRWYsWUFBWSxLQUFLLEVBQUUsaUJBQWlCLEVBTW5DO0lBRUssWUFBWSxDQUFDLGVBQWUsRUFBRSxZQUFZLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUV4RjtJQUVLLFdBQVcsQ0FBQyxlQUFlLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsRUFBRSxHQUFHLElBQUksQ0FBQyxDQVcvRTtJQUVLLGFBQWEsQ0FBQyxlQUFlLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUUxRTtJQUVELFdBQVcsQ0FBQyxlQUFlLEVBQUUsWUFBWSxFQUFFLE9BQU8sRUFBRSxFQUFFLEVBQUUsT0FBTyxFQUFFLEVBQUUsRUFBRSxVQUFVLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0F3QnRHO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILG9CQUFvQixDQUFDLGVBQWUsRUFBRSxZQUFZLEVBQUUsUUFBUSxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBZ0JoRztJQUVELGdCQUFnQixDQUFDLGVBQWUsRUFBRSxZQUFZLEVBQUUsUUFBUSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQXNCN0U7SUFFRCxlQUFlLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUUsRUFBRSxFQUFFLE9BQU8sRUFBRSxFQUFFLEVBQUUsRUFBRSxpQkFtQjNFO0NBQ0YifQ==

package/dest/storage/capsule_data_provider/capsule_data_provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"capsule_data_provider.d.ts","sourceRoot":"","sources":["../../../src/storage/capsule_data_provider/capsule_data_provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,KAAK,KAAK,EAAyB,MAAM,uBAAuB,CAAC;AAC1E,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,qBAAa,mBAAoB,YAAW,YAAY;;IAMtD,KAAK,EAAE,KAAK,CAAC;gBAED,KAAK,EAAE,iBAAiB;IAQ9B,YAAY,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAInF,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC;IAa1E,aAAa,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrE,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBhG,OAAO;CAMrB"}
+{"version":3,"file":"capsule_data_provider.d.ts","sourceRoot":"","sources":["../../../src/storage/capsule_data_provider/capsule_data_provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,qBAAa,mBAAmB;;IAM9B,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,KAAK,EAAE,iBAAiB,EAMnC;IAEK,YAAY,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAExF;IAEK,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAW/E;IAEK,aAAa,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAE1E;IAED,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBtG;IAED;;;;;;;OAOG;IACH,oBAAoB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBhG;IAED,gBAAgB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAsB7E;IAED,eAAe,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,iBAmB3E;CACF"}

package/dest/storage/capsule_data_provider/capsule_data_provider.js

@@ -1,15 +1,14 @@
 import { Fr } from '@aztec/foundation/fields';
-import { toArray } from '@aztec/foundation/iterable';
-import { createDebugOnlyLogger } from '@aztec/foundation/log';
+import { createLogger } from '@aztec/foundation/log';
 export class CapsuleDataProvider {
     #store;
     // Arbitrary data stored by contracts. Key is computed as `${contractAddress}:${key}`
     #capsules;
-    debug;
+    logger;
     constructor(store){
         this.#store = store;
         this.#capsules = this.#store.openMap('capsules');
-        this.debug = createDebugOnlyLogger('pxe:capsule-data-provider');
+        this.logger = createLogger('pxe:capsule-data-provider');
     }
     async storeCapsule(contractAddress, slot, capsule) {
         await this.#capsules.set(dbSlotToKey(contractAddress, slot), Buffer.concat(capsule.map((value)=>value.toBuffer())));
@@ -17,7 +16,7 @@ export class CapsuleDataProvider {
     async loadCapsule(contractAddress, slot) {
         const dataBuffer = await this.#capsules.getAsync(dbSlotToKey(contractAddress, slot));
         if (!dataBuffer) {
-            this.debug(`Data not found for contract ${contractAddress.toString()} and slot ${slot.toString()}`);
+            this.logger.trace(`Data not found for contract ${contractAddress.toString()} and slot ${slot.toString()}`);
             return null;
         }
         const capsule = [];
@@ -29,29 +28,91 @@ export class CapsuleDataProvider {
     async deleteCapsule(contractAddress, slot) {
         await this.#capsules.delete(dbSlotToKey(contractAddress, slot));
     }
-    async copyCapsule(contractAddress, srcSlot, dstSlot, numEntries) {
-        // In order to support overlapping source and destination regions, we need to check the relative positions of source
-        // and destination. If destination is ahead of source, then by the time we overwrite source elements using forward
-        // indexes we'll have already read those. On the contrary, if source is ahead of destination we need to use backward
-        // indexes to avoid reading elements that've been overwritten.
-        const indexes = Array.from(Array(numEntries).keys());
-        if (srcSlot.lt(dstSlot)) {
-            indexes.reverse();
-        }
-        for (const i of indexes){
-            const currentSrcSlot = dbSlotToKey(contractAddress, srcSlot.add(new Fr(i)));
-            const currentDstSlot = dbSlotToKey(contractAddress, dstSlot.add(new Fr(i)));
-            const toCopy = await this.#capsules.getAsync(currentSrcSlot);
-            if (!toCopy) {
-                throw new Error(`Attempted to copy empty slot ${currentSrcSlot} for contract ${contractAddress.toString()}`);
+    copyCapsule(contractAddress, srcSlot, dstSlot, numEntries) {
+        return this.#store.transactionAsync(async ()=>{
+            // In order to support overlapping source and destination regions, we need to check the relative positions of source
+            // and destination. If destination is ahead of source, then by the time we overwrite source elements using forward
+            // indexes we'll have already read those. On the contrary, if source is ahead of destination we need to use backward
+            // indexes to avoid reading elements that've been overwritten.
+            const indexes = Array.from(Array(numEntries).keys());
+            if (srcSlot.lt(dstSlot)) {
+                indexes.reverse();
             }
-            await this.#capsules.set(currentDstSlot, toCopy);
-        }
+            for (const i of indexes){
+                const currentSrcSlot = dbSlotToKey(contractAddress, srcSlot.add(new Fr(i)));
+                const currentDstSlot = dbSlotToKey(contractAddress, dstSlot.add(new Fr(i)));
+                const toCopy = await this.#capsules.getAsync(currentSrcSlot);
+                if (!toCopy) {
+                    throw new Error(`Attempted to copy empty slot ${currentSrcSlot} for contract ${contractAddress.toString()}`);
+                }
+                await this.#capsules.set(currentDstSlot, toCopy);
+            }
+        });
+    }
+    /**
+   * Appends multiple capsules to a capsule array stored at the base slot.
+   * The array length is stored at the base slot, and elements are stored in consecutive slots after it.
+   * All operations are performed in a single transaction.
+   * @param contractAddress - The contract address that owns the capsule array
+   * @param baseSlot - The slot where the array length is stored
+   * @param content - Array of capsule data to append
+   */ appendToCapsuleArray(contractAddress, baseSlot, content) {
+        return this.#store.transactionAsync(async ()=>{
+            // Load current length, defaulting to 0 if not found
+            const lengthData = await this.loadCapsule(contractAddress, baseSlot);
+            const currentLength = lengthData ? lengthData[0].toNumber() : 0;
+            // Store each capsule at consecutive slots after baseSlot + 1 + currentLength
+            for(let i = 0; i < content.length; i++){
+                const nextSlot = arraySlot(baseSlot, currentLength + i);
+                await this.storeCapsule(contractAddress, nextSlot, content[i]);
+            }
+            // Update length to include all new capsules
+            const newLength = currentLength + content.length;
+            await this.storeCapsule(contractAddress, baseSlot, [
+                new Fr(newLength)
+            ]);
+        });
     }
-    async getSize() {
-        return (await toArray(this.#capsules.valuesAsync())).reduce((sum, value)=>sum + value.length * Fr.SIZE_IN_BYTES, 0);
+    readCapsuleArray(contractAddress, baseSlot) {
+        return this.#store.transactionAsync(async ()=>{
+            // Load length, defaulting to 0 if not found
+            const maybeLength = await this.loadCapsule(contractAddress, baseSlot);
+            const length = maybeLength ? maybeLength[0].toBigInt() : 0n;
+            const values = [];
+            // Read each capsule at consecutive slots after baseSlot
+            for(let i = 0; i < length; i++){
+                const currentValue = await this.loadCapsule(contractAddress, arraySlot(baseSlot, i));
+                if (currentValue == undefined) {
+                    throw new Error(`Expected non-empty value at capsule array in base slot ${baseSlot} at index ${i} for contract ${contractAddress}`);
+                }
+                values.push(currentValue);
+            }
+            return values;
+        });
+    }
+    setCapsuleArray(contractAddress, baseSlot, content) {
+        return this.#store.transactionAsync(async ()=>{
+            // Load current length, defaulting to 0 if not found
+            const maybeLength = await this.loadCapsule(contractAddress, baseSlot);
+            const originalLength = maybeLength ? maybeLength[0].toNumber() : 0;
+            // Set the new length
+            await this.storeCapsule(contractAddress, baseSlot, [
+                new Fr(content.length)
+            ]);
+            // Store the new content, possibly overwriting existing values
+            for(let i = 0; i < content.length; i++){
+                await this.storeCapsule(contractAddress, arraySlot(baseSlot, i), content[i]);
+            }
+            // Clear any stragglers
+            for(let i = content.length; i < originalLength; i++){
+                await this.deleteCapsule(contractAddress, arraySlot(baseSlot, i));
+            }
+        });
     }
 }
 function dbSlotToKey(contractAddress, slot) {
     return `${contractAddress.toString()}:${slot.toString()}`;
 }
+function arraySlot(baseSlot, index) {
+    return baseSlot.add(new Fr(1)).add(new Fr(index));
+}

package/dest/storage/capsule_data_provider/index.d.ts

@@ -1,2 +1,2 @@
 export { CapsuleDataProvider } from './capsule_data_provider.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL2NhcHN1bGVfZGF0YV9wcm92aWRlci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQyJ9

package/dest/storage/contract_data_provider/contract_data_provider.d.ts

@@ -1,12 +1,10 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
+import type { FUNCTION_TREE_HEIGHT } from '@aztec/constants';
 import type { Fr } from '@aztec/foundation/fields';
 import type { MembershipWitness } from '@aztec/foundation/trees';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import { type ContractArtifact, type FunctionArtifact, type FunctionDebugMetadata, FunctionSelector } from '@aztec/stdlib/abi';
+import { type ContractArtifact, type FunctionAbi, type FunctionArtifactWithContractName, type FunctionDebugMetadata, FunctionSelector } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { type ContractClass, type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
-import type { DataProvider } from '../data_provider.js';
 /**
  * ContractDataProvider serves as a data manager and retriever for Aztec.nr contracts.
  * It provides methods to obtain contract addresses, function ABI, bytecode, and membership witnesses
@@ -14,41 +12,17 @@ import type { DataProvider } from '../data_provider.js';
  * to efficiently serve the requested data. It interacts with the ContractDatabase and AztecNode to fetch
  * the required information and facilitate cryptographic proof generation.
  */
-export declare class ContractDataProvider implements DataProvider {
+export declare class ContractDataProvider {
     #private;
-    /** Map from contract class id to private function tree. */
-    private contractClassesCache;
     constructor(store: AztecAsyncKVStore);
     addContractArtifact(id: Fr, contract: ContractArtifact): Promise<void>;
     addContractInstance(contract: ContractInstanceWithAddress): Promise<void>;
-    /**
-     * Retrieve or create a ContractTree instance based on the provided class id.
-     * If an existing tree with the same class id is found in the cache, it will be returned.
-     * Otherwise, a new ContractTree instance will be created using the contract data from the database
-     * and added to the cache before returning.
-     *
-     * @param classId - The class id of the contract for which the ContractTree is required.
-     * @returns A ContractTree instance associated with the specified contract address.
-     * @throws An Error if the contract is not found in the ContractDatabase.
-     */
-    private getTreeForClassId;
-    /**
-     * Retrieve or create a ContractTree instance based on the provided AztecAddress.
-     * If an existing tree with the same contract address is found in the cache, it will be returned.
-     * Otherwise, a new ContractTree instance will be created using the contract data from the database
-     * and added to the cache before returning.
-     *
-     * @param contractAddress - The AztecAddress of the contract for which the ContractTree is required.
-     * @returns A ContractTree instance associated with the specified contract address.
-     * @throws An Error if the contract is not found in the ContractDatabase.
-     */
-    private getTreeForAddress;
     getContractsAddresses(): Promise<AztecAddress[]>;
     /** Returns a contract instance for a given address. Throws if not found. */
-    getContractInstance(contractAddress: AztecAddress): Promise<ContractInstanceWithAddress>;
-    getContractArtifact(contractClassId: Fr): Promise<ContractArtifact>;
+    getContractInstance(contractAddress: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
+    getContractArtifact(contractClassId: Fr): Promise<ContractArtifact | undefined>;
     /** Returns a contract class for a given class id. Throws if not found. */
-    getContractClass(contractClassId: Fr): Promise<ContractClass>;
+    getContractClass(contractClassId: Fr): Promise<ContractClass | undefined>;
     getContract(address: AztecAddress): Promise<(ContractInstanceWithAddress & ContractArtifact) | undefined>;
     /**
      * Retrieves the artifact of a specified function within a given contract.
@@ -59,17 +33,9 @@ export declare class ContractDataProvider implements DataProvider {
      * @param selector - The function selector.
      * @returns The corresponding function's artifact as an object.
      */
-    getFunctionArtifact(contractAddress: AztecAddress, selector: FunctionSelector): Promise<FunctionArtifact>;
-    /**
-     * Retrieves the artifact of a specified function within a given contract.
-     * The function is identified by its name, which is unique within a contract.
-     * Throws if the contract has not been added to the database.
-     *
-     * @param contractAddress - The AztecAddress representing the contract containing the function.
-     * @param functionName - The name of the function.
-     * @returns The corresponding function's artifact as an object
-     */
-    getFunctionArtifactByName(contractAddress: AztecAddress, functionName: string): Promise<FunctionArtifact | undefined>;
+    getFunctionArtifact(contractAddress: AztecAddress, selector: FunctionSelector): Promise<FunctionArtifactWithContractName | undefined>;
+    getPublicFunctionArtifact(contractAddress: AztecAddress): Promise<FunctionArtifactWithContractName | undefined>;
+    getFunctionAbi(contractAddress: AztecAddress, selector: FunctionSelector): Promise<FunctionAbi | undefined>;
     /**
      * Retrieves the debug metadata of a specified function within a given contract.
      * The function is identified by its selector, which is a unique code generated from the function's signature.
@@ -81,17 +47,7 @@ export declare class ContractDataProvider implements DataProvider {
      * @returns The corresponding function's artifact as an object.
      */
     getFunctionDebugMetadata(contractAddress: AztecAddress, selector: FunctionSelector): Promise<FunctionDebugMetadata | undefined>;
-    /**
-     * Retrieve the bytecode of a specific function in a contract at the given address.
-     * The returned bytecode is required for executing and verifying the function's behavior
-     * in the Aztec network. Throws an error if the contract or function cannot be found.
-     *
-     * @param contractAddress - The contract's address.
-     * @param selector - The function selector.
-     * @returns A Promise that resolves to a Buffer containing the bytecode of the specified function.
-     * @throws Error if the contract address is unknown or not found.
-     */
-    getBytecode(contractAddress: AztecAddress, selector: FunctionSelector): Promise<Buffer>;
+    getPublicFunctionDebugMetadata(contractAddress: AztecAddress): Promise<FunctionDebugMetadata | undefined>;
     /**
      * Retrieve the function membership witness for the given contract class and function selector.
      * The function membership witness represents a proof that the function belongs to the specified contract.
@@ -101,9 +57,8 @@ export declare class ContractDataProvider implements DataProvider {
      * @param selector - The function selector.
      * @returns A promise that resolves with the MembershipWitness instance for the specified contract's function.
      */
-    getFunctionMembershipWitness(contractClassId: Fr, selector: FunctionSelector): Promise<MembershipWitness<5>>;
-    getDebugContractName(contractAddress: AztecAddress): Promise<string>;
+    getFunctionMembershipWitness(contractClassId: Fr, selector: FunctionSelector): Promise<MembershipWitness<typeof FUNCTION_TREE_HEIGHT> | undefined>;
+    getDebugContractName(contractAddress: AztecAddress): Promise<string | undefined>;
     getDebugFunctionName(contractAddress: AztecAddress, selector: FunctionSelector): Promise<string>;
-    getSize(): Promise<number>;
 }
-//# sourceMappingURL=contract_data_provider.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfZGF0YV9wcm92aWRlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0b3JhZ2UvY29udHJhY3RfZGF0YV9wcm92aWRlci9jb250cmFjdF9kYXRhX3Byb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDN0QsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFbkQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUN4RSxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxXQUFXLEVBRWhCLEtBQUssZ0NBQWdDLEVBQ3JDLEtBQUsscUJBQXFCLEVBQzFCLGdCQUFnQixFQUtqQixNQUFNLG1CQUFtQixDQUFDO0FBQzNCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQ0wsS0FBSyxhQUFhLEVBQ2xCLEtBQUssMkJBQTJCLEVBR2pDLE1BQU0sd0JBQXdCLENBQUM7QUFJaEM7Ozs7OztHQU1HO0FBQ0gscUJBQWEsb0JBQW9COztJQVcvQixZQUFZLEtBQUssRUFBRSxpQkFBaUIsRUFHbkM7SUFJWSxtQkFBbUIsQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLFFBQVEsRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBa0JsRjtJQUVLLG1CQUFtQixDQUFDLFFBQVEsRUFBRSwyQkFBMkIsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBTzlFO0lBNENLLHFCQUFxQixJQUFJLE9BQU8sQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQUdyRDtJQUVELDRFQUE0RTtJQUMvRCxtQkFBbUIsQ0FBQyxlQUFlLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQywyQkFBMkIsR0FBRyxTQUFTLENBQUMsQ0FHaEg7SUFFWSxtQkFBbUIsQ0FBQyxlQUFlLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsR0FBRyxTQUFTLENBQUMsQ0FJM0Y7SUFFRCwwRUFBMEU7SUFDN0QsZ0JBQWdCLENBQUMsZUFBZSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsYUFBYSxHQUFHLFNBQVMsQ0FBQyxDQUdyRjtJQUVZLFdBQVcsQ0FDdEIsT0FBTyxFQUFFLFlBQVksR0FDcEIsT0FBTyxDQUFDLENBQUMsMkJBQTJCLEdBQUcsZ0JBQWdCLENBQUMsR0FBRyxTQUFTLENBQUMsQ0FVdkU7SUFFRDs7Ozs7Ozs7T0FRRztJQUNVLG1CQUFtQixDQUM5QixlQUFlLEVBQUUsWUFBWSxFQUM3QixRQUFRLEVBQUUsZ0JBQWdCLEdBQ3pCLE9BQU8sQ0FBQyxnQ0FBZ0MsR0FBRyxTQUFTLENBQUMsQ0FJdkQ7SUFFWSx5QkFBeUIsQ0FDcEMsZUFBZSxFQUFFLFlBQVksR0FDNUIsT0FBTyxDQUFDLGdDQUFnQyxHQUFHLFNBQVMsQ0FBQyxDQUl2RDtJQUVZLGNBQWMsQ0FDekIsZUFBZSxFQUFFLFlBQVksRUFDN0IsUUFBUSxFQUFFLGdCQUFnQixHQUN6QixPQUFPLENBQUMsV0FBVyxHQUFHLFNBQVMsQ0FBQyxDQUdsQztJQUVEOzs7Ozs7Ozs7T0FTRztJQUNVLHdCQUF3QixDQUNuQyxlQUFlLEVBQUUsWUFBWSxFQUM3QixRQUFRLEVBQUUsZ0JBQWdCLEdBQ3pCLE9BQU8sQ0FBQyxxQkFBcUIsR0FBRyxTQUFTLENBQUMsQ0FJNUM7SUFFWSw4QkFBOEIsQ0FDekMsZUFBZSxFQUFFLFlBQVksR0FDNUIsT0FBTyxDQUFDLHFCQUFxQixHQUFHLFNBQVMsQ0FBQyxDQUk1QztJQUVEOzs7Ozs7OztPQVFHO0lBQ1UsNEJBQTRCLENBQ3ZDLGVBQWUsRUFBRSxFQUFFLEVBQ25CLFFBQVEsRUFBRSxnQkFBZ0IsR0FDekIsT0FBTyxDQUFDLGlCQUFpQixDQUFDLE9BQU8sb0JBQW9CLENBQUMsR0FBRyxTQUFTLENBQUMsQ0FHckU7SUFFWSxvQkFBb0IsQ0FBQyxlQUFlLEVBQUUsWUFBWSwrQkFHOUQ7SUFFWSxvQkFBb0IsQ0FBQyxlQUFlLEVBQUUsWUFBWSxFQUFFLFFBQVEsRUFBRSxnQkFBZ0IsbUJBSTFGO0NBNkJGIn0=

package/dest/storage/contract_data_provider/contract_data_provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_data_provider.d.ts","sourceRoot":"","sources":["../../../src/storage/contract_data_provider/contract_data_provider.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AAExE,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC1B,gBAAgB,EAKjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,2BAA2B,EAEjC,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGxD;;;;;;GAMG;AACH,qBAAa,oBAAqB,YAAW,YAAY;;IACvD,2DAA2D;IAC3D,OAAO,CAAC,oBAAoB,CAAgD;gBAKhE,KAAK,EAAE,iBAAiB;IAOvB,mBAAmB,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB7E,mBAAmB,CAAC,QAAQ,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB/E;;;;;;;;;OASG;YACW,iBAAiB;IAY/B;;;;;;;;;OASG;YACW,iBAAiB;IAOzB,qBAAqB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAKtD,4EAA4E;IAC/D,mBAAmB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAQxF,mBAAmB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAKhF,0EAA0E;IAC7D,gBAAgB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAK7D,WAAW,CACtB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,CAAC,2BAA2B,GAAG,gBAAgB,CAAC,GAAG,SAAS,CAAC;IASxE;;;;;;;;OAQG;IACU,mBAAmB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB;IAK1F;;;;;;;;OAQG;IACU,yBAAyB,CACpC,eAAe,EAAE,YAAY,EAC7B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAKxC;;;;;;;;;OASG;IACU,wBAAwB,CACnC,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IAM7C;;;;;;;;;OASG;IACU,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB;IAKlF;;;;;;;;OAQG;IACU,4BAA4B,CACvC,eAAe,EAAE,EAAE,EACnB,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAKnB,oBAAoB,CAAC,eAAe,EAAE,YAAY;IAKlD,oBAAoB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB;IAO9E,OAAO;CAKrB"}
+{"version":3,"file":"contract_data_provider.d.ts","sourceRoot":"","sources":["../../../src/storage/contract_data_provider/contract_data_provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAEhB,KAAK,gCAAgC,EACrC,KAAK,qBAAqB,EAC1B,gBAAgB,EAKjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,2BAA2B,EAGjC,MAAM,wBAAwB,CAAC;AAIhC;;;;;;GAMG;AACH,qBAAa,oBAAoB;;IAW/B,YAAY,KAAK,EAAE,iBAAiB,EAGnC;IAIY,mBAAmB,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBlF;IAEK,mBAAmB,CAAC,QAAQ,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CAO9E;IA4CK,qBAAqB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAGrD;IAED,4EAA4E;IAC/D,mBAAmB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC,CAGhH;IAEY,mBAAmB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAI3F;IAED,0EAA0E;IAC7D,gBAAgB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAGrF;IAEY,WAAW,CACtB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,CAAC,2BAA2B,GAAG,gBAAgB,CAAC,GAAG,SAAS,CAAC,CAUvE;IAED;;;;;;;;OAQG;IACU,mBAAmB,CAC9B,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,gCAAgC,GAAG,SAAS,CAAC,CAIvD;IAEY,yBAAyB,CACpC,eAAe,EAAE,YAAY,GAC5B,OAAO,CAAC,gCAAgC,GAAG,SAAS,CAAC,CAIvD;IAEY,cAAc,CACzB,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAGlC;IAED;;;;;;;;;OASG;IACU,wBAAwB,CACnC,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAI5C;IAEY,8BAA8B,CACzC,eAAe,EAAE,YAAY,GAC5B,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAI5C;IAED;;;;;;;;OAQG;IACU,4BAA4B,CACvC,eAAe,EAAE,EAAE,EACnB,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,iBAAiB,CAAC,OAAO,oBAAoB,CAAC,GAAG,SAAS,CAAC,CAGrE;IAEY,oBAAoB,CAAC,eAAe,EAAE,YAAY,+BAG9D;IAEY,oBAAoB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,mBAI1F;CA6BF"}

package/dest/storage/contract_data_provider/contract_data_provider.js

@@ -1,8 +1,7 @@
 import { toArray } from '@aztec/foundation/iterable';
-import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/simulator/client';
 import { FunctionSelector, FunctionType, contractArtifactFromBuffer, contractArtifactToBuffer, getFunctionDebugMetadata } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { SerializableContractInstance } from '@aztec/stdlib/contract';
+import { SerializableContractInstance, getContractClassFromArtifact } from '@aztec/stdlib/contract';
 import { PrivateFunctionsTree } from './private_functions_tree.js';
 /**
  * ContractDataProvider serves as a data manager and retriever for Aztec.nr contracts.
@@ -11,7 +10,9 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
  * to efficiently serve the requested data. It interacts with the ContractDatabase and AztecNode to fetch
  * the required information and facilitate cryptographic proof generation.
  */ export class ContractDataProvider {
-    /** Map from contract class id to private function tree. */ contractClassesCache = new Map();
+    /** Map from contract class id to private function tree. */ // TODO: Update it to be LRU cache so that it doesn't keep all the data all the time.
+    #privateFunctionTrees = new Map();
+    /** Map from contract address to contract class id */ #contractClassIdMap = new Map();
     #contractArtifacts;
     #contractInstances;
     constructor(store){
@@ -28,17 +29,19 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
         await this.#contractArtifacts.set(id.toString(), contractArtifactToBuffer(contract));
     }
     async addContractInstance(contract) {
+        this.#contractClassIdMap.set(contract.address.toString(), contract.currentContractClassId);
         await this.#contractInstances.set(contract.address.toString(), new SerializableContractInstance(contract).toBuffer());
     }
     // Private getters
-    async #getContractInstance(address) {
-        const contract = await this.#contractInstances.getAsync(address.toString());
-        return contract && SerializableContractInstance.fromBuffer(contract).withAddress(address);
-    }
-    async #getContractArtifact(id) {
-        const contract = await this.#contractArtifacts.getAsync(id.toString());
-        // TODO(@spalladino): AztecAsyncMap lies and returns Uint8Arrays instead of Buffers, hence the extra Buffer.from.
-        return contract && contractArtifactFromBuffer(Buffer.from(contract));
+    async #getContractClassId(contractAddress) {
+        if (!this.#contractClassIdMap.has(contractAddress.toString())) {
+            const instance = await this.getContractInstance(contractAddress);
+            if (!instance) {
+                return;
+            }
+            this.#contractClassIdMap.set(contractAddress.toString(), instance.currentContractClassId);
+        }
+        return this.#contractClassIdMap.get(contractAddress.toString());
     }
     /**
    * Retrieve or create a ContractTree instance based on the provided class id.
@@ -49,29 +52,20 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
    * @param classId - The class id of the contract for which the ContractTree is required.
    * @returns A ContractTree instance associated with the specified contract address.
    * @throws An Error if the contract is not found in the ContractDatabase.
-   */ async getTreeForClassId(classId) {
-        if (!this.contractClassesCache.has(classId.toString())) {
-            const artifact = await this.#getContractArtifact(classId);
+   */ async #getPrivateFunctionTreeForClassId(classId) {
+        if (!this.#privateFunctionTrees.has(classId.toString())) {
+            const artifact = await this.getContractArtifact(classId);
             if (!artifact) {
-                throw new ContractClassNotFoundError(classId.toString());
+                return;
             }
             const tree = await PrivateFunctionsTree.create(artifact);
-            this.contractClassesCache.set(classId.toString(), tree);
+            this.#privateFunctionTrees.set(classId.toString(), tree);
         }
-        return this.contractClassesCache.get(classId.toString());
+        return this.#privateFunctionTrees.get(classId.toString());
     }
-    /**
-   * Retrieve or create a ContractTree instance based on the provided AztecAddress.
-   * If an existing tree with the same contract address is found in the cache, it will be returned.
-   * Otherwise, a new ContractTree instance will be created using the contract data from the database
-   * and added to the cache before returning.
-   *
-   * @param contractAddress - The AztecAddress of the contract for which the ContractTree is required.
-   * @returns A ContractTree instance associated with the specified contract address.
-   * @throws An Error if the contract is not found in the ContractDatabase.
-   */ async getTreeForAddress(contractAddress) {
-        const instance = await this.getContractInstance(contractAddress);
-        return this.getTreeForClassId(instance.currentContractClassId);
+    async #getContractArtifactByAddress(contractAddress) {
+        const contractClassId = await this.#getContractClassId(contractAddress);
+        return contractClassId && this.getContractArtifact(contractClassId);
     }
     // Public getters
     async getContractsAddresses() {
@@ -79,25 +73,26 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
         return keys.map(AztecAddress.fromString);
     }
     /** Returns a contract instance for a given address. Throws if not found. */ async getContractInstance(contractAddress) {
-        const instance = await this.#getContractInstance(contractAddress);
-        if (!instance) {
-            throw new ContractNotFoundError(contractAddress.toString());
-        }
-        return instance;
+        const contract = await this.#contractInstances.getAsync(contractAddress.toString());
+        return contract && SerializableContractInstance.fromBuffer(contract).withAddress(contractAddress);
     }
     async getContractArtifact(contractClassId) {
-        const tree = await this.getTreeForClassId(contractClassId);
-        return tree.getArtifact();
+        const contract = await this.#contractArtifacts.getAsync(contractClassId.toString());
+        // TODO(@spalladino): AztecAsyncMap lies and returns Uint8Arrays instead of Buffers, hence the extra Buffer.from.
+        return contract && contractArtifactFromBuffer(Buffer.from(contract));
     }
     /** Returns a contract class for a given class id. Throws if not found. */ async getContractClass(contractClassId) {
-        const tree = await this.getTreeForClassId(contractClassId);
-        return tree.getContractClass();
+        const artifact = await this.getContractArtifact(contractClassId);
+        return artifact && getContractClassFromArtifact(artifact);
     }
     async getContract(address) {
         const instance = await this.getContractInstance(address);
-        const artifact = instance && await this.getContractArtifact(instance?.currentContractClassId);
-        if (!instance || !artifact) {
-            return undefined;
+        if (!instance) {
+            return;
+        }
+        const artifact = await this.getContractArtifact(instance.currentContractClassId);
+        if (!artifact) {
+            return;
         }
         return {
             ...instance,
@@ -113,20 +108,24 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
    * @param selector - The function selector.
    * @returns The corresponding function's artifact as an object.
    */ async getFunctionArtifact(contractAddress, selector) {
-        const tree = await this.getTreeForAddress(contractAddress);
-        return tree.getFunctionArtifact(selector);
+        const artifact = await this.#getContractArtifactByAddress(contractAddress);
+        const fnArtifact = artifact && await this.#findFunctionArtifactBySelector(artifact, selector);
+        return fnArtifact && {
+            ...fnArtifact,
+            contractName: artifact.name
+        };
     }
-    /**
-   * Retrieves the artifact of a specified function within a given contract.
-   * The function is identified by its name, which is unique within a contract.
-   * Throws if the contract has not been added to the database.
-   *
-   * @param contractAddress - The AztecAddress representing the contract containing the function.
-   * @param functionName - The name of the function.
-   * @returns The corresponding function's artifact as an object
-   */ async getFunctionArtifactByName(contractAddress, functionName) {
-        const tree = await this.getTreeForAddress(contractAddress);
-        return tree.getArtifact().functions.find((f)=>f.name === functionName);
+    async getPublicFunctionArtifact(contractAddress) {
+        const artifact = await this.#getContractArtifactByAddress(contractAddress);
+        const fnArtifact = artifact && artifact.functions.find((fn)=>fn.functionType === FunctionType.PUBLIC);
+        return fnArtifact && {
+            ...fnArtifact,
+            contractName: artifact.name
+        };
+    }
+    async getFunctionAbi(contractAddress, selector) {
+        const artifact = await this.#getContractArtifactByAddress(contractAddress);
+        return artifact && await this.#findFunctionAbiBySelector(artifact, selector);
     }
     /**
    * Retrieves the debug metadata of a specified function within a given contract.
@@ -138,22 +137,14 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
    * @param selector - The function selector.
    * @returns The corresponding function's artifact as an object.
    */ async getFunctionDebugMetadata(contractAddress, selector) {
-        const tree = await this.getTreeForAddress(contractAddress);
-        const artifact = await tree.getFunctionArtifact(selector);
-        return getFunctionDebugMetadata(tree.getArtifact(), artifact);
+        const artifact = await this.#getContractArtifactByAddress(contractAddress);
+        const fnArtifact = artifact && await this.#findFunctionArtifactBySelector(artifact, selector);
+        return fnArtifact && getFunctionDebugMetadata(artifact, fnArtifact);
     }
-    /**
-   * Retrieve the bytecode of a specific function in a contract at the given address.
-   * The returned bytecode is required for executing and verifying the function's behavior
-   * in the Aztec network. Throws an error if the contract or function cannot be found.
-   *
-   * @param contractAddress - The contract's address.
-   * @param selector - The function selector.
-   * @returns A Promise that resolves to a Buffer containing the bytecode of the specified function.
-   * @throws Error if the contract address is unknown or not found.
-   */ async getBytecode(contractAddress, selector) {
-        const tree = await this.getTreeForAddress(contractAddress);
-        return tree.getBytecode(selector);
+    async getPublicFunctionDebugMetadata(contractAddress) {
+        const artifact = await this.#getContractArtifactByAddress(contractAddress);
+        const fnArtifact = artifact && artifact.functions.find((fn)=>fn.functionType === FunctionType.PUBLIC);
+        return fnArtifact && getFunctionDebugMetadata(artifact, fnArtifact);
     }
     /**
    * Retrieve the function membership witness for the given contract class and function selector.
@@ -164,20 +155,39 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
    * @param selector - The function selector.
    * @returns A promise that resolves with the MembershipWitness instance for the specified contract's function.
    */ async getFunctionMembershipWitness(contractClassId, selector) {
-        const tree = await this.getTreeForClassId(contractClassId);
-        return tree.getFunctionMembershipWitness(selector);
+        const tree = await this.#getPrivateFunctionTreeForClassId(contractClassId);
+        return tree?.getFunctionMembershipWitness(selector);
     }
     async getDebugContractName(contractAddress) {
-        const tree = await this.getTreeForAddress(contractAddress);
-        return tree.getArtifact().name;
+        const artifact = await this.#getContractArtifactByAddress(contractAddress);
+        return artifact?.name;
     }
     async getDebugFunctionName(contractAddress, selector) {
-        const tree = await this.getTreeForAddress(contractAddress);
-        const { name: contractName } = tree.getArtifact();
-        const { name: functionName } = await tree.getFunctionArtifact(selector);
-        return `${contractName}:${functionName}`;
+        const artifact = await this.#getContractArtifactByAddress(contractAddress);
+        const fnArtifact = artifact && await this.#findFunctionAbiBySelector(artifact, selector);
+        return `${artifact?.name ?? contractAddress}:${fnArtifact?.name ?? selector}`;
+    }
+    async #findFunctionArtifactBySelector(artifact, selector) {
+        const functions = artifact.functions;
+        for(let i = 0; i < functions.length; i++){
+            const fn = functions[i];
+            const fnSelector = await FunctionSelector.fromNameAndParameters(fn.name, fn.parameters);
+            if (fnSelector.equals(selector)) {
+                return fn;
+            }
+        }
     }
-    async getSize() {
-        return (await toArray(this.#contractInstances.valuesAsync())).concat(await toArray(this.#contractArtifacts.valuesAsync())).reduce((sum, value)=>sum + value.length, 0);
+    async #findFunctionAbiBySelector(artifact, selector) {
+        const functions = [
+            ...artifact.functions,
+            ...artifact.nonDispatchPublicFunctions ?? []
+        ];
+        for(let i = 0; i < functions.length; i++){
+            const fn = functions[i];
+            const fnSelector = await FunctionSelector.fromNameAndParameters(fn.name, fn.parameters);
+            if (fnSelector.equals(selector)) {
+                return fn;
+            }
+        }
     }
 }

package/dest/storage/contract_data_provider/index.d.ts

@@ -1,3 +1,2 @@
 export { ContractDataProvider } from './contract_data_provider.js';
-export { PrivateFunctionsTree } from './private_functions_tree.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL2NvbnRyYWN0X2RhdGFfcHJvdmlkZXIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNkJBQTZCLENBQUMifQ==

package/dest/storage/contract_data_provider/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/storage/contract_data_provider/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/storage/contract_data_provider/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC"}

package/dest/storage/contract_data_provider/index.js

@@ -1,2 +1 @@
 export { ContractDataProvider } from './contract_data_provider.js';
-export { PrivateFunctionsTree } from './private_functions_tree.js';