@aztec/aztec-faucet 0.0.0-test.1 → 0.0.1-commit.03f7ef2

package/dest/bin/index.d.ts

@@ -1,3 +1,3 @@
 #!/usr/bin/env -S node --no-warnings
 export {};
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iaW4vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/dest/config.d.ts

@@ -1,17 +1,17 @@
-import { type L1ReaderConfig } from '@aztec/ethereum';
-import { type ConfigMappingsType } from '@aztec/foundation/config';
+import { type L1ReaderConfig } from '@aztec/ethereum/l1-reader';
+import { type ConfigMappingsType, SecretValue } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 export type L1AssetConfig = {
     address: EthAddress;
     amount: bigint;
 };
 export type FaucetConfig = L1ReaderConfig & {
-    l1Mnemonic: string;
-    mnemonicAccountIndex: number;
+    l1Mnemonic?: SecretValue<string>;
+    mnemonicAddressIndex: number;
     interval: number;
     ethAmount: string;
     l1Assets: L1AssetConfig[];
 };
 export declare const faucetConfigMapping: ConfigMappingsType<FaucetConfig>;
 export declare function getFaucetConfigFromEnv(): FaucetConfig;
-//# sourceMappingURL=config.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBMEIsTUFBTSwyQkFBMkIsQ0FBQztBQUN4RixPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFDdkIsV0FBVyxFQUlaLE1BQU0sMEJBQTBCLENBQUM7QUFDbEMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTNELE1BQU0sTUFBTSxhQUFhLEdBQUc7SUFDMUIsT0FBTyxFQUFFLFVBQVUsQ0FBQztJQUNwQixNQUFNLEVBQUUsTUFBTSxDQUFDO0NBQ2hCLENBQUM7QUFFRixNQUFNLE1BQU0sWUFBWSxHQUFHLGNBQWMsR0FBRztJQUMxQyxVQUFVLENBQUMsRUFBRSxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDakMsb0JBQW9CLEVBQUUsTUFBTSxDQUFDO0lBQzdCLFFBQVEsRUFBRSxNQUFNLENBQUM7SUFDakIsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixRQUFRLEVBQUUsYUFBYSxFQUFFLENBQUM7Q0FDM0IsQ0FBQztBQUVGLGVBQU8sTUFBTSxtQkFBbUIsRUFBRSxrQkFBa0IsQ0FBQyxZQUFZLENBcUNoRSxDQUFDO0FBRUYsd0JBQWdCLHNCQUFzQixJQUFJLFlBQVksQ0FFckQifQ==

package/dest/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAC9G,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,UAAU,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,cAAc,GAAG;IAC1C,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,aAAa,EAAE,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,kBAAkB,CAAC,YAAY,CAoChE,CAAC;AAEF,wBAAgB,sBAAsB,IAAI,YAAY,CAErD"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,2BAA2B,CAAC;AACxF,OAAO,EACL,KAAK,kBAAkB,EACvB,WAAW,EAIZ,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,UAAU,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,cAAc,GAAG;IAC1C,UAAU,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,aAAa,EAAE,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,kBAAkB,CAAC,YAAY,CAqChE,CAAC;AAEF,wBAAgB,sBAAsB,IAAI,YAAY,CAErD"}

package/dest/config.js

