@aztec/txe 0.76.4 → 0.77.0-testnet-ignition.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (35) hide show
  1. package/dest/bin/index.js +3 -5
  2. package/dest/index.d.ts +1 -1
  3. package/dest/index.d.ts.map +1 -1
  4. package/dest/index.js +106 -106
  5. package/dest/node/txe_node.d.ts +19 -6
  6. package/dest/node/txe_node.d.ts.map +1 -1
  7. package/dest/node/txe_node.js +303 -334
  8. package/dest/oracle/txe_oracle.d.ts +25 -16
  9. package/dest/oracle/txe_oracle.d.ts.map +1 -1
  10. package/dest/oracle/txe_oracle.js +249 -143
  11. package/dest/txe_service/txe_service.d.ts +3 -3
  12. package/dest/txe_service/txe_service.d.ts.map +1 -1
  13. package/dest/txe_service/txe_service.js +205 -105
  14. package/dest/util/encoding.d.ts +39 -25
  15. package/dest/util/encoding.d.ts.map +1 -1
  16. package/dest/util/encoding.js +45 -11
  17. package/dest/util/expected_failure_error.js +1 -2
  18. package/dest/util/txe_database.d.ts +3 -2
  19. package/dest/util/txe_database.d.ts.map +1 -1
  20. package/dest/util/txe_database.js +6 -10
  21. package/dest/util/txe_public_contract_data_source.d.ts +5 -3
  22. package/dest/util/txe_public_contract_data_source.d.ts.map +1 -1
  23. package/dest/util/txe_public_contract_data_source.js +25 -13
  24. package/dest/util/txe_world_state_db.d.ts +6 -8
  25. package/dest/util/txe_world_state_db.d.ts.map +1 -1
  26. package/dest/util/txe_world_state_db.js +10 -23
  27. package/package.json +14 -15
  28. package/src/index.ts +2 -2
  29. package/src/node/txe_node.ts +64 -42
  30. package/src/oracle/txe_oracle.ts +101 -86
  31. package/src/txe_service/txe_service.ts +25 -28
  32. package/src/util/encoding.ts +32 -5
  33. package/src/util/txe_database.ts +3 -2
  34. package/src/util/txe_public_contract_data_source.ts +8 -9
  35. package/src/util/txe_world_state_db.ts +9 -26
@@ -1,8 +1,9 @@
1
1
  /// <reference types="node" resolution-mode="require"/>
2
2
  /// <reference types="node" resolution-mode="require"/>
3
- import { AztecAddress, type ContractInstanceWithAddress } from '@aztec/circuits.js';
4
- import { type ContractArtifact } from '@aztec/foundation/abi';
5
3
  import { Fr } from '@aztec/foundation/fields';
4
+ import { type ContractArtifact } from '@aztec/stdlib/abi';
5
+ import { AztecAddress } from '@aztec/stdlib/aztec-address';
6
+ import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
6
7
  import { z } from 'zod';
7
8
  export type ForeignCallSingle = string;
8
9
  export type ForeignCallArray = string[];
@@ -19,8 +20,18 @@ export declare function fromArray(obj: ForeignCallArray): Fr[];
19
20
  * @returns
20
21
  */
21
22
  export declare function fromUintArray(obj: ForeignCallArray, uintBitSize: number): Buffer;
22
- export declare function toSingle(obj: Fr | AztecAddress): string;
23
- export declare function toArray(objs: Fr[]): `0x${string}`[];
23
+ export declare function toSingle(obj: Fr | AztecAddress): ForeignCallSingle;
24
+ export declare function toArray(objs: Fr[]): ForeignCallArray;
25
+ export declare function bufferToU8Array(buffer: Buffer): ForeignCallArray;
26
+ /**
27
+ * Converts a ForeignCallArray into a tuple which represents a nr BoundedVec.
28
+ * If the input array is shorter than the maxLen, it pads the result with zeros,
29
+ * so that nr can correctly coerce this result into a BoundedVec.
30
+ * @param array
31
+ * @param maxLen - the max length of the BoundedVec.
32
+ * @returns a tuple representing a BoundedVec.
33
+ */
34
+ export declare function arrayToBoundedVec(array: ForeignCallArray, maxLen: number): [ForeignCallArray, ForeignCallSingle];
24
35
  export declare function toForeignCallResult(obj: (ForeignCallSingle | ForeignCallArray)[]): {
25
36
  values: (string | ForeignCallArray)[];
26
37
  };
@@ -28,26 +39,27 @@ export declare const ForeignCallSingleSchema: z.ZodString;
28
39
  export declare const ForeignCallArraySchema: z.ZodArray<z.ZodString, "many">;
29
40
  export declare const ForeignCallArgsSchema: z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">, import("@aztec/foundation/schemas").ZodFor<ContractArtifact>, z.ZodIntersection<z.ZodObject<{
30
41
  version: z.ZodLiteral<1>;
