@aztec/stdlib 0.85.0-alpha-testnet.3 → 0.85.0-alpha-testnet.4

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 (9) hide show
  1. package/dest/tests/mocks.d.ts +6 -2
  2. package/dest/tests/mocks.d.ts.map +1 -1
  3. package/dest/tests/mocks.js +7 -2
  4. package/dest/tx/validator/error_texts.d.ts +3 -1
  5. package/dest/tx/validator/error_texts.d.ts.map +1 -1
  6. package/dest/tx/validator/error_texts.js +3 -1
  7. package/package.json +7 -7
  8. package/src/tests/mocks.ts +14 -2
  9. package/src/tx/validator/error_texts.ts +3 -1
package/dest/tests/mocks.d.ts CHANGED
@@ -14,7 +14,7 @@ import { TxHash } from '../tx/tx_hash.js';
14
14
  export declare const randomTxHash: () => TxHash;
15
15
  export declare const randomExtendedNote: ({ note, recipient, contractAddress, txHash, storageSlot, }?: Partial<ExtendedNote>) => Promise<ExtendedNote>;
16
16
  export declare const randomUniqueNote: ({ note, recipient, contractAddress, txHash, storageSlot, nonce, }?: Partial<UniqueNote>) => Promise<UniqueNote>;
17
- export declare const mockTx: (seed?: number, { numberOfNonRevertiblePublicCallRequests, numberOfRevertiblePublicCallRequests, numberOfRevertibleNullifiers, hasPublicTeardownCallRequest, publicCalldataSize, feePayer, clientIvcProof, maxPriorityFeesPerGas, }?: {
17
+ export declare const mockTx: (seed?: number, { numberOfNonRevertiblePublicCallRequests, numberOfRevertiblePublicCallRequests, numberOfRevertibleNullifiers, hasPublicTeardownCallRequest, publicCalldataSize, feePayer, clientIvcProof, maxPriorityFeesPerGas, chainId, version, vkTreeRoot, protocolContractTreeRoot, }?: {
18
18
  numberOfNonRevertiblePublicCallRequests?: number;
19
19
  numberOfRevertiblePublicCallRequests?: number;
20
20
  numberOfRevertibleNullifiers?: number;
@@ -23,8 +23,12 @@ export declare const mockTx: (seed?: number, { numberOfNonRevertiblePublicCallRe
23
23
  feePayer?: AztecAddress;
24
24
  clientIvcProof?: ClientIvcProof;
25
25
  maxPriorityFeesPerGas?: GasFees;
26
+ chainId?: Fr;
27
+ version?: Fr;
28
+ vkTreeRoot?: Fr;
29
+ protocolContractTreeRoot?: Fr;
26
30
  }) => Promise<Tx>;
27
- export declare const mockTxForRollup: (seed?: number) => Promise<Tx>;
31
+ export declare const mockTxForRollup: (seed?: number, opts?: Parameters<typeof mockTx>[1]) => Promise<Tx>;
28
32
  export declare const mockSimulatedTx: (seed?: number) => Promise<TxSimulationResult>;
29
33
  export declare const randomContractArtifact: () => ContractArtifact;
30
34
  export declare const randomContractInstanceWithAddress: (opts?: {
package/dest/tests/mocks.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../src/tests/mocks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAe,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAIzD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAS7C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAoE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAEnH,OAAO,EAAE,kBAAkB,EAAiC,MAAM,uBAAuB,CAAC;AAE1F,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG1C,eAAO,MAAM,YAAY,QAAO,MAAyB,CAAC;AAE1D,eAAO,MAAM,kBAAkB,gEAM5B,QAAQ,YAAY,CAAC,0BAQvB,CAAC;AAEF,eAAO,MAAM,gBAAgB,uEAO1B,QAAQ,UAAU,CAAC,wBASrB,CAAC;AAEF,eAAO,MAAM,MAAM,wOAWd;IACD,uCAAuC,CAAC,EAAE,MAAM,CAAC;IACjD,oCAAoC,CAAC,EAAE,MAAM,CAAC;IAC9C,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,gBAqDF,CAAC;AAEF,eAAO,MAAM,eAAe,gCAC2E,CAAC;AAkBxG,eAAO,MAAM,eAAe,gDAgB3B,CAAC;AAEF,eAAO,MAAM,sBAAsB,QAAO,gBAWxC,CAAC;AAEH,eAAO,MAAM,iCAAiC,UACtC;IAAE,eAAe,CAAC,EAAE,EAAE,CAAA;CAAE,YACpB,YAAY,KACrB,QAAQ,2BAA2B,CAUrC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;EAIlC,CAAC;AAEF,MAAM,WAAW,2BAA2B;IAC1C,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,EAAE,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAyBD,eAAO,MAAM,iBAAiB,aAAoB,2BAA2B,KAAG,QAAQ,aAAa,CAGpG,CAAC;AAGF,eAAO,MAAM,oBAAoB,aAAoB,2BAA2B,KAAG,QAAQ,gBAAgB,CAG1G,CAAC"}
1
+ {"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../src/tests/mocks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAe,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAIzD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAS7C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAoE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAEnH,OAAO,EAAE,kBAAkB,EAAiC,MAAM,uBAAuB,CAAC;AAE1F,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG1C,eAAO,MAAM,YAAY,QAAO,MAAyB,CAAC;AAE1D,eAAO,MAAM,kBAAkB,gEAM5B,QAAQ,YAAY,CAAC,0BAQvB,CAAC;AAEF,eAAO,MAAM,gBAAgB,uEAO1B,QAAQ,UAAU,CAAC,wBASrB,CAAC;AAEF,eAAO,MAAM,MAAM,gSAed;IACD,uCAAuC,CAAC,EAAE,MAAM,CAAC;IACjD,oCAAoC,CAAC,EAAE,MAAM,CAAC;IAC9C,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,OAAO,CAAC,EAAE,EAAE,CAAC;IACb,OAAO,CAAC,EAAE,EAAE,CAAC;IACb,UAAU,CAAC,EAAE,EAAE,CAAC;IAChB,wBAAwB,CAAC,EAAE,EAAE,CAAC;CAC/B,gBAyDF,CAAC;AAEF,eAAO,MAAM,eAAe,yBAAoB,WAAW,aAAa,CAAC,CAAC,CAAC,CAAC,gBACoC,CAAC;AAkBjH,eAAO,MAAM,eAAe,gDAgB3B,CAAC;AAEF,eAAO,MAAM,sBAAsB,QAAO,gBAWxC,CAAC;AAEH,eAAO,MAAM,iCAAiC,UACtC;IAAE,eAAe,CAAC,EAAE,EAAE,CAAA;CAAE,YACpB,YAAY,KACrB,QAAQ,2BAA2B,CAUrC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;EAIlC,CAAC;AAEF,MAAM,WAAW,2BAA2B;IAC1C,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,EAAE,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAyBD,eAAO,MAAM,iBAAiB,aAAoB,2BAA2B,KAAG,QAAQ,aAAa,CAGpG,CAAC;AAGF,eAAO,MAAM,oBAAoB,aAAoB,2BAA2B,KAAG,QAAQ,gBAAgB,CAG1G,CAAC"}
package/dest/tests/mocks.js CHANGED
@@ -32,7 +32,7 @@ export const randomExtendedNote = async ({ note = Note.random(), recipient = und
32
32
  export const randomUniqueNote = async ({ note = Note.random(), recipient = undefined, contractAddress = undefined, txHash = randomTxHash(), storageSlot = Fr.random(), nonce = Fr.random() } = {})=>{
33
33
  return new UniqueNote(note, recipient ?? await AztecAddress.random(), contractAddress ?? await AztecAddress.random(), storageSlot, txHash, nonce);
34
34
  };
35
- export const mockTx = async (seed = 1, { numberOfNonRevertiblePublicCallRequests = MAX_ENQUEUED_CALLS_PER_TX / 2, numberOfRevertiblePublicCallRequests = MAX_ENQUEUED_CALLS_PER_TX / 2, numberOfRevertibleNullifiers = 0, hasPublicTeardownCallRequest = false, publicCalldataSize = 2, feePayer, clientIvcProof = ClientIvcProof.empty(), maxPriorityFeesPerGas } = {})=>{
35
+ export const mockTx = async (seed = 1, { numberOfNonRevertiblePublicCallRequests = MAX_ENQUEUED_CALLS_PER_TX / 2, numberOfRevertiblePublicCallRequests = MAX_ENQUEUED_CALLS_PER_TX / 2, numberOfRevertibleNullifiers = 0, hasPublicTeardownCallRequest = false, publicCalldataSize = 2, feePayer, clientIvcProof = ClientIvcProof.empty(), maxPriorityFeesPerGas, chainId = Fr.ZERO, version = Fr.ZERO, vkTreeRoot = Fr.ZERO, protocolContractTreeRoot = Fr.ZERO } = {})=>{
36
36
  const totalPublicCallRequests = numberOfNonRevertiblePublicCallRequests + numberOfRevertiblePublicCallRequests + (hasPublicTeardownCallRequest ? 1 : 0);
37
37
  const isForPublic = totalPublicCallRequests > 0;
38
38
  const data = PrivateKernelTailCircuitPublicInputs.empty();
@@ -42,6 +42,10 @@ export const mockTx = async (seed = 1, { numberOfNonRevertiblePublicCallRequests
42
42
  maxPriorityFeesPerGas
43
43
  });
44
44
  data.feePayer = feePayer ?? await AztecAddress.random();
45
+ data.constants.txContext.chainId = chainId;
46
+ data.constants.txContext.version = version;
47
+ data.constants.vkTreeRoot = vkTreeRoot;
48
+ data.constants.protocolContractTreeRoot = protocolContractTreeRoot;
45
49
  const publicFunctionCalldata = [];
46
50
  if (!isForPublic) {
47
51
  data.forRollup.end.nullifiers[0] = firstNullifier.value;
@@ -69,7 +73,8 @@ export const mockTx = async (seed = 1, { numberOfNonRevertiblePublicCallRequests
69
73
  }
70
74
  return new Tx(data, clientIvcProof, [], publicFunctionCalldata);
71
75
  };
72
- export const mockTxForRollup = (seed = 1)=>mockTx(seed, {
76
+ export const mockTxForRollup = (seed = 1, opts = {})=>mockTx(seed, {
77
+ ...opts,
73
78
  numberOfNonRevertiblePublicCallRequests: 0,
74
79
  numberOfRevertiblePublicCallRequests: 0
75
80
  });
package/dest/tx/validator/error_texts.d.ts CHANGED
@@ -5,8 +5,10 @@ export declare const TX_ERROR_SETUP_FUNCTION_NOT_ALLOWED = "Setup function not o
5
5
  export declare const TX_ERROR_DUPLICATE_NULLIFIER_IN_TX = "Duplicate nullifier in tx";
6
6
  export declare const TX_ERROR_EXISTING_NULLIFIER = "Existing nullifier";
7
7
  export declare const TX_ERROR_INVALID_BLOCK_NUMBER = "Invalid block number";
8
- export declare const TX_ERROR_INCORRECT_CHAIN_ID = "Incorrect chain id";
8
+ export declare const TX_ERROR_INCORRECT_L1_CHAIN_ID = "Incorrect L1 chain id";
9
9
  export declare const TX_ERROR_INCORRECT_ROLLUP_VERSION = "Incorrect rollup version";
10
+ export declare const TX_ERROR_INCORRECT_VK_TREE_ROOT = "Incorrect protocol circuits tree root";
11
+ export declare const TX_ERROR_INCORRECT_PROTOCOL_CONTRACT_TREE_ROOT = "Incorrect protocol contracts tree root";
10
12
  export declare const TX_ERROR_INVALID_PROOF = "Invalid proof";
11
13
  export declare const TX_ERROR_INCORRECT_CALLDATA = "Incorrect calldata for public call";
12
14
  export declare const TX_ERROR_CALLDATA_COUNT_MISMATCH = "Wrong number of calldata for public calls";
package/dest/tx/validator/error_texts.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"error_texts.d.ts","sourceRoot":"","sources":["../../../src/tx/validator/error_texts.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,iCAAiC,6BAA6B,CAAC;AAC5E,eAAO,MAAM,uCAAuC,mCAAmC,CAAC;AACxF,eAAO,MAAM,+BAA+B,8CAA8C,CAAC;AAG3F,eAAO,MAAM,mCAAmC,qCAAqC,CAAC;AAGtF,eAAO,MAAM,kCAAkC,8BAA8B,CAAC;AAC9E,eAAO,MAAM,2BAA2B,uBAAuB,CAAC;AAGhE,eAAO,MAAM,6BAA6B,yBAAyB,CAAC;AACpE,eAAO,MAAM,2BAA2B,uBAAuB,CAAC;AAChE,eAAO,MAAM,iCAAiC,6BAA6B,CAAC;AAG5E,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AAGtD,eAAO,MAAM,2BAA2B,uCAAuC,CAAC;AAChF,eAAO,MAAM,gCAAgC,8CAA8C,CAAC;AAC5F,eAAO,MAAM,iCAAiC,uDAAuD,CAAC;AACtG,eAAO,MAAM,iCAAiC,6CAA6C,CAAC;AAC5F,eAAO,MAAM,kCAAkC,0CAA0C,CAAC;AAC1F,eAAO,MAAM,4BAA4B,mCAAmC,CAAC;AAC7E,eAAO,MAAM,mCAAmC,2CAA2C,CAAC;AAG5F,eAAO,MAAM,qBAAqB,2BAA2B,CAAC;AAG9D,eAAO,MAAM,0BAA0B,uCAAuC,CAAC"}
1
+ {"version":3,"file":"error_texts.d.ts","sourceRoot":"","sources":["../../../src/tx/validator/error_texts.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,iCAAiC,6BAA6B,CAAC;AAC5E,eAAO,MAAM,uCAAuC,mCAAmC,CAAC;AACxF,eAAO,MAAM,+BAA+B,8CAA8C,CAAC;AAG3F,eAAO,MAAM,mCAAmC,qCAAqC,CAAC;AAGtF,eAAO,MAAM,kCAAkC,8BAA8B,CAAC;AAC9E,eAAO,MAAM,2BAA2B,uBAAuB,CAAC;AAGhE,eAAO,MAAM,6BAA6B,yBAAyB,CAAC;AACpE,eAAO,MAAM,8BAA8B,0BAA0B,CAAC;AACtE,eAAO,MAAM,iCAAiC,6BAA6B,CAAC;AAC5E,eAAO,MAAM,+BAA+B,0CAA0C,CAAC;AACvF,eAAO,MAAM,8CAA8C,2CAA2C,CAAC;AAGvG,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AAGtD,eAAO,MAAM,2BAA2B,uCAAuC,CAAC;AAChF,eAAO,MAAM,gCAAgC,8CAA8C,CAAC;AAC5F,eAAO,MAAM,iCAAiC,uDAAuD,CAAC;AACtG,eAAO,MAAM,iCAAiC,6CAA6C,CAAC;AAC5F,eAAO,MAAM,kCAAkC,0CAA0C,CAAC;AAC1F,eAAO,MAAM,4BAA4B,mCAAmC,CAAC;AAC7E,eAAO,MAAM,mCAAmC,2CAA2C,CAAC;AAG5F,eAAO,MAAM,qBAAqB,2BAA2B,CAAC;AAG9D,eAAO,MAAM,0BAA0B,uCAAuC,CAAC"}
package/dest/tx/validator/error_texts.js CHANGED
@@ -9,8 +9,10 @@ export const TX_ERROR_DUPLICATE_NULLIFIER_IN_TX = 'Duplicate nullifier in tx';
9
9
  export const TX_ERROR_EXISTING_NULLIFIER = 'Existing nullifier';
10
10
  // Metadata
11
11
  export const TX_ERROR_INVALID_BLOCK_NUMBER = 'Invalid block number';
12
- export const TX_ERROR_INCORRECT_CHAIN_ID = 'Incorrect chain id';
12
+ export const TX_ERROR_INCORRECT_L1_CHAIN_ID = 'Incorrect L1 chain id';
13
13
  export const TX_ERROR_INCORRECT_ROLLUP_VERSION = 'Incorrect rollup version';
14
+ export const TX_ERROR_INCORRECT_VK_TREE_ROOT = 'Incorrect protocol circuits tree root';
15
+ export const TX_ERROR_INCORRECT_PROTOCOL_CONTRACT_TREE_ROOT = 'Incorrect protocol contracts tree root';
14
16
  // Proof
15
17
  export const TX_ERROR_INVALID_PROOF = 'Invalid proof';
16
18
  //Data
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/stdlib",
3
- "version": "0.85.0-alpha-testnet.3",
3
+ "version": "0.85.0-alpha-testnet.4",
4
4
  "type": "module",
5
5
  "inherits": [
6
6
  "../package.common.json",
@@ -68,12 +68,12 @@
68
68
  "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
69
69
  },
70
70
  "dependencies": {
71
- "@aztec/bb.js": "0.85.0-alpha-testnet.3",
72
- "@aztec/blob-lib": "0.85.0-alpha-testnet.3",
73
- "@aztec/constants": "0.85.0-alpha-testnet.3",
74
- "@aztec/ethereum": "0.85.0-alpha-testnet.3",
75
- "@aztec/foundation": "0.85.0-alpha-testnet.3",
76
- "@aztec/noir-noirc_abi": "0.85.0-alpha-testnet.3",
71
+ "@aztec/bb.js": "0.85.0-alpha-testnet.4",
72
+ "@aztec/blob-lib": "0.85.0-alpha-testnet.4",
73
+ "@aztec/constants": "0.85.0-alpha-testnet.4",
74
+ "@aztec/ethereum": "0.85.0-alpha-testnet.4",
75
+ "@aztec/foundation": "0.85.0-alpha-testnet.4",
76
+ "@aztec/noir-noirc_abi": "0.85.0-alpha-testnet.4",
77
77
  "@google-cloud/storage": "^7.15.0",
78
78
  "lodash.chunk": "^4.2.0",
79
79
  "lodash.isequal": "^4.5.0",
package/src/tests/mocks.ts CHANGED
@@ -79,6 +79,10 @@ export const mockTx = async (
79
79
  feePayer,
80
80
  clientIvcProof = ClientIvcProof.empty(),
81
81
  maxPriorityFeesPerGas,
82
+ chainId = Fr.ZERO,
83
+ version = Fr.ZERO,
84
+ vkTreeRoot = Fr.ZERO,
85
+ protocolContractTreeRoot = Fr.ZERO,
82
86
  }: {
83
87
  numberOfNonRevertiblePublicCallRequests?: number;
84
88
  numberOfRevertiblePublicCallRequests?: number;
@@ -88,6 +92,10 @@ export const mockTx = async (
88
92
  feePayer?: AztecAddress;
89
93
  clientIvcProof?: ClientIvcProof;
90
94
  maxPriorityFeesPerGas?: GasFees;
95
+ chainId?: Fr;
96
+ version?: Fr;
97
+ vkTreeRoot?: Fr;
98
+ protocolContractTreeRoot?: Fr;
91
99
  } = {},
92
100
  ) => {
93
101
  const totalPublicCallRequests =
@@ -102,6 +110,10 @@ export const mockTx = async (
102
110
  maxPriorityFeesPerGas,
103
111
  });
104
112
  data.feePayer = feePayer ?? (await AztecAddress.random());
113
+ data.constants.txContext.chainId = chainId;
114
+ data.constants.txContext.version = version;
115
+ data.constants.vkTreeRoot = vkTreeRoot;
116
+ data.constants.protocolContractTreeRoot = protocolContractTreeRoot;
105
117
 
106
118
  const publicFunctionCalldata: HashedValues[] = [];
107
119
  if (!isForPublic) {
@@ -143,8 +155,8 @@ export const mockTx = async (
143
155
  return new Tx(data, clientIvcProof, [], publicFunctionCalldata);
144
156
  };
145
157
 
146
- export const mockTxForRollup = (seed = 1) =>
147
- mockTx(seed, { numberOfNonRevertiblePublicCallRequests: 0, numberOfRevertiblePublicCallRequests: 0 });
158
+ export const mockTxForRollup = (seed = 1, opts: Parameters<typeof mockTx>[1] = {}) =>
159
+ mockTx(seed, { ...opts, numberOfNonRevertiblePublicCallRequests: 0, numberOfRevertiblePublicCallRequests: 0 });
148
160
 
149
161
  const emptyPrivateCallExecutionResult = () =>
150
162
  new PrivateCallExecutionResult(
package/src/tx/validator/error_texts.ts CHANGED
@@ -12,8 +12,10 @@ export const TX_ERROR_EXISTING_NULLIFIER = 'Existing nullifier';
12
12
 
13
13
  // Metadata
14
14
  export const TX_ERROR_INVALID_BLOCK_NUMBER = 'Invalid block number';
15
- export const TX_ERROR_INCORRECT_CHAIN_ID = 'Incorrect chain id';
15
+ export const TX_ERROR_INCORRECT_L1_CHAIN_ID = 'Incorrect L1 chain id';
16
16
  export const TX_ERROR_INCORRECT_ROLLUP_VERSION = 'Incorrect rollup version';
17
+ export const TX_ERROR_INCORRECT_VK_TREE_ROOT = 'Incorrect protocol circuits tree root';
18
+ export const TX_ERROR_INCORRECT_PROTOCOL_CONTRACT_TREE_ROOT = 'Incorrect protocol contracts tree root';
17
19
 
18
20
  // Proof
19
21
  export const TX_ERROR_INVALID_PROOF = 'Invalid proof';