@@ -1,15 +1,16 @@
-import { l1ReaderConfigMappings } from '@aztec/ethereum';
-import { getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
+import { l1ReaderConfigMappings } from '@aztec/ethereum/l1-reader';
+import { getConfigFromMappings, numberConfigHelper, secretStringConfigHelper } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 export const faucetConfigMapping = {
     ...l1ReaderConfigMappings,
     l1Mnemonic: {
         env: 'MNEMONIC',
-        description: 'The mnemonic for the faucet account'
+        description: 'The mnemonic for the faucet account',
+        ...secretStringConfigHelper()
     },
-    mnemonicAccountIndex: {
-        env: 'FAUCET_MNEMONIC_ACCOUNT_INDEX',
-        description: 'The account to use',
+    mnemonicAddressIndex: {
+        env: 'FAUCET_MNEMONIC_ADDRESS_INDEX',
+        description: 'The address to use',
         ...numberConfigHelper(0)
     },
     interval: {

package/dest/faucet.d.ts

@@ -6,8 +6,7 @@ export declare class Faucet {
     private account;
     private timeFn;
     private log;
-    private walletClient;
-    private publicClient;
+    private l1Client;
     private dripHistory;
     private l1Assets;
     constructor(config: FaucetConfig, account: LocalAccount, timeFn?: () => number, log?: import("@aztec/foundation/log").Logger);
@@ -25,4 +24,4 @@ export declare class ThrottleError extends Error {
 export declare class UnknownAsset extends Error {
     constructor(asset: string);
 }
-//# sourceMappingURL=faucet.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmF1Y2V0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZmF1Y2V0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBSWhFLE9BQU8sRUFLTCxLQUFLLFlBQVksRUFJbEIsTUFBTSxNQUFNLENBQUM7QUFHZCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsYUFBYSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBTy9ELHFCQUFhLE1BQU07SUFPZixPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxPQUFPO0lBQ2YsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsR0FBRztJQVRiLE9BQU8sQ0FBQyxRQUFRLENBQTJCO0lBRTNDLE9BQU8sQ0FBQyxXQUFXLENBQTBDO0lBQzdELE9BQU8sQ0FBQyxRQUFRLENBQThCO0lBRTlDLFlBQ1UsTUFBTSxFQUFFLFlBQVksRUFDcEIsT0FBTyxFQUFFLFlBQVksRUFDckIsTUFBTSxHQUFFLE1BQU0sTUFBaUIsRUFDL0IsR0FBRyx5Q0FBK0IsRUFLM0M7SUFFRCxPQUFvQixNQUFNLENBQUMsTUFBTSxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBYWhFO0lBRU0sSUFBSSxDQUFDLEVBQUUsRUFBRSxVQUFVLEVBQUUsU0FBUyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBTTVEO0lBRVksT0FBTyxDQUFDLEVBQUUsRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVlsRDtJQUVZLFNBQVMsQ0FBQyxFQUFFLEVBQUUsVUFBVSxFQUFFLFNBQVMsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQWN2RTtJQUVZLFVBQVUsQ0FBQyxhQUFhLEVBQUUsYUFBYSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0F1Qm5FO0lBRUQsT0FBTyxDQUFDLGFBQWE7SUFhckIsT0FBTyxDQUFDLGNBQWM7Q0FTdkI7QUFFRCxxQkFBYSxhQUFjLFNBQVEsS0FBSztJQUN0QyxZQUFZLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFFekM7Q0FDRjtBQUVELHFCQUFhLFlBQWEsU0FBUSxLQUFLO0lBQ3JDLFlBQVksS0FBSyxFQUFFLE1BQU0sRUFFeEI7Q0FDRiJ9

package/dest/faucet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"faucet.d.ts","sourceRoot":"","sources":["../src/faucet.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAIhE,OAAO,EAKL,KAAK,YAAY,EAQlB,MAAM,MAAM,CAAC;AAGd,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAO/D,qBAAa,MAAM;IAQf,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,GAAG;IAVb,OAAO,CAAC,YAAY,CAAmB;IACvC,OAAO,CAAC,YAAY,CAAmB;IAEvC,OAAO,CAAC,WAAW,CAA0C;IAC7D,OAAO,CAAC,QAAQ,CAA8B;gBAGpC,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,YAAY,EACrB,MAAM,GAAE,MAAM,MAAiB,EAC/B,GAAG,yCAA+B;WAgBxB,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAe1D,IAAI,CAAC,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQhD,OAAO,CAAC,EAAE,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IActC,SAAS,CAAC,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB3D,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBpE,OAAO,CAAC,aAAa;IAarB,OAAO,CAAC,cAAc;CASvB;AAED,qBAAa,aAAc,SAAQ,KAAK;gBAC1B,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAG3C;AAED,qBAAa,YAAa,SAAQ,KAAK;gBACzB,KAAK,EAAE,MAAM;CAG1B"}
+{"version":3,"file":"faucet.d.ts","sourceRoot":"","sources":["../src/faucet.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAIhE,OAAO,EAKL,KAAK,YAAY,EAIlB,MAAM,MAAM,CAAC;AAGd,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAO/D,qBAAa,MAAM;IAOf,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,GAAG;IATb,OAAO,CAAC,QAAQ,CAA2B;IAE3C,OAAO,CAAC,WAAW,CAA0C;IAC7D,OAAO,CAAC,QAAQ,CAA8B;IAE9C,YACU,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,YAAY,EACrB,MAAM,GAAE,MAAM,MAAiB,EAC/B,GAAG,yCAA+B,EAK3C;IAED,OAAoB,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAahE;IAEM,IAAI,CAAC,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM5D;IAEY,OAAO,CAAC,EAAE,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAYlD;IAEY,SAAS,CAAC,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAcvE;IAEY,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBnE;IAED,OAAO,CAAC,aAAa;IAarB,OAAO,CAAC,cAAc;CASvB;AAED,qBAAa,aAAc,SAAQ,KAAK;IACtC,YAAY,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAEzC;CACF;AAED,qBAAa,YAAa,SAAQ,KAAK;IACrC,YAAY,KAAK,EAAE,MAAM,EAExB;CACF"}

package/dest/faucet.js

@@ -1,15 +1,15 @@
-import { createEthereumChain } from '@aztec/ethereum';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { createExtendedL1Client } from '@aztec/ethereum/client';
 import { createLogger } from '@aztec/foundation/log';
 import { TestERC20Abi } from '@aztec/l1-artifacts';
-import { createPublicClient, createWalletClient, fallback, getContract, parseEther, http as viemHttp } from 'viem';
+import { getContract, parseEther } from 'viem';
 import { mnemonicToAccount } from 'viem/accounts';
 export class Faucet {
     config;
     account;
     timeFn;
     log;
-    walletClient;
-    publicClient;
+    l1Client;
     dripHistory;
     l1Assets;
     constructor(config, account, timeFn = Date.now, log = createLogger('aztec:faucet')){
@@ -20,22 +20,14 @@ export class Faucet {
         this.dripHistory = new Map();
         this.l1Assets = new Map();
         const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
-        this.walletClient = createWalletClient({
-            account: this.account,
-            chain: chain.chainInfo,
-            transport: fallback(chain.rpcUrls.map((url)=>viemHttp(url)))
-        });
-        this.publicClient = createPublicClient({
-            chain: chain.chainInfo,
-            transport: fallback(chain.rpcUrls.map((url)=>viemHttp(url)))
-        });
+        this.l1Client = createExtendedL1Client(config.l1RpcUrls, this.account, chain.chainInfo);
     }
     static async create(config) {
-        if (!config.l1Mnemonic) {
+        if (!config.l1Mnemonic || !config.l1Mnemonic.getValue()) {
             throw new Error('Missing faucet mnemonic');
         }
-        const account = mnemonicToAccount(config.l1Mnemonic, {
-            addressIndex: config.mnemonicAccountIndex
+        const account = mnemonicToAccount(config.l1Mnemonic.getValue(), {
+            addressIndex: config.mnemonicAddressIndex
         });
         const faucet = new Faucet(config, account);
         for (const asset of config.l1Assets){
@@ -52,12 +44,12 @@ export class Faucet {
     }
     async sendEth(to) {
         this.checkThrottle(to, 'ETH');
-        const hash = await this.walletClient.sendTransaction({
+        const hash = await this.l1Client.sendTransaction({
             account: this.account,
             to: to.toString(),
             value: parseEther(this.config.ethAmount)
         });
-        await this.publicClient.waitForTransactionReceipt({
+        await this.l1Client.waitForTransactionReceipt({
             hash
         });
         this.updateThrottle(to, 'ETH');
@@ -73,7 +65,7 @@ export class Faucet {
             to.toString(),
             asset.amount
         ]);
-        await this.publicClient.waitForTransactionReceipt({
+        await this.l1Client.waitForTransactionReceipt({
             hash
         });
         this.updateThrottle(to, assetName);
@@ -83,7 +75,7 @@ export class Faucet {
         const contract = getContract({
             abi: TestERC20Abi,
             address: l1AssetConfig.address.toString(),
-            client: this.walletClient
+            client: this.l1Client
         });
         const [name, owner] = await Promise.all([
             contract.read.name(),

package/dest/http.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="node" resolution-mode="require"/>
 import { type ApiSchemaFor } from '@aztec/foundation/schemas';
 import { type Faucet } from './faucet.js';
 export declare function createFaucetHttpServer(faucet: Faucet, apiPrefix?: string, logger?: import("@aztec/foundation/log").Logger): import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
 export declare const FaucetSchema: ApiSchemaFor<Faucet>;
-//# sourceMappingURL=http.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2h0dHAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLEtBQUssWUFBWSxFQUFXLE1BQU0sMkJBQTJCLENBQUM7QUFTdkUsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFpQixNQUFNLGFBQWEsQ0FBQztBQUV6RCx3QkFBZ0Isc0JBQXNCLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxTQUFTLFNBQUssRUFBRSxNQUFNLHlDQUFvQyxzR0E2RGhIO0FBRUQsZUFBTyxNQUFNLFlBQVksRUFBRSxZQUFZLENBQUMsTUFBTSxDQVE3QyxDQUFDIn0=

package/dest/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../src/http.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,KAAK,YAAY,EAAW,MAAM,2BAA2B,CAAC;AASvE,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,aAAa,CAAC;AAEzD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,SAAK,EAAE,MAAM,yCAAoC,sGA6DhH;AAED,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,MAAM,CAQ7C,CAAC"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../src/http.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAW,MAAM,2BAA2B,CAAC;AASvE,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,aAAa,CAAC;AAEzD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,SAAK,EAAE,MAAM,yCAAoC,sGA6DhH;AAED,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,MAAM,CAQ7C,CAAC"}

package/dest/index.d.ts

@@ -1,4 +1,4 @@
 export * from './faucet.js';
 export * from './http.js';
 export * from './config.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLFdBQVcsQ0FBQztBQUMxQixjQUFjLGFBQWEsQ0FBQyJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec-faucet",
-  "version": "0.0.0-test.1",
+  "version": "0.0.1-commit.03f7ef2",
   "main": "dest/bin/index.js",
   "type": "module",
   "bin": "./dest/bin/index.js",
@@ -17,11 +17,9 @@
   },
   "scripts": {
     "start": "node --no-warnings ./dest/bin",
-    "build": "yarn clean && tsc -b",
-    "build:dev": "tsc -b --watch",
+    "build": "yarn clean && ../scripts/tsc.sh",
+    "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
@@ -58,27 +56,32 @@
     "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
+    ],
+    "testEnvironment": "../../foundation/src/jest/env.mjs",
+    "setupFilesAfterEnv": [
+      "../../foundation/src/jest/setupAfterEnv.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/ethereum": "0.0.0-test.1",
-    "@aztec/foundation": "0.0.0-test.1",
-    "@aztec/l1-artifacts": "0.0.0-test.1",
+    "@aztec/ethereum": "0.0.1-commit.03f7ef2",
+    "@aztec/foundation": "0.0.1-commit.03f7ef2",
+    "@aztec/l1-artifacts": "0.0.1-commit.03f7ef2",
     "@koa/cors": "^5.0.0",
-    "koa": "^2.14.2",
+    "koa": "^2.16.1",
     "koa-bodyparser": "^4.4.1",
-    "koa-router": "^12.0.0",
-    "viem": "2.22.8",
+    "koa-router": "^13.1.1",
+    "viem": "npm:@aztec/viem@2.38.2",
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@jest/globals": "^29.5.0",
-    "@types/jest": "^29.5.0",
+    "@jest/globals": "^30.0.0",
+    "@types/jest": "^30.0.0",
     "@types/koa-bodyparser": "^4.3.12",
-    "@types/node": "^18.7.23",
-    "jest": "^29.5.0",
+    "@types/node": "^22.15.17",
+    "@typescript/native-preview": "7.0.0-dev.20251126.1",
+    "jest": "^30.0.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.3.3"
   },
   "files": [
     "dest",
@@ -87,6 +90,6 @@
   ],
   "types": "./dest/index.d.ts",
   "engines": {
-    "node": ">=18"
+    "node": ">=20.10"
   }
 }

package/src/config.ts

@@ -1,5 +1,11 @@
-import { type L1ReaderConfig, l1ReaderConfigMappings } from '@aztec/ethereum';
-import { type ConfigMappingsType, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
+import { type L1ReaderConfig, l1ReaderConfigMappings } from '@aztec/ethereum/l1-reader';
+import {
+  type ConfigMappingsType,
+  SecretValue,
+  getConfigFromMappings,
+  numberConfigHelper,
+  secretStringConfigHelper,
+} from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 
 export type L1AssetConfig = {
@@ -8,8 +14,8 @@ export type L1AssetConfig = {
 };
 
 export type FaucetConfig = L1ReaderConfig & {
-  l1Mnemonic: string;
-  mnemonicAccountIndex: number;
+  l1Mnemonic?: SecretValue<string>;
+  mnemonicAddressIndex: number;
   interval: number;
   ethAmount: string;
   l1Assets: L1AssetConfig[];
@@ -20,10 +26,11 @@ export const faucetConfigMapping: ConfigMappingsType<FaucetConfig> = {
   l1Mnemonic: {
     env: 'MNEMONIC',
     description: 'The mnemonic for the faucet account',
+    ...secretStringConfigHelper(),
   },
-  mnemonicAccountIndex: {
-    env: 'FAUCET_MNEMONIC_ACCOUNT_INDEX',
-    description: 'The account to use',
+  mnemonicAddressIndex: {
+    env: 'FAUCET_MNEMONIC_ADDRESS_INDEX',
+    description: 'The address to use',
     ...numberConfigHelper(0),
   },
   interval: {

package/src/faucet.ts

@@ -1,4 +1,6 @@
-import { type ViemPublicClient, type ViemWalletClient, createEthereumChain } from '@aztec/ethereum';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { createExtendedL1Client } from '@aztec/ethereum/client';
+import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { TestERC20Abi } from '@aztec/l1-artifacts';
@@ -10,12 +12,8 @@ import {
   type HttpTransport,
   type LocalAccount,
   type WalletClient,
-  createPublicClient,
-  createWalletClient,
-  fallback,
   getContract,
   parseEther,
-  http as viemHttp,
 } from 'viem';
 import { mnemonicToAccount } from 'viem/accounts';
 
@@ -27,8 +25,7 @@ type L1Asset = {
 };
 
 export class Faucet {
-  private walletClient: ViemWalletClient;
-  private publicClient: ViemPublicClient;
+  private l1Client: ExtendedViemWalletClient;
 
   private dripHistory = new Map<string, Map<string, number>>();
   private l1Assets = new Map<string, L1Asset>();
@@ -41,24 +38,15 @@ export class Faucet {
   ) {
     const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
 
-    this.walletClient = createWalletClient({
-      account: this.account,
-      chain: chain.chainInfo,
-      transport: fallback(chain.rpcUrls.map(url => viemHttp(url))),
-    });
-
-    this.publicClient = createPublicClient({
-      chain: chain.chainInfo,
-      transport: fallback(chain.rpcUrls.map(url => viemHttp(url))),
-    });
+    this.l1Client = createExtendedL1Client(config.l1RpcUrls, this.account, chain.chainInfo);
   }
 
   public static async create(config: FaucetConfig): Promise<Faucet> {
-    if (!config.l1Mnemonic) {
+    if (!config.l1Mnemonic || !config.l1Mnemonic.getValue()) {
       throw new Error('Missing faucet mnemonic');
     }
 
-    const account = mnemonicToAccount(config.l1Mnemonic, { addressIndex: config.mnemonicAccountIndex });
+    const account = mnemonicToAccount(config.l1Mnemonic.getValue(), { addressIndex: config.mnemonicAddressIndex });
     const faucet = new Faucet(config, account);
 
     for (const asset of config.l1Assets) {
@@ -79,12 +67,12 @@ export class Faucet {
   public async sendEth(to: EthAddress): Promise<void> {
     this.checkThrottle(to, 'ETH');
 
-    const hash = await this.walletClient.sendTransaction({
+    const hash = await this.l1Client.sendTransaction({
       account: this.account,
       to: to.toString(),
       value: parseEther(this.config.ethAmount),
     });
-    await this.publicClient.waitForTransactionReceipt({ hash });
+    await this.l1Client.waitForTransactionReceipt({ hash });
 
     this.updateThrottle(to, 'ETH');
     this.log.info(`Sent ETH ${this.config.ethAmount} to ${to} in tx ${hash}`);
@@ -99,7 +87,7 @@ export class Faucet {
     this.checkThrottle(to, assetName);
 
     const hash = await asset.contract.write.mint([to.toString(), asset.amount]);
-    await this.publicClient.waitForTransactionReceipt({ hash });
+    await this.l1Client.waitForTransactionReceipt({ hash });
 
     this.updateThrottle(to, assetName);
 
@@ -110,7 +98,7 @@ export class Faucet {
     const contract = getContract({
       abi: TestERC20Abi,
       address: l1AssetConfig.address.toString(),
-      client: this.walletClient,
+      client: this.l1Client,
     });
 
     const [name, owner] = await Promise.all([contract.read.name(), contract.read.owner()]);