31
- salt: z.ZodType<Fr, any, string>;
32
- deployer: z.ZodType<AztecAddress, any, string>;
33
- contractClassId: z.ZodType<Fr, any, string>;
34
- initializationHash: z.ZodType<Fr, any, string>;
42
+ salt: import("@aztec/foundation/schemas").ZodFor<Fr>;
43
+ deployer: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;
44
+ currentContractClassId: import("@aztec/foundation/schemas").ZodFor<Fr>;
45
+ originalContractClassId: import("@aztec/foundation/schemas").ZodFor<Fr>;
46
+ initializationHash: import("@aztec/foundation/schemas").ZodFor<Fr>;
35
47
  publicKeys: z.ZodEffects<z.ZodObject<{
36
- masterNullifierPublicKey: z.ZodType<import("@aztec/circuits.js").Point, any, string>;
37
- masterIncomingViewingPublicKey: z.ZodType<import("@aztec/circuits.js").Point, any, string>;
38
- masterOutgoingViewingPublicKey: z.ZodType<import("@aztec/circuits.js").Point, any, string>;
39
- masterTaggingPublicKey: z.ZodType<import("@aztec/circuits.js").Point, any, string>;
48
+ masterNullifierPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
49
+ masterIncomingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
50
+ masterOutgoingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
51
+ masterTaggingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
40
52
  }, "strip", z.ZodTypeAny, {
41
- masterNullifierPublicKey: import("@aztec/circuits.js").Point;
42
- masterIncomingViewingPublicKey: import("@aztec/circuits.js").Point;
43
- masterOutgoingViewingPublicKey: import("@aztec/circuits.js").Point;
44
- masterTaggingPublicKey: import("@aztec/circuits.js").Point;
53
+ masterNullifierPublicKey: import("@aztec/foundation/fields").Point;
54
+ masterIncomingViewingPublicKey: import("@aztec/foundation/fields").Point;
55
+ masterOutgoingViewingPublicKey: import("@aztec/foundation/fields").Point;
56
+ masterTaggingPublicKey: import("@aztec/foundation/fields").Point;
45
57
  }, {
46
58
  masterNullifierPublicKey: string;
47
59
  masterIncomingViewingPublicKey: string;
48
60
  masterOutgoingViewingPublicKey: string;
49
61
  masterTaggingPublicKey: string;
50
- }>, import("@aztec/circuits.js").PublicKeys, {
62
+ }>, import("@aztec/aztec.js").PublicKeys, {
51
63
  masterNullifierPublicKey: string;
52
64
  masterIncomingViewingPublicKey: string;
53
65
  masterOutgoingViewingPublicKey: string;
@@ -57,27 +69,29 @@ export declare const ForeignCallArgsSchema: z.ZodArray<z.ZodUnion<[z.ZodString,
57
69
  version: 1;
58
70
  salt: Fr;
59
71
  deployer: AztecAddress;
60
- contractClassId: Fr;
72
+ currentContractClassId: Fr;
73
+ originalContractClassId: Fr;
61
74
  initializationHash: Fr;
62
- publicKeys: import("@aztec/circuits.js").PublicKeys;
75
+ publicKeys: import("@aztec/aztec.js").PublicKeys;
63
76
  }, {
64
77
  version: 1;
65
- salt: string;
66
- deployer: string;
67
- contractClassId: string;
68
- initializationHash: string;
69
78
  publicKeys: {
70
79
  masterNullifierPublicKey: string;
71
80
  masterIncomingViewingPublicKey: string;
72
81
  masterOutgoingViewingPublicKey: string;
73
82
  masterTaggingPublicKey: string;
74
83
  };
84
+ salt?: any;
85
+ deployer?: any;
86
+ currentContractClassId?: any;
87
+ originalContractClassId?: any;
88
+ initializationHash?: any;
75
89
  }>, z.ZodObject<{
76
- address: z.ZodType<AztecAddress, any, string>;
90
+ address: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;
77
91
  }, "strip", z.ZodTypeAny, {
78
92
  address: AztecAddress;
79
93
  }, {
80
- address: string;
94
+ address?: any;
81
95
  }>>]>, "many">;
