@aztec/aztec.js 0.47.1 → 0.48.0
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.
- package/dest/api/fee.d.ts +2 -2
- package/dest/api/fee.d.ts.map +1 -1
- package/dest/api/fee.js +3 -3
- package/dest/contract/base_contract_interaction.d.ts +1 -1
- package/dest/contract/base_contract_interaction.d.ts.map +1 -1
- package/dest/contract/sent_tx.d.ts +1 -0
- package/dest/contract/sent_tx.d.ts.map +1 -1
- package/dest/contract/sent_tx.js +2 -1
- package/dest/entrypoint/payload.js +3 -3
- package/dest/fee/{native_fee_payment_method.d.ts → fee_juice_payment_method.d.ts} +3 -3
- package/dest/fee/fee_juice_payment_method.d.ts.map +1 -0
- package/dest/fee/fee_juice_payment_method.js +19 -0
- package/dest/fee/{native_fee_payment_method_with_claim.d.ts → fee_juice_payment_method_with_claim.d.ts} +5 -5
- package/dest/fee/fee_juice_payment_method_with_claim.d.ts.map +1 -0
- package/dest/fee/fee_juice_payment_method_with_claim.js +32 -0
- package/dest/index.d.ts +1 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +2 -2
- package/dest/rpc_clients/index.d.ts +1 -0
- package/dest/rpc_clients/index.d.ts.map +1 -1
- package/dest/rpc_clients/index.js +2 -1
- package/dest/rpc_clients/node/index.d.ts +11 -0
- package/dest/rpc_clients/node/index.d.ts.map +1 -0
- package/dest/rpc_clients/node/index.js +62 -0
- package/dest/rpc_clients/pxe_client.d.ts.map +1 -1
- package/dest/rpc_clients/pxe_client.js +3 -1
- package/dest/utils/authwit.js +4 -4
- package/dest/utils/cheat_codes.d.ts +15 -6
- package/dest/utils/cheat_codes.d.ts.map +1 -1
- package/dest/utils/cheat_codes.js +34 -18
- package/dest/wallet/account_wallet.js +2 -2
- package/dest/wallet/base_wallet.d.ts +3 -1
- package/dest/wallet/base_wallet.d.ts.map +1 -1
- package/dest/wallet/base_wallet.js +9 -5
- package/package.json +8 -7
- package/src/api/fee.ts +2 -2
- package/src/contract/sent_tx.ts +1 -0
- package/src/entrypoint/payload.ts +2 -2
- package/src/fee/{native_fee_payment_method.ts → fee_juice_payment_method.ts} +4 -4
- package/src/fee/{native_fee_payment_method_with_claim.ts → fee_juice_payment_method_with_claim.ts} +6 -6
- package/src/index.ts +1 -1
- package/src/rpc_clients/index.ts +1 -0
- package/src/rpc_clients/node/index.ts +69 -0
- package/src/rpc_clients/pxe_client.ts +2 -0
- package/src/utils/authwit.ts +3 -3
- package/src/utils/cheat_codes.ts +35 -17
- package/src/wallet/account_wallet.ts +1 -1
- package/src/wallet/base_wallet.ts +8 -4
- package/dest/fee/native_fee_payment_method.d.ts.map +0 -1
- package/dest/fee/native_fee_payment_method.js +0 -19
- package/dest/fee/native_fee_payment_method_with_claim.d.ts.map +0 -1
- package/dest/fee/native_fee_payment_method_with_claim.js +0 -32
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Fr } from '@aztec/circuits.js';
|
|
2
|
+
import { deriveStorageSlotInMap } from '@aztec/circuits.js/hash';
|
|
2
3
|
import { toBigIntBE, toHex } from '@aztec/foundation/bigint-buffer';
|
|
3
|
-
import { keccak256
|
|
4
|
+
import { keccak256 } from '@aztec/foundation/crypto';
|
|
4
5
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
5
6
|
import fs from 'fs';
|
|
6
7
|
/**
|
|
@@ -86,6 +87,17 @@ export class EthCheatCodes {
|
|
|
86
87
|
}
|
|
87
88
|
this.logger.info(`Mined ${numberOfBlocks} blocks`);
|
|
88
89
|
}
|
|
90
|
+
/**
|
|
91
|
+
* Set the interval between blocks (block time)
|
|
92
|
+
* @param interval - The interval to use between blocks
|
|
93
|
+
*/
|
|
94
|
+
async setBlockInterval(interval) {
|
|
95
|
+
const res = await this.rpcCall('anvil_setBlockTimestampInterval', [interval]);
|
|
96
|
+
if (res.error) {
|
|
97
|
+
throw new Error(`Error setting block interval: ${res.error.message}`);
|
|
98
|
+
}
|
|
99
|
+
this.logger.info(`Set block interval to ${interval}`);
|
|
100
|
+
}
|
|
89
101
|
/**
|
|
90
102
|
* Set the next block timestamp
|
|
91
103
|
* @param timestamp - The timestamp to set the next block to
|
|
@@ -97,6 +109,18 @@ export class EthCheatCodes {
|
|
|
97
109
|
}
|
|
98
110
|
this.logger.info(`Set next block timestamp to ${timestamp}`);
|
|
99
111
|
}
|
|
112
|
+
/**
|
|
113
|
+
* Set the next block timestamp and mines the block
|
|
114
|
+
* @param timestamp - The timestamp to set the next block to
|
|
115
|
+
*/
|
|
116
|
+
async warp(timestamp) {
|
|
117
|
+
const res = await this.rpcCall('evm_setNextBlockTimestamp', [timestamp]);
|
|
118
|
+
if (res.error) {
|
|
119
|
+
throw new Error(`Error warping: ${res.error.message}`);
|
|
120
|
+
}
|
|
121
|
+
await this.mine();
|
|
122
|
+
this.logger.info(`Warped to ${timestamp}`);
|
|
123
|
+
}
|
|
100
124
|
/**
|
|
101
125
|
* Dumps the current chain state to a file.
|
|
102
126
|
* @param fileName - The file name to dump state into
|
|
@@ -224,14 +248,12 @@ export class AztecCheatCodes {
|
|
|
224
248
|
}
|
|
225
249
|
/**
|
|
226
250
|
* Computes the slot value for a given map and key.
|
|
227
|
-
* @param
|
|
251
|
+
* @param mapSlot - The slot of the map (specified in Aztec.nr contract)
|
|
228
252
|
* @param key - The key to lookup in the map
|
|
229
253
|
* @returns The storage slot of the value in the map
|
|
230
254
|
*/
|
|
231
|
-
computeSlotInMap(
|
|
232
|
-
|
|
233
|
-
// aztec3-packages/aztec-nr/aztec/src/state_vars/map.nr
|
|
234
|
-
return pedersenHash([new Fr(baseSlot), new Fr(key)]);
|
|
255
|
+
computeSlotInMap(mapSlot, key) {
|
|
256
|
+
return deriveStorageSlotInMap(mapSlot, new Fr(key));
|
|
235
257
|
}
|
|
236
258
|
/**
|
|
237
259
|
* Get the current blocknumber
|
|
@@ -241,18 +263,12 @@ export class AztecCheatCodes {
|
|
|
241
263
|
return await this.pxe.getBlockNumber();
|
|
242
264
|
}
|
|
243
265
|
/**
|
|
244
|
-
*
|
|
245
|
-
*
|
|
246
|
-
* @param to - The timestamp to set the next block to (must be greater than current time)
|
|
266
|
+
* Get the current timestamp
|
|
267
|
+
* @returns The current timestamp
|
|
247
268
|
*/
|
|
248
|
-
async
|
|
249
|
-
const
|
|
250
|
-
|
|
251
|
-
// also store this time on the rollup contract (slot 2 tracks `lastBlockTs`).
|
|
252
|
-
// This is because when the sequencer executes public functions, it uses the timestamp stored in the rollup contract.
|
|
253
|
-
await this.eth.store(rollupContract, 7n, BigInt(to));
|
|
254
|
-
// also store this on slot of the rollup contract (`lastWarpedBlockTs`) which tracks the last time warp was used.
|
|
255
|
-
await this.eth.store(rollupContract, 8n, BigInt(to));
|
|
269
|
+
async timestamp() {
|
|
270
|
+
const res = await this.pxe.getBlock(await this.blockNumber());
|
|
271
|
+
return res?.header.globalVariables.timestamp.toNumber() ?? 0;
|
|
256
272
|
}
|
|
257
273
|
/**
|
|
258
274
|
* Loads the value stored at the given slot in the public storage of the given contract.
|
|
@@ -280,4 +296,4 @@ export class AztecCheatCodes {
|
|
|
280
296
|
return extendedNotes.map(extendedNote => extendedNote.note);
|
|
281
297
|
}
|
|
282
298
|
}
|
|
283
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
299
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cheat_codes.js","sourceRoot":"","sources":["../../src/utils/cheat_codes.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ import { BaseWallet } from './base_wallet.js';
|
|
|
9
9
|
*/
|
|
10
10
|
export class AccountWallet extends BaseWallet {
|
|
11
11
|
constructor(pxe, account) {
|
|
12
|
-
super(pxe);
|
|
12
|
+
super(pxe, [account.getAddress()]);
|
|
13
13
|
this.account = account;
|
|
14
14
|
}
|
|
15
15
|
createTxExecutionRequest(exec) {
|
|
@@ -237,4 +237,4 @@ export class AccountWallet extends BaseWallet {
|
|
|
237
237
|
};
|
|
238
238
|
}
|
|
239
239
|
}
|
|
240
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
240
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"account_wallet.js","sourceRoot":"","sources":["../../src/wallet/account_wallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,13 +13,15 @@ import { type IntentAction, type IntentInnerHash } from '../utils/authwit.js';
|
|
|
13
13
|
*/
|
|
14
14
|
export declare abstract class BaseWallet implements Wallet {
|
|
15
15
|
protected readonly pxe: PXE;
|
|
16
|
-
|
|
16
|
+
private scopes?;
|
|
17
|
+
constructor(pxe: PXE, scopes?: AztecAddress[] | undefined);
|
|
17
18
|
abstract getCompleteAddress(): CompleteAddress;
|
|
18
19
|
abstract getChainId(): Fr;
|
|
19
20
|
abstract getVersion(): Fr;
|
|
20
21
|
abstract createTxExecutionRequest(exec: ExecutionRequestInit): Promise<TxExecutionRequest>;
|
|
21
22
|
abstract createAuthWit(intent: Fr | Buffer | IntentInnerHash | IntentAction): Promise<AuthWitness>;
|
|
22
23
|
abstract rotateNullifierKeys(newNskM: Fq): Promise<void>;
|
|
24
|
+
setScopes(scopes: AztecAddress[]): void;
|
|
23
25
|
getAddress(): AztecAddress;
|
|
24
26
|
getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
|
|
25
27
|
getContractClass(id: Fr): Promise<ContractClassWithId | undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base_wallet.d.ts","sourceRoot":"","sources":["../../src/wallet/base_wallet.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAC/B,KAAK,mBAAmB,EACxB,KAAK,OAAO,EACZ,KAAK,SAAS,EACd,KAAK,mBAAmB,EACxB,KAAK,GAAG,EACR,KAAK,OAAO,EACZ,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,EAAE,EACP,KAAK,QAAQ,EACb,KAAK,kBAAkB,EACvB,KAAK,MAAM,EACX,KAAK,SAAS,EACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,eAAe,EACpB,KAAK,EAAE,EACP,KAAK,EAAE,EACP,KAAK,cAAc,EACnB,KAAK,KAAK,EACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AACpG,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE9E;;GAEG;AACH,8BAAsB,UAAW,YAAW,MAAM;IACpC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG;
|
|
1
|
+
{"version":3,"file":"base_wallet.d.ts","sourceRoot":"","sources":["../../src/wallet/base_wallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,12 @@
|
|
|
2
2
|
* A base class for Wallet implementations
|
|
3
3
|
*/
|
|
4
4
|
export class BaseWallet {
|
|
5
|
-
constructor(pxe) {
|
|
5
|
+
constructor(pxe, scopes) {
|
|
6
6
|
this.pxe = pxe;
|
|
7
|
+
this.scopes = scopes;
|
|
8
|
+
}
|
|
9
|
+
setScopes(scopes) {
|
|
10
|
+
this.scopes = scopes;
|
|
7
11
|
}
|
|
8
12
|
getAddress() {
|
|
9
13
|
return this.getCompleteAddress().address;
|
|
@@ -51,10 +55,10 @@ export class BaseWallet {
|
|
|
51
55
|
return this.pxe.getContracts();
|
|
52
56
|
}
|
|
53
57
|
proveTx(txRequest, simulatePublic) {
|
|
54
|
-
return this.pxe.proveTx(txRequest, simulatePublic);
|
|
58
|
+
return this.pxe.proveTx(txRequest, simulatePublic, this.scopes);
|
|
55
59
|
}
|
|
56
60
|
simulateTx(txRequest, simulatePublic, msgSender) {
|
|
57
|
-
return this.pxe.simulateTx(txRequest, simulatePublic, msgSender);
|
|
61
|
+
return this.pxe.simulateTx(txRequest, simulatePublic, msgSender, this.scopes);
|
|
58
62
|
}
|
|
59
63
|
sendTx(tx) {
|
|
60
64
|
return this.pxe.sendTx(tx);
|
|
@@ -79,7 +83,7 @@ export class BaseWallet {
|
|
|
79
83
|
return this.pxe.getPublicStorageAt(contract, storageSlot);
|
|
80
84
|
}
|
|
81
85
|
addNote(note) {
|
|
82
|
-
return this.pxe.addNote(note);
|
|
86
|
+
return this.pxe.addNote(note, this.getAddress());
|
|
83
87
|
}
|
|
84
88
|
addNullifiedNote(note) {
|
|
85
89
|
return this.pxe.addNullifiedNote(note);
|
|
@@ -139,4 +143,4 @@ export class BaseWallet {
|
|
|
139
143
|
return this.pxe.getEvents(type, eventMetadata, from, limit, vpks);
|
|
140
144
|
}
|
|
141
145
|
}
|
|
142
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
146
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZV93YWxsZXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FsbGV0L2Jhc2Vfd2FsbGV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQXFDQTs7R0FFRztBQUNILE1BQU0sT0FBZ0IsVUFBVTtJQUM5QixZQUErQixHQUFRLEVBQVUsTUFBdUI7UUFBekMsUUFBRyxHQUFILEdBQUcsQ0FBSztRQUFVLFdBQU0sR0FBTixNQUFNLENBQWlCO0lBQUcsQ0FBQztJQWM1RSxTQUFTLENBQUMsTUFBc0I7UUFDOUIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7SUFDdkIsQ0FBQztJQUVELFVBQVU7UUFDUixPQUFPLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLE9BQU8sQ0FBQztJQUMzQyxDQUFDO0lBQ0QsbUJBQW1CLENBQUMsT0FBcUI7UUFDdkMsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQy9DLENBQUM7SUFDRCxnQkFBZ0IsQ0FBQyxFQUFNO1FBQ3JCLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUN2QyxDQUFDO0lBQ0QsbUJBQW1CLENBQUMsRUFBTTtRQUN4QixPQUFPLElBQUksQ0FBQyxHQUFHLENBQUMsbUJBQW1CLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDMUMsQ0FBQztJQUNELFVBQVUsQ0FBQyxPQUFhO1FBQ3RCLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDdEMsQ0FBQztJQUNELGVBQWUsQ0FBQyxTQUFhLEVBQUUsY0FBOEI7UUFDM0QsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsY0FBYyxDQUFDLENBQUM7SUFDN0QsQ0FBQztJQUNELFVBQVUsQ0FBQyxPQUFxQixFQUFFLFNBQWE7UUFDN0MsT0FBTyxJQUFJLENB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
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/aztec.js",
|
|
3
3
|
"homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/aztec.js",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.48.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
7
7
|
".": "./dest/index.js",
|
|
@@ -73,12 +73,13 @@
|
|
|
73
73
|
]
|
|
74
74
|
},
|
|
75
75
|
"dependencies": {
|
|
76
|
-
"@aztec/circuit-types": "0.
|
|
77
|
-
"@aztec/circuits.js": "0.
|
|
78
|
-
"@aztec/ethereum": "0.
|
|
79
|
-
"@aztec/foundation": "0.
|
|
80
|
-
"@aztec/protocol-contracts": "0.
|
|
81
|
-
"@aztec/types": "0.
|
|
76
|
+
"@aztec/circuit-types": "0.48.0",
|
|
77
|
+
"@aztec/circuits.js": "0.48.0",
|
|
78
|
+
"@aztec/ethereum": "0.48.0",
|
|
79
|
+
"@aztec/foundation": "0.48.0",
|
|
80
|
+
"@aztec/protocol-contracts": "0.48.0",
|
|
81
|
+
"@aztec/types": "0.48.0",
|
|
82
|
+
"axios": "^1.7.2",
|
|
82
83
|
"tslib": "^2.4.0"
|
|
83
84
|
},
|
|
84
85
|
"devDependencies": {
|
package/src/api/fee.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export type { FeePaymentMethod } from '../fee/fee_payment_method.js';
|
|
2
|
-
export {
|
|
2
|
+
export { FeeJuicePaymentMethod } from '../fee/fee_juice_payment_method.js';
|
|
3
3
|
export { PrivateFeePaymentMethod } from '../fee/private_fee_payment_method.js';
|
|
4
4
|
export { PublicFeePaymentMethod } from '../fee/public_fee_payment_method.js';
|
|
5
|
-
export {
|
|
5
|
+
export { FeeJuicePaymentMethodWithClaim } from '../fee/fee_juice_payment_method_with_claim.js';
|
|
6
6
|
export { NoFeePaymentMethod } from '../fee/no_fee_payment_method.js';
|
package/src/contract/sent_tx.ts
CHANGED
|
@@ -45,6 +45,7 @@ export class SentTx {
|
|
|
45
45
|
* The function internally awaits for the 'txHashPromise' to resolve, and then returns the resolved transaction hash.
|
|
46
46
|
*
|
|
47
47
|
* @returns A promise that resolves to the transaction hash of the SentTx instance.
|
|
48
|
+
* TODO(#7717): Don't throw here.
|
|
48
49
|
*/
|
|
49
50
|
public getTxHash(): Promise<TxHash> {
|
|
50
51
|
return this.txHashPromise;
|
|
@@ -2,7 +2,7 @@ import { FunctionCall, PackedValues } from '@aztec/circuit-types';
|
|
|
2
2
|
import { type AztecAddress, Fr, type GasSettings, GeneratorIndex } from '@aztec/circuits.js';
|
|
3
3
|
import { FunctionType } from '@aztec/foundation/abi';
|
|
4
4
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
5
|
-
import {
|
|
5
|
+
import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
|
|
6
6
|
import { type Tuple } from '@aztec/foundation/serialize';
|
|
7
7
|
|
|
8
8
|
import { type FeePaymentMethod } from '../fee/fee_payment_method.js';
|
|
@@ -100,7 +100,7 @@ export abstract class EntrypointPayload {
|
|
|
100
100
|
* @returns The hash of the payload
|
|
101
101
|
*/
|
|
102
102
|
hash() {
|
|
103
|
-
return
|
|
103
|
+
return poseidon2HashWithSeparator(this.toFields(), this.#generatorIndex);
|
|
104
104
|
}
|
|
105
105
|
|
|
106
106
|
/** Serializes the function calls to an array of fields. */
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { type FunctionCall } from '@aztec/circuit-types';
|
|
2
2
|
import { type AztecAddress } from '@aztec/circuits.js';
|
|
3
|
-
import {
|
|
3
|
+
import { FeeJuiceAddress } from '@aztec/protocol-contracts/fee-juice';
|
|
4
4
|
|
|
5
5
|
import { type FeePaymentMethod } from './fee_payment_method.js';
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
|
-
* Pay fee directly in the
|
|
8
|
+
* Pay fee directly in the Fee Juice.
|
|
9
9
|
*/
|
|
10
|
-
export class
|
|
10
|
+
export class FeeJuicePaymentMethod implements FeePaymentMethod {
|
|
11
11
|
constructor(protected sender: AztecAddress) {}
|
|
12
12
|
|
|
13
13
|
getAsset() {
|
|
14
|
-
return
|
|
14
|
+
return FeeJuiceAddress;
|
|
15
15
|
}
|
|
16
16
|
|
|
17
17
|
getFunctionCalls(): Promise<FunctionCall[]> {
|
package/src/fee/{native_fee_payment_method_with_claim.ts → fee_juice_payment_method_with_claim.ts}
RENAMED
|
@@ -1,26 +1,26 @@
|
|
|
1
1
|
import { type FunctionCall } from '@aztec/circuit-types';
|
|
2
2
|
import { type AztecAddress, Fr, FunctionSelector } from '@aztec/circuits.js';
|
|
3
3
|
import { FunctionType } from '@aztec/foundation/abi';
|
|
4
|
-
import {
|
|
4
|
+
import { FeeJuiceAddress } from '@aztec/protocol-contracts/fee-juice';
|
|
5
5
|
|
|
6
|
-
import {
|
|
6
|
+
import { FeeJuicePaymentMethod } from './fee_juice_payment_method.js';
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
|
-
* Pay fee directly with
|
|
9
|
+
* Pay fee directly with Fee Juice claimed on the same tx.
|
|
10
10
|
*/
|
|
11
|
-
export class
|
|
11
|
+
export class FeeJuicePaymentMethodWithClaim extends FeeJuicePaymentMethod {
|
|
12
12
|
constructor(sender: AztecAddress, private claimAmount: bigint | Fr, private claimSecret: Fr) {
|
|
13
13
|
super(sender);
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
/**
|
|
17
|
-
* Creates a function call to pay the fee in
|
|
17
|
+
* Creates a function call to pay the fee in Fee Juice.
|
|
18
18
|
* @returns A function call
|
|
19
19
|
*/
|
|
20
20
|
override getFunctionCalls(): Promise<FunctionCall[]> {
|
|
21
21
|
return Promise.resolve([
|
|
22
22
|
{
|
|
23
|
-
to:
|
|
23
|
+
to: FeeJuiceAddress,
|
|
24
24
|
name: 'claim',
|
|
25
25
|
selector: FunctionSelector.fromSignature('claim((Field),Field,Field)'),
|
|
26
26
|
isStatic: false,
|
package/src/index.ts
CHANGED
|
@@ -55,7 +55,7 @@ export {
|
|
|
55
55
|
} from './utils/index.js';
|
|
56
56
|
export { NoteSelector } from '@aztec/foundation/abi';
|
|
57
57
|
|
|
58
|
-
export { createPXEClient } from './rpc_clients/index.js';
|
|
58
|
+
export { createPXEClient, createCompatibleClient } from './rpc_clients/index.js';
|
|
59
59
|
|
|
60
60
|
export { AuthWitnessProvider } from './account/index.js';
|
|
61
61
|
|
package/src/rpc_clients/index.ts
CHANGED
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import { type PXE } from '@aztec/circuit-types';
|
|
2
|
+
import { type DebugLogger } from '@aztec/foundation/log';
|
|
3
|
+
import { NoRetryError } from '@aztec/foundation/retry';
|
|
4
|
+
|
|
5
|
+
import axios, { type AxiosError, type AxiosResponse } from 'axios';
|
|
6
|
+
|
|
7
|
+
import { createPXEClient } from '../pxe_client.js';
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* A fetch implementation using axios.
|
|
11
|
+
* @param host - The URL of the host.
|
|
12
|
+
* @param rpcMethod - The RPC method to call.
|
|
13
|
+
* @param body - The body of the request.
|
|
14
|
+
* @param useApiEndpoints - Whether to use the API endpoints or inject the method in the body.
|
|
15
|
+
* @param _noRetry - Whether to retry on non-server errors.
|
|
16
|
+
* @returns The response data.
|
|
17
|
+
*/
|
|
18
|
+
async function axiosFetch(host: string, rpcMethod: string, body: any, useApiEndpoints: boolean, _noRetry = true) {
|
|
19
|
+
let resp: AxiosResponse;
|
|
20
|
+
if (useApiEndpoints) {
|
|
21
|
+
resp = await axios
|
|
22
|
+
.post(`${host}/${rpcMethod}`, body, {
|
|
23
|
+
headers: { 'content-type': 'application/json' },
|
|
24
|
+
})
|
|
25
|
+
.catch((error: AxiosError) => {
|
|
26
|
+
if (error.response) {
|
|
27
|
+
return error.response;
|
|
28
|
+
}
|
|
29
|
+
throw error;
|
|
30
|
+
});
|
|
31
|
+
} else {
|
|
32
|
+
resp = await axios
|
|
33
|
+
.post(
|
|
34
|
+
host,
|
|
35
|
+
{ ...body, method: rpcMethod },
|
|
36
|
+
{
|
|
37
|
+
headers: { 'content-type': 'application/json' },
|
|
38
|
+
},
|
|
39
|
+
)
|
|
40
|
+
.catch((error: AxiosError) => {
|
|
41
|
+
if (error.response) {
|
|
42
|
+
return error.response;
|
|
43
|
+
}
|
|
44
|
+
throw error;
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
const isOK = resp.status >= 200 && resp.status < 300;
|
|
49
|
+
if (isOK) {
|
|
50
|
+
return resp.data;
|
|
51
|
+
} else if (resp.status >= 400 && resp.status < 500) {
|
|
52
|
+
throw new NoRetryError('(JSON-RPC PROPAGATED) ' + resp.data.error.message);
|
|
53
|
+
} else {
|
|
54
|
+
throw new Error('(JSON-RPC PROPAGATED) ' + resp.data.error.message);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
/**
|
|
59
|
+
* Creates a PXE client with a given set of retries on non-server errors.
|
|
60
|
+
* Checks that PXE matches the expected version, and warns if not.
|
|
61
|
+
* @param rpcUrl - URL of the RPC server wrapping the PXE.
|
|
62
|
+
* @param _logger - Debug logger to warn version incompatibilities.
|
|
63
|
+
* @returns A PXE client.
|
|
64
|
+
*/
|
|
65
|
+
export function createCompatibleClient(rpcUrl: string, _logger: DebugLogger): Promise<PXE> {
|
|
66
|
+
// Use axios due to timeout issues with fetch when proving TXs.
|
|
67
|
+
const pxe = createPXEClient(rpcUrl, axiosFetch);
|
|
68
|
+
return Promise.resolve(pxe);
|
|
69
|
+
}
|
|
@@ -26,6 +26,7 @@ import {
|
|
|
26
26
|
Point,
|
|
27
27
|
} from '@aztec/circuits.js';
|
|
28
28
|
import { NoteSelector } from '@aztec/foundation/abi';
|
|
29
|
+
import { BaseHashType } from '@aztec/foundation/hash';
|
|
29
30
|
import { createJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
|
|
30
31
|
|
|
31
32
|
/**
|
|
@@ -54,6 +55,7 @@ export const createPXEClient = (url: string, fetch = makeFetch([1, 2, 3], false)
|
|
|
54
55
|
Point,
|
|
55
56
|
TxExecutionRequest,
|
|
56
57
|
TxHash,
|
|
58
|
+
BaseHashType,
|
|
57
59
|
},
|
|
58
60
|
{
|
|
59
61
|
EncryptedNoteL2BlockL2Logs,
|
package/src/utils/authwit.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type FunctionCall, PackedValues } from '@aztec/circuit-types';
|
|
2
2
|
import { type AztecAddress, Fr, GeneratorIndex } from '@aztec/circuits.js';
|
|
3
|
-
import {
|
|
3
|
+
import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
|
|
4
4
|
|
|
5
5
|
import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
|
|
6
6
|
|
|
@@ -81,7 +81,7 @@ export const computeInnerAuthWitHashFromAction = (caller: AztecAddress, action:
|
|
|
81
81
|
* @returns The inner hash for the witness
|
|
82
82
|
*/
|
|
83
83
|
export const computeInnerAuthWitHash = (args: Fr[]) => {
|
|
84
|
-
return
|
|
84
|
+
return poseidon2HashWithSeparator(args, GeneratorIndex.AUTHWIT_INNER);
|
|
85
85
|
};
|
|
86
86
|
|
|
87
87
|
/**
|
|
@@ -99,5 +99,5 @@ export const computeInnerAuthWitHash = (args: Fr[]) => {
|
|
|
99
99
|
* @returns The outer hash for the witness
|
|
100
100
|
*/
|
|
101
101
|
const computeOuterAuthWitHash = (consumer: AztecAddress, chainId: Fr, version: Fr, innerHash: Fr) => {
|
|
102
|
-
return
|
|
102
|
+
return poseidon2HashWithSeparator([consumer.toField(), chainId, version, innerHash], GeneratorIndex.AUTHWIT_OUTER);
|
|
103
103
|
};
|
package/src/utils/cheat_codes.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { type Note, type PXE } from '@aztec/circuit-types';
|
|
2
2
|
import { type AztecAddress, type EthAddress, Fr } from '@aztec/circuits.js';
|
|
3
|
+
import { deriveStorageSlotInMap } from '@aztec/circuits.js/hash';
|
|
3
4
|
import { toBigIntBE, toHex } from '@aztec/foundation/bigint-buffer';
|
|
4
|
-
import { keccak256
|
|
5
|
+
import { keccak256 } from '@aztec/foundation/crypto';
|
|
5
6
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
6
7
|
|
|
7
8
|
import fs from 'fs';
|
|
@@ -93,6 +94,18 @@ export class EthCheatCodes {
|
|
|
93
94
|
this.logger.info(`Mined ${numberOfBlocks} blocks`);
|
|
94
95
|
}
|
|
95
96
|
|
|
97
|
+
/**
|
|
98
|
+
* Set the interval between blocks (block time)
|
|
99
|
+
* @param interval - The interval to use between blocks
|
|
100
|
+
*/
|
|
101
|
+
public async setBlockInterval(interval: number): Promise<void> {
|
|
102
|
+
const res = await this.rpcCall('anvil_setBlockTimestampInterval', [interval]);
|
|
103
|
+
if (res.error) {
|
|
104
|
+
throw new Error(`Error setting block interval: ${res.error.message}`);
|
|
105
|
+
}
|
|
106
|
+
this.logger.info(`Set block interval to ${interval}`);
|
|
107
|
+
}
|
|
108
|
+
|
|
96
109
|
/**
|
|
97
110
|
* Set the next block timestamp
|
|
98
111
|
* @param timestamp - The timestamp to set the next block to
|
|
@@ -105,6 +118,19 @@ export class EthCheatCodes {
|
|
|
105
118
|
this.logger.info(`Set next block timestamp to ${timestamp}`);
|
|
106
119
|
}
|
|
107
120
|
|
|
121
|
+
/**
|
|
122
|
+
* Set the next block timestamp and mines the block
|
|
123
|
+
* @param timestamp - The timestamp to set the next block to
|
|
124
|
+
*/
|
|
125
|
+
public async warp(timestamp: number): Promise<void> {
|
|
126
|
+
const res = await this.rpcCall('evm_setNextBlockTimestamp', [timestamp]);
|
|
127
|
+
if (res.error) {
|
|
128
|
+
throw new Error(`Error warping: ${res.error.message}`);
|
|
129
|
+
}
|
|
130
|
+
await this.mine();
|
|
131
|
+
this.logger.info(`Warped to ${timestamp}`);
|
|
132
|
+
}
|
|
133
|
+
|
|
108
134
|
/**
|
|
109
135
|
* Dumps the current chain state to a file.
|
|
110
136
|
* @param fileName - The file name to dump state into
|
|
@@ -239,14 +265,12 @@ export class AztecCheatCodes {
|
|
|
239
265
|
|
|
240
266
|
/**
|
|
241
267
|
* Computes the slot value for a given map and key.
|
|
242
|
-
* @param
|
|
268
|
+
* @param mapSlot - The slot of the map (specified in Aztec.nr contract)
|
|
243
269
|
* @param key - The key to lookup in the map
|
|
244
270
|
* @returns The storage slot of the value in the map
|
|
245
271
|
*/
|
|
246
|
-
public computeSlotInMap(
|
|
247
|
-
|
|
248
|
-
// aztec3-packages/aztec-nr/aztec/src/state_vars/map.nr
|
|
249
|
-
return pedersenHash([new Fr(baseSlot), new Fr(key)]);
|
|
272
|
+
public computeSlotInMap(mapSlot: Fr | bigint, key: Fr | bigint | AztecAddress): Fr {
|
|
273
|
+
return deriveStorageSlotInMap(mapSlot, new Fr(key));
|
|
250
274
|
}
|
|
251
275
|
|
|
252
276
|
/**
|
|
@@ -258,18 +282,12 @@ export class AztecCheatCodes {
|
|
|
258
282
|
}
|
|
259
283
|
|
|
260
284
|
/**
|
|
261
|
-
*
|
|
262
|
-
*
|
|
263
|
-
* @param to - The timestamp to set the next block to (must be greater than current time)
|
|
285
|
+
* Get the current timestamp
|
|
286
|
+
* @returns The current timestamp
|
|
264
287
|
*/
|
|
265
|
-
public async
|
|
266
|
-
const
|
|
267
|
-
|
|
268
|
-
// also store this time on the rollup contract (slot 2 tracks `lastBlockTs`).
|
|
269
|
-
// This is because when the sequencer executes public functions, it uses the timestamp stored in the rollup contract.
|
|
270
|
-
await this.eth.store(rollupContract, 7n, BigInt(to));
|
|
271
|
-
// also store this on slot of the rollup contract (`lastWarpedBlockTs`) which tracks the last time warp was used.
|
|
272
|
-
await this.eth.store(rollupContract, 8n, BigInt(to));
|
|
288
|
+
public async timestamp(): Promise<number> {
|
|
289
|
+
const res = await this.pxe.getBlock(await this.blockNumber());
|
|
290
|
+
return res?.header.globalVariables.timestamp.toNumber() ?? 0;
|
|
273
291
|
}
|
|
274
292
|
|
|
275
293
|
/**
|