@aztec/aztec-faucet 0.85.0 → 0.86.0

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);

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":"AACA,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;gBAGpC,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,YAAY,EACrB,MAAM,GAAE,MAAM,MAAiB,EAC/B,GAAG,yCAA+B;WAOxB,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"}

package/dest/faucet.js

@@ -1,15 +1,14 @@
-import { createEthereumChain } from '@aztec/ethereum';
+import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 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,15 +19,7 @@ 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) {
@@ -52,12 +43,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 +64,7 @@ export class Faucet {
             to.toString(),
             asset.amount
         ]);
-        await this.publicClient.waitForTransactionReceipt({
+        await this.l1Client.waitForTransactionReceipt({
             hash
         });
         this.updateThrottle(to, assetName);
@@ -83,7 +74,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec-faucet",
-  "version": "0.85.0",
+  "version": "0.86.0",
   "main": "dest/bin/index.js",
   "type": "module",
   "bin": "./dest/bin/index.js",
@@ -20,8 +20,6 @@
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --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": [
@@ -61,9 +59,9 @@
     ]
   },
   "dependencies": {
-    "@aztec/ethereum": "0.85.0",
-    "@aztec/foundation": "0.85.0",
-    "@aztec/l1-artifacts": "0.85.0",
+    "@aztec/ethereum": "0.86.0",
+    "@aztec/foundation": "0.86.0",
+    "@aztec/l1-artifacts": "0.86.0",
     "@koa/cors": "^5.0.0",
     "koa": "^2.16.1",
     "koa-bodyparser": "^4.4.1",

package/src/faucet.ts

@@ -1,4 +1,4 @@
-import { type ViemPublicClient, type ViemWalletClient, createEthereumChain } from '@aztec/ethereum';
+import { type ExtendedViemWalletClient, createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { TestERC20Abi } from '@aztec/l1-artifacts';
@@ -10,12 +10,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 +23,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,16 +36,7 @@ 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> {
@@ -79,12 +65,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 +85,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 +96,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()]);