82
96
  export declare const ForeignCallResultSchema: z.ZodObject<{
83
97
  values: z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>, "many">;
@@ -1 +1 @@
1
- {"version":3,"file":"encoding.d.ts","sourceRoot":"","sources":["../../src/util/encoding.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,2BAA2B,EAAqC,MAAM,oBAAoB,CAAC;AACvH,OAAO,EAAE,KAAK,gBAAgB,EAA0B,MAAM,uBAAuB,CAAC;AACtF,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC;AAEvC,MAAM,MAAM,gBAAgB,GAAG,MAAM,EAAE,CAAC;AAExC,MAAM,MAAM,eAAe,GAAG,CAAC,iBAAiB,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,2BAA2B,CAAC,EAAE,CAAC;AAExH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,CAAC,iBAAiB,GAAG,gBAAgB,CAAC,EAAE,CAAC;CAClD,CAAC;AAEF,wBAAgB,UAAU,CAAC,GAAG,EAAE,iBAAiB,MAEhD;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,iBAAiB,gBAEvD;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,gBAAgB,QAE9C;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,UAMvE;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,EAAE,GAAG,YAAY,UAE9C;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,mBAEjC;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,CAAC,iBAAiB,GAAG,gBAAgB,CAAC,EAAE;;EAEhF;AAED,eAAO,MAAM,uBAAuB,aAAa,CAAC;AAElD,eAAO,MAAM,sBAAsB,iCAAsB,CAAC;AAE1D,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAEjC,CAAC;AAEF,eAAO,MAAM,uBAAuB;;;;;;EAElC,CAAC"}
1
+ {"version":3,"file":"encoding.d.ts","sourceRoot":"","sources":["../../src/util/encoding.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,KAAK,gBAAgB,EAA0B,MAAM,mBAAmB,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,KAAK,2BAA2B,EAAqC,MAAM,wBAAwB,CAAC;AAE7G,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC;AAEvC,MAAM,MAAM,gBAAgB,GAAG,MAAM,EAAE,CAAC;AAExC,MAAM,MAAM,eAAe,GAAG,CAAC,iBAAiB,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,2BAA2B,CAAC,EAAE,CAAC;AAExH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,CAAC,iBAAiB,GAAG,gBAAgB,CAAC,EAAE,CAAC;CAClD,CAAC;AAEF,wBAAgB,UAAU,CAAC,GAAG,EAAE,iBAAiB,MAEhD;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,iBAAiB,gBAEvD;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,gBAAgB,QAE9C;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAMhF;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,EAAE,GAAG,YAAY,GAAG,iBAAiB,CAElE;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,gBAAgB,CAEpD;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAEhE;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAYhH;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,CAAC,iBAAiB,GAAG,gBAAgB,CAAC,EAAE;;EAEhF;AAED,eAAO,MAAM,uBAAuB,aAAa,CAAC;AAElD,eAAO,MAAM,sBAAsB,iCAAsB,CAAC;AAE1D,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAEjC,CAAC;AAEF,eAAO,MAAM,uBAAuB;;;;;;EAElC,CAAC"}
@@ -1,7 +1,8 @@
1
- import { AztecAddress, ContractInstanceWithAddressSchema } from '@aztec/circuits.js';
2
- import { ContractArtifactSchema } from '@aztec/foundation/abi';
3
1
  import { Fr } from '@aztec/foundation/fields';
4
2
  import { hexToBuffer } from '@aztec/foundation/string';
3
+ import { ContractArtifactSchema } from '@aztec/stdlib/abi';
4
+ import { AztecAddress } from '@aztec/stdlib/aztec-address';
5
+ import { ContractInstanceWithAddressSchema } from '@aztec/stdlib/contract';
5
6
  import { z } from 'zod';
6
7
  export function fromSingle(obj) {
7
8
  return Fr.fromBuffer(Buffer.from(obj, 'hex'));
@@ -10,33 +11,66 @@ export function addressFromSingle(obj) {
10
11
  return new AztecAddress(fromSingle(obj));
11
12
  }
12
13
  export function fromArray(obj) {
13
- return obj.map(str => Fr.fromBuffer(hexToBuffer(str)));
14
+ return obj.map((str)=>Fr.fromBuffer(hexToBuffer(str)));
14
15
  }
15
16
  /**
16
17
  * Converts an array of Noir unsigned integers to a single tightly-packed buffer.
17
18
  * @param uintBitSize If it's an array of Noir u8's, put `8`, etc.
18
19
  * @returns
19
- */
20
- export function fromUintArray(obj, uintBitSize) {
20
+ */ export function fromUintArray(obj, uintBitSize) {
21
21
  if (uintBitSize % 8 !== 0) {
22
22
  throw new Error(`u${uintBitSize} is not a supported type in Noir`);
23
23
  }
24
24
  const uintByteSize = uintBitSize / 8;
25
- return Buffer.concat(obj.map(str => hexToBuffer(str).slice(-uintByteSize)));
25
+ return Buffer.concat(obj.map((str)=>hexToBuffer(str).slice(-uintByteSize)));
26
26
  }
27
27
  export function toSingle(obj) {
28
28
  return obj.toString().slice(2);
29
29
  }
30
30
  export function toArray(objs) {
31
- return objs.map(obj => obj.toString());
31
+ return objs.map((obj)=>obj.toString());
32
+ }
33
+ export function bufferToU8Array(buffer) {
34
+ return toArray(Array.from(buffer).map((byte)=>new Fr(byte)));
35
+ }
36
+ /**
37
+ * Converts a ForeignCallArray into a tuple which represents a nr BoundedVec.
38
+ * If the input array is shorter than the maxLen, it pads the result with zeros,
39
+ * so that nr can correctly coerce this result into a BoundedVec.
40
+ * @param array
41
+ * @param maxLen - the max length of the BoundedVec.
42
+ * @returns a tuple representing a BoundedVec.
43
+ */ export function arrayToBoundedVec(array, maxLen) {
44
+ if (array.length > maxLen) {
45
+ throw new Error(`Array of length ${array.length} larger than maxLen ${maxLen}`);
46
+ }
47
+ const lengthDiff = maxLen - array.length;
48
+ // We pad the array to the maxLen of the BoundedVec.
49
+ const zeroPaddingArray = toArray(Array(lengthDiff).fill(new Fr(0)));
50
+ // These variable names match with the BoundedVec members in nr:
51
+ const storage = array.concat(zeroPaddingArray);
52
+ const len = toSingle(new Fr(array.length));
53
+ return [
54
+ storage,
55
+ len
56
+ ];
32
57
  }
33
58
  export function toForeignCallResult(obj) {
34
- return { values: obj };
59
+ return {
60
+ values: obj
61
+ };
35
62
  }
36
63
  export const ForeignCallSingleSchema = z.string();
37
64
  export const ForeignCallArraySchema = z.array(z.string());
38
- export const ForeignCallArgsSchema = z.array(z.union([ForeignCallSingleSchema, ForeignCallArraySchema, ContractArtifactSchema, ContractInstanceWithAddressSchema]));
65
+ export const ForeignCallArgsSchema = z.array(z.union([
66
+ ForeignCallSingleSchema,
67
+ ForeignCallArraySchema,
68
+ ContractArtifactSchema,
69
+ ContractInstanceWithAddressSchema
70
+ ]));
39
71
  export const ForeignCallResultSchema = z.object({
40
- values: z.array(z.union([ForeignCallSingleSchema, ForeignCallArraySchema])),
72
+ values: z.array(z.union([
73
+ ForeignCallSingleSchema,
74
+ ForeignCallArraySchema
75
+ ]))
41
76
  });
42
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW5jb2RpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbC9lbmNvZGluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFvQyxpQ0FBaUMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3ZILE9BQU8sRUFBeUIsc0JBQXNCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUN0RixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRXZELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFZeEIsTUFBTSxVQUFVLFVBQVUsQ0FBQyxHQUFzQjtJQUMvQyxPQUFPLEVBQUUsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLENBQUMsQ0FBQztBQUNoRCxDQUFDO0FBRUQsTUFBTSxVQUFVLGlCQUFpQixDQUFDLEdBQXNCO0lBQ3RELE9BQU8sSUFBSSxZQUFZLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7QUFDM0MsQ0FBQztBQUVELE1BQU0sVUFBVSxTQUFTLENBQUMsR0FBcUI7SUFDN0MsT0FBTyxHQUFHLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3pELENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLGFBQWEsQ0FBQyxHQUFxQixFQUFFLFdBQW1CO0lBQ3RFLElBQUksV0FBVyxHQUFHLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUMxQixNQUFNLElBQUksS0FBSyxDQUFDLElBQUksV0FBVyxrQ0FBa0MsQ0FBQyxDQUFDO0lBQ3JFLENBQUM7SUFDRCxNQUFNLFlBQVksR0FBRyxXQUFXLEdBQUcsQ0FBQyxDQUFDO0lBQ3JDLE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUM5RSxDQUFDO0FBRUQsTUFBTSxVQUFVLFFBQVEsQ0FBQyxHQUFzQjtJQUM3QyxPQUFPLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDakMsQ0FBQztBQUVELE1BQU0sVUFBVSxPQUFPLENBQUMsSUFBVTtJQUNoQyxPQUFPLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztBQUN6QyxDQUFDO0FBRUQsTUFBTSxVQUFVLG1CQUFtQixDQUFDLEdBQTZDO0lBQy9FLE9BQU8sRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLENBQUM7QUFDekIsQ0FBQztBQUVELE1BQU0sQ0FBQyxNQUFNLHVCQUF1QixHQUFHLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQztBQUVsRCxNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO0FBRTFELE1BQU0sQ0FBQyxNQUFNLHFCQUFxQixHQUFHLENBQUMsQ0FBQyxLQUFLLENBQzFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyx1QkFBdUIsRUFBRSxzQkFBc0IsRUFBRSxzQkFBc0IsRUFBRSxpQ0FBaUMsQ0FBQyxDQUFDLENBQ3RILENBQUM7QUFFRixNQUFNLENBQUMsTUFBTSx1QkFBdUIsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDO0lBQzlDLE1BQU0sRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyx1QkFBdUIsRUFBRSxzQkFBc0IsQ0FBQyxDQUFDLENBQUM7Q0FDNUUsQ0FBQyxDQUFDIn0=
@@ -1,6 +1,5 @@
1
1
  export class ExpectedFailureError extends Error {
2
- constructor(message) {
2
+ constructor(message){
3
3
  super(message);
4
4
  }
5
5
  }
6
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhwZWN0ZWRfZmFpbHVyZV9lcnJvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsL2V4cGVjdGVkX2ZhaWx1cmVfZXJyb3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxPQUFPLG9CQUFxQixTQUFRLEtBQUs7SUFDN0MsWUFBWSxPQUFlO1FBQ3pCLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNqQixDQUFDO0NBQ0YifQ==
@@ -1,6 +1,7 @@
1
- import { type AztecAddress, CompleteAddress } from '@aztec/circuits.js';
2
- import { type AztecAsyncKVStore } from '@aztec/kv-store';
1
+ import type { AztecAsyncKVStore } from '@aztec/kv-store';
3
2
  import { KVPxeDatabase } from '@aztec/pxe';
3
+ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
4
+ import { CompleteAddress } from '@aztec/stdlib/contract';
4
5
  export declare class TXEDatabase extends KVPxeDatabase {
5
6
  #private;
6
7
  constructor(db: AztecAsyncKVStore);
@@ -1 +1 @@
1
- {"version":3,"file":"txe_database.d.ts","sourceRoot":"","sources":["../../src/util/txe_database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,KAAK,iBAAiB,EAAsB,MAAM,iBAAiB,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,qBAAa,WAAY,SAAQ,aAAa;;gBAGhC,EAAE,EAAE,iBAAiB;IAK3B,UAAU,CAAC,GAAG,EAAE,YAAY;IAQ5B,UAAU,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe;CAI3D"}
1
+ {"version":3,"file":"txe_database.d.ts","sourceRoot":"","sources":["../../src/util/txe_database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,qBAAa,WAAY,SAAQ,aAAa;;gBAGhC,EAAE,EAAE,iBAAiB;IAK3B,UAAU,CAAC,GAAG,EAAE,YAAY;IAQ5B,UAAU,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe;CAI3D"}
@@ -1,24 +1,20 @@
1
- var _TXEDatabase_accounts;
2
- import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
3
- import { CompleteAddress } from '@aztec/circuits.js';
4
1
  import { KVPxeDatabase } from '@aztec/pxe';
2
+ import { CompleteAddress } from '@aztec/stdlib/contract';
5
3
  export class TXEDatabase extends KVPxeDatabase {
6
- constructor(db) {
4
+ #accounts;
5
+ constructor(db){
7
6
  super(db);
8
- _TXEDatabase_accounts.set(this, void 0);
9
- __classPrivateFieldSet(this, _TXEDatabase_accounts, db.openMap('accounts'), "f");
7
+ this.#accounts = db.openMap('accounts');
10
8
  }
11
9
  async getAccount(key) {
12
- const completeAddress = await __classPrivateFieldGet(this, _TXEDatabase_accounts, "f").getAsync(key.toString());
10
+ const completeAddress = await this.#accounts.getAsync(key.toString());
13
11
  if (!completeAddress) {
14
12
  throw new Error(`Account not found: ${key.toString()}`);
15
13
  }
16
14
  return CompleteAddress.fromBuffer(completeAddress);
17
15
  }
18
16
  async setAccount(key, value) {
19
- await __classPrivateFieldGet(this, _TXEDatabase_accounts, "f").set(key.toString(), value.toBuffer());
17
+ await this.#accounts.set(key.toString(), value.toBuffer());
20
18
  await this.addCompleteAddress(value);
21
19
  }
22
20
  }
23
- _TXEDatabase_accounts = new WeakMap();
24
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX2RhdGFiYXNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWwvdHhlX2RhdGFiYXNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsT0FBTyxFQUFxQixlQUFlLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUV4RSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRTNDLE1BQU0sT0FBTyxXQUFZLFNBQVEsYUFBYTtJQUc1QyxZQUFZLEVBQXFCO1FBQy9CLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUhaLHdDQUF5QztRQUl2Qyx1QkFBQSxJQUFJLHlCQUFhLEVBQUUsQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLE1BQUEsQ0FBQztJQUMxQyxDQUFDO0lBRUQsS0FBSyxDQUFDLFVBQVUsQ0FBQyxHQUFpQjtRQUNoQyxNQUFNLGVBQWUsR0FBRyxNQUFNLHVCQUFBLElBQUksNkJBQVUsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDdEUsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO1lBQ3JCLE1BQU0sSUFBSSxLQUFLLENBQUMsc0JBQXNCLEdBQUcsQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDMUQsQ0FBQztRQUNELE9BQU8sZUFBZSxDQUFDLFVBQVUsQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUNyRCxDQUFDO0lBRUQsS0FBSyxDQUFDLFVBQVUsQ0FBQyxHQUFpQixFQUFFLEtBQXNCO1FBQ3hELE1BQU0sdUJBQUEsSUFBSSw2QkFBVSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLEVBQUUsS0FBSyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDM0QsTUFBTSxJQUFJLENBQUMsa0JBQWtCLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDdkMsQ0FBQztDQUNGIn0=
@@ -1,6 +1,8 @@
1
- import { type AztecAddress, type ContractClassPublic, type ContractDataSource, type ContractInstanceWithAddress, Fr, FunctionSelector, type PublicFunction } from '@aztec/circuits.js';
2
- import { type ContractArtifact } from '@aztec/foundation/abi';
3
- import { type TXE } from '../oracle/txe_oracle.js';
1
+ import { Fr } from '@aztec/foundation/fields';
2
+ import { type ContractArtifact, FunctionSelector } from '@aztec/stdlib/abi';
3
+ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
4
+ import { type ContractClassPublic, type ContractDataSource, type ContractInstanceWithAddress, type PublicFunction } from '@aztec/stdlib/contract';
5
+ import type { TXE } from '../oracle/txe_oracle.js';
4
6
  export declare class TXEPublicContractDataSource implements ContractDataSource {
5
7
  private txeOracle;
6
8
  constructor(txeOracle: TXE);
@@ -1 +1 @@
1
- {"version":3,"file":"txe_public_contract_data_source.d.ts","sourceRoot":"","sources":["../../src/util/txe_public_contract_data_source.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,2BAA2B,EAChC,EAAE,EACF,gBAAgB,EAEhB,KAAK,cAAc,EAEpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAG9D,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAEnD,qBAAa,2BAA4B,YAAW,kBAAkB;IACxD,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAE,GAAG;IAE5B,iBAAiB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAQ/G,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAI3B,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IA0BlE,qBAAqB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAKtD,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAK1F,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IAI9B,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAKjF,uBAAuB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAgB7G,kCAAkC,CAAC,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAK1F,gBAAgB,CAAC,cAAc,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;CAIrE"}
1
+ {"version":3,"file":"txe_public_contract_data_source.d.ts","sourceRoot":"","sources":["../../src/util/txe_public_contract_data_source.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,KAAK,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,2BAA2B,EAChC,KAAK,cAAc,EAEpB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAEnD,qBAAa,2BAA4B,YAAW,kBAAkB;IACxD,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAE,GAAG;IAE5B,iBAAiB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAQ/G,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAI3B,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IA0BlE,qBAAqB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAKtD,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAK1F,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IAI9B,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAKjF,uBAAuB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAgB7G,kCAAkC,CAAC,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAK1F,gBAAgB,CAAC,cAAc,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;CAIrE"}
@@ -1,7 +1,11 @@
1
- import { Fr, FunctionSelector, PUBLIC_DISPATCH_SELECTOR, computePublicBytecodeCommitment, } from '@aztec/circuits.js';
1
+ import { PUBLIC_DISPATCH_SELECTOR } from '@aztec/constants';
2
+ import { Fr } from '@aztec/foundation/fields';
2
3
  import { PrivateFunctionsTree } from '@aztec/pxe';
4
+ import { FunctionSelector } from '@aztec/stdlib/abi';
5
+ import { computePublicBytecodeCommitment } from '@aztec/stdlib/contract';
3
6
  export class TXEPublicContractDataSource {
4
- constructor(txeOracle) {
7
+ txeOracle;
8
+ constructor(txeOracle){
5
9
  this.txeOracle = txeOracle;
6
10
  }
7
11
  async getPublicFunction(address, selector) {
@@ -9,7 +13,10 @@ export class TXEPublicContractDataSource {
9
13
  if (!bytecode) {
10
14
  return undefined;
11
15
  }
12
- return { bytecode, selector };
16
+ return {
17
+ bytecode,
18
+ selector
19
+ };
13
20
  }
14
21
  getBlockNumber() {
15
22
  return this.txeOracle.getBlockNumber();
@@ -23,7 +30,7 @@ export class TXEPublicContractDataSource {
23
30
  if (contractClass.packedBytecode.length > 0) {
24
31
  publicFunctions.push({
25
32
  selector: FunctionSelector.fromField(new Fr(PUBLIC_DISPATCH_SELECTOR)),
26
- bytecode: contractClass.packedBytecode,
33
+ bytecode: contractClass.packedBytecode
27
34
  });
28
35
  }
29
36
  return {
@@ -34,7 +41,7 @@ export class TXEPublicContractDataSource {
34
41
  privateFunctionsRoot: new Fr(privateFunctionsRoot.root),
35
42
  version: contractClass.version,
36
43
  privateFunctions: [],
37
- unconstrainedFunctions: [],
44
+ unconstrainedFunctions: []
38
45
  };
39
46
  }
40
47
  async getBytecodeCommitment(id) {
@@ -43,25 +50,31 @@ export class TXEPublicContractDataSource {
43
50
  }
44
51
  async getContract(address) {
45
52
  const instance = await this.txeOracle.getContractDataOracle().getContractInstance(address);
46
- return { ...instance, address };
53
+ return {
54
+ ...instance,
55
+ address
56
+ };
47
57
  }
48
58
  getContractClassIds() {
49
59
  throw new Error('Method not implemented.');
50
60
  }
51
61
  async getContractArtifact(address) {
52
62
  const instance = await this.txeOracle.getContractDataOracle().getContractInstance(address);
53
- return this.txeOracle.getContractDataOracle().getContractArtifact(instance.contractClassId);
63
+ return this.txeOracle.getContractDataOracle().getContractArtifact(instance.currentContractClassId);
54
64
  }
55
65
  async getContractFunctionName(address, selector) {
56
66
  const artifact = await this.getContractArtifact(address);
57
67
  if (!artifact) {
58
68
  return undefined;
59
69
  }
60
- const functionSelectorsAndNames = await Promise.all(artifact.functions.map(async (f) => ({
61
- name: f.name,
62
- selector: await FunctionSelector.fromNameAndParameters({ name: f.name, parameters: f.parameters }),
63
- })));
64
- const func = functionSelectorsAndNames.find(f => f.selector.equals(selector));
70
+ const functionSelectorsAndNames = await Promise.all(artifact.functions.map(async (f)=>({
71
+ name: f.name,
72
+ selector: await FunctionSelector.fromNameAndParameters({
73
+ name: f.name,
74
+ parameters: f.parameters
75
+ })
76
+ })));
77
+ const func = functionSelectorsAndNames.find((f)=>f.selector.equals(selector));
65
78
  return Promise.resolve(func?.name);
66
79
  }
67
80
  registerContractFunctionSignatures(_address, _signatures) {
@@ -73,4 +86,3 @@ export class TXEPublicContractDataSource {
73
86
  return Promise.resolve();
74
87
  }
75
88
  }
76
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX3B1YmxpY19jb250cmFjdF9kYXRhX3NvdXJjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsL3R4ZV9wdWJsaWNfY29udHJhY3RfZGF0YV9zb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUtMLEVBQUUsRUFDRixnQkFBZ0IsRUFDaEIsd0JBQXdCLEVBRXhCLCtCQUErQixHQUNoQyxNQUFNLG9CQUFvQixDQUFDO0FBRTVCLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUlsRCxNQUFNLE9BQU8sMkJBQTJCO0lBQ3RDLFlBQW9CLFNBQWM7UUFBZCxjQUFTLEdBQVQsU0FBUyxDQUFLO0lBQUcsQ0FBQztJQUV0QyxLQUFLLENBQUMsaUJBQWlCLENBQUMsT0FBcUIsRUFBRSxRQUEwQjtRQUN2RSxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxTQUFTLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxXQUFXLENBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQzdGLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUNkLE9BQU8sU0FBUyxDQUFDO1FBQ25CLENBQUM7UUFDRCxPQUFPLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxDQUFDO0lBQ2hDLENBQUM7SUFFRCxjQUFjO1FBQ1osT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLGNBQWMsRUFBRSxDQUFDO0lBQ3pDLENBQUM7SUFFRCxLQUFLLENBQUMsZ0JBQWdCLENBQUMsRUFBTTtRQUMzQixNQUFNLGFBQWEsR0FBRyxNQUFNLElBQUksQ0FBQyxTQUFTLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUN4RixNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxTQUFTLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUN0RixN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
@@ -1,16 +1,14 @@
1
- import { type MerkleTreeWriteOperations } from '@aztec/circuit-types';
2
- import { type AztecAddress, type ContractDataSource, Fr } from '@aztec/circuits.js';
1
+ import { Fr } from '@aztec/foundation/fields';
3
2
  import { WorldStateDB } from '@aztec/simulator/server';
4
- import { type TXE } from '../oracle/txe_oracle.js';
3
+ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
4
+ import type { ContractDataSource } from '@aztec/stdlib/contract';
5
+ import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
6
+ import type { TXE } from '../oracle/txe_oracle.js';
5
7
  export declare class TXEWorldStateDB extends WorldStateDB {
6
8
  private merkleDb;
7
9
  private txe;
8
10
  constructor(merkleDb: MerkleTreeWriteOperations, dataSource: ContractDataSource, txe: TXE);
9
11
  storageRead(contract: AztecAddress, slot: Fr): Promise<Fr>;
10
- storageWrite(contract: AztecAddress, slot: Fr, newValue: Fr): Promise<bigint>;
11
- checkpoint(): Promise<void>;
12
- rollbackToCheckpoint(): Promise<void>;
13
- commit(): Promise<void>;
14
- rollbackToCommit(): Promise<void>;
12
+ storageWrite(contract: AztecAddress, slot: Fr, newValue: Fr): Promise<void>;
15
13
  }
16
14
  //# sourceMappingURL=txe_world_state_db.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"txe_world_state_db.d.ts","sourceRoot":"","sources":["../../src/util/txe_world_state_db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACpF,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,EAAE,EAGH,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAEnD,qBAAa,eAAgB,SAAQ,YAAY;IACnC,OAAO,CAAC,QAAQ;IAA6D,OAAO,CAAC,GAAG;gBAAhF,QAAQ,EAAE,yBAAyB,EAAE,UAAU,EAAE,kBAAkB,EAAU,GAAG,EAAE,GAAG;IAI1F,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAgB1D,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAQnF,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAG3B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAGrC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAGvB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAG3C"}
1
+ {"version":3,"file":"txe_world_state_db.d.ts","sourceRoot":"","sources":["../../src/util/txe_world_state_db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAGjF,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAEnD,qBAAa,eAAgB,SAAQ,YAAY;IACnC,OAAO,CAAC,QAAQ;IAA6D,OAAO,CAAC,GAAG;gBAAhF,QAAQ,EAAE,yBAAyB,EAAE,UAAU,EAAE,kBAAkB,EAAU,GAAG,EAAE,GAAG;IAI1F,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAgB1D,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAK3F"}
@@ -1,40 +1,27 @@
1
- import { MerkleTreeId } from '@aztec/circuit-types';
2
- import { Fr, PublicDataWrite, } from '@aztec/circuits.js';
3
- import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
1
+ import { Fr } from '@aztec/foundation/fields';
4
2
  import { WorldStateDB } from '@aztec/simulator/server';
3
+ import { PublicDataWrite } from '@aztec/stdlib/avm';
4
+ import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
5
+ import { MerkleTreeId } from '@aztec/stdlib/trees';
5
6
  export class TXEWorldStateDB extends WorldStateDB {
6
- constructor(merkleDb, dataSource, txe) {
7
- super(merkleDb, dataSource);
8
- this.merkleDb = merkleDb;
9
- this.txe = txe;
7
+ merkleDb;
8
+ txe;
9
+ constructor(merkleDb, dataSource, txe){
10
+ super(merkleDb, dataSource), this.merkleDb = merkleDb, this.txe = txe;
10
11
  }
11
12
  async storageRead(contract, slot) {
12
13
  const leafSlot = (await computePublicDataTreeLeafSlot(contract, slot)).toBigInt();
13
14
  const lowLeafResult = await this.merkleDb.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
14
15
  let value = Fr.ZERO;
15
16
  if (lowLeafResult && lowLeafResult.alreadyPresent) {
16
- const preimage = (await this.merkleDb.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index));
17
+ const preimage = await this.merkleDb.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
17
18
  value = preimage.value;
18
19
  }
19
20
  return value;
20
21
  }
21
22
  async storageWrite(contract, slot, newValue) {
22
23
  await this.txe.addPublicDataWrites([
23
- new PublicDataWrite(await computePublicDataTreeLeafSlot(contract, slot), newValue),
24
+ new PublicDataWrite(await computePublicDataTreeLeafSlot(contract, slot), newValue)
24
25
  ]);
25
- return newValue.toBigInt();
26
- }
27
- checkpoint() {
28
- return Promise.resolve();
29
- }
30
- rollbackToCheckpoint() {
31
- throw new Error('Cannot rollback');
32
- }
33
- commit() {
34
- return Promise.resolve();
35
- }
36
- rollbackToCommit() {
37
- throw new Error('Cannot rollback');
38
26
  }
39
27
  }
40
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhlX3dvcmxkX3N0YXRlX2RiLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWwvdHhlX3dvcmxkX3N0YXRlX2RiLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQWtDLE1BQU0sc0JBQXNCLENBQUM7QUFDcEYsT0FBTyxFQUdMLEVBQUUsRUFFRixlQUFlLEdBQ2hCLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDeEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBSXZELE1BQU0sT0FBTyxlQUFnQixTQUFRLFlBQVk7SUFDL0MsWUFBb0IsUUFBbUMsRUFBRSxVQUE4QixFQUFVLEdBQVE7UUFDdkcsS0FBSyxDQUFDLFFBQVEsRUFBRSxVQUFVLENBQUMsQ0FBQztRQURWLGFBQVEsR0FBUixRQUFRLENBQTJCO1FBQTBDLFFBQUcsR0FBSCxHQUFHLENBQUs7SUFFekcsQ0FBQztJQUVRLEtBQUssQ0FBQyxXQUFXLENBQUMsUUFBc0IsRUFBRSxJQUFRO1FBQ3pELE1BQU0sUUFBUSxHQUFHLENBQUMsTUFBTSw2QkFBNkIsQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUVsRixNQUFNLGFBQWEsR0FBRyxNQUFNLElBQUksQ0FBQyxRQUFRLENBQUMscUJBQXFCLENBQUMsWUFBWSxDQUFDLGdCQUFnQixFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBRXpHLElBQUksS0FBSyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUM7UUFDcEIsSUFBSSxhQUFhLElBQUksYUFBYSxDQUFDLGNBQWMsRUFBRSxDQUFDO1lBQ2xELE1BQU0sUUFBUSxHQUFHLENBQUMsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FDbkQsWUFBWSxDQUFDLGdCQUFnQixFQUM3QixhQUFhLENBQUMsS0FBSyxDQUNwQixDQUErQixDQUFDO1lBQ2pDLEtBQUssR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDO1FBQ3pCLENBQUM7UUFDRCxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7SUFFUSxLQUFLLENBQUMsWUFBWSxDQUFDLFFBQXNCLEVBQUUsSUFBUSxFQUFFLFFBQVk7UUFDeEUsTUFBTSxJQUFJLENBQUMsR0FBRyxDQUFDLG1CQUFtQixDQUFDO1lBQ2pDLElBQUksZUFBZSxDQUFDLE1BQU0sNkJBQTZCLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxFQUFFLFFBQVEsQ0FBQztTQUNuRixDQUFDLENBQUM7UUFFSCxPQUFPLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUM3QixDQUFDO0lBRVEsVUFBVTtRQUNqQixPQUFPLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUMzQixDQUFDO0lBQ1Esb0JBQW9CO1FBQzNCLE1BQU0sSUFBSSxLQUFLLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUNyQyxDQUFDO0lBQ1EsTUFBTTtRQUNiLE9BQU8sT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQzNCLENBQUM7SUFDUSxnQkFBZ0I7UUFDdkIsTUFBTSxJQUFJLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQ3JDLENBQUM7Q0FDRiJ9
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/txe",
3
- "version": "0.76.4",
3
+ "version": "0.77.0-testnet-ignition.21",
4
4
  "type": "module",
5
5
  "exports": "./dest/index.js",
6
6
  "bin": "./dest/bin/index.js",
@@ -17,7 +17,7 @@
17
17
  "clean": "rm -rf ./dest .tsbuildinfo",
18
18
  "formatting": "run -T prettier --check ./src && run -T eslint ./src",
19
19
  "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
20
- "test": "HARDWARE_CONCURRENCY=${HARDWARE_CONCURRENCY:-16} RAYON_NUM_THREADS=${RAYON_NUM_THREADS:-4} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
20
+ "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
21
21
  "dev": "LOG_LEVEL=debug node ./dest/bin/index.js",
22
22
  "start": "node --no-warnings ./dest/bin/index.js"
23
23
  },
@@ -53,24 +53,23 @@
53
53
  "reporters": [
54
54
  "default"
55
55
  ],
56
- "testTimeout": 30000,
56
+ "testTimeout": 120000,
57
57
  "setupFiles": [
58
58
  "../../foundation/src/jest/setup.mjs"
59
59
  ]
60
60
  },
61
61
  "dependencies": {
62
- "@aztec/accounts": "0.76.4",
63
- "@aztec/aztec.js": "0.76.4",
64
- "@aztec/circuit-types": "0.76.4",
65
- "@aztec/circuits.js": "0.76.4",
66
- "@aztec/foundation": "0.76.4",
67
- "@aztec/key-store": "0.76.4",
68
- "@aztec/kv-store": "0.76.4",
69
- "@aztec/protocol-contracts": "0.76.4",
70
- "@aztec/pxe": "0.76.4",
71
- "@aztec/simulator": "0.76.4",
72
- "@aztec/types": "0.76.4",
73
- "@aztec/world-state": "0.76.4",
62
+ "@aztec/accounts": "0.77.0-testnet-ignition.21",
63
+ "@aztec/aztec.js": "0.77.0-testnet-ignition.21",
64
+ "@aztec/constants": "0.77.0-testnet-ignition.21",
65
+ "@aztec/foundation": "0.77.0-testnet-ignition.21",
66
+ "@aztec/key-store": "0.77.0-testnet-ignition.21",
67
+ "@aztec/kv-store": "0.77.0-testnet-ignition.21",
68
+ "@aztec/protocol-contracts": "0.77.0-testnet-ignition.21",
69
+ "@aztec/pxe": "0.77.0-testnet-ignition.21",
70
+ "@aztec/simulator": "0.77.0-testnet-ignition.21",
71
+ "@aztec/stdlib": "0.77.0-testnet-ignition.21",
72
+ "@aztec/world-state": "0.77.0-testnet-ignition.21",
74
73
  "zod": "^3.23.8"
75
74
  },
76
75
  "devDependencies": {
package/src/index.ts CHANGED
@@ -10,8 +10,8 @@ import {
10
10
  loadContractArtifact,
11
11
  } from '@aztec/aztec.js';
12
12
  import { createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
13
- import { type Logger } from '@aztec/foundation/log';
14
- import { type ApiSchemaFor, type ZodFor } from '@aztec/foundation/schemas';
13
+ import type { Logger } from '@aztec/foundation/log';
14
+ import type { ApiSchemaFor, ZodFor } from '@aztec/stdlib/schemas';
15
15
 
16
16
  import { readFile, readdir } from 'fs/promises';
17
17
  import { join } from 'path';