@aztec/stdlib 0.0.0-test.0 → 0.0.1-commit.023c3e5

package/dest/contract/contract_address.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_address.d.ts","sourceRoot":"","sources":["../../src/contract/contract_address.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,KAAK,WAAW,EAAE,gBAAgB,EAAmB,MAAM,iBAAiB,CAAC;AACtF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAG9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAI1E;;;;;;;;GAQG;AACH,wBAAsB,kCAAkC,CACtD,QAAQ,EACJ,gBAAgB,GAChB,CAAC;IAAE,uBAAuB,EAAE,EAAE,CAAC;IAAC,wBAAwB,EAAE,EAAE,CAAA;CAAE,GAAG,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,GACzG,OAAO,CAAC,YAAY,CAAC,CAGvB;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,QAAQ,EACJ,IAAI,CAAC,gBAAgB,EAAE,yBAAyB,GAAG,oBAAoB,GAAG,MAAM,GAAG,UAAU,CAAC,GAC9F;IAAE,uBAAuB,EAAE,EAAE,CAAC;IAAC,wBAAwB,EAAE,EAAE,CAAA;CAAE,GAChE,OAAO,CAAC,EAAE,CAAC,CAUb;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,oBAAoB,GAAG,MAAM,GAAG,UAAU,CAAC,GAC3E,OAAO,CAAC,EAAE,CAAC,CAKb;AAED;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAOzG;AAED;;;;;GAKG;AACH,wBAAsB,wCAAwC,CAC5D,MAAM,EAAE,gBAAgB,EACxB,WAAW,EAAE,EAAE,EAAE,GAChB,OAAO,CAAC,EAAE,CAAC,CAGb"}
+{"version":3,"file":"contract_address.d.ts","sourceRoot":"","sources":["../../src/contract/contract_address.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,KAAK,WAAW,EAAE,gBAAgB,EAAmB,MAAM,iBAAiB,CAAC;AACtF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAG9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAI1E;;;;;;;;GAQG;AACH,wBAAsB,kCAAkC,CACtD,QAAQ,EACJ,gBAAgB,GAChB,CAAC;IAAE,uBAAuB,EAAE,EAAE,CAAC;IAAC,wBAAwB,EAAE,EAAE,CAAA;CAAE,GAAG,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,GACzG,OAAO,CAAC,YAAY,CAAC,CAGvB;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,QAAQ,EACJ,IAAI,CAAC,gBAAgB,EAAE,yBAAyB,GAAG,oBAAoB,GAAG,MAAM,GAAG,UAAU,CAAC,GAC9F;IAAE,uBAAuB,EAAE,EAAE,CAAC;IAAC,wBAAwB,EAAE,EAAE,CAAA;CAAE,GAChE,OAAO,CAAC,EAAE,CAAC,CAUb;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,oBAAoB,GAAG,MAAM,GAAG,UAAU,CAAC,GAC3E,OAAO,CAAC,EAAE,CAAC,CAKb;AAED;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAOzG;AAED;;;;;GAKG;AACH,wBAAsB,wCAAwC,CAC5D,MAAM,EAAE,gBAAgB,EACxB,WAAW,EAAE,EAAE,EAAE,GAChB,OAAO,CAAC,EAAE,CAAC,CAGb"}

package/dest/contract/contract_address.js

@@ -1,12 +1,12 @@
 import { GeneratorIndex } from '@aztec/constants';
-import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { FunctionSelector, encodeArguments } from '../abi/index.js';
 import { computeVarArgsHash } from '../hash/hash.js';
 import { computeAddress } from '../keys/index.js';
 // TODO(@spalladino): Review all generator indices in this file
 /**
- * Returns the deployment address for a given contract instance as defined on the [Protocol Specs](../../../../docs/docs/protocol-specs/addresses-and-keys/specification.md).
+ * Returns the deployment address for a given contract instance.
  * ```
  * salted_initialization_hash = pedersen([salt, initialization_hash, deployer], GENERATOR__SALTED_INITIALIZATION_HASH)
  * partial_address = pedersen([contract_class_id, salted_initialization_hash], GENERATOR__CONTRACT_PARTIAL_ADDRESS_V1)
@@ -60,5 +60,5 @@ import { computeAddress } from '../keys/index.js';
     return poseidon2HashWithSeparator([
         initFn,
         argsHash
-    ], GeneratorIndex.CONSTRUCTOR);
+    ], GeneratorIndex.INITIALIZER);
 }

package/dest/contract/contract_class.d.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { type ContractArtifact, type FunctionArtifact } from '../abi/index.js';
 import { type ContractClassIdPreimage } from './contract_class_id.js';
 import type { ContractClass, ContractClassWithId } from './interfaces/index.js';
@@ -14,4 +14,4 @@ export declare function getContractClassPrivateFunctionFromArtifact(f: FunctionA
  */
 export declare function computeVerificationKeyHash(f: FunctionArtifact): Promise<Fr>;
 export {};
-//# sourceMappingURL=contract_class.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfY2xhc3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9jb250cmFjdF9jbGFzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFcEQsT0FBTyxFQUFFLEtBQUssZ0JBQWdCLEVBQUUsS0FBSyxnQkFBZ0IsRUFBa0MsTUFBTSxpQkFBaUIsQ0FBQztBQUcvRyxPQUFPLEVBQUUsS0FBSyx1QkFBdUIsRUFBc0MsTUFBTSx3QkFBd0IsQ0FBQztBQUMxRyxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVoRixvREFBb0Q7QUFDcEQsS0FBSyx3QkFBd0IsR0FBRyxnQkFBZ0IsR0FBRztJQUFFLFlBQVksRUFBRSxFQUFFLENBQUE7Q0FBRSxDQUFDO0FBS3hFLG9FQUFvRTtBQUNwRSx3QkFBc0IsNEJBQTRCLENBQ2hELFFBQVEsRUFBRSxnQkFBZ0IsR0FBRyx3QkFBd0IsR0FDcEQsT0FBTyxDQUFDLG1CQUFtQixHQUFHLHVCQUF1QixDQUFDLENBMEJ4RDtBQUVELHdCQUFzQiwyQ0FBMkMsQ0FDL0QsQ0FBQyxFQUFFLGdCQUFnQixHQUNsQixPQUFPLENBQUMsYUFBYSxDQUFDLGtCQUFrQixDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FLcEQ7QUFFRDs7R0FFRztBQUNILHdCQUFzQiwwQkFBMEIsQ0FBQyxDQUFDLEVBQUUsZ0JBQWdCLGVBS25FIn0=

package/dest/contract/contract_class.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_class.d.ts","sourceRoot":"","sources":["../../src/contract/contract_class.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAkC,MAAM,iBAAiB,CAAC;AAG/G,OAAO,EAAE,KAAK,uBAAuB,EAAsC,MAAM,wBAAwB,CAAC;AAC1G,OAAO,KAAK,EAAE,aAAa,EAAE,mBAAmB,EAAkB,MAAM,uBAAuB,CAAC;AAEhG,oDAAoD;AACpD,KAAK,wBAAwB,GAAG,gBAAgB,GAAG;IAAE,YAAY,EAAE,EAAE,CAAA;CAAE,CAAC;AAKxE,oEAAoE;AACpE,wBAAsB,4BAA4B,CAChD,QAAQ,EAAE,gBAAgB,GAAG,wBAAwB,GACpD,OAAO,CAAC,mBAAmB,GAAG,uBAAuB,CAAC,CA0CxD;AAED,wBAAsB,2CAA2C,CAC/D,CAAC,EAAE,gBAAgB,GAClB,OAAO,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAKpD;AAED;;GAEG;AACH,wBAAsB,0BAA0B,CAAC,CAAC,EAAE,gBAAgB,eAKnE"}
+{"version":3,"file":"contract_class.d.ts","sourceRoot":"","sources":["../../src/contract/contract_class.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAkC,MAAM,iBAAiB,CAAC;AAG/G,OAAO,EAAE,KAAK,uBAAuB,EAAsC,MAAM,wBAAwB,CAAC;AAC1G,OAAO,KAAK,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEhF,oDAAoD;AACpD,KAAK,wBAAwB,GAAG,gBAAgB,GAAG;IAAE,YAAY,EAAE,EAAE,CAAA;CAAE,CAAC;AAKxE,oEAAoE;AACpE,wBAAsB,4BAA4B,CAChD,QAAQ,EAAE,gBAAgB,GAAG,wBAAwB,GACpD,OAAO,CAAC,mBAAmB,GAAG,uBAAuB,CAAC,CA0BxD;AAED,wBAAsB,2CAA2C,CAC/D,CAAC,EAAE,gBAAgB,GAClB,OAAO,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAKpD;AAED;;GAEG;AACH,wBAAsB,0BAA0B,CAAC,CAAC,EAAE,gBAAgB,eAKnE"}

package/dest/contract/contract_class.js

@@ -1,6 +1,4 @@
-import { PUBLIC_DISPATCH_SELECTOR } from '@aztec/constants';
-import { vkAsFieldsMegaHonk } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { vkAsFieldsMegaHonk } from '@aztec/foundation/crypto/keys';
 import { FunctionSelector, FunctionType } from '../abi/index.js';
 import { hashVK } from '../hash/hash.js';
 import { computeArtifactHash } from './artifact_hash.js';
@@ -9,30 +7,16 @@ const cmpFunctionArtifacts = (a, b)=>a.selector.toField().cmp(b.selector.toField
 /** Creates a ContractClass from a contract compilation artifact. */ export async function getContractClassFromArtifact(artifact) {
     const artifactHash = 'artifactHash' in artifact ? artifact.artifactHash : await computeArtifactHash(artifact);
     const publicFunctions = artifact.functions.filter((f)=>f.functionType === FunctionType.PUBLIC);
-    const artifactPublicFunctions = await Promise.all(publicFunctions.map(async (f)=>({
-            selector: await FunctionSelector.fromNameAndParameters(f.name, f.parameters),
-            bytecode: f.bytecode
-        })));
-    artifactPublicFunctions.sort(cmpFunctionArtifacts);
-    let packedBytecode = Buffer.alloc(0);
-    let dispatchFunction = undefined;
-    if (artifactPublicFunctions.length > 0) {
-        dispatchFunction = artifactPublicFunctions.find((f)=>f.selector.equals(FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR))));
-        if (!dispatchFunction) {
-            throw new Error(`A contract with public functions should define a public_dispatch(Field) function as its public entrypoint. Contract: ${artifact.name}`);
-        }
-        packedBytecode = dispatchFunction.bytecode;
+    if (publicFunctions.length > 1) {
+        throw new Error(`Contract should contain at most one public function artifact. Received ${publicFunctions.length}.`);
     }
+    const packedBytecode = publicFunctions[0]?.bytecode ?? Buffer.alloc(0);
     const privateFunctions = artifact.functions.filter((f)=>f.functionType === FunctionType.PRIVATE);
     const privateArtifactFunctions = await Promise.all(privateFunctions.map(getContractClassPrivateFunctionFromArtifact));
     privateArtifactFunctions.sort(cmpFunctionArtifacts);
     const contractClass = {
         version: 1,
         artifactHash,
-        // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8985): Remove public functions.
-        publicFunctions: dispatchFunction ? [
-            dispatchFunction
-        ] : [],
         packedBytecode,
         privateFunctions: privateArtifactFunctions
     };

package/dest/contract/contract_class_id.d.ts

@@ -1,13 +1,11 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { ContractClass } from './interfaces/contract_class.js';
 /**
  * Returns the id of a contract class computed as its hash.
  *
  * ```
  * version = 1
- * private_function_leaves = private_functions.map(fn => pedersen([fn.function_selector as Field, fn.vk_hash], GENERATOR__FUNCTION_LEAF))
+ * private_function_leaves = private_functions.map(fn => pedersen([fn.function_selector as Field, fn.vk_hash], GENERATOR__PRIVATE_FUNCTION_LEAF))
  * private_functions_root = merkleize(private_function_leaves)
  * bytecode_commitment = calculate_commitment(packed_bytecode)
  * contract_class_id = pedersen([version, artifact_hash, private_functions_root, bytecode_commitment], GENERATOR__CLASS_IDENTIFIER)
@@ -29,4 +27,4 @@ export type ContractClassIdPreimage = {
     publicBytecodeCommitment: Fr;
 };
 export declare function computePublicBytecodeCommitment(packedBytecode: Buffer): Promise<Fr>;
-//# sourceMappingURL=contract_class_id.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfY2xhc3NfaWQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9jb250cmFjdF9jbGFzc19pZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFLcEQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFHcEU7Ozs7Ozs7Ozs7OztHQVlHO0FBQ0gsd0JBQXNCLHNCQUFzQixDQUFDLGFBQWEsRUFBRSxhQUFhLEdBQUcsdUJBQXVCLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUVoSDtBQUVELDJFQUEyRTtBQUMzRSx3QkFBc0Isa0NBQWtDLENBQ3RELGFBQWEsRUFBRSxhQUFhLEdBQUcsdUJBQXVCLEdBQ3JELE9BQU8sQ0FBQyx1QkFBdUIsR0FBRztJQUFFLEVBQUUsRUFBRSxFQUFFLENBQUE7Q0FBRSxDQUFDLENBZS9DO0FBRUQsMEVBQTBFO0FBQzFFLHdCQUFzQiw4QkFBOEIsQ0FBQyxhQUFhLEVBQUUsYUFBYSxHQUFHLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQyxDQUluSDtBQUVELHVDQUF1QztBQUN2QyxNQUFNLE1BQU0sdUJBQXVCLEdBQUc7SUFDcEMsWUFBWSxFQUFFLEVBQUUsQ0FBQztJQUNqQixvQkFBb0IsRUFBRSxFQUFFLENBQUM7SUFDekIsd0JBQXdCLEVBQUUsRUFBRSxDQUFDO0NBQzlCLENBQUM7QUFFRix3QkFBc0IsK0JBQStCLENBQUMsY0FBYyxFQUFFLE1BQU0sZUFjM0UifQ==

package/dest/contract/contract_class_id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_class_id.d.ts","sourceRoot":"","sources":["../../src/contract/contract_class_id.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAK9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAGpE;;;;;;;;;;;;GAYG;AACH,wBAAsB,sBAAsB,CAAC,aAAa,EAAE,aAAa,GAAG,uBAAuB,GAAG,OAAO,CAAC,EAAE,CAAC,CAEhH;AAED,2EAA2E;AAC3E,wBAAsB,kCAAkC,CACtD,aAAa,EAAE,aAAa,GAAG,uBAAuB,GACrD,OAAO,CAAC,uBAAuB,GAAG;IAAE,EAAE,EAAE,EAAE,CAAA;CAAE,CAAC,CAe/C;AAED,0EAA0E;AAC1E,wBAAsB,8BAA8B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAInH;AAED,uCAAuC;AACvC,MAAM,MAAM,uBAAuB,GAAG;IACpC,YAAY,EAAE,EAAE,CAAC;IACjB,oBAAoB,EAAE,EAAE,CAAC;IACzB,wBAAwB,EAAE,EAAE,CAAC;CAC9B,CAAC;AAEF,wBAAsB,+BAA+B,CAAC,cAAc,EAAE,MAAM,eAQ3E"}
+{"version":3,"file":"contract_class_id.d.ts","sourceRoot":"","sources":["../../src/contract/contract_class_id.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAKpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAGpE;;;;;;;;;;;;GAYG;AACH,wBAAsB,sBAAsB,CAAC,aAAa,EAAE,aAAa,GAAG,uBAAuB,GAAG,OAAO,CAAC,EAAE,CAAC,CAEhH;AAED,2EAA2E;AAC3E,wBAAsB,kCAAkC,CACtD,aAAa,EAAE,aAAa,GAAG,uBAAuB,GACrD,OAAO,CAAC,uBAAuB,GAAG;IAAE,EAAE,EAAE,EAAE,CAAA;CAAE,CAAC,CAe/C;AAED,0EAA0E;AAC1E,wBAAsB,8BAA8B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAInH;AAED,uCAAuC;AACvC,MAAM,MAAM,uBAAuB,GAAG;IACpC,YAAY,EAAE,EAAE,CAAC;IACjB,oBAAoB,EAAE,EAAE,CAAC;IACzB,wBAAwB,EAAE,EAAE,CAAC;CAC9B,CAAC;AAEF,wBAAsB,+BAA+B,CAAC,cAAc,EAAE,MAAM,eAc3E"}

package/dest/contract/contract_class_id.js

@@ -1,6 +1,6 @@
 import { GeneratorIndex, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS } from '@aztec/constants';
-import { poseidon2HashAccumulate, poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { strict as assert } from 'assert';
 import { bufferAsFields } from '../abi/index.js';
 import { computePrivateFunctionsRoot } from './private_function.js';
@@ -9,7 +9,7 @@ import { computePrivateFunctionsRoot } from './private_function.js';
  *
  * ```
  * version = 1
- * private_function_leaves = private_functions.map(fn => pedersen([fn.function_selector as Field, fn.vk_hash], GENERATOR__FUNCTION_LEAF))
+ * private_function_leaves = private_functions.map(fn => pedersen([fn.function_selector as Field, fn.vk_hash], GENERATOR__PRIVATE_FUNCTION_LEAF))
  * private_functions_root = merkleize(private_function_leaves)
  * bytecode_commitment = calculate_commitment(packed_bytecode)
  * contract_class_id = pedersen([version, artifact_hash, private_functions_root, bytecode_commitment], GENERATOR__CLASS_IDENTIFIER)
@@ -27,7 +27,7 @@ import { computePrivateFunctionsRoot } from './private_function.js';
         artifactHash,
         privateFunctionsRoot,
         publicBytecodeCommitment
-    ], GeneratorIndex.CONTRACT_LEAF);
+    ], GeneratorIndex.CONTRACT_CLASS_ID);
     return {
         id,
         artifactHash,
@@ -46,9 +46,11 @@ import { computePrivateFunctionsRoot } from './private_function.js';
 }
 export async function computePublicBytecodeCommitment(packedBytecode) {
     // Encode the buffer into field elements (chunked into 32 bytes each)
-    const encodedBytecode = bufferAsFields(packedBytecode, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS);
     // The first element is the length of the bytecode (in bytes)
-    const bytecodeLength = Math.ceil(encodedBytecode[0].toNumber() / (Fr.SIZE_IN_BYTES - 1));
+    const [bytecodeLengthAsField, ...bytecodeAsFields] = bufferAsFields(packedBytecode, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS);
+    const bytecodeLength = Math.ceil(bytecodeLengthAsField.toNumber() / (Fr.SIZE_IN_BYTES - 1));
     assert(bytecodeLength < MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS, 'Bytecode exceeds maximum deployable size');
-    return bytecodeLength == 0 ? new Fr(0) : await poseidon2HashAccumulate(encodedBytecode.slice(0, bytecodeLength + 1));
+    // NOTE: hash the bytecode here only up to the actual length of the bytecode.
+    // We do not hash the entire max bytecode length!
+    return await poseidon2HashWithSeparator(bytecodeAsFields.slice(0, bytecodeLength), GeneratorIndex.PUBLIC_BYTECODE);
 }

package/dest/contract/contract_deployment_data.d.ts

@@ -0,0 +1,119 @@
+import { ContractClassLog, PrivateLog } from '@aztec/stdlib/logs';
+import type { Tx } from '@aztec/stdlib/tx';
+import { z } from 'zod';
+/**
+ * Class containing contract class logs and private logs which are both
+ * relevant for contract registrations and deployments.
+ */
+export declare class ContractDeploymentData {
+    readonly contractClassLogs: ContractClassLog[];
+    readonly privateLogs: PrivateLog[];
+    constructor(contractClassLogs: ContractClassLog[], privateLogs: PrivateLog[]);
+    getContractClassLogs(): ContractClassLog[];
+    getPrivateLogs(): PrivateLog[];
+    static from(args: {
+        contractClassLogs: ContractClassLog[];
+        privateLogs: PrivateLog[];
+    }): ContractDeploymentData;
+    static empty(): ContractDeploymentData;
+    static get schema(): z.ZodEffects<z.ZodObject<{
+        contractClassLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
+            contractAddress: import("@aztec/foundation/schemas").ZodFor<import("../aztec-address/index.js").AztecAddress>;
+            fields: z.ZodEffects<z.ZodObject<{
+                fields: z.ZodEffects<z.ZodArray<z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>, "many">, import("@aztec/foundation/schemas").Fr[], string[]>;
+            }, "strip", z.ZodTypeAny, {
+                fields: import("@aztec/foundation/schemas").Fr[];
+            }, {
+                fields: string[];
+            }>, import("@aztec/stdlib/logs").ContractClassLogFields, {
+                fields: string[];
+            }>;
+            emittedLength: z.ZodNumber;
+        }, "strip", z.ZodTypeAny, {
+            contractAddress: import("../aztec-address/index.js").AztecAddress;
+            fields: import("@aztec/stdlib/logs").ContractClassLogFields;
+            emittedLength: number;
+        }, {
+            contractAddress?: any;
+            fields: {
+                fields: string[];
+            };
+            emittedLength: number;
+        }>, ContractClassLog, {
+            contractAddress?: any;
+            fields: {
+                fields: string[];
+            };
+            emittedLength: number;
+        }>, "many">;
+        privateLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
+            fields: z.ZodArray<z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>, "many">;
+            emittedLength: z.ZodNumber;
+        }, "strict", z.ZodTypeAny, {
+            fields: import("@aztec/foundation/schemas").Fr[];
+            emittedLength: number;
+        }, {
+            fields: string[];
+            emittedLength: number;
+        }>, PrivateLog, {
+            fields: string[];
+            emittedLength: number;
+        }>, "many">;
+    }, "strip", z.ZodTypeAny, {
+        contractClassLogs: ContractClassLog[];
+        privateLogs: PrivateLog[];
+    }, {
+        contractClassLogs: {
+            contractAddress?: any;
+            fields: {
+                fields: string[];
+            };
+            emittedLength: number;
+        }[];
+        privateLogs: {
+            fields: string[];
+            emittedLength: number;
+        }[];
+    }>, ContractDeploymentData, {
+        contractClassLogs: {
+            contractAddress?: any;
+            fields: {
+                fields: string[];
+            };
+            emittedLength: number;
+        }[];
+        privateLogs: {
+            fields: string[];
+            emittedLength: number;
+        }[];
+    }>;
+    /**
+     * Creates a ContractDeploymentData from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * @param obj - Plain object containing ContractDeploymentData fields
+     * @returns A ContractDeploymentData instance
+     */
+    static fromPlainObject(obj: any): ContractDeploymentData;
+}
+/**
+ * Class containing both revertible and non-revertible registration/deployment data.
+ */
+export declare class AllContractDeploymentData {
+    readonly nonRevertibleContractDeploymentData: ContractDeploymentData;
+    readonly revertibleContractDeploymentData: ContractDeploymentData;
+    constructor(nonRevertibleContractDeploymentData: ContractDeploymentData, revertibleContractDeploymentData: ContractDeploymentData);
+    getNonRevertibleContractDeploymentData(): ContractDeploymentData;
+    getRevertibleContractDeploymentData(): ContractDeploymentData;
+    /**
+     * Extracts all contract registration/deployment data from a tx separated by revertibility.
+     * This includes contract class logs and private logs.
+     *
+     * This method handles both private-only transactions and transactions with public calls,
+     * properly splitting logs between revertible and non-revertible categories.
+     * @param tx - The transaction to extract data from
+     * @returns The extracted deployment data separated by revertibility
+     */
+    static fromTx(tx: Tx): AllContractDeploymentData;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfZGVwbG95bWVudF9kYXRhLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3QvY29udHJhY3RfZGVwbG95bWVudF9kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNsRSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUzQyxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCOzs7R0FHRztBQUNILHFCQUFhLHNCQUFzQjthQUVmLGlCQUFpQixFQUFFLGdCQUFnQixFQUFFO2FBQ3JDLFdBQVcsRUFBRSxVQUFVLEVBQUU7SUFGM0MsWUFDa0IsaUJBQWlCLEVBQUUsZ0JBQWdCLEVBQUUsRUFDckMsV0FBVyxFQUFFLFVBQVUsRUFBRSxFQUN2QztJQUVHLG9CQUFvQixJQUFJLGdCQUFnQixFQUFFLENBRWhEO0lBRU0sY0FBYyxJQUFJLFVBQVUsRUFBRSxDQUVwQztJQUVELE9BQWMsSUFBSSxDQUFDLElBQUksRUFBRTtRQUFFLGlCQUFpQixFQUFFLGdCQUFnQixFQUFFLENBQUM7UUFBQyxXQUFXLEVBQUUsVUFBVSxFQUFFLENBQUE7S0FBRSwwQkFFNUY7SUFFRCxPQUFjLEtBQUssSUFBSSxzQkFBc0IsQ0FFNUM7SUFFRCxXQUFrQixNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BT3ZCO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsT0FBYyxlQUFlLENBQUMsR0FBRyxFQUFFLEdBQUcsR0FBRyxzQkFBc0IsQ0FROUQ7Q0FDRjtBQUVEOztHQUVHO0FBQ0gscUJBQWEseUJBQXlCO2FBRWxCLG1DQUFtQyxFQUFFLHNCQUFzQjthQUMzRCxnQ0FBZ0MsRUFBRSxzQkFBc0I7SUFGMUUsWUFDa0IsbUNBQW1DLEVBQUUsc0JBQXNCLEVBQzNELGdDQUFnQyxFQUFFLHNCQUFzQixFQUN0RTtJQUVHLHNDQUFzQyxJQUFJLHNCQUFzQixDQUV0RTtJQUVNLG1DQUFtQyxJQUFJLHNCQUFzQixDQUVuRTtJQUVEOzs7Ozs7OztPQVFHO0lBQ0gsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLHlCQUF5QixDQXVDL0M7Q0FDRiJ9

package/dest/contract/contract_deployment_data.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contract_deployment_data.d.ts","sourceRoot":"","sources":["../../src/contract/contract_deployment_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE3C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;GAGG;AACH,qBAAa,sBAAsB;aAEf,iBAAiB,EAAE,gBAAgB,EAAE;aACrC,WAAW,EAAE,UAAU,EAAE;IAF3C,YACkB,iBAAiB,EAAE,gBAAgB,EAAE,EACrC,WAAW,EAAE,UAAU,EAAE,EACvC;IAEG,oBAAoB,IAAI,gBAAgB,EAAE,CAEhD;IAEM,cAAc,IAAI,UAAU,EAAE,CAEpC;IAED,OAAc,IAAI,CAAC,IAAI,EAAE;QAAE,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;QAAC,WAAW,EAAE,UAAU,EAAE,CAAA;KAAE,0BAE5F;IAED,OAAc,KAAK,IAAI,sBAAsB,CAE5C;IAED,WAAkB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAOvB;IAED;;;;;;OAMG;IACH,OAAc,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,sBAAsB,CAQ9D;CACF;AAED;;GAEG;AACH,qBAAa,yBAAyB;aAElB,mCAAmC,EAAE,sBAAsB;aAC3D,gCAAgC,EAAE,sBAAsB;IAF1E,YACkB,mCAAmC,EAAE,sBAAsB,EAC3D,gCAAgC,EAAE,sBAAsB,EACtE;IAEG,sCAAsC,IAAI,sBAAsB,CAEtE;IAEM,mCAAmC,IAAI,sBAAsB,CAEnE;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,GAAG,yBAAyB,CAuC/C;CACF"}

package/dest/contract/contract_deployment_data.js

@@ -0,0 +1,99 @@
+import { ContractClassLog, PrivateLog } from '@aztec/stdlib/logs';
+import { z } from 'zod';
+/**
+ * Class containing contract class logs and private logs which are both
+ * relevant for contract registrations and deployments.
+ */ export class ContractDeploymentData {
+    contractClassLogs;
+    privateLogs;
+    constructor(contractClassLogs, privateLogs){
+        this.contractClassLogs = contractClassLogs;
+        this.privateLogs = privateLogs;
+    }
+    getContractClassLogs() {
+        return this.contractClassLogs;
+    }
+    getPrivateLogs() {
+        return this.privateLogs;
+    }
+    static from(args) {
+        return new ContractDeploymentData(args.contractClassLogs, args.privateLogs);
+    }
+    static empty() {
+        return new ContractDeploymentData([], []);
+    }
+    static get schema() {
+        return z.object({
+            contractClassLogs: z.array(ContractClassLog.schema),
+            privateLogs: z.array(PrivateLog.schema)
+        }).transform(ContractDeploymentData.from);
+    }
+    /**
+   * Creates a ContractDeploymentData from a plain object without Zod validation.
+   * This method is optimized for performance and skips validation, making it suitable
+   * for deserializing trusted data (e.g., from C++ via MessagePack).
+   * @param obj - Plain object containing ContractDeploymentData fields
+   * @returns A ContractDeploymentData instance
+   */ static fromPlainObject(obj) {
+        if (obj instanceof ContractDeploymentData) {
+            return obj;
+        }
+        return new ContractDeploymentData(obj.contractClassLogs.map((log)=>ContractClassLog.fromPlainObject(log)), obj.privateLogs.map((log)=>PrivateLog.fromPlainObject(log)));
+    }
+}
+/**
+ * Class containing both revertible and non-revertible registration/deployment data.
+ */ export class AllContractDeploymentData {
+    nonRevertibleContractDeploymentData;
+    revertibleContractDeploymentData;
+    constructor(nonRevertibleContractDeploymentData, revertibleContractDeploymentData){
+        this.nonRevertibleContractDeploymentData = nonRevertibleContractDeploymentData;
+        this.revertibleContractDeploymentData = revertibleContractDeploymentData;
+    }
+    getNonRevertibleContractDeploymentData() {
+        return this.nonRevertibleContractDeploymentData;
+    }
+    getRevertibleContractDeploymentData() {
+        return this.revertibleContractDeploymentData;
+    }
+    /**
+   * Extracts all contract registration/deployment data from a tx separated by revertibility.
+   * This includes contract class logs and private logs.
+   *
+   * This method handles both private-only transactions and transactions with public calls,
+   * properly splitting logs between revertible and non-revertible categories.
+   * @param tx - The transaction to extract data from
+   * @returns The extracted deployment data separated by revertibility
+   */ static fromTx(tx) {
+        const hasPublicCalls = !!tx.data.forPublic;
+        // Extract contract class logs from the tx
+        const allClassLogs = tx.getContractClassLogs();
+        let nonRevertibleClassLogs;
+        let revertibleClassLogs;
+        if (hasPublicCalls) {
+            // Transactions with public calls can have both revertible and non-revertible contract class logs
+            // Split the logs up here based on revertibility
+            nonRevertibleClassLogs = tx.getSplitContractClassLogs(/*revertible=*/ false);
+            revertibleClassLogs = tx.getSplitContractClassLogs(/*revertible=*/ true);
+        } else {
+            // Private-only tx: all logs are non-revertible
+            nonRevertibleClassLogs = allClassLogs;
+            revertibleClassLogs = [];
+        }
+        // Extract contract instance logs from the transaction's private logs
+        let nonRevertibleInstanceLogs;
+        let revertibleInstanceLogs;
+        if (hasPublicCalls) {
+            // Transactions with public calls can have both revertible and non-revertible contract instance logs
+            // Split the logs up here based on revertibility
+            nonRevertibleInstanceLogs = tx.data.forPublic.nonRevertibleAccumulatedData.privateLogs.filter((l)=>!l.isEmpty());
+            revertibleInstanceLogs = tx.data.forPublic.revertibleAccumulatedData.privateLogs.filter((l)=>!l.isEmpty());
+        } else {
+            // Private-only tx: use logs from the `forRollup` member of the tx
+            // For private-only txs, all logs are non-revertible
+            nonRevertibleInstanceLogs = tx.data.forRollup.end.privateLogs.filter((l)=>!l.isEmpty());
+            revertibleInstanceLogs = [];
+        }
+        return new AllContractDeploymentData(new ContractDeploymentData(nonRevertibleClassLogs, nonRevertibleInstanceLogs), new ContractDeploymentData(revertibleClassLogs, revertibleInstanceLogs));
+    }
+}

package/dest/contract/contract_function_dao.d.ts

@@ -10,4 +10,4 @@ export interface ContractFunctionDao extends FunctionArtifact {
      */
     selector: FunctionSelector;
 }
-//# sourceMappingURL=contract_function_dao.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfZnVuY3Rpb25fZGFvLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3QvY29udHJhY3RfZnVuY3Rpb25fZGFvLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLGdCQUFnQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFMUU7Ozs7R0FJRztBQUNILE1BQU0sV0FBVyxtQkFBb0IsU0FBUSxnQkFBZ0I7SUFDM0Q7O09BRUc7SUFDSCxRQUFRLEVBQUUsZ0JBQWdCLENBQUM7Q0FDNUIifQ==

package/dest/contract/contract_instance.d.ts

@@ -1,12 +1,18 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
-import { type ContractArtifact, type FunctionArtifact } from '../abi/index.js';
+import { type ContractArtifact, type FunctionAbi } from '../abi/index.js';
 import { AztecAddress } from '../aztec-address/index.js';
 import { PublicKeys } from '../keys/public_keys.js';
 import type { ContractInstance, ContractInstanceWithAddress } from './interfaces/contract_instance.js';
+export type ContractInstantiationData = {
+    constructorArtifact?: FunctionAbi | string;
+    constructorArgs?: any[];
+    skipArgsDecoding?: boolean;
+    salt: Fr;
+    publicKeys?: PublicKeys;
+    deployer?: AztecAddress;
+};
 export declare class SerializableContractInstance {
     readonly version: 1;
     readonly salt: Fr;
@@ -16,7 +22,7 @@ export declare class SerializableContractInstance {
     readonly initializationHash: Fr;
     readonly publicKeys: PublicKeys;
     constructor(instance: ContractInstance);
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     /** Returns a copy of this object with its address included. */
     withAddress(address: AztecAddress): ContractInstanceWithAddress;
     static fromBuffer(bufferOrReader: Buffer | BufferReader): SerializableContractInstance;
@@ -24,17 +30,10 @@ export declare class SerializableContractInstance {
     static default(): SerializableContractInstance;
 }
 /**
- * Generates a Contract Instance from the deployment params.
+ * Generates a Contract Instance from some instantiation params.
  * @param artifact - The account contract build artifact.
- * @param opts - Options for the deployment.
+ * @param opts - Options for the contract's instantiation.
  * @returns - The contract instance
  */
-export declare function getContractInstanceFromDeployParams(artifact: ContractArtifact, opts: {
-    constructorArtifact?: FunctionArtifact | string;
-    constructorArgs?: any[];
-    skipArgsDecoding?: boolean;
-    salt?: Fr;
-    publicKeys?: PublicKeys;
-    deployer?: AztecAddress;
-}): Promise<ContractInstanceWithAddress>;
-//# sourceMappingURL=contract_instance.d.ts.map
+export declare function getContractInstanceFromInstantiationParams(artifact: ContractArtifact, opts: ContractInstantiationData): Promise<ContractInstanceWithAddress>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfaW5zdGFuY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9jb250cmFjdF9pbnN0YW5jZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBaUMsTUFBTSw2QkFBNkIsQ0FBQztBQUMxRixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxXQUFXLEVBS2pCLE1BQU0saUJBQWlCLENBQUM7QUFDekIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXpELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQU1wRCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSwyQkFBMkIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBSXZHLE1BQU0sTUFBTSx5QkFBeUIsR0FBRztJQUN0QyxtQkFBbUIsQ0FBQyxFQUFFLFdBQVcsR0FBRyxNQUFNLENBQUM7SUFDM0MsZUFBZSxDQUFDLEVBQUUsR0FBRyxFQUFFLENBQUM7SUFDeEIsZ0JBQWdCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDM0IsSUFBSSxFQUFFLEVBQUUsQ0FBQztJQUNULFVBQVUsQ0FBQyxFQUFFLFVBQVUsQ0FBQztJQUN4QixRQUFRLENBQUMsRUFBRSxZQUFZLENBQUM7Q0FDekIsQ0FBQztBQUVGLHFCQUFhLDRCQUE0QjtJQUN2QyxTQUFnQixPQUFPLElBQVc7SUFDbEMsU0FBZ0IsSUFBSSxFQUFFLEVBQUUsQ0FBQztJQUN6QixTQUFnQixRQUFRLEVBQUUsWUFBWSxDQUFDO0lBQ3ZDLFNBQWdCLHNCQUFzQixFQUFFLEVBQUUsQ0FBQztJQUMzQyxTQUFnQix1QkFBdUIsRUFBRSxFQUFFLENBQUM7SUFDNUMsU0FBZ0Isa0JBQWtCLEVBQUUsRUFBRSxDQUFDO0lBQ3ZDLFNBQWdCLFVBQVUsRUFBRSxVQUFVLENBQUM7SUFFdkMsWUFBWSxRQUFRLEVBQUUsZ0JBQWdCLEVBVXJDO0lBRU0sUUFBUSw0QkFVZDtJQUVELCtEQUErRDtJQUMvRCxXQUFXLENBQUMsT0FBTyxFQUFFLFlBQVksR0FBRywyQkFBMkIsQ0FFOUQ7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLGNBQWMsRUFBRSxNQUFNLEdBQUcsWUFBWSxnQ0FXdEQ7SUFFRCxPQUFhLE1BQU0sQ0FBQyxJQUFJLEdBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFNLHlDQVdqRTtJQUVELE1BQU0sQ0FBQyxPQUFPLGlDQVViO0NBQ0Y7QUFFRDs7Ozs7R0FLRztBQUNILHdCQUFzQiwwQ0FBMEMsQ0FDOUQsUUFBUSxFQUFFLGdCQUFnQixFQUMxQixJQUFJLEVBQUUseUJBQXlCLEdBQzlCLE9BQU8sQ0FBQywyQkFBMkIsQ0FBQyxDQXlCdEMifQ==

package/dest/contract/contract_instance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_instance.d.ts","sourceRoot":"","sources":["../../src/contract/contract_instance.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAiC,MAAM,6BAA6B,CAAC;AAC1F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAA2C,MAAM,iBAAiB,CAAC;AACxH,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAMpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,mCAAmC,CAAC;AAIvG,qBAAa,4BAA4B;IACvC,SAAgB,OAAO,IAAW;IAClC,SAAgB,IAAI,EAAE,EAAE,CAAC;IACzB,SAAgB,QAAQ,EAAE,YAAY,CAAC;IACvC,SAAgB,sBAAsB,EAAE,EAAE,CAAC;IAC3C,SAAgB,uBAAuB,EAAE,EAAE,CAAC;IAC5C,SAAgB,kBAAkB,EAAE,EAAE,CAAC;IACvC,SAAgB,UAAU,EAAE,UAAU,CAAC;gBAE3B,QAAQ,EAAE,gBAAgB;IAY/B,QAAQ;IAYf,+DAA+D;IAC/D,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,2BAA2B;IAI/D,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY;WAa1C,MAAM,CAAC,IAAI,GAAE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAM;IAalE,MAAM,CAAC,OAAO;CAWf;AAED;;;;;GAKG;AACH,wBAAsB,mCAAmC,CACvD,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE;IACJ,mBAAmB,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAAC;IAChD,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,IAAI,CAAC,EAAE,EAAE,CAAC;IACV,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB,GACA,OAAO,CAAC,2BAA2B,CAAC,CA0BtC"}
+{"version":3,"file":"contract_instance.d.ts","sourceRoot":"","sources":["../../src/contract/contract_instance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAiC,MAAM,6BAA6B,CAAC;AAC1F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAKjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAMpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,mCAAmC,CAAC;AAIvG,MAAM,MAAM,yBAAyB,GAAG;IACtC,mBAAmB,CAAC,EAAE,WAAW,GAAG,MAAM,CAAC;IAC3C,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,IAAI,EAAE,EAAE,CAAC;IACT,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB,CAAC;AAEF,qBAAa,4BAA4B;IACvC,SAAgB,OAAO,IAAW;IAClC,SAAgB,IAAI,EAAE,EAAE,CAAC;IACzB,SAAgB,QAAQ,EAAE,YAAY,CAAC;IACvC,SAAgB,sBAAsB,EAAE,EAAE,CAAC;IAC3C,SAAgB,uBAAuB,EAAE,EAAE,CAAC;IAC5C,SAAgB,kBAAkB,EAAE,EAAE,CAAC;IACvC,SAAgB,UAAU,EAAE,UAAU,CAAC;IAEvC,YAAY,QAAQ,EAAE,gBAAgB,EAUrC;IAEM,QAAQ,4BAUd;IAED,+DAA+D;IAC/D,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,2BAA2B,CAE9D;IAED,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,gCAWtD;IAED,OAAa,MAAM,CAAC,IAAI,GAAE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAM,yCAWjE;IAED,MAAM,CAAC,OAAO,iCAUb;CACF;AAED;;;;;GAKG;AACH,wBAAsB,0CAA0C,CAC9D,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,yBAAyB,GAC9B,OAAO,CAAC,2BAA2B,CAAC,CAyBtC"}

package/dest/contract/contract_instance.js

@@ -1,6 +1,6 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, numToUInt8, serializeToBuffer } from '@aztec/foundation/serialize';
-import { FunctionSelector, getDefaultInitializer } from '../abi/index.js';
+import { FunctionSelector, getAllFunctionAbis, getDefaultInitializer } from '../abi/index.js';
 import { AztecAddress } from '../aztec-address/index.js';
 import { getContractClassFromArtifact } from '../contract/contract_class.js';
 import { PublicKeys } from '../keys/public_keys.js';
@@ -71,13 +71,12 @@ export class SerializableContractInstance {
     }
 }
 /**
- * Generates a Contract Instance from the deployment params.
+ * Generates a Contract Instance from some instantiation params.
  * @param artifact - The account contract build artifact.
- * @param opts - Options for the deployment.
+ * @param opts - Options for the contract's instantiation.
  * @returns - The contract instance
- */ export async function getContractInstanceFromDeployParams(artifact, opts) {
+ */ export async function getContractInstanceFromInstantiationParams(artifact, opts) {
     const args = opts.constructorArgs ?? [];
-    const salt = opts.salt ?? Fr.random();
     const constructorArtifact = getConstructorArtifact(artifact, opts.constructorArtifact);
     const deployer = opts.deployer ?? AztecAddress.ZERO;
     const contractClass = await getContractClassFromArtifact(artifact);
@@ -88,7 +87,7 @@ export class SerializableContractInstance {
         originalContractClassId: contractClass.id,
         initializationHash,
         publicKeys,
-        salt,
+        salt: opts.salt,
         deployer,
         version: 1
     };
@@ -99,11 +98,12 @@ export class SerializableContractInstance {
 }
 function getConstructorArtifact(artifact, requestedConstructorArtifact) {
     if (typeof requestedConstructorArtifact === 'string') {
-        const found = artifact.functions.find((fn)=>fn.name === requestedConstructorArtifact);
+        const found = getAllFunctionAbis(artifact).find((fn)=>fn.name === requestedConstructorArtifact);
         if (!found) {
             throw new Error(`No constructor found with name ${requestedConstructorArtifact}`);
         }
         return found;
     }
+    // TODO: shouldn't we check that requestedConstructorArtifact exists on artifact before returning?
     return requestedConstructorArtifact ?? getDefaultInitializer(artifact);
 }

package/dest/contract/contract_instance_update.d.ts

@@ -1,17 +1,16 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
+import type { UInt64 } from '../types/shared.js';
 import type { ContractInstanceUpdate } from './interfaces/contract_instance_update.js';
 export declare class SerializableContractInstanceUpdate {
     prevContractClassId: Fr;
     newContractClassId: Fr;
-    blockOfChange: number;
+    timestampOfChange: UInt64;
     constructor(instance: ContractInstanceUpdate);
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     static fromBuffer(bufferOrReader: Buffer | BufferReader): SerializableContractInstanceUpdate;
     static random(opts?: Partial<FieldsOf<ContractInstanceUpdate>>): SerializableContractInstanceUpdate;
     static default(): SerializableContractInstanceUpdate;
 }
-//# sourceMappingURL=contract_instance_update.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfaW5zdGFuY2VfdXBkYXRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3QvY29udHJhY3RfaW5zdGFuY2VfdXBkYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBQzlFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFFdkYscUJBQWEsa0NBQWtDO0lBQzdDLG1CQUFtQixFQUFFLEVBQUUsQ0FBQztJQUN4QixrQkFBa0IsRUFBRSxFQUFFLENBQUM7SUFDdkIsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBRTFCLFlBQVksUUFBUSxFQUFFLHNCQUFzQixFQUkzQztJQUVNLFFBQVEsNEJBRWQ7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLGNBQWMsRUFBRSxNQUFNLEdBQUcsWUFBWSxzQ0FPdEQ7SUFFRCxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksR0FBRSxPQUFPLENBQUMsUUFBUSxDQUFDLHNCQUFzQixDQUFDLENBQU0sc0NBT2pFO0lBRUQsTUFBTSxDQUFDLE9BQU8sdUNBTWI7Q0FDRiJ9

package/dest/contract/contract_instance_update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_instance_update.d.ts","sourceRoot":"","sources":["../../src/contract/contract_instance_update.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAEvF,qBAAa,kCAAkC;IAC7C,mBAAmB,EAAE,EAAE,CAAC;IACxB,kBAAkB,EAAE,EAAE,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;gBAEV,QAAQ,EAAE,sBAAsB;IAMrC,QAAQ;IAIf,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY;IASvD,MAAM,CAAC,MAAM,CAAC,IAAI,GAAE,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAM;IASlE,MAAM,CAAC,OAAO;CAOf"}
+{"version":3,"file":"contract_instance_update.d.ts","sourceRoot":"","sources":["../../src/contract/contract_instance_update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAEvF,qBAAa,kCAAkC;IAC7C,mBAAmB,EAAE,EAAE,CAAC;IACxB,kBAAkB,EAAE,EAAE,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAE1B,YAAY,QAAQ,EAAE,sBAAsB,EAI3C;IAEM,QAAQ,4BAEd;IAED,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,sCAOtD;IAED,MAAM,CAAC,MAAM,CAAC,IAAI,GAAE,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAM,sCAOjE;IAED,MAAM,CAAC,OAAO,uCAMb;CACF"}

package/dest/contract/contract_instance_update.js

@@ -1,30 +1,30 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 export class SerializableContractInstanceUpdate {
     prevContractClassId;
     newContractClassId;
-    blockOfChange;
+    timestampOfChange;
     constructor(instance){
         this.prevContractClassId = instance.prevContractClassId;
         this.newContractClassId = instance.newContractClassId;
-        this.blockOfChange = instance.blockOfChange;
+        this.timestampOfChange = instance.timestampOfChange;
     }
     toBuffer() {
-        return serializeToBuffer(this.prevContractClassId, this.newContractClassId, this.blockOfChange);
+        return serializeToBuffer(this.prevContractClassId, this.newContractClassId, this.timestampOfChange);
     }
     static fromBuffer(bufferOrReader) {
         const reader = BufferReader.asReader(bufferOrReader);
         return new SerializableContractInstanceUpdate({
             prevContractClassId: reader.readObject(Fr),
             newContractClassId: reader.readObject(Fr),
-            blockOfChange: reader.readNumber()
+            timestampOfChange: reader.readObject(Fr).toBigInt()
         });
     }
     static random(opts = {}) {
         return new SerializableContractInstanceUpdate({
             prevContractClassId: Fr.random(),
             newContractClassId: Fr.random(),
-            blockOfChange: Math.floor(Math.random() * 1000),
+            timestampOfChange: BigInt(Math.floor(Math.random() * 1000)),
             ...opts
         });
     }
@@ -32,7 +32,7 @@ export class SerializableContractInstanceUpdate {
         return new SerializableContractInstanceUpdate({
             prevContractClassId: Fr.zero(),
             newContractClassId: Fr.zero(),
-            blockOfChange: 0
+            timestampOfChange: 0n
         });
     }
 }

package/dest/contract/deployment_info.d.ts

@@ -1,4 +1,4 @@
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { CompleteAddress } from './complete_address.js';
 /**
  * Represents the data generated as part of contract deployment.
@@ -21,4 +21,4 @@ export type DeploymentInfo = {
      */
     functionTreeRoot: Fr;
 };
-//# sourceMappingURL=deployment_info.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95bWVudF9pbmZvLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3QvZGVwbG95bWVudF9pbmZvLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTdEOztHQUVHO0FBQ0gsTUFBTSxNQUFNLGNBQWMsR0FBRztJQUMzQjs7T0FFRztJQUNILGVBQWUsRUFBRSxlQUFlLENBQUM7SUFDakM7O09BRUc7SUFDSCxpQkFBaUIsRUFBRSxFQUFFLENBQUM7SUFDdEI7O09BRUc7SUFDSCxlQUFlLEVBQUUsRUFBRSxDQUFDO0lBQ3BCOztPQUVHO0lBQ0gsZ0JBQWdCLEVBQUUsRUFBRSxDQUFDO0NBQ3RCLENBQUMifQ==

package/dest/contract/deployment_info.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deployment_info.d.ts","sourceRoot":"","sources":["../../src/contract/deployment_info.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B;;OAEG;IACH,eAAe,EAAE,eAAe,CAAC;IACjC;;OAEG;IACH,iBAAiB,EAAE,EAAE,CAAC;IACtB;;OAEG;IACH,eAAe,EAAE,EAAE,CAAC;IACpB;;OAEG;IACH,gBAAgB,EAAE,EAAE,CAAC;CACtB,CAAC"}
+{"version":3,"file":"deployment_info.d.ts","sourceRoot":"","sources":["../../src/contract/deployment_info.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B;;OAEG;IACH,eAAe,EAAE,eAAe,CAAC;IACjC;;OAEG;IACH,iBAAiB,EAAE,EAAE,CAAC;IACtB;;OAEG;IACH,eAAe,EAAE,EAAE,CAAC;IACpB;;OAEG;IACH,gBAAgB,EAAE,EAAE,CAAC;CACtB,CAAC"}