@aztec/end-to-end 2.1.0-rc.1 → 2.1.0-rc.11
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/e2e_cross_chain_messaging/cross_chain_messaging_test.js +1 -1
- package/dest/e2e_epochs/epochs_test.d.ts +4 -2
- package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
- package/dest/e2e_epochs/epochs_test.js +8 -8
- package/dest/e2e_fees/fees_test.js +1 -1
- package/dest/e2e_multi_validator/utils.d.ts.map +1 -1
- package/dest/e2e_multi_validator/utils.js +4 -10
- package/dest/e2e_p2p/inactivity_slash_test.d.ts +31 -0
- package/dest/e2e_p2p/inactivity_slash_test.d.ts.map +1 -0
- package/dest/e2e_p2p/inactivity_slash_test.js +132 -0
- package/dest/e2e_p2p/p2p_network.d.ts +19 -17
- package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
- package/dest/e2e_p2p/p2p_network.js +4 -2
- package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
- package/dest/fixtures/e2e_prover_test.js +4 -3
- package/dest/fixtures/l1_to_l2_messaging.d.ts +1 -1
- package/dest/fixtures/l1_to_l2_messaging.js +1 -1
- package/dest/fixtures/setup_l1_contracts.d.ts +1 -1
- package/dest/fixtures/setup_l1_contracts.d.ts.map +1 -1
- package/dest/fixtures/setup_l1_contracts.js +1 -1
- package/dest/fixtures/setup_p2p_test.d.ts +6 -2
- package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
- package/dest/fixtures/setup_p2p_test.js +2 -1
- package/dest/fixtures/snapshot_manager.d.ts.map +1 -1
- package/dest/fixtures/snapshot_manager.js +18 -15
- package/dest/fixtures/utils.d.ts +4 -2
- package/dest/fixtures/utils.d.ts.map +1 -1
- package/dest/fixtures/utils.js +8 -6
- package/dest/shared/cross_chain_test_harness.d.ts +1 -1
- package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
- package/dest/shared/cross_chain_test_harness.js +1 -1
- package/dest/shared/uniswap_l1_l2.js +1 -1
- package/dest/spartan/utils.d.ts.map +1 -1
- package/dest/spartan/utils.js +1 -1
- package/package.json +37 -37
- package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +1 -1
- package/src/e2e_epochs/epochs_test.ts +12 -10
- package/src/e2e_fees/bridging_race.notest.ts +1 -1
- package/src/e2e_fees/fees_test.ts +1 -1
- package/src/e2e_multi_validator/utils.ts +4 -10
- package/src/e2e_p2p/inactivity_slash_test.ts +174 -0
- package/src/e2e_p2p/p2p_network.ts +6 -6
- package/src/fixtures/e2e_prover_test.ts +3 -2
- package/src/fixtures/l1_to_l2_messaging.ts +1 -1
- package/src/fixtures/setup_l1_contracts.ts +2 -2
- package/src/fixtures/setup_p2p_test.ts +7 -3
- package/src/fixtures/snapshot_manager.ts +22 -14
- package/src/fixtures/utils.ts +9 -7
- package/src/shared/cross_chain_test_harness.ts +1 -1
- package/src/shared/uniswap_l1_l2.ts +1 -1
- package/src/spartan/utils.ts +1 -1
|
@@ -18,14 +18,14 @@ import { createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
|
|
|
18
18
|
import { tryStop } from '@aztec/stdlib/interfaces/server';
|
|
19
19
|
import { getConfigEnvVars as getTelemetryConfig, initTelemetryClient } from '@aztec/telemetry-client';
|
|
20
20
|
import { getGenesisValues } from '@aztec/world-state/testing';
|
|
21
|
+
import { mnemonicToAccount } from '@spalladino/viem/accounts';
|
|
22
|
+
import { foundry } from '@spalladino/viem/chains';
|
|
21
23
|
import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
|
|
22
24
|
import { copySync, removeSync } from 'fs-extra/esm';
|
|
23
25
|
import fs from 'fs/promises';
|
|
24
26
|
import getPort from 'get-port';
|
|
25
27
|
import { tmpdir } from 'os';
|
|
26
28
|
import path, { join } from 'path';
|
|
27
|
-
import { mnemonicToAccount } from 'viem/accounts';
|
|
28
|
-
import { foundry } from 'viem/chains';
|
|
29
29
|
import { MNEMONIC, TEST_MAX_TX_POOL_SIZE, TEST_PEER_CHECK_INTERVAL_MS } from './fixtures.js';
|
|
30
30
|
import { getACVMConfig } from './get_acvm_config.js';
|
|
31
31
|
import { getBBConfig } from './get_bb_config.js';
|
|
@@ -234,17 +234,6 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
|
|
|
234
234
|
aztecNodeConfig.dataDirectory = statePath;
|
|
235
235
|
}
|
|
236
236
|
aztecNodeConfig.blobSinkUrl = `http://127.0.0.1:${blobSinkPort}`;
|
|
237
|
-
// Start anvil. We go via a wrapper script to ensure if the parent dies, anvil dies.
|
|
238
|
-
logger.verbose('Starting anvil...');
|
|
239
|
-
const res = await startAnvil({
|
|
240
|
-
l1BlockTime: opts.ethereumSlotDuration
|
|
241
|
-
});
|
|
242
|
-
const anvil = res.anvil;
|
|
243
|
-
aztecNodeConfig.l1RpcUrls = [
|
|
244
|
-
res.rpcUrl
|
|
245
|
-
];
|
|
246
|
-
// Deploy our L1 contracts.
|
|
247
|
-
logger.verbose('Deploying L1 contracts...');
|
|
248
237
|
const hdAccount = mnemonicToAccount(MNEMONIC, {
|
|
249
238
|
addressIndex: 0
|
|
250
239
|
});
|
|
@@ -262,7 +251,19 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
|
|
|
262
251
|
`0x${validatorPrivKey.toString('hex')}`
|
|
263
252
|
]);
|
|
264
253
|
aztecNodeConfig.coinbase = opts.coinbase ?? EthAddress.fromString(`${hdAccount.address}`);
|
|
254
|
+
logger.info(`Setting up environment with config`, aztecNodeConfig);
|
|
255
|
+
// Start anvil. We go via a wrapper script to ensure if the parent dies, anvil dies.
|
|
256
|
+
logger.verbose('Starting anvil...');
|
|
257
|
+
const res = await startAnvil({
|
|
258
|
+
l1BlockTime: opts.ethereumSlotDuration
|
|
259
|
+
});
|
|
260
|
+
const anvil = res.anvil;
|
|
261
|
+
aztecNodeConfig.l1RpcUrls = [
|
|
262
|
+
res.rpcUrl
|
|
263
|
+
];
|
|
265
264
|
const ethCheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls);
|
|
265
|
+
// Deploy our L1 contracts.
|
|
266
|
+
logger.verbose('Deploying L1 contracts...');
|
|
266
267
|
if (opts.l1StartTime) {
|
|
267
268
|
await ethCheatCodes.warp(opts.l1StartTime, {
|
|
268
269
|
resetBlockInterval: true
|
|
@@ -282,7 +283,6 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
|
|
|
282
283
|
});
|
|
283
284
|
aztecNodeConfig.l1Contracts = deployL1ContractsValues.l1ContractAddresses;
|
|
284
285
|
aztecNodeConfig.rollupVersion = deployL1ContractsValues.rollupVersion;
|
|
285
|
-
aztecNodeConfig.l1PublishRetryIntervalMS = 100;
|
|
286
286
|
const dateProvider = new TestDateProvider();
|
|
287
287
|
const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.l1Client, dateProvider);
|
|
288
288
|
await watcher.start();
|
|
@@ -318,6 +318,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
|
|
|
318
318
|
if (opts.startProverNode) {
|
|
319
319
|
logger.verbose('Creating and syncing a simulated prover node with p2p disabled...');
|
|
320
320
|
proverNode = await createAndSyncProverNode(`0x${proverNodePrivateKey.toString('hex')}`, aztecNodeConfig, {
|
|
321
|
+
...aztecNodeConfig.proverNodeConfig,
|
|
321
322
|
dataDirectory: path.join(directoryToCleanup, randomBytes(8).toString('hex')),
|
|
322
323
|
p2pEnabled: false
|
|
323
324
|
}, aztecNode, prefilledPublicData);
|
|
@@ -416,7 +417,9 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
|
|
|
416
417
|
const proverNodePrivateKey = getPrivateKeyFromIndex(2);
|
|
417
418
|
const proverNodePrivateKeyHex = `0x${proverNodePrivateKey.toString('hex')}`;
|
|
418
419
|
proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, aztecNodeConfig, {
|
|
419
|
-
|
|
420
|
+
...aztecNodeConfig.proverNodeConfig,
|
|
421
|
+
dataDirectory: path.join(directoryToCleanup, randomBytes(8).toString('hex')),
|
|
422
|
+
p2pEnabled: false
|
|
420
423
|
}, aztecNode, prefilledPublicData);
|
|
421
424
|
}
|
|
422
425
|
logger.verbose('Creating pxe...');
|
package/dest/fixtures/utils.d.ts
CHANGED
|
@@ -17,7 +17,7 @@ import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
|
|
|
17
17
|
import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
|
|
18
18
|
import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
|
|
19
19
|
import { type TelemetryClient, type TelemetryClientConfig } from '@aztec/telemetry-client';
|
|
20
|
-
import { type Chain, type HDAccount, type PrivateKeyAccount } from 'viem';
|
|
20
|
+
import { type Chain, type HDAccount, type PrivateKeyAccount } from '@spalladino/viem';
|
|
21
21
|
export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js';
|
|
22
22
|
export { startAnvil };
|
|
23
23
|
export declare const getPrivateKeyFromIndex: (index: number) => Buffer | null;
|
|
@@ -192,5 +192,7 @@ export declare function setupSponsoredFPC(pxe: PXE): Promise<ContractInstanceWit
|
|
|
192
192
|
*/
|
|
193
193
|
export declare function registerSponsoredFPC(pxe: PXE): Promise<void>;
|
|
194
194
|
export declare function waitForProvenChain(node: AztecNode, targetBlock?: number, timeoutSec?: number, intervalSec?: number): Promise<void>;
|
|
195
|
-
export declare function createAndSyncProverNode(proverNodePrivateKey: `0x${string}`, aztecNodeConfig: AztecNodeConfig, proverNodeConfig: Partial<ProverNodeConfig> & Pick<DataStoreConfig, 'dataDirectory'
|
|
195
|
+
export declare function createAndSyncProverNode(proverNodePrivateKey: `0x${string}`, aztecNodeConfig: AztecNodeConfig, proverNodeConfig: Partial<ProverNodeConfig> & Pick<DataStoreConfig, 'dataDirectory'> & {
|
|
196
|
+
dontStart?: boolean;
|
|
197
|
+
}, aztecNode: AztecNode | undefined, prefilledPublicData?: PublicDataTreeLeaf[], proverNodeDeps?: ProverNodeDeps): Promise<ProverNode>;
|
|
196
198
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fixtures/utils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,KAAK,eAAe,EAAsC,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAEL,KAAK,0BAA0B,EAC/B,KAAK,YAAY,EACjB,KAAK,SAAS,EAEd,KAAK,cAAc,EACnB,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,MAAM,EAOZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEpE,OAAO,EAAE,KAAK,cAAc,EAAwB,MAAM,yBAAyB,CAAC;AAEpF,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,2BAA2B,EAGhC,KAAK,QAAQ,EAOd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,aAAa,EAGb,UAAU,EACX,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAI9C,OAAO,EAAgB,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,OAAO,EAAE,oBAAoB,EAAkC,MAAM,yBAAyB,CAAC;AAE/F,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAoB,MAAM,oBAAoB,CAAC;AACnH,OAAO,EACL,KAAK,UAAU,EACf,KAAK,gBAAgB,EAGtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,EACL,KAAK,2BAA2B,EAGjC,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAGtE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAG3B,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fixtures/utils.ts"],"names":[],"mappings":"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"}
|
package/dest/fixtures/utils.js
CHANGED
|
@@ -31,13 +31,13 @@ import { tryStop } from '@aztec/stdlib/interfaces/server';
|
|
|
31
31
|
import { getConfigEnvVars as getTelemetryConfig, initTelemetryClient } from '@aztec/telemetry-client';
|
|
32
32
|
import { BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
|
|
33
33
|
import { getGenesisValues } from '@aztec/world-state/testing';
|
|
34
|
+
import { getContract } from '@spalladino/viem';
|
|
35
|
+
import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from '@spalladino/viem/accounts';
|
|
36
|
+
import { foundry } from '@spalladino/viem/chains';
|
|
34
37
|
import fs from 'fs/promises';
|
|
35
38
|
import getPort from 'get-port';
|
|
36
39
|
import { tmpdir } from 'os';
|
|
37
40
|
import * as path from 'path';
|
|
38
|
-
import { getContract } from 'viem';
|
|
39
|
-
import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
|
|
40
|
-
import { foundry } from 'viem/chains';
|
|
41
41
|
import { MNEMONIC, TEST_PEER_CHECK_INTERVAL_MS } from './fixtures.js';
|
|
42
42
|
import { getACVMConfig } from './get_acvm_config.js';
|
|
43
43
|
import { getBBConfig } from './get_bb_config.js';
|
|
@@ -328,7 +328,7 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
|
|
|
328
328
|
}, telemetry);
|
|
329
329
|
await blobSink.start();
|
|
330
330
|
config.blobSinkUrl = `http://localhost:${blobSinkPort}`;
|
|
331
|
-
logger.verbose('Creating and synching an aztec node
|
|
331
|
+
logger.verbose('Creating and synching an aztec node', config);
|
|
332
332
|
const acvmConfig = await getACVMConfig(logger);
|
|
333
333
|
if (acvmConfig) {
|
|
334
334
|
config.acvmWorkingDirectory = acvmConfig.acvmWorkingDirectory;
|
|
@@ -339,7 +339,6 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
|
|
|
339
339
|
config.bbBinaryPath = bbConfig.bbBinaryPath;
|
|
340
340
|
config.bbWorkingDirectory = bbConfig.bbWorkingDirectory;
|
|
341
341
|
}
|
|
342
|
-
config.l1PublishRetryIntervalMS = 100;
|
|
343
342
|
const blobSinkClient = createBlobSinkClient(config, {
|
|
344
343
|
logger: createLogger('node:blob-sink:client')
|
|
345
344
|
});
|
|
@@ -645,6 +644,7 @@ export function createAndSyncProverNode(proverNodePrivateKey, aztecNodeConfig, p
|
|
|
645
644
|
txGatheringTimeoutMs: 24_000,
|
|
646
645
|
proverNodeFailedEpochStore: undefined,
|
|
647
646
|
proverId: EthAddress.fromNumber(1),
|
|
647
|
+
proverNodeEpochProvingDelayMs: undefined,
|
|
648
648
|
...proverNodeConfig
|
|
649
649
|
};
|
|
650
650
|
const l1TxUtils = createDelayedL1TxUtils(aztecNodeConfig, proverNodePrivateKey, 'prover-node', proverNodeDeps.dateProvider);
|
|
@@ -659,7 +659,9 @@ export function createAndSyncProverNode(proverNodePrivateKey, aztecNodeConfig, p
|
|
|
659
659
|
getLogger().info(`Created and synced prover node`, {
|
|
660
660
|
publisherAddress: l1TxUtils.client.account.address
|
|
661
661
|
});
|
|
662
|
-
|
|
662
|
+
if (!proverNodeConfig.dontStart) {
|
|
663
|
+
await proverNode.start();
|
|
664
|
+
}
|
|
663
665
|
return proverNode;
|
|
664
666
|
});
|
|
665
667
|
}
|
|
@@ -2,7 +2,7 @@ import { type AccountWallet, AuthWitness, type AztecAddress, type AztecNode, Eth
|
|
|
2
2
|
import { type ExtendedViemWalletClient, type L1ContractAddresses } from '@aztec/ethereum';
|
|
3
3
|
import { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
4
4
|
import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
|
|
5
|
-
import { type Hex } from 'viem';
|
|
5
|
+
import { type Hex } from '@spalladino/viem';
|
|
6
6
|
/**
|
|
7
7
|
* Deploy L1 token and portal, initialize portal, deploy a non native l2 token contract, its L2 bridge contract and attach is to the portal.
|
|
8
8
|
* @param wallet - the wallet instance
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cross_chain_test_harness.d.ts","sourceRoot":"","sources":["../../src/shared/cross_chain_test_harness.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,aAAa,EAClB,WAAW,EACX,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,UAAU,EACV,KAAK,QAAQ,EACb,EAAE,EAGF,KAAK,aAAa,EAClB,KAAK,0BAA0B,EAC/B,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,MAAM,EAEZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,KAAK,wBAAwB,EAAE,KAAK,mBAAmB,EAAoB,MAAM,iBAAiB,CAAC;AAE5G,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAE3E,OAAO,EAAE,KAAK,GAAG,EAAe,MAAM,
|
|
1
|
+
{"version":3,"file":"cross_chain_test_harness.d.ts","sourceRoot":"","sources":["../../src/shared/cross_chain_test_harness.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { deployL1Contract } from '@aztec/ethereum';
|
|
|
4
4
|
import { TestERC20Abi, TokenPortalAbi, TokenPortalBytecode } from '@aztec/l1-artifacts';
|
|
5
5
|
import { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
6
6
|
import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
|
|
7
|
-
import { getContract } from 'viem';
|
|
7
|
+
import { getContract } from '@spalladino/viem';
|
|
8
8
|
import { mintTokensToPrivate } from '../fixtures/token_utils.js';
|
|
9
9
|
// docs:start:deployAndInitializeTokenAndBridgeContracts
|
|
10
10
|
/**
|
|
@@ -6,7 +6,7 @@ import { UniswapContract } from '@aztec/noir-contracts.js/Uniswap';
|
|
|
6
6
|
import { computeL2ToL1MessageHash } from '@aztec/stdlib/hash';
|
|
7
7
|
import { computeL2ToL1MembershipWitness } from '@aztec/stdlib/messaging';
|
|
8
8
|
import { jest } from '@jest/globals';
|
|
9
|
-
import { getContract, parseEther, toFunctionSelector } from 'viem';
|
|
9
|
+
import { getContract, parseEther, toFunctionSelector } from '@spalladino/viem';
|
|
10
10
|
import { ensureAccountContractsPublished } from '../fixtures/utils.js';
|
|
11
11
|
import { CrossChainTestHarness } from './cross_chain_test_harness.js';
|
|
12
12
|
// PSA: This tests works on forked mainnet. There is a dump of the data in `dumpedState` such that we
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/spartan/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC7E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,oBAAoB,EAG1B,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/spartan/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC7E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,oBAAoB,EAG1B,MAAM,iCAAiC,CAAC;AAGzC,OAAO,EAAE,YAAY,EAAyB,MAAM,eAAe,CAAC;AAGpE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,QAAA,MAAM,gBAAgB;;;;;;;;;;;;;;;EAKpB,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU,CAIzD;AAyBD,wBAAgB,WAAW,WAE1B;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,mBAEvF;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,mBAG5G;AAED,wBAAsB,gBAAgB,CAAC,EACrC,QAAQ,EACR,SAAS,EACT,aAAa,EACb,QAAQ,GACT,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IAEtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC;IACV,OAAO,EAAE,YAAY,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,CA6DD;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM;aAjE7C,YAAY;UACf,MAAM;GAsEb;AAED,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,MAAM;aAzElD,YAAY;UACf,MAAM;GA8Eb;AAED,wBAAsB,oBAAoB,CAAC,EACzC,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,KAAa,GACd,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,mBAOA;AAED,wBAAsB,qBAAqB,CAAC,EAC1C,QAAQ,EACR,SAAS,EACT,KAAK,EACL,OAAc,EACd,KAAa,GACd,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,mBAOA;AAED,wBAAsB,sBAAsB,CAAC,EAC3C,QAAQ,EACR,KAAK,EACL,SAAS,EACT,SAAmB,EACnB,OAAe,GAChB,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,mBAKA;AAED,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,UAEhE;AAuCD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,qBAAqB,CAAC,EAC1C,YAAY,EACZ,eAAe,EACf,UAAU,EACV,YAAY,EACZ,kBAAiC,EACjC,OAAc,EACd,KAAY,EACZ,MAAW,EACX,MAAM,GACP,EAAE;IACD,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IACzC,MAAM,EAAE,MAAM,CAAC;CAChB,mBA2BA;AAED,wBAAgB,kBAAkB,CAAC,EACjC,SAAS,EACT,UAAU,EACV,eAAe,EACf,MAAM,GACP,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;CAChB,mBAWA;AAED,wBAAgB,eAAe,CAAC,EAC9B,SAAS,EACT,UAAU,EACV,MAAM,GACP,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,mBASA;AAED,wBAAgB,qBAAqB,CAAC,EACpC,SAAS,EACT,UAAU,EACV,MAAM,GACP,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,mBASA;AAED,wBAAgB,oBAAoB,CAAC,EACnC,SAAS,EACT,UAAU,EACV,eAAe,EACf,MAAM,GACP,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;CAChB,mBAWA;AAED,wBAAgB,kBAAkB,CAAC,EACjC,SAAS,EACT,UAAU,EACV,MAAM,EACN,MAAM,GACP,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;CAC1C,mBASA;AAED,wBAAgB,mBAAmB,CAAC,EAClC,UAAU,EACV,SAAS,EACT,UAAU,EACV,MAAM,GACP,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,mBAQA;AAED,wBAAsB,kBAAkB,CACtC,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,iBAef;AAED,wBAAsB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAMjE;AAED,wBAAsB,8BAA8B,CAClD,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,iBAgBf;AAED,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,qBAMpD;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,mCAK5F;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,UAAU,mCAElD;AAED,wBAAsB,mBAAmB,CAAC,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CA2BpH;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,UAAU;AACf,gDAAgD;AAChD,SAAS,CAAC,EAAE,YAAY,EAAE,GACzB,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,gBAAgB,CAAC;IAAC,OAAO,CAAC,EAAE,YAAY,CAAA;CAAE,CAAC,CAuB5E;AAED,4DAA4D;AAC5D,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAsB5F;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,iBAcpD;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAW1C"}
|
package/dest/spartan/utils.js
CHANGED
|
@@ -2,10 +2,10 @@ import { createLogger, sleep } from '@aztec/aztec.js';
|
|
|
2
2
|
import { makeBackoff, retry } from '@aztec/foundation/retry';
|
|
3
3
|
import { schemas } from '@aztec/foundation/schemas';
|
|
4
4
|
import { createAztecNodeAdminClient, createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
|
|
5
|
+
import { createPublicClient, fallback, http } from '@spalladino/viem';
|
|
5
6
|
import { exec, execSync, spawn } from 'child_process';
|
|
6
7
|
import path from 'path';
|
|
7
8
|
import { promisify } from 'util';
|
|
8
|
-
import { createPublicClient, fallback, http } from 'viem';
|
|
9
9
|
import { z } from 'zod';
|
|
10
10
|
const execAsync = promisify(exec);
|
|
11
11
|
const logger = createLogger('e2e:k8s-utils');
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/end-to-end",
|
|
3
|
-
"version": "2.1.0-rc.
|
|
3
|
+
"version": "2.1.0-rc.11",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"inherits": [
|
|
@@ -25,44 +25,45 @@
|
|
|
25
25
|
"formatting": "run -T prettier --check ./src && run -T eslint ./src"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@aztec/accounts": "2.1.0-rc.
|
|
29
|
-
"@aztec/archiver": "2.1.0-rc.
|
|
30
|
-
"@aztec/aztec": "2.1.0-rc.
|
|
31
|
-
"@aztec/aztec-node": "2.1.0-rc.
|
|
32
|
-
"@aztec/aztec.js": "2.1.0-rc.
|
|
33
|
-
"@aztec/bb-prover": "2.1.0-rc.
|
|
34
|
-
"@aztec/blob-lib": "2.1.0-rc.
|
|
35
|
-
"@aztec/blob-sink": "2.1.0-rc.
|
|
36
|
-
"@aztec/bot": "2.1.0-rc.
|
|
37
|
-
"@aztec/cli": "2.1.0-rc.
|
|
38
|
-
"@aztec/constants": "2.1.0-rc.
|
|
39
|
-
"@aztec/entrypoints": "2.1.0-rc.
|
|
40
|
-
"@aztec/epoch-cache": "2.1.0-rc.
|
|
41
|
-
"@aztec/ethereum": "2.1.0-rc.
|
|
42
|
-
"@aztec/foundation": "2.1.0-rc.
|
|
43
|
-
"@aztec/kv-store": "2.1.0-rc.
|
|
44
|
-
"@aztec/l1-artifacts": "2.1.0-rc.
|
|
45
|
-
"@aztec/merkle-tree": "2.1.0-rc.
|
|
46
|
-
"@aztec/node-keystore": "2.1.0-rc.
|
|
47
|
-
"@aztec/noir-contracts.js": "2.1.0-rc.
|
|
48
|
-
"@aztec/noir-noirc_abi": "2.1.0-rc.
|
|
49
|
-
"@aztec/noir-protocol-circuits-types": "2.1.0-rc.
|
|
50
|
-
"@aztec/noir-test-contracts.js": "2.1.0-rc.
|
|
51
|
-
"@aztec/p2p": "2.1.0-rc.
|
|
52
|
-
"@aztec/protocol-contracts": "2.1.0-rc.
|
|
53
|
-
"@aztec/prover-client": "2.1.0-rc.
|
|
54
|
-
"@aztec/prover-node": "2.1.0-rc.
|
|
55
|
-
"@aztec/pxe": "2.1.0-rc.
|
|
56
|
-
"@aztec/sequencer-client": "2.1.0-rc.
|
|
57
|
-
"@aztec/simulator": "2.1.0-rc.
|
|
58
|
-
"@aztec/slasher": "2.1.0-rc.
|
|
59
|
-
"@aztec/stdlib": "2.1.0-rc.
|
|
60
|
-
"@aztec/telemetry-client": "2.1.0-rc.
|
|
61
|
-
"@aztec/validator-client": "2.1.0-rc.
|
|
62
|
-
"@aztec/world-state": "2.1.0-rc.
|
|
28
|
+
"@aztec/accounts": "2.1.0-rc.11",
|
|
29
|
+
"@aztec/archiver": "2.1.0-rc.11",
|
|
30
|
+
"@aztec/aztec": "2.1.0-rc.11",
|
|
31
|
+
"@aztec/aztec-node": "2.1.0-rc.11",
|
|
32
|
+
"@aztec/aztec.js": "2.1.0-rc.11",
|
|
33
|
+
"@aztec/bb-prover": "2.1.0-rc.11",
|
|
34
|
+
"@aztec/blob-lib": "2.1.0-rc.11",
|
|
35
|
+
"@aztec/blob-sink": "2.1.0-rc.11",
|
|
36
|
+
"@aztec/bot": "2.1.0-rc.11",
|
|
37
|
+
"@aztec/cli": "2.1.0-rc.11",
|
|
38
|
+
"@aztec/constants": "2.1.0-rc.11",
|
|
39
|
+
"@aztec/entrypoints": "2.1.0-rc.11",
|
|
40
|
+
"@aztec/epoch-cache": "2.1.0-rc.11",
|
|
41
|
+
"@aztec/ethereum": "2.1.0-rc.11",
|
|
42
|
+
"@aztec/foundation": "2.1.0-rc.11",
|
|
43
|
+
"@aztec/kv-store": "2.1.0-rc.11",
|
|
44
|
+
"@aztec/l1-artifacts": "2.1.0-rc.11",
|
|
45
|
+
"@aztec/merkle-tree": "2.1.0-rc.11",
|
|
46
|
+
"@aztec/node-keystore": "2.1.0-rc.11",
|
|
47
|
+
"@aztec/noir-contracts.js": "2.1.0-rc.11",
|
|
48
|
+
"@aztec/noir-noirc_abi": "2.1.0-rc.11",
|
|
49
|
+
"@aztec/noir-protocol-circuits-types": "2.1.0-rc.11",
|
|
50
|
+
"@aztec/noir-test-contracts.js": "2.1.0-rc.11",
|
|
51
|
+
"@aztec/p2p": "2.1.0-rc.11",
|
|
52
|
+
"@aztec/protocol-contracts": "2.1.0-rc.11",
|
|
53
|
+
"@aztec/prover-client": "2.1.0-rc.11",
|
|
54
|
+
"@aztec/prover-node": "2.1.0-rc.11",
|
|
55
|
+
"@aztec/pxe": "2.1.0-rc.11",
|
|
56
|
+
"@aztec/sequencer-client": "2.1.0-rc.11",
|
|
57
|
+
"@aztec/simulator": "2.1.0-rc.11",
|
|
58
|
+
"@aztec/slasher": "2.1.0-rc.11",
|
|
59
|
+
"@aztec/stdlib": "2.1.0-rc.11",
|
|
60
|
+
"@aztec/telemetry-client": "2.1.0-rc.11",
|
|
61
|
+
"@aztec/validator-client": "2.1.0-rc.11",
|
|
62
|
+
"@aztec/world-state": "2.1.0-rc.11",
|
|
63
63
|
"@iarna/toml": "^2.2.5",
|
|
64
64
|
"@jest/globals": "^30.0.0",
|
|
65
65
|
"@noble/curves": "=1.0.0",
|
|
66
|
+
"@spalladino/viem": "2.38.2-eip7594.0",
|
|
66
67
|
"@swc/core": "^1.4.11",
|
|
67
68
|
"@swc/jest": "^0.2.36",
|
|
68
69
|
"@types/fs-extra": "^11.0.2",
|
|
@@ -96,7 +97,6 @@
|
|
|
96
97
|
"tslib": "^2.4.0",
|
|
97
98
|
"typescript": "^5.3.3",
|
|
98
99
|
"util": "^0.12.5",
|
|
99
|
-
"viem": "2.23.7",
|
|
100
100
|
"zod": "^3.23.8"
|
|
101
101
|
},
|
|
102
102
|
"devDependencies": {
|
|
@@ -22,7 +22,7 @@ import { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
|
22
22
|
import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
|
|
23
23
|
import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
|
|
24
24
|
|
|
25
|
-
import { getContract } from 'viem';
|
|
25
|
+
import { getContract } from '@spalladino/viem';
|
|
26
26
|
|
|
27
27
|
import { MNEMONIC } from '../fixtures/fixtures.js';
|
|
28
28
|
import {
|
|
@@ -18,7 +18,7 @@ import { randomBytes } from '@aztec/foundation/crypto';
|
|
|
18
18
|
import { withLogNameSuffix } from '@aztec/foundation/log';
|
|
19
19
|
import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
|
|
20
20
|
import { getMockPubSubP2PServiceFactory } from '@aztec/p2p/test-helpers';
|
|
21
|
-
import { ProverNode, ProverNodePublisher } from '@aztec/prover-node';
|
|
21
|
+
import { ProverNode, type ProverNodeConfig, ProverNodePublisher } from '@aztec/prover-node';
|
|
22
22
|
import type { TestProverNode } from '@aztec/prover-node/test';
|
|
23
23
|
import {
|
|
24
24
|
type SequencerClient,
|
|
@@ -31,9 +31,9 @@ import { EthAddress, type L2BlockNumber } from '@aztec/stdlib/block';
|
|
|
31
31
|
import { type L1RollupConstants, getProofSubmissionDeadlineTimestamp } from '@aztec/stdlib/epoch-helpers';
|
|
32
32
|
import { tryStop } from '@aztec/stdlib/interfaces/server';
|
|
33
33
|
|
|
34
|
+
import type { Hex } from '@spalladino/viem';
|
|
35
|
+
import { privateKeyToAccount } from '@spalladino/viem/accounts';
|
|
34
36
|
import { join } from 'path';
|
|
35
|
-
import type { Hex } from 'viem';
|
|
36
|
-
import { privateKeyToAccount } from 'viem/accounts';
|
|
37
37
|
|
|
38
38
|
import {
|
|
39
39
|
type EndToEndContext,
|
|
@@ -128,9 +128,6 @@ export class EpochsTestContext {
|
|
|
128
128
|
// using the prover's eth address if the proverId is used for something in the rollup contract
|
|
129
129
|
// Use numeric EthAddress for deterministic prover id
|
|
130
130
|
proverId: EthAddress.fromNumber(1),
|
|
131
|
-
// This must be enough so that the tx from the prover is delayed properly,
|
|
132
|
-
// but not so much to hang the sequencer and timeout the teardown
|
|
133
|
-
txPropagationMaxQueryAttempts: opts.txPropagationMaxQueryAttempts ?? 12,
|
|
134
131
|
worldStateBlockHistory: WORLD_STATE_BLOCK_HISTORY,
|
|
135
132
|
exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
|
|
136
133
|
slasherFlavor: 'none',
|
|
@@ -187,15 +184,20 @@ export class EpochsTestContext {
|
|
|
187
184
|
await this.context.teardown();
|
|
188
185
|
}
|
|
189
186
|
|
|
190
|
-
public async createProverNode() {
|
|
187
|
+
public async createProverNode(opts: { dontStart?: boolean } & Partial<ProverNodeConfig> = {}) {
|
|
191
188
|
this.logger.warn('Creating and syncing a simulated prover node...');
|
|
192
189
|
const proverNodePrivateKey = this.getNextPrivateKey();
|
|
193
190
|
const suffix = (this.proverNodes.length + 1).toString();
|
|
191
|
+
const proverId = EthAddress.fromNumber(parseInt(suffix, 10));
|
|
194
192
|
const proverNode = await withLogNameSuffix(suffix, () =>
|
|
195
193
|
createAndSyncProverNode(
|
|
196
194
|
proverNodePrivateKey,
|
|
197
|
-
{ ...this.context.config, proverId
|
|
198
|
-
{
|
|
195
|
+
{ ...this.context.config, proverId },
|
|
196
|
+
{
|
|
197
|
+
dataDirectory: join(this.context.config.dataDirectory!, randomBytes(8).toString('hex')),
|
|
198
|
+
proverId,
|
|
199
|
+
...opts,
|
|
200
|
+
},
|
|
199
201
|
this.context.aztecNode,
|
|
200
202
|
undefined,
|
|
201
203
|
{ dateProvider: this.context.dateProvider },
|
|
@@ -427,7 +429,7 @@ export class EpochsTestContext {
|
|
|
427
429
|
sequencer.getSequencer().on(eventName, (args: Parameters<SequencerEvents[typeof eventName]>[0]) => {
|
|
428
430
|
const evt = makeEvent(i, eventName, args);
|
|
429
431
|
failEvents.push(evt);
|
|
430
|
-
this.logger.error(`Failed event ${eventName} from sequencer ${sequencerIndex}`, evt);
|
|
432
|
+
this.logger.error(`Failed event ${eventName} from sequencer ${sequencerIndex}`, undefined, evt);
|
|
431
433
|
});
|
|
432
434
|
});
|
|
433
435
|
});
|
|
@@ -4,7 +4,7 @@ import { Fq } from '@aztec/foundation/fields';
|
|
|
4
4
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
5
5
|
|
|
6
6
|
import { jest } from '@jest/globals';
|
|
7
|
-
import type { Hex } from 'viem';
|
|
7
|
+
import type { Hex } from '@spalladino/viem';
|
|
8
8
|
|
|
9
9
|
import { FeesTest } from './fees_test.js';
|
|
10
10
|
|
|
@@ -23,7 +23,7 @@ import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
|
23
23
|
import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
|
|
24
24
|
import { GasSettings } from '@aztec/stdlib/gas';
|
|
25
25
|
|
|
26
|
-
import { getContract } from 'viem';
|
|
26
|
+
import { getContract } from '@spalladino/viem';
|
|
27
27
|
|
|
28
28
|
import { MNEMONIC } from '../fixtures/fixtures.js';
|
|
29
29
|
import {
|
|
@@ -3,9 +3,9 @@ import { getAddressFromPrivateKey } from '@aztec/ethereum';
|
|
|
3
3
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
4
|
import type { EthPrivateKey } from '@aztec/node-keystore';
|
|
5
5
|
|
|
6
|
+
import { signMessage, signTypedData } from '@spalladino/viem/accounts';
|
|
6
7
|
import { writeFile } from 'fs/promises';
|
|
7
8
|
import { createServer } from 'http';
|
|
8
|
-
import { signMessage, signTypedData } from 'viem/accounts';
|
|
9
9
|
|
|
10
10
|
// Create a mock JSON RPC signer
|
|
11
11
|
// Only supports signing messages and type data
|
|
@@ -157,9 +157,7 @@ export async function createKeyFile3(
|
|
|
157
157
|
schemaVersion: 1,
|
|
158
158
|
validators: [
|
|
159
159
|
{
|
|
160
|
-
attester:
|
|
161
|
-
address: validatorAddress.toChecksumString(),
|
|
162
|
-
},
|
|
160
|
+
attester: validatorAddress.toChecksumString(),
|
|
163
161
|
coinbase: coinbase.toChecksumString(),
|
|
164
162
|
publisher: [publisher1Key, publisher2Key],
|
|
165
163
|
feeRecipient: feeRecipient.toString(),
|
|
@@ -193,9 +191,7 @@ export async function createKeyFile4(
|
|
|
193
191
|
},
|
|
194
192
|
validators: [
|
|
195
193
|
{
|
|
196
|
-
attester:
|
|
197
|
-
address: validator1Address.toChecksumString(),
|
|
198
|
-
},
|
|
194
|
+
attester: validator1Address.toChecksumString(),
|
|
199
195
|
coinbase: coinbase1.toChecksumString(),
|
|
200
196
|
publisher: {
|
|
201
197
|
mnemonic: mnemonic,
|
|
@@ -206,9 +202,7 @@ export async function createKeyFile4(
|
|
|
206
202
|
feeRecipient: feeRecipient1.toString(),
|
|
207
203
|
},
|
|
208
204
|
{
|
|
209
|
-
attester:
|
|
210
|
-
address: validator2Address.toChecksumString(),
|
|
211
|
-
},
|
|
205
|
+
attester: validator2Address.toChecksumString(),
|
|
212
206
|
coinbase: coinbase2.toChecksumString(),
|
|
213
207
|
publisher: [publisher2Key, publisher3Key],
|
|
214
208
|
feeRecipient: feeRecipient2.toString(),
|