@aztec/node-lib 3.0.0-devnet.5 → 3.0.0-devnet.6-patch.1
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/actions/build-snapshot-metadata.d.ts +1 -1
- package/dest/actions/create-backups.d.ts +1 -1
- package/dest/actions/index.d.ts +1 -1
- package/dest/actions/snapshot-sync.d.ts +2 -2
- package/dest/actions/snapshot-sync.d.ts.map +1 -1
- package/dest/actions/snapshot-sync.js +4 -4
- package/dest/actions/upload-snapshot.d.ts +1 -1
- package/dest/config/index.d.ts +5 -1
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +10 -0
- package/dest/factories/index.d.ts +1 -1
- package/dest/factories/l1_tx_utils.d.ts +32 -6
- package/dest/factories/l1_tx_utils.d.ts.map +1 -1
- package/dest/factories/l1_tx_utils.js +46 -6
- package/dest/metrics/index.d.ts +1 -1
- package/dest/metrics/l1_tx_metrics.d.ts +2 -2
- package/dest/metrics/l1_tx_metrics.d.ts.map +1 -1
- package/dest/metrics/l1_tx_metrics.js +1 -1
- package/dest/stores/index.d.ts +1 -1
- package/dest/stores/l1_tx_store.d.ts +4 -4
- package/dest/stores/l1_tx_store.d.ts.map +1 -1
- package/dest/stores/l1_tx_store.js +19 -11
- package/package.json +26 -23
- package/src/actions/snapshot-sync.ts +4 -4
- package/src/config/index.ts +15 -0
- package/src/factories/l1_tx_utils.ts +96 -6
- package/src/metrics/l1_tx_metrics.ts +2 -2
- package/src/stores/l1_tx_store.ts +21 -12
|
@@ -2,4 +2,4 @@ import type { Archiver } from '@aztec/archiver';
|
|
|
2
2
|
import type { UploadSnapshotMetadata } from '@aztec/stdlib/snapshots';
|
|
3
3
|
import type { UploadSnapshotConfig } from './upload-snapshot.js';
|
|
4
4
|
export declare function buildSnapshotMetadata(archiver: Archiver, config: UploadSnapshotConfig): Promise<UploadSnapshotMetadata>;
|
|
5
|
-
//# sourceMappingURL=
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGQtc25hcHNob3QtbWV0YWRhdGEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL2J1aWxkLXNuYXBzaG90LW1ldGFkYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFdEUsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVqRSx3QkFBc0IscUJBQXFCLENBQ3pDLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLE1BQU0sRUFBRSxvQkFBb0IsR0FDM0IsT0FBTyxDQUFDLHNCQUFzQixDQUFDLENBb0JqQyJ9
|
|
@@ -3,4 +3,4 @@ import type { Logger } from '@aztec/foundation/log';
|
|
|
3
3
|
import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
4
4
|
import type { SnapshotDataUrls } from '@aztec/stdlib/snapshots';
|
|
5
5
|
export declare function createBackups(backupDir: string, archiver: Archiver, worldState: WorldStateSynchronizer, log: Logger): Promise<SnapshotDataUrls>;
|
|
6
|
-
//# sourceMappingURL=
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLWJhY2t1cHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL2NyZWF0ZS1iYWNrdXBzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUtoRSx3QkFBc0IsYUFBYSxDQUNqQyxTQUFTLEVBQUUsTUFBTSxFQUNqQixRQUFRLEVBQUUsUUFBUSxFQUNsQixVQUFVLEVBQUUsc0JBQXNCLEVBQ2xDLEdBQUcsRUFBRSxNQUFNLDZCQTRCWiJ9
|
package/dest/actions/index.d.ts
CHANGED
|
@@ -2,4 +2,4 @@ export * from './snapshot-sync.js';
|
|
|
2
2
|
export * from './upload-snapshot.js';
|
|
3
3
|
export * from './create-backups.js';
|
|
4
4
|
export * from './build-snapshot-metadata.js';
|
|
5
|
-
//# sourceMappingURL=
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsOEJBQThCLENBQUMifQ==
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type ArchiverConfig } from '@aztec/archiver';
|
|
2
|
-
import { type EthereumClientConfig } from '@aztec/ethereum';
|
|
2
|
+
import { type EthereumClientConfig } from '@aztec/ethereum/client';
|
|
3
3
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
4
|
import type { Logger } from '@aztec/foundation/log';
|
|
5
5
|
import type { DataStoreConfig } from '@aztec/kv-store/config';
|
|
@@ -24,4 +24,4 @@ export declare function snapshotSync(snapshot: Pick<SnapshotMetadata, 'dataUrls'
|
|
|
24
24
|
snapshotsUrl: string;
|
|
25
25
|
}): Promise<void>;
|
|
26
26
|
export {};
|
|
27
|
-
//# sourceMappingURL=
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic25hcHNob3Qtc3luYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FjdGlvbnMvc25hcHNob3Qtc3luYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTRDLEtBQUssY0FBYyxFQUF1QixNQUFNLGlCQUFpQixDQUFDO0FBRXJILE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFtQixNQUFNLHdCQUF3QixDQUFDO0FBQ3BGLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBR3hELE9BQU8sRUFDTCxLQUFLLGdCQUFnQixFQUt0QixNQUFNLHlCQUF5QixDQUFDO0FBTWpDLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFLM0QsS0FBSyxrQkFBa0IsR0FBRyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsVUFBVSxDQUFDLEdBQzFELElBQUksQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLGVBQWUsQ0FBQyxHQUNoRCxJQUFJLENBQUMsY0FBYyxFQUFFLHdCQUF3QixHQUFHLFNBQVMsQ0FBQyxHQUMxRCxRQUFRLENBQUMsZUFBZSxDQUFDLEdBQ3pCLG9CQUFvQixHQUFHO0lBQ3JCLGFBQWEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3pCLDJCQUEyQixDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3RDLENBQUM7QUFFSjs7O0dBR0c7QUFDSCx3QkFBc0IsZUFBZSxDQUFDLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxHQUFHLEVBQUUsTUFBTSxvQkFpSzVFO0FBRUQ7O0dBRUc7QUFDSCx3QkFBc0IsWUFBWSxDQUNoQyxRQUFRLEVBQUUsSUFBSSxDQUFDLGdCQUFnQixFQUFFLFVBQVUsQ0FBQyxFQUM1QyxHQUFHLEVBQUUsTUFBTSxFQUNYLE1BQU0sRUFBRTtJQUFFLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFBQyxhQUFhLEVBQUUsVUFBVSxDQUFDO0lBQUMsWUFBWSxFQUFFLE1BQU0sQ0FBQTtDQUFFLGlCQXFEbkYifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot-sync.d.ts","sourceRoot":"","sources":["../../src/actions/snapshot-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,KAAK,cAAc,EAAuB,MAAM,iBAAiB,CAAC;AAErH,OAAO,EAAE,KAAK,oBAAoB,EAAmB,MAAM,
|
|
1
|
+
{"version":3,"file":"snapshot-sync.d.ts","sourceRoot":"","sources":["../../src/actions/snapshot-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,KAAK,cAAc,EAAuB,MAAM,iBAAiB,CAAC;AAErH,OAAO,EAAE,KAAK,oBAAoB,EAAmB,MAAM,wBAAwB,CAAC;AACpF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGxD,OAAO,EACL,KAAK,gBAAgB,EAKtB,MAAM,yBAAyB,CAAC;AAMjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAK3D,KAAK,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,GAC1D,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GAChD,IAAI,CAAC,cAAc,EAAE,wBAAwB,GAAG,SAAS,CAAC,GAC1D,QAAQ,CAAC,eAAe,CAAC,GACzB,oBAAoB,GAAG;IACrB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC,CAAC;AAEJ;;;GAGG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,oBAiK5E;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC5C,GAAG,EAAE,MAAM,EACX,MAAM,EAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,UAAU,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,iBAqDnF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ARCHIVER_DB_VERSION, ARCHIVER_STORE_NAME, createArchiverStore } from '@aztec/archiver';
|
|
2
2
|
import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
|
|
3
|
-
import { getPublicClient } from '@aztec/ethereum';
|
|
3
|
+
import { getPublicClient } from '@aztec/ethereum/client';
|
|
4
4
|
import { tryRmDir } from '@aztec/foundation/fs';
|
|
5
5
|
import { P2P_STORE_NAME } from '@aztec/p2p';
|
|
6
6
|
import { DatabaseVersionManager } from '@aztec/stdlib/database-version';
|
|
@@ -123,7 +123,7 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
|
|
|
123
123
|
});
|
|
124
124
|
}
|
|
125
125
|
if (snapshotCandidates.length === 0) {
|
|
126
|
-
log.verbose(`No valid snapshots found from any URL
|
|
126
|
+
log.verbose(`No valid snapshots found from any URL, skipping snapshot sync`, {
|
|
127
127
|
...indexMetadata,
|
|
128
128
|
snapshotsUrls
|
|
129
129
|
});
|
|
@@ -150,14 +150,14 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
|
|
|
150
150
|
});
|
|
151
151
|
return true;
|
|
152
152
|
} catch (err) {
|
|
153
|
-
log.error(`Failed to download snapshot from ${url}
|
|
153
|
+
log.error(`Failed to download snapshot from ${url}, trying next candidate`, err, {
|
|
154
154
|
snapshot,
|
|
155
155
|
snapshotsUrl: url
|
|
156
156
|
});
|
|
157
157
|
continue;
|
|
158
158
|
}
|
|
159
159
|
}
|
|
160
|
-
log.error(`Failed to download snapshot from all URLs
|
|
160
|
+
log.error(`Failed to download snapshot from all URLs`, {
|
|
161
161
|
snapshotsUrls
|
|
162
162
|
});
|
|
163
163
|
return false;
|
|
@@ -9,4 +9,4 @@ export type UploadSnapshotConfig = Pick<ChainConfig, 'l1ChainId' | 'rollupVersio
|
|
|
9
9
|
* and uploads them to the specified location. Location must be a URL supported by our file store (eg `gs://bucketname/path`).
|
|
10
10
|
*/
|
|
11
11
|
export declare function uploadSnapshot(location: string, archiver: Archiver, worldState: WorldStateSynchronizer, config: UploadSnapshotConfig, log: Logger): Promise<void>;
|
|
12
|
-
//# sourceMappingURL=
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLXNuYXBzaG90LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWN0aW9ucy91cGxvYWQtc25hcHNob3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUF1QixLQUFLLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXJFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXhELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFXOUUsTUFBTSxNQUFNLG9CQUFvQixHQUFHLElBQUksQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLGVBQWUsQ0FBQyxHQUNqRixJQUFJLENBQUMsZUFBZSxFQUFFLGVBQWUsQ0FBQyxDQUFDO0FBRXpDOzs7R0FHRztBQUNILHdCQUFzQixjQUFjLENBQ2xDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLFVBQVUsRUFBRSxzQkFBc0IsRUFDbEMsTUFBTSxFQUFFLG9CQUFvQixFQUM1QixHQUFHLEVBQUUsTUFBTSxpQkFvQloifQ==
|
package/dest/config/index.d.ts
CHANGED
|
@@ -14,6 +14,10 @@ export type SharedNodeConfig = {
|
|
|
14
14
|
autoUpdateUrl?: string;
|
|
15
15
|
/** URL of the Web3Signer instance */
|
|
16
16
|
web3SignerUrl?: string;
|
|
17
|
+
/** Whether to run in fisherman mode */
|
|
18
|
+
fishermanMode?: boolean;
|
|
19
|
+
/** Force verification of tx Chonk proofs. Only used for testnet */
|
|
20
|
+
debugForceTxProofVerification: boolean;
|
|
17
21
|
};
|
|
18
22
|
export declare const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig>;
|
|
19
|
-
//# sourceMappingURL=
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQXVCLE1BQU0sMEJBQTBCLENBQUM7QUFFeEYsTUFBTSxNQUFNLGdCQUFnQixHQUFHO0lBQzdCLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLHlGQUF5RjtJQUN6RixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLGdLQUFnSztJQUNoSyxRQUFRLEVBQUUsTUFBTSxHQUFHLFVBQVUsR0FBRyxnQkFBZ0IsQ0FBQztJQUNqRCw2SUFBNkk7SUFDN0ksYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFFekIscU9BQXFPO0lBQ3JPLFVBQVUsQ0FBQyxFQUFFLFVBQVUsR0FBRyxRQUFRLEdBQUcsUUFBUSxHQUFHLG9CQUFvQixDQUFDO0lBQ3JFLHNEQUFzRDtJQUN0RCxhQUFhLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFdkIscUNBQXFDO0lBQ3JDLGFBQWEsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN2Qix1Q0FBdUM7SUFDdkMsYUFBYSxDQUFDLEVBQUUsT0FBTyxDQUFDO0lBRXhCLG1FQUFtRTtJQUNuRSw2QkFBNkIsRUFBRSxPQUFPLENBQUM7Q0FDeEMsQ0FBQztBQUVGLGVBQU8sTUFBTSx3QkFBd0IsRUFBRSxrQkFBa0IsQ0FBQyxnQkFBZ0IsQ0FvRHpFLENBQUMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAuB,MAAM,0BAA0B,CAAC;AAExF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,gKAAgK;IAChK,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,gBAAgB,CAAC;IACjD,6IAA6I;IAC7I,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IAEzB,qOAAqO;IACrO,UAAU,CAAC,EAAE,UAAU,GAAG,QAAQ,GAAG,QAAQ,GAAG,oBAAoB,CAAC;IACrE,sDAAsD;IACtD,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,qCAAqC;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAuB,MAAM,0BAA0B,CAAC;AAExF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,gKAAgK;IAChK,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,gBAAgB,CAAC;IACjD,6IAA6I;IAC7I,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IAEzB,qOAAqO;IACrO,UAAU,CAAC,EAAE,UAAU,GAAG,QAAQ,GAAG,QAAQ,GAAG,oBAAoB,CAAC;IACrE,sDAAsD;IACtD,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,qCAAqC;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uCAAuC;IACvC,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,mEAAmE;IACnE,6BAA6B,EAAE,OAAO,CAAC;CACxC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CAoDzE,CAAC"}
|
package/dest/config/index.js
CHANGED
|
@@ -37,5 +37,15 @@ export const sharedNodeConfigMappings = {
|
|
|
37
37
|
env: 'WEB3_SIGNER_URL',
|
|
38
38
|
description: 'URL of the Web3Signer instance',
|
|
39
39
|
parseEnv: (val)=>val.trim()
|
|
40
|
+
},
|
|
41
|
+
fishermanMode: {
|
|
42
|
+
env: 'FISHERMAN_MODE',
|
|
43
|
+
description: 'Whether to run in fisherman mode.',
|
|
44
|
+
...booleanConfigHelper(false)
|
|
45
|
+
},
|
|
46
|
+
debugForceTxProofVerification: {
|
|
47
|
+
env: 'DEBUG_FORCE_TX_PROOF_VERIFICATION',
|
|
48
|
+
description: 'Whether to force tx proof verification. Only has an effect if real proving is turned off',
|
|
49
|
+
...booleanConfigHelper(false)
|
|
40
50
|
}
|
|
41
51
|
};
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export * from './l1_tx_utils.js';
|
|
2
|
-
//# sourceMappingURL=
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mYWN0b3JpZXMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxrQkFBa0IsQ0FBQyJ9
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import type { EthSigner
|
|
1
|
+
import type { EthSigner } from '@aztec/ethereum/eth-signer';
|
|
2
|
+
import type { L1TxUtilsConfig } from '@aztec/ethereum/l1-tx-utils';
|
|
3
|
+
import type { ExtendedViemWalletClient, ViemClient } from '@aztec/ethereum/types';
|
|
2
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
3
5
|
import type { DateProvider } from '@aztec/foundation/timer';
|
|
4
6
|
import type { DataStoreConfig } from '@aztec/kv-store/config';
|
|
@@ -16,7 +18,7 @@ export declare function createL1TxUtilsWithBlobsFromViemWallet(clients: Extended
|
|
|
16
18
|
dateProvider?: DateProvider;
|
|
17
19
|
}): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").L1TxUtilsWithBlobs[]>;
|
|
18
20
|
/**
|
|
19
|
-
* Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics.
|
|
21
|
+
* Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics. Removes duplicates
|
|
20
22
|
*/
|
|
21
23
|
export declare function createL1TxUtilsWithBlobsFromEthSigner(client: ViemClient, signers: EthSigner[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
|
|
22
24
|
debugMaxGasLimit?: boolean;
|
|
@@ -37,9 +39,9 @@ export declare function createL1TxUtilsFromViemWalletWithStore(clients: Extended
|
|
|
37
39
|
logger?: ReturnType<typeof createLogger>;
|
|
38
40
|
dateProvider?: DateProvider;
|
|
39
41
|
scope?: L1TxScope;
|
|
40
|
-
}): Promise<import("@aztec/ethereum").L1TxUtils[]>;
|
|
42
|
+
}): Promise<import("@aztec/ethereum/l1-tx-utils").L1TxUtils[]>;
|
|
41
43
|
/**
|
|
42
|
-
* Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics.
|
|
44
|
+
* Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics. Removes duplicates.
|
|
43
45
|
*/
|
|
44
46
|
export declare function createL1TxUtilsFromEthSignerWithStore(client: ViemClient, signers: EthSigner[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
|
|
45
47
|
debugMaxGasLimit?: boolean;
|
|
@@ -49,5 +51,29 @@ export declare function createL1TxUtilsFromEthSignerWithStore(client: ViemClient
|
|
|
49
51
|
logger?: ReturnType<typeof createLogger>;
|
|
50
52
|
dateProvider?: DateProvider;
|
|
51
53
|
scope?: L1TxScope;
|
|
52
|
-
}): Promise<import("@aztec/ethereum").L1TxUtils[]>;
|
|
53
|
-
|
|
54
|
+
}): Promise<import("@aztec/ethereum/l1-tx-utils").L1TxUtils[]>;
|
|
55
|
+
/**
|
|
56
|
+
* Creates ForwarderL1TxUtils from multiple Viem wallets, sharing store and metrics.
|
|
57
|
+
* This wraps all transactions through a forwarder contract for testing purposes.
|
|
58
|
+
*/
|
|
59
|
+
export declare function createForwarderL1TxUtilsFromViemWallet(clients: ExtendedViemWalletClient[], forwarderAddress: import('@aztec/foundation/eth-address').EthAddress, config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
|
|
60
|
+
debugMaxGasLimit?: boolean;
|
|
61
|
+
scope?: L1TxScope;
|
|
62
|
+
}, deps: {
|
|
63
|
+
telemetry: TelemetryClient;
|
|
64
|
+
logger?: ReturnType<typeof createLogger>;
|
|
65
|
+
dateProvider?: DateProvider;
|
|
66
|
+
}): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").ForwarderL1TxUtils[]>;
|
|
67
|
+
/**
|
|
68
|
+
* Creates ForwarderL1TxUtils from multiple EthSigners, sharing store and metrics.
|
|
69
|
+
* This wraps all transactions through a forwarder contract for testing purposes.
|
|
70
|
+
*/
|
|
71
|
+
export declare function createForwarderL1TxUtilsFromEthSigner(client: ViemClient, signers: EthSigner[], forwarderAddress: import('@aztec/foundation/eth-address').EthAddress, config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
|
|
72
|
+
debugMaxGasLimit?: boolean;
|
|
73
|
+
scope?: L1TxScope;
|
|
74
|
+
}, deps: {
|
|
75
|
+
telemetry: TelemetryClient;
|
|
76
|
+
logger?: ReturnType<typeof createLogger>;
|
|
77
|
+
dateProvider?: DateProvider;
|
|
78
|
+
}): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").ForwarderL1TxUtils[]>;
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfdXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mYWN0b3JpZXMvbDFfdHhfdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFLNUQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFPbkUsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbEYsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBK0I3RDs7R0FFRztBQUNILHdCQUFzQixzQ0FBc0MsQ0FDMUQsT0FBTyxFQUFFLHdCQUF3QixFQUFFLEVBQ25DLE1BQU0sRUFBRSxlQUFlLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxHQUFHO0lBQUUsZ0JBQWdCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFBQyxLQUFLLENBQUMsRUFBRSxTQUFTLENBQUE7Q0FBRSxFQUN0RyxJQUFJLEVBQUU7SUFDSixTQUFTLEVBQUUsZUFBZSxDQUFDO0lBQzNCLE1BQU0sQ0FBQyxFQUFFLFVBQVUsQ0FBQyxPQUFPLFlBQVksQ0FBQyxDQUFDO0lBQ3pDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQztDQUM3QixrRkFPRjtBQUVEOztHQUVHO0FBQ0gsd0JBQXNCLHFDQUFxQyxDQUN6RCxNQUFNLEVBQUUsVUFBVSxFQUNsQixPQUFPLEVBQUUsU0FB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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"l1_tx_utils.d.ts","sourceRoot":"","sources":["../../src/factories/l1_tx_utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"l1_tx_utils.d.ts","sourceRoot":"","sources":["../../src/factories/l1_tx_utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { createL1TxUtilsFromEthSigner as createL1TxUtilsFromEthSignerBase, createL1TxUtilsFromViemWallet as createL1TxUtilsFromViemWalletBase } from '@aztec/ethereum';
|
|
2
|
-
import { createL1TxUtilsWithBlobsFromEthSigner as createL1TxUtilsWithBlobsFromEthSignerBase, createL1TxUtilsWithBlobsFromViemWallet as createL1TxUtilsWithBlobsFromViemWalletBase } from '@aztec/ethereum/l1-tx-utils-with-blobs';
|
|
1
|
+
import { createL1TxUtilsFromEthSigner as createL1TxUtilsFromEthSignerBase, createL1TxUtilsFromViemWallet as createL1TxUtilsFromViemWalletBase } from '@aztec/ethereum/l1-tx-utils';
|
|
2
|
+
import { createForwarderL1TxUtilsFromEthSigner as createForwarderL1TxUtilsFromEthSignerBase, createForwarderL1TxUtilsFromViemWallet as createForwarderL1TxUtilsFromViemWalletBase, createL1TxUtilsWithBlobsFromEthSigner as createL1TxUtilsWithBlobsFromEthSignerBase, createL1TxUtilsWithBlobsFromViemWallet as createL1TxUtilsWithBlobsFromViemWalletBase } from '@aztec/ethereum/l1-tx-utils-with-blobs';
|
|
3
3
|
import { omit } from '@aztec/foundation/collection';
|
|
4
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
5
5
|
import { createStore } from '@aztec/kv-store/lmdb-v2';
|
|
@@ -31,10 +31,23 @@ const L1_TX_STORE_NAME = 'l1-tx-utils';
|
|
|
31
31
|
return clients.map((client)=>createL1TxUtilsWithBlobsFromViemWalletBase(client, sharedDeps, config, config.debugMaxGasLimit));
|
|
32
32
|
}
|
|
33
33
|
/**
|
|
34
|
-
* Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics.
|
|
34
|
+
* Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics. Removes duplicates
|
|
35
35
|
*/ export async function createL1TxUtilsWithBlobsFromEthSigner(client, signers, config, deps) {
|
|
36
36
|
const sharedDeps = await createSharedDeps(config, deps);
|
|
37
|
-
|
|
37
|
+
// Deduplicate signers by address to avoid creating multiple L1TxUtils instances
|
|
38
|
+
// for the same publisher address (e.g., when multiple attesters share the same publisher key)
|
|
39
|
+
const signersByAddress = new Map();
|
|
40
|
+
for (const signer of signers){
|
|
41
|
+
const addressKey = signer.address.toString().toLowerCase();
|
|
42
|
+
if (!signersByAddress.has(addressKey)) {
|
|
43
|
+
signersByAddress.set(addressKey, signer);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
const uniqueSigners = Array.from(signersByAddress.values());
|
|
47
|
+
if (uniqueSigners.length < signers.length) {
|
|
48
|
+
sharedDeps.logger.info(`Deduplicated ${signers.length} signers to ${uniqueSigners.length} unique publisher addresses`);
|
|
49
|
+
}
|
|
50
|
+
return uniqueSigners.map((signer)=>createL1TxUtilsWithBlobsFromEthSignerBase(client, signer, sharedDeps, config, config.debugMaxGasLimit));
|
|
38
51
|
}
|
|
39
52
|
/**
|
|
40
53
|
* Creates L1TxUtils (without blobs) from multiple Viem wallets, sharing store and metrics.
|
|
@@ -43,8 +56,35 @@ const L1_TX_STORE_NAME = 'l1-tx-utils';
|
|
|
43
56
|
return clients.map((client)=>createL1TxUtilsFromViemWalletBase(client, sharedDeps, config));
|
|
44
57
|
}
|
|
45
58
|
/**
|
|
46
|
-
* Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics.
|
|
59
|
+
* Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics. Removes duplicates.
|
|
47
60
|
*/ export async function createL1TxUtilsFromEthSignerWithStore(client, signers, config, deps) {
|
|
48
61
|
const sharedDeps = await createSharedDeps(config, deps);
|
|
49
|
-
|
|
62
|
+
// Deduplicate signers by address to avoid creating multiple L1TxUtils instances
|
|
63
|
+
// for the same publisher address (e.g., when multiple attesters share the same publisher key)
|
|
64
|
+
const signersByAddress = new Map();
|
|
65
|
+
for (const signer of signers){
|
|
66
|
+
const addressKey = signer.address.toString().toLowerCase();
|
|
67
|
+
if (!signersByAddress.has(addressKey)) {
|
|
68
|
+
signersByAddress.set(addressKey, signer);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
const uniqueSigners = Array.from(signersByAddress.values());
|
|
72
|
+
if (uniqueSigners.length < signers.length) {
|
|
73
|
+
sharedDeps.logger.info(`Deduplicated ${signers.length} signers to ${uniqueSigners.length} unique publisher addresses`);
|
|
74
|
+
}
|
|
75
|
+
return uniqueSigners.map((signer)=>createL1TxUtilsFromEthSignerBase(client, signer, sharedDeps, config));
|
|
76
|
+
}
|
|
77
|
+
/**
|
|
78
|
+
* Creates ForwarderL1TxUtils from multiple Viem wallets, sharing store and metrics.
|
|
79
|
+
* This wraps all transactions through a forwarder contract for testing purposes.
|
|
80
|
+
*/ export async function createForwarderL1TxUtilsFromViemWallet(clients, forwarderAddress, config, deps) {
|
|
81
|
+
const sharedDeps = await createSharedDeps(config, deps);
|
|
82
|
+
return clients.map((client)=>createForwarderL1TxUtilsFromViemWalletBase(client, forwarderAddress, sharedDeps, config, config.debugMaxGasLimit));
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* Creates ForwarderL1TxUtils from multiple EthSigners, sharing store and metrics.
|
|
86
|
+
* This wraps all transactions through a forwarder contract for testing purposes.
|
|
87
|
+
*/ export async function createForwarderL1TxUtilsFromEthSigner(client, signers, forwarderAddress, config, deps) {
|
|
88
|
+
const sharedDeps = await createSharedDeps(config, deps);
|
|
89
|
+
return signers.map((signer)=>createForwarderL1TxUtilsFromEthSignerBase(client, signer, forwarderAddress, sharedDeps, config, config.debugMaxGasLimit));
|
|
50
90
|
}
|
package/dest/metrics/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export * from './l1_tx_metrics.js';
|
|
2
|
-
//# sourceMappingURL=
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tZXRyaWNzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUMifQ==
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { IL1TxMetrics, L1TxState } from '@aztec/ethereum';
|
|
1
|
+
import type { IL1TxMetrics, L1TxState } from '@aztec/ethereum/l1-tx-utils';
|
|
2
2
|
import { type Meter } from '@aztec/telemetry-client';
|
|
3
3
|
export type L1TxScope = 'sequencer' | 'prover' | 'other';
|
|
4
4
|
/**
|
|
@@ -26,4 +26,4 @@ export declare class L1TxMetrics implements IL1TxMetrics {
|
|
|
26
26
|
recordMinedTx(state: L1TxState, l1Timestamp: Date): void;
|
|
27
27
|
recordDroppedTx(state: L1TxState): void;
|
|
28
28
|
}
|
|
29
|
-
//# sourceMappingURL=
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfbWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21ldHJpY3MvbDFfdHhfbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHM0UsT0FBTyxFQUdMLEtBQUssS0FBSyxFQUlYLE1BQU0seUJBQXlCLENBQUM7QUFFakMsTUFBTSxNQUFNLFNBQVMsR0FBRyxXQUFXLEdBQUcsUUFBUSxHQUFHLE9BQU8sQ0FBQztBQUV6RDs7R0FFRztBQUNILHFCQUFhLFdBQVksWUFBVyxZQUFZO0lBbUI1QyxPQUFPLENBQUMsS0FBSztJQUNiLE9BQU8sQ0FBQyxLQUFLO0lBQ2IsT0FBTyxDQUFDLE1BQU07SUFuQmhCLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFHbkMsT0FBTyxDQUFDLG9CQUFvQixDQUFZO0lBR3hDLE9BQU8sQ0FBQyxZQUFZLENBQWdCO0lBQ3BDLE9BQU8sQ0FBQyxlQUFlLENBQWdCO0lBQ3ZDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBZ0I7SUFDeEMsT0FBTyxDQUFDLGVBQWUsQ0FBZ0I7SUFHdkMsT0FBTyxDQUFDLHVCQUF1QixDQUFZO0lBQzNDLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFDbkMsT0FBTyxDQUFDLGdCQUFnQixDQUFZO0lBRXBDLFlBQ1UsS0FBSyxFQUFFLEtBQUssRUFDWixLQUFLLEdBQUUsU0FBbUIsRUFDMUIsTUFBTSx5Q0FBc0MsRUFtRHJEO0lBRUQ7Ozs7T0FJRztJQUNJLGFBQWEsQ0FBQyxLQUFLLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFBRSxJQUFJLEdBQUcsSUFBSSxDQW9EOUQ7SUFFTSxlQUFlLENBQUMsS0FBSyxFQUFFLFNBQVMsR0FBRyxJQUFJLENBaUI3QztDQUNGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"l1_tx_metrics.d.ts","sourceRoot":"","sources":["../../src/metrics/l1_tx_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"l1_tx_metrics.d.ts","sourceRoot":"","sources":["../../src/metrics/l1_tx_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAG3E,OAAO,EAGL,KAAK,KAAK,EAIX,MAAM,yBAAyB,CAAC;AAEjC,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,OAAO,CAAC;AAEzD;;GAEG;AACH,qBAAa,WAAY,YAAW,YAAY;IAmB5C,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,MAAM;IAnBhB,OAAO,CAAC,eAAe,CAAY;IAGnC,OAAO,CAAC,oBAAoB,CAAY;IAGxC,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,eAAe,CAAgB;IACvC,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,eAAe,CAAgB;IAGvC,OAAO,CAAC,uBAAuB,CAAY;IAC3C,OAAO,CAAC,eAAe,CAAY;IACnC,OAAO,CAAC,gBAAgB,CAAY;IAEpC,YACU,KAAK,EAAE,KAAK,EACZ,KAAK,GAAE,SAAmB,EAC1B,MAAM,yCAAsC,EAmDrD;IAED;;;;OAIG;IACI,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,GAAG,IAAI,CAoD9D;IAEM,eAAe,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAiB7C;CACF"}
|
package/dest/stores/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export * from './l1_tx_store.js';
|
|
2
|
-
//# sourceMappingURL=
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yZXMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxrQkFBa0IsQ0FBQyJ9
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { IL1TxStore, L1BlobInputs, L1TxState } from '@aztec/ethereum';
|
|
1
|
+
import type { IL1TxStore, L1BlobInputs, L1TxState } from '@aztec/ethereum/l1-tx-utils';
|
|
2
2
|
import type { Logger } from '@aztec/foundation/log';
|
|
3
3
|
import type { AztecAsyncKVStore } from '@aztec/kv-store';
|
|
4
4
|
/**
|
|
@@ -9,7 +9,7 @@ import type { AztecAsyncKVStore } from '@aztec/kv-store';
|
|
|
9
9
|
export declare class L1TxStore implements IL1TxStore {
|
|
10
10
|
private readonly store;
|
|
11
11
|
private readonly log;
|
|
12
|
-
static readonly SCHEMA_VERSION
|
|
12
|
+
static readonly SCHEMA_VERSION: number;
|
|
13
13
|
private readonly states;
|
|
14
14
|
private readonly blobs;
|
|
15
15
|
private readonly stateIdCounter;
|
|
@@ -54,7 +54,7 @@ export declare class L1TxStore implements IL1TxStore {
|
|
|
54
54
|
* @param account - The sender account address
|
|
55
55
|
* @param stateId - The state ID to delete
|
|
56
56
|
*/
|
|
57
|
-
deleteState(account: string,
|
|
57
|
+
deleteState(account: string, ...stateIds: number[]): Promise<void>;
|
|
58
58
|
/**
|
|
59
59
|
* Clears all transaction states for a specific account.
|
|
60
60
|
* @param account - The sender account address
|
|
@@ -86,4 +86,4 @@ export declare class L1TxStore implements IL1TxStore {
|
|
|
86
86
|
*/
|
|
87
87
|
private deserializeBlobInputs;
|
|
88
88
|
}
|
|
89
|
-
//# sourceMappingURL=
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yZXMvbDFfdHhfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBYyxTQUFTLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVuRyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQTJFeEU7Ozs7R0FJRztBQUNILHFCQUFhLFNBQVUsWUFBVyxVQUFVO0lBUXhDLE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSztJQUN0QixPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUc7SUFSdEIsZ0JBQXVCLGNBQWMsU0FBSztJQUUxQyxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBZ0M7SUFDdkQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQWdDO0lBQ3RELE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFnQztJQUUvRCxZQUNtQixLQUFLLEVBQUUsaUJBQWlCLEVBQ3hCLEdBQUcsR0FBRSxNQUEwQyxFQUtqRTtJQUVEOztPQUVHO0lBQ0ksa0JBQWtCLENBQUMsT0FBTyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBTzFEO0lBRUQ7O09BRUc7SUFDSCxPQUFPLENBQUMsT0FBTztJQUlmOzs7OztPQUtHO0lBQ1UsU0FBUyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBUTVFO0lBRUQ7Ozs7O09BS0c7SUFDVSxTQUFTLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxZQUFZLEdBQUcsU0FBUyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FRNUc7SUFFRDs7OztPQUlHO0lBQ1UsVUFBVSxDQUFDLE9BQU8sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLFNBQVMsRUFBRSxDQUFDLENBb0M3RDtJQUVEOzs7OztPQUtHO0lBQ1UsU0FBUyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQyxDQTBCdkY7SUFFRDs7OztPQUlHO0lBQ1UsV0FBVyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsR0FBRyxRQUFRLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVk5RTtJQUVEOzs7T0FHRztJQUNVLFdBQVcsQ0FBQyxPQUFPLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FXdkQ7SUFFRDs7O09BR0c7SUFDVSxjQUFjLElBQUksT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBUy9DO0lBRUQ7O09BRUc7SUFDVSxLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUdsQztJQUVEOztPQUVHO0lBQ0gsT0FBTyxDQUFDLGNBQWM7SUFrQ3RCOztPQUVHO0lBQ0gsT0FBTyxDQUFDLGdCQUFnQjtJQTJDeEI7O09BRUc7SUFDSCxPQUFPLENBQUMsbUJBQW1CO0lBTzNCOztPQUVHO0lBQ0gsT0FBTyxDQUFDLHFCQUFxQjtDQVk5QiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"l1_tx_store.d.ts","sourceRoot":"","sources":["../../src/stores/l1_tx_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAc,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"l1_tx_store.d.ts","sourceRoot":"","sources":["../../src/stores/l1_tx_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAc,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAEnG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AA2ExE;;;;GAIG;AACH,qBAAa,SAAU,YAAW,UAAU;IAQxC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,GAAG;IARtB,gBAAuB,cAAc,SAAK;IAE1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgC;IACvD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgC;IACtD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgC;IAE/D,YACmB,KAAK,EAAE,iBAAiB,EACxB,GAAG,GAAE,MAA0C,EAKjE;IAED;;OAEG;IACI,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO1D;IAED;;OAEG;IACH,OAAO,CAAC,OAAO;IAIf;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAQ5E;IAED;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ5G;IAED;;;;OAIG;IACU,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAoC7D;IAED;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CA0BvF;IAED;;;;OAIG;IACU,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAY9E;IAED;;;OAGG;IACU,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWvD;IAED;;;OAGG;IACU,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAS/C;IAED;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAGlC;IAED;;OAEG;IACH,OAAO,CAAC,cAAc;IAkCtB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IA2CxB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAO3B;;OAEG;IACH,OAAO,CAAC,qBAAqB;CAY9B"}
|
|
@@ -134,22 +134,30 @@ import { createLogger } from '@aztec/foundation/log';
|
|
|
134
134
|
* Deletes a specific state and its associated blobs.
|
|
135
135
|
* @param account - The sender account address
|
|
136
136
|
* @param stateId - The state ID to delete
|
|
137
|
-
*/ async deleteState(account,
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
this.
|
|
137
|
+
*/ async deleteState(account, ...stateIds) {
|
|
138
|
+
if (stateIds.length === 0) {
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
141
|
+
await this.store.transactionAsync(async ()=>{
|
|
142
|
+
for (const stateId of stateIds){
|
|
143
|
+
const key = this.makeKey(account, stateId);
|
|
144
|
+
await this.states.delete(key);
|
|
145
|
+
await this.blobs.delete(key);
|
|
146
|
+
}
|
|
147
|
+
});
|
|
142
148
|
}
|
|
143
149
|
/**
|
|
144
150
|
* Clears all transaction states for a specific account.
|
|
145
151
|
* @param account - The sender account address
|
|
146
152
|
*/ async clearStates(account) {
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
+
await this.store.transactionAsync(async ()=>{
|
|
154
|
+
const states = await this.loadStates(account);
|
|
155
|
+
for (const state of states){
|
|
156
|
+
await this.deleteState(account, state.id);
|
|
157
|
+
}
|
|
158
|
+
await this.stateIdCounter.delete(account);
|
|
159
|
+
this.log.info(`Cleared all tx states for account ${account}`);
|
|
160
|
+
});
|
|
153
161
|
}
|
|
154
162
|
/**
|
|
155
163
|
* Gets all accounts that have stored states.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/node-lib",
|
|
3
|
-
"version": "3.0.0-devnet.
|
|
3
|
+
"version": "3.0.0-devnet.6-patch.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
"./actions": "./dest/actions/index.js",
|
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
"../package.common.json"
|
|
14
14
|
],
|
|
15
15
|
"scripts": {
|
|
16
|
-
"build": "yarn clean && tsc
|
|
17
|
-
"build:dev": "tsc
|
|
16
|
+
"build": "yarn clean && ../scripts/tsc.sh",
|
|
17
|
+
"build:dev": "../scripts/tsc.sh --watch",
|
|
18
18
|
"clean": "rm -rf ./dest .tsbuildinfo",
|
|
19
19
|
"bb": "node --no-warnings ./dest/bb/index.js",
|
|
20
20
|
"test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
|
|
@@ -57,35 +57,38 @@
|
|
|
57
57
|
]
|
|
58
58
|
},
|
|
59
59
|
"dependencies": {
|
|
60
|
-
"@aztec/archiver": "3.0.0-devnet.
|
|
61
|
-
"@aztec/bb-prover": "3.0.0-devnet.
|
|
62
|
-
"@aztec/blob-sink": "3.0.0-devnet.
|
|
63
|
-
"@aztec/constants": "3.0.0-devnet.
|
|
64
|
-
"@aztec/epoch-cache": "3.0.0-devnet.
|
|
65
|
-
"@aztec/ethereum": "3.0.0-devnet.
|
|
66
|
-
"@aztec/foundation": "3.0.0-devnet.
|
|
67
|
-
"@aztec/kv-store": "3.0.0-devnet.
|
|
68
|
-
"@aztec/merkle-tree": "3.0.0-devnet.
|
|
69
|
-
"@aztec/p2p": "3.0.0-devnet.
|
|
70
|
-
"@aztec/protocol-contracts": "3.0.0-devnet.
|
|
71
|
-
"@aztec/prover-client": "3.0.0-devnet.
|
|
72
|
-
"@aztec/sequencer-client": "3.0.0-devnet.
|
|
73
|
-
"@aztec/simulator": "3.0.0-devnet.
|
|
74
|
-
"@aztec/stdlib": "3.0.0-devnet.
|
|
75
|
-
"@aztec/telemetry-client": "3.0.0-devnet.
|
|
76
|
-
"@aztec/validator-client": "3.0.0-devnet.
|
|
77
|
-
"@aztec/world-state": "3.0.0-devnet.
|
|
60
|
+
"@aztec/archiver": "3.0.0-devnet.6-patch.1",
|
|
61
|
+
"@aztec/bb-prover": "3.0.0-devnet.6-patch.1",
|
|
62
|
+
"@aztec/blob-sink": "3.0.0-devnet.6-patch.1",
|
|
63
|
+
"@aztec/constants": "3.0.0-devnet.6-patch.1",
|
|
64
|
+
"@aztec/epoch-cache": "3.0.0-devnet.6-patch.1",
|
|
65
|
+
"@aztec/ethereum": "3.0.0-devnet.6-patch.1",
|
|
66
|
+
"@aztec/foundation": "3.0.0-devnet.6-patch.1",
|
|
67
|
+
"@aztec/kv-store": "3.0.0-devnet.6-patch.1",
|
|
68
|
+
"@aztec/merkle-tree": "3.0.0-devnet.6-patch.1",
|
|
69
|
+
"@aztec/p2p": "3.0.0-devnet.6-patch.1",
|
|
70
|
+
"@aztec/protocol-contracts": "3.0.0-devnet.6-patch.1",
|
|
71
|
+
"@aztec/prover-client": "3.0.0-devnet.6-patch.1",
|
|
72
|
+
"@aztec/sequencer-client": "3.0.0-devnet.6-patch.1",
|
|
73
|
+
"@aztec/simulator": "3.0.0-devnet.6-patch.1",
|
|
74
|
+
"@aztec/stdlib": "3.0.0-devnet.6-patch.1",
|
|
75
|
+
"@aztec/telemetry-client": "3.0.0-devnet.6-patch.1",
|
|
76
|
+
"@aztec/validator-client": "3.0.0-devnet.6-patch.1",
|
|
77
|
+
"@aztec/world-state": "3.0.0-devnet.6-patch.1",
|
|
78
78
|
"tslib": "^2.4.0"
|
|
79
79
|
},
|
|
80
80
|
"devDependencies": {
|
|
81
|
-
"@aztec/blob-lib": "3.0.0-devnet.
|
|
81
|
+
"@aztec/blob-lib": "3.0.0-devnet.6-patch.1",
|
|
82
|
+
"@aztec/node-keystore": "3.0.0-devnet.6-patch.1",
|
|
82
83
|
"@jest/globals": "^30.0.0",
|
|
83
84
|
"@types/jest": "^30.0.0",
|
|
84
85
|
"@types/node": "^22.15.17",
|
|
86
|
+
"@typescript/native-preview": "7.0.0-dev.20251126.1",
|
|
85
87
|
"jest": "^30.0.0",
|
|
86
88
|
"jest-mock-extended": "^4.0.0",
|
|
87
89
|
"ts-node": "^10.9.1",
|
|
88
|
-
"typescript": "^5.3.3"
|
|
90
|
+
"typescript": "^5.3.3",
|
|
91
|
+
"viem": "npm:@aztec/viem@2.38.2"
|
|
89
92
|
},
|
|
90
93
|
"files": [
|
|
91
94
|
"dest",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ARCHIVER_DB_VERSION, ARCHIVER_STORE_NAME, type ArchiverConfig, createArchiverStore } from '@aztec/archiver';
|
|
2
2
|
import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
|
|
3
|
-
import { type EthereumClientConfig, getPublicClient } from '@aztec/ethereum';
|
|
3
|
+
import { type EthereumClientConfig, getPublicClient } from '@aztec/ethereum/client';
|
|
4
4
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
5
5
|
import { tryRmDir } from '@aztec/foundation/fs';
|
|
6
6
|
import type { Logger } from '@aztec/foundation/log';
|
|
@@ -163,7 +163,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
|
|
|
163
163
|
}
|
|
164
164
|
|
|
165
165
|
if (snapshotCandidates.length === 0) {
|
|
166
|
-
log.verbose(`No valid snapshots found from any URL
|
|
166
|
+
log.verbose(`No valid snapshots found from any URL, skipping snapshot sync`, { ...indexMetadata, snapshotsUrls });
|
|
167
167
|
return false;
|
|
168
168
|
}
|
|
169
169
|
|
|
@@ -190,7 +190,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
|
|
|
190
190
|
});
|
|
191
191
|
return true;
|
|
192
192
|
} catch (err) {
|
|
193
|
-
log.error(`Failed to download snapshot from ${url}
|
|
193
|
+
log.error(`Failed to download snapshot from ${url}, trying next candidate`, err, {
|
|
194
194
|
snapshot,
|
|
195
195
|
snapshotsUrl: url,
|
|
196
196
|
});
|
|
@@ -198,7 +198,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
|
|
|
198
198
|
}
|
|
199
199
|
}
|
|
200
200
|
|
|
201
|
-
log.error(`Failed to download snapshot from all URLs
|
|
201
|
+
log.error(`Failed to download snapshot from all URLs`, { snapshotsUrls });
|
|
202
202
|
return false;
|
|
203
203
|
}
|
|
204
204
|
|
package/src/config/index.ts
CHANGED
|
@@ -17,6 +17,11 @@ export type SharedNodeConfig = {
|
|
|
17
17
|
|
|
18
18
|
/** URL of the Web3Signer instance */
|
|
19
19
|
web3SignerUrl?: string;
|
|
20
|
+
/** Whether to run in fisherman mode */
|
|
21
|
+
fishermanMode?: boolean;
|
|
22
|
+
|
|
23
|
+
/** Force verification of tx Chonk proofs. Only used for testnet */
|
|
24
|
+
debugForceTxProofVerification: boolean;
|
|
20
25
|
};
|
|
21
26
|
|
|
22
27
|
export const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig> = {
|
|
@@ -61,4 +66,14 @@ export const sharedNodeConfigMappings: ConfigMappingsType<SharedNodeConfig> = {
|
|
|
61
66
|
description: 'URL of the Web3Signer instance',
|
|
62
67
|
parseEnv: (val: string) => val.trim(),
|
|
63
68
|
},
|
|
69
|
+
fishermanMode: {
|
|
70
|
+
env: 'FISHERMAN_MODE',
|
|
71
|
+
description: 'Whether to run in fisherman mode.',
|
|
72
|
+
...booleanConfigHelper(false),
|
|
73
|
+
},
|
|
74
|
+
debugForceTxProofVerification: {
|
|
75
|
+
env: 'DEBUG_FORCE_TX_PROOF_VERIFICATION',
|
|
76
|
+
description: 'Whether to force tx proof verification. Only has an effect if real proving is turned off',
|
|
77
|
+
...booleanConfigHelper(false),
|
|
78
|
+
},
|
|
64
79
|
};
|
|
@@ -1,12 +1,16 @@
|
|
|
1
|
+
import type { EthSigner } from '@aztec/ethereum/eth-signer';
|
|
1
2
|
import {
|
|
2
3
|
createL1TxUtilsFromEthSigner as createL1TxUtilsFromEthSignerBase,
|
|
3
4
|
createL1TxUtilsFromViemWallet as createL1TxUtilsFromViemWalletBase,
|
|
4
|
-
} from '@aztec/ethereum';
|
|
5
|
-
import type {
|
|
5
|
+
} from '@aztec/ethereum/l1-tx-utils';
|
|
6
|
+
import type { L1TxUtilsConfig } from '@aztec/ethereum/l1-tx-utils';
|
|
6
7
|
import {
|
|
8
|
+
createForwarderL1TxUtilsFromEthSigner as createForwarderL1TxUtilsFromEthSignerBase,
|
|
9
|
+
createForwarderL1TxUtilsFromViemWallet as createForwarderL1TxUtilsFromViemWalletBase,
|
|
7
10
|
createL1TxUtilsWithBlobsFromEthSigner as createL1TxUtilsWithBlobsFromEthSignerBase,
|
|
8
11
|
createL1TxUtilsWithBlobsFromViemWallet as createL1TxUtilsWithBlobsFromViemWalletBase,
|
|
9
12
|
} from '@aztec/ethereum/l1-tx-utils-with-blobs';
|
|
13
|
+
import type { ExtendedViemWalletClient, ViemClient } from '@aztec/ethereum/types';
|
|
10
14
|
import { omit } from '@aztec/foundation/collection';
|
|
11
15
|
import { createLogger } from '@aztec/foundation/log';
|
|
12
16
|
import type { DateProvider } from '@aztec/foundation/timer';
|
|
@@ -65,7 +69,7 @@ export async function createL1TxUtilsWithBlobsFromViemWallet(
|
|
|
65
69
|
}
|
|
66
70
|
|
|
67
71
|
/**
|
|
68
|
-
* Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics.
|
|
72
|
+
* Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics. Removes duplicates
|
|
69
73
|
*/
|
|
70
74
|
export async function createL1TxUtilsWithBlobsFromEthSigner(
|
|
71
75
|
client: ViemClient,
|
|
@@ -79,7 +83,25 @@ export async function createL1TxUtilsWithBlobsFromEthSigner(
|
|
|
79
83
|
) {
|
|
80
84
|
const sharedDeps = await createSharedDeps(config, deps);
|
|
81
85
|
|
|
82
|
-
|
|
86
|
+
// Deduplicate signers by address to avoid creating multiple L1TxUtils instances
|
|
87
|
+
// for the same publisher address (e.g., when multiple attesters share the same publisher key)
|
|
88
|
+
const signersByAddress = new Map<string, EthSigner>();
|
|
89
|
+
for (const signer of signers) {
|
|
90
|
+
const addressKey = signer.address.toString().toLowerCase();
|
|
91
|
+
if (!signersByAddress.has(addressKey)) {
|
|
92
|
+
signersByAddress.set(addressKey, signer);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
const uniqueSigners = Array.from(signersByAddress.values());
|
|
97
|
+
|
|
98
|
+
if (uniqueSigners.length < signers.length) {
|
|
99
|
+
sharedDeps.logger.info(
|
|
100
|
+
`Deduplicated ${signers.length} signers to ${uniqueSigners.length} unique publisher addresses`,
|
|
101
|
+
);
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
return uniqueSigners.map(signer =>
|
|
83
105
|
createL1TxUtilsWithBlobsFromEthSignerBase(client, signer, sharedDeps, config, config.debugMaxGasLimit),
|
|
84
106
|
);
|
|
85
107
|
}
|
|
@@ -103,7 +125,7 @@ export async function createL1TxUtilsFromViemWalletWithStore(
|
|
|
103
125
|
}
|
|
104
126
|
|
|
105
127
|
/**
|
|
106
|
-
* Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics.
|
|
128
|
+
* Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics. Removes duplicates.
|
|
107
129
|
*/
|
|
108
130
|
export async function createL1TxUtilsFromEthSignerWithStore(
|
|
109
131
|
client: ViemClient,
|
|
@@ -118,5 +140,73 @@ export async function createL1TxUtilsFromEthSignerWithStore(
|
|
|
118
140
|
) {
|
|
119
141
|
const sharedDeps = await createSharedDeps(config, deps);
|
|
120
142
|
|
|
121
|
-
|
|
143
|
+
// Deduplicate signers by address to avoid creating multiple L1TxUtils instances
|
|
144
|
+
// for the same publisher address (e.g., when multiple attesters share the same publisher key)
|
|
145
|
+
const signersByAddress = new Map<string, EthSigner>();
|
|
146
|
+
for (const signer of signers) {
|
|
147
|
+
const addressKey = signer.address.toString().toLowerCase();
|
|
148
|
+
if (!signersByAddress.has(addressKey)) {
|
|
149
|
+
signersByAddress.set(addressKey, signer);
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
const uniqueSigners = Array.from(signersByAddress.values());
|
|
154
|
+
|
|
155
|
+
if (uniqueSigners.length < signers.length) {
|
|
156
|
+
sharedDeps.logger.info(
|
|
157
|
+
`Deduplicated ${signers.length} signers to ${uniqueSigners.length} unique publisher addresses`,
|
|
158
|
+
);
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
return uniqueSigners.map(signer => createL1TxUtilsFromEthSignerBase(client, signer, sharedDeps, config));
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
/**
|
|
165
|
+
* Creates ForwarderL1TxUtils from multiple Viem wallets, sharing store and metrics.
|
|
166
|
+
* This wraps all transactions through a forwarder contract for testing purposes.
|
|
167
|
+
*/
|
|
168
|
+
export async function createForwarderL1TxUtilsFromViemWallet(
|
|
169
|
+
clients: ExtendedViemWalletClient[],
|
|
170
|
+
forwarderAddress: import('@aztec/foundation/eth-address').EthAddress,
|
|
171
|
+
config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
|
|
172
|
+
deps: {
|
|
173
|
+
telemetry: TelemetryClient;
|
|
174
|
+
logger?: ReturnType<typeof createLogger>;
|
|
175
|
+
dateProvider?: DateProvider;
|
|
176
|
+
},
|
|
177
|
+
) {
|
|
178
|
+
const sharedDeps = await createSharedDeps(config, deps);
|
|
179
|
+
|
|
180
|
+
return clients.map(client =>
|
|
181
|
+
createForwarderL1TxUtilsFromViemWalletBase(client, forwarderAddress, sharedDeps, config, config.debugMaxGasLimit),
|
|
182
|
+
);
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
/**
|
|
186
|
+
* Creates ForwarderL1TxUtils from multiple EthSigners, sharing store and metrics.
|
|
187
|
+
* This wraps all transactions through a forwarder contract for testing purposes.
|
|
188
|
+
*/
|
|
189
|
+
export async function createForwarderL1TxUtilsFromEthSigner(
|
|
190
|
+
client: ViemClient,
|
|
191
|
+
signers: EthSigner[],
|
|
192
|
+
forwarderAddress: import('@aztec/foundation/eth-address').EthAddress,
|
|
193
|
+
config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
|
|
194
|
+
deps: {
|
|
195
|
+
telemetry: TelemetryClient;
|
|
196
|
+
logger?: ReturnType<typeof createLogger>;
|
|
197
|
+
dateProvider?: DateProvider;
|
|
198
|
+
},
|
|
199
|
+
) {
|
|
200
|
+
const sharedDeps = await createSharedDeps(config, deps);
|
|
201
|
+
|
|
202
|
+
return signers.map(signer =>
|
|
203
|
+
createForwarderL1TxUtilsFromEthSignerBase(
|
|
204
|
+
client,
|
|
205
|
+
signer,
|
|
206
|
+
forwarderAddress,
|
|
207
|
+
sharedDeps,
|
|
208
|
+
config,
|
|
209
|
+
config.debugMaxGasLimit,
|
|
210
|
+
),
|
|
211
|
+
);
|
|
122
212
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { IL1TxMetrics, L1TxState } from '@aztec/ethereum';
|
|
2
|
-
import { TxUtilsState } from '@aztec/ethereum';
|
|
1
|
+
import type { IL1TxMetrics, L1TxState } from '@aztec/ethereum/l1-tx-utils';
|
|
2
|
+
import { TxUtilsState } from '@aztec/ethereum/l1-tx-utils';
|
|
3
3
|
import { createLogger } from '@aztec/foundation/log';
|
|
4
4
|
import {
|
|
5
5
|
Attributes,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { IL1TxStore, L1BlobInputs, L1TxConfig, L1TxState } from '@aztec/ethereum';
|
|
1
|
+
import type { IL1TxStore, L1BlobInputs, L1TxConfig, L1TxState } from '@aztec/ethereum/l1-tx-utils';
|
|
2
2
|
import { jsonStringify } from '@aztec/foundation/json-rpc';
|
|
3
3
|
import type { Logger } from '@aztec/foundation/log';
|
|
4
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
@@ -231,11 +231,18 @@ export class L1TxStore implements IL1TxStore {
|
|
|
231
231
|
* @param account - The sender account address
|
|
232
232
|
* @param stateId - The state ID to delete
|
|
233
233
|
*/
|
|
234
|
-
public async deleteState(account: string,
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
234
|
+
public async deleteState(account: string, ...stateIds: number[]): Promise<void> {
|
|
235
|
+
if (stateIds.length === 0) {
|
|
236
|
+
return;
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
await this.store.transactionAsync(async () => {
|
|
240
|
+
for (const stateId of stateIds) {
|
|
241
|
+
const key = this.makeKey(account, stateId);
|
|
242
|
+
await this.states.delete(key);
|
|
243
|
+
await this.blobs.delete(key);
|
|
244
|
+
}
|
|
245
|
+
});
|
|
239
246
|
}
|
|
240
247
|
|
|
241
248
|
/**
|
|
@@ -243,14 +250,16 @@ export class L1TxStore implements IL1TxStore {
|
|
|
243
250
|
* @param account - The sender account address
|
|
244
251
|
*/
|
|
245
252
|
public async clearStates(account: string): Promise<void> {
|
|
246
|
-
|
|
253
|
+
await this.store.transactionAsync(async () => {
|
|
254
|
+
const states = await this.loadStates(account);
|
|
247
255
|
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
256
|
+
for (const state of states) {
|
|
257
|
+
await this.deleteState(account, state.id);
|
|
258
|
+
}
|
|
251
259
|
|
|
252
|
-
|
|
253
|
-
|
|
260
|
+
await this.stateIdCounter.delete(account);
|
|
261
|
+
this.log.info(`Cleared all tx states for account ${account}`);
|
|
262
|
+
});
|
|
254
263
|
}
|
|
255
264
|
|
|
256
265
|
/**
|