@aztec/ethereum 0.73.0 → 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2

package/dest/utils.js

@@ -1,7 +1,8 @@
 import { ErrorsAbi } from '@aztec/l1-artifacts';
-import { BaseError, ContractFunctionRevertedError, decodeErrorResult, decodeEventLog, } from 'viem';
+import { BaseError, ContractFunctionRevertedError, decodeErrorResult, decodeEventLog } from 'viem';
 export class FormattedViemError extends Error {
-    constructor(message, metaMessages) {
+    metaMessages;
+    constructor(message, metaMessages){
         super(message);
         this.name = 'FormattedViemError';
         this.metaMessages = metaMessages;
@@ -15,18 +16,20 @@ export function extractEvent(logs, address, abi, eventName, filter, logger) {
     return event;
 }
 function tryExtractEvent(logs, address, abi, eventName, filter, logger) {
-    for (const log of logs) {
+    for (const log of logs){
         if (log.address.toLowerCase() === address.toLowerCase()) {
             try {
-                const decodedEvent = decodeEventLog({ abi, ...log });
+                const decodedEvent = decodeEventLog({
+                    abi,
+                    ...log
+                });
                 if (decodedEvent.eventName === eventName) {
                     const matchingEvent = decodedEvent;
                     if (!filter || filter(matchingEvent)) {
                         return matchingEvent;
                     }
                 }
-            }
-            catch (err) {
+            } catch (err) {
                 logger?.warn(`Failed to decode event log for contract ${address}: ${err}`);
             }
         }
@@ -34,7 +37,7 @@ function tryExtractEvent(logs, address, abi, eventName, filter, logger) {
 }
 export function prettyLogViemErrorMsg(err) {
     if (err instanceof BaseError) {
-        const revertError = err.walk(err => err instanceof ContractFunctionRevertedError);
+        const revertError = err.walk((err)=>err instanceof ContractFunctionRevertedError);
         if (revertError instanceof ContractFunctionRevertedError) {
             const errorName = revertError.data?.errorName ?? '';
             const args = revertError.metaMessages && revertError.metaMessages?.length > 1 ? revertError.metaMessages[1].trimStart() : '';
@@ -43,24 +46,44 @@ export function prettyLogViemErrorMsg(err) {
     }
     return err?.message ?? err;
 }
+function getNestedErrorData(error) {
+    // If nothing, bail
+    if (!error) {
+        return undefined;
+    }
+    // If it's an object with a `data` property, return it
+    // (Remember to check TS type-safely or cast as needed)
+    if (typeof error === 'object' && error !== null && 'data' in error) {
+        const possibleData = error.data;
+        if (typeof possibleData === 'string' && possibleData.startsWith('0x')) {
+            return possibleData;
+        }
+    }
+    // If it has a `cause`, recurse
+    if (typeof error === 'object' && error !== null && 'cause' in error) {
+        return getNestedErrorData(error.cause);
+    }
+    // Not found
+    return undefined;
+}
 /**
  * Formats a Viem error into a FormattedViemError instance.
  * @param error - The error to format.
  * @param abi - The ABI to use for decoding.
  * @returns A FormattedViemError instance.
- */
-export function formatViemError(error, abi = ErrorsAbi) {
+ */ export function formatViemError(error, abi = ErrorsAbi) {
     // If error is already a FormattedViemError, return it as is
     if (error instanceof FormattedViemError) {
         return error;
     }
     // First try to decode as a custom error using the ABI
     try {
-        if (error?.data) {
+        const data = getNestedErrorData(error);
+        if (data) {
             // Try to decode the error data using the ABI
             const decoded = decodeErrorResult({
                 abi,
-                data: error.data,
+                data: data
             });
             if (decoded) {
                 return new FormattedViemError(`${decoded.errorName}(${decoded.args?.join(', ') ?? ''})`, error?.metaMessages);
@@ -68,28 +91,25 @@ export function formatViemError(error, abi = ErrorsAbi) {
         }
         // If it's a BaseError, try to get the custom error through ContractFunctionRevertedError
         if (error instanceof BaseError) {
-            const revertError = error.walk(err => err instanceof ContractFunctionRevertedError);
+            const revertError = error.walk((err)=>err instanceof ContractFunctionRevertedError);
             if (revertError instanceof ContractFunctionRevertedError) {
                 let errorName = revertError.data?.errorName;
                 if (!errorName) {
                     errorName = revertError.signature ?? '';
                 }
-                const args = revertError.metaMessages && revertError.metaMessages?.length > 1
-                    ? revertError.metaMessages[1].trimStart()
-                    : '';
+                const args = revertError.metaMessages && revertError.metaMessages?.length > 1 ? revertError.metaMessages[1].trimStart() : '';
                 return new FormattedViemError(`${errorName}${args}`, error?.metaMessages);
             }
         }
-    }
-    catch (decodeErr) {
-        // If decoding fails, we fall back to the original formatting
+    } catch (decodeErr) {
+    // If decoding fails, we fall back to the original formatting
     }
     // If it's a regular Error instance, return it with its message
     if (error instanceof Error) {
-        return new FormattedViemError(error.message);
+        return error;
     }
     // Original formatting logic for non-custom errors
-    const truncateHex = (hex, length = 100) => {
+    const truncateHex = (hex, length = 100)=>{
         if (!hex || typeof hex !== 'string') {
             return hex;
         }
@@ -101,17 +121,17 @@ export function formatViemError(error, abi = ErrorsAbi) {
         }
         return `${hex.slice(0, length)}...${hex.slice(-length)}`;
     };
-    const formatRequestBody = (body) => {
+    const formatRequestBody = (body)=>{
         try {
             const parsed = JSON.parse(body);
             // Recursively process all parameters that might contain hex strings
-            const processParams = (obj) => {
+            const processParams = (obj)=>{
                 if (Array.isArray(obj)) {
-                    return obj.map(item => processParams(item));
+                    return obj.map((item)=>processParams(item));
                 }
                 if (typeof obj === 'object' && obj !== null) {
                     const result = {};
-                    for (const [key, value] of Object.entries(obj)) {
+                    for (const [key, value] of Object.entries(obj)){
                         result[key] = processParams(value);
                     }
                     return result;
@@ -126,35 +146,37 @@ export function formatViemError(error, abi = ErrorsAbi) {
             // Process the entire request body
             const processed = processParams(parsed);
             return JSON.stringify(processed, null, 2);
-        }
-        catch {
+        } catch  {
             return body;
         }
     };
-    const truncateHexStringsInText = (text) => {
+    const truncateHexStringsInText = (text)=>{
         const hexRegex = /\b0x[a-fA-F0-9]{10,}/g;
-        return text.replace(hexRegex, hex => truncateHex(hex));
+        return text.replace(hexRegex, (hex)=>truncateHex(hex));
     };
-    const extractAndFormatRequestBody = (message) => {
+    const extractAndFormatRequestBody = (message)=>{
         // First handle Request body JSON
         const requestBodyRegex = /Request body: ({[\s\S]*?})\n/g;
-        let result = message.replace(requestBodyRegex, (match, body) => {
+        let result = message.replace(requestBodyRegex, (match, body)=>{
             return `Request body: ${formatRequestBody(body)}\n`;
         });
         // Then handle Arguments section
         const argsRegex = /((?:Request |Estimate Gas )?Arguments:[\s\S]*?(?=\n\n|$))/g;
-        result = result.replace(argsRegex, section => {
+        result = result.replace(argsRegex, (section)=>{
             const lines = section.split('\n');
-            const processedLines = lines.map(line => {
+            const processedLines = lines.map((line)=>{
                 // Check if line contains a colon followed by content
                 const colonIndex = line.indexOf(':');
                 if (colonIndex !== -1) {
-                    const [prefix, content] = [line.slice(0, colonIndex + 1), line.slice(colonIndex + 1).trim()];
+                    const [prefix, content] = [
+                        line.slice(0, colonIndex + 1),
+                        line.slice(colonIndex + 1).trim()
+                    ];
                     // If content contains a hex string, truncate it
                     if (content.includes('0x')) {
                         const hexMatches = content.match(/0x[a-fA-F0-9]+/g) || [];
                         let processedContent = content;
-                        hexMatches.forEach(hex => {
+                        hexMatches.forEach((hex)=>{
                             processedContent = processedContent.replace(hex, truncateHex(hex));
                         });
                         return `${prefix} ${processedContent}`;
@@ -176,14 +198,12 @@ export function tryGetCustomErrorName(err) {
         // See https://viem.sh/docs/contract/simulateContract#handling-custom-errors
         if (err.name === 'ViemError' || err.name === 'ContractFunctionExecutionError') {
             const baseError = err;
-            const revertError = baseError.walk(err => err.name === 'ContractFunctionRevertedError');
+            const revertError = baseError.walk((err)=>err.name === 'ContractFunctionRevertedError');
             if (revertError) {
                 return revertError.data?.errorName;
             }
         }
-    }
-    catch (_e) {
+    } catch (_e) {
         return undefined;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/ethereum",
-  "version": "0.73.0",
+  "version": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -26,14 +26,15 @@
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'",
     "start": "node ./dest/index.js",
-    "test": "HARDWARE_CONCURRENCY=${HARDWARE_CONCURRENCY:-16} RAYON_NUM_THREADS=${RAYON_NUM_THREADS:-4} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
+    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/foundation": "0.73.0",
-    "@aztec/l1-artifacts": "0.73.0",
+    "@aztec/blob-lib": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
+    "@aztec/foundation": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
+    "@aztec/l1-artifacts": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
     "@viem/anvil": "^0.0.10",
     "dotenv": "^16.0.3",
     "tslib": "^2.4.0",

package/src/contracts/empire_base.ts

@@ -0,0 +1,19 @@
+import { EmpireBaseAbi } from '@aztec/l1-artifacts/EmpireBaseAbi';
+
+import { type Hex, encodeFunctionData } from 'viem';
+
+import { type L1TxRequest } from '../l1_tx_utils.js';
+
+export interface IEmpireBase {
+  getRoundInfo(rollupAddress: Hex, round: bigint): Promise<{ lastVote: bigint; leader: Hex; executed: boolean }>;
+  computeRound(slot: bigint): Promise<bigint>;
+  createVoteRequest(payload: Hex): L1TxRequest;
+}
+
+export function encodeVote(payload: Hex): Hex {
+  return encodeFunctionData({
+    abi: EmpireBaseAbi,
+    functionName: 'vote',
+    args: [payload],
+  });
+}

package/src/contracts/forwarder.ts

@@ -1,9 +1,11 @@
+import { toHex } from '@aztec/foundation/bigint-buffer';
 import { type Logger } from '@aztec/foundation/log';
 import { ForwarderAbi, ForwarderBytecode } from '@aztec/l1-artifacts';
 
 import {
   type Account,
   type Chain,
+  type EncodeFunctionDataParameters,
   type GetContractReturnType,
   type Hex,
   type HttpTransport,
@@ -15,11 +17,12 @@ import {
 
 import { type L1Clients, deployL1Contract } from '../deploy_l1_contracts.js';
 import { type L1BlobInputs, type L1GasConfig, type L1TxRequest, type L1TxUtils } from '../l1_tx_utils.js';
+import { RollupContract } from './rollup.js';
 
 export class ForwarderContract {
   private readonly forwarder: GetContractReturnType<typeof ForwarderAbi, PublicClient<HttpTransport, Chain>>;
 
-  constructor(public readonly client: L1Clients['publicClient'], address: Hex) {
+  constructor(public readonly client: L1Clients['publicClient'], address: Hex, public readonly rollupAddress: Hex) {
     this.forwarder = getContract({ address, abi: ForwarderAbi, client });
   }
 
@@ -28,6 +31,7 @@ export class ForwarderContract {
     walletClient: WalletClient<HttpTransport, Chain, Account>,
     publicClient: PublicClient<HttpTransport, Chain>,
     logger: Logger,
+    rollupAddress: Hex,
   ) {
     logger.info('Deploying forwarder contract');
 
@@ -48,7 +52,7 @@ export class ForwarderContract {
 
     logger.info(`Forwarder contract deployed at ${address} with owner ${owner}`);
 
-    return new ForwarderContract(publicClient, address.toString());
+    return new ForwarderContract(publicClient, address.toString(), rollupAddress);
   }
 
   public getAddress() {
@@ -60,20 +64,22 @@ export class ForwarderContract {
     l1TxUtils: L1TxUtils,
     gasConfig: L1GasConfig | undefined,
     blobConfig: L1BlobInputs | undefined,
+    logger: Logger,
   ) {
     requests = requests.filter(request => request.to !== null);
     const toArgs = requests.map(request => request.to!);
     const dataArgs = requests.map(request => request.data!);
-    const data = encodeFunctionData({
+    const forwarderFunctionData: EncodeFunctionDataParameters<typeof ForwarderAbi, 'forward'> = {
       abi: ForwarderAbi,
       functionName: 'forward',
       args: [toArgs, dataArgs],
-    });
+    };
+    const encodedForwarderData = encodeFunctionData(forwarderFunctionData);
 
     const { receipt, gasPrice } = await l1TxUtils.sendAndMonitorTransaction(
       {
         to: this.forwarder.address,
-        data,
+        data: encodedForwarderData,
       },
       gasConfig,
       blobConfig,
@@ -83,10 +89,10 @@ export class ForwarderContract {
       const stats = await l1TxUtils.getTransactionStats(receipt.transactionHash);
       return { receipt, gasPrice, stats };
     } else {
+      logger.error('Forwarder transaction failed', undefined, { receipt });
+
       const args = {
-        args: [toArgs, dataArgs],
-        functionName: 'forward',
-        abi: ForwarderAbi,
+        ...forwarderFunctionData,
         address: this.forwarder.address,
       };
 
@@ -97,14 +103,31 @@ export class ForwarderContract {
         if (maxFeePerBlobGas === undefined) {
           errorMsg = 'maxFeePerBlobGas is required to get the error message';
         } else {
-          errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(data, args, {
-            blobs: blobConfig.blobs,
-            kzg: blobConfig.kzg,
-            maxFeePerBlobGas,
-          });
+          logger.debug('Trying to get error from reverted tx with blob config');
+          errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(
+            encodedForwarderData,
+            args,
+            {
+              blobs: blobConfig.blobs,
+              kzg: blobConfig.kzg,
+              maxFeePerBlobGas,
+            },
+            [
+              {
+                address: this.rollupAddress,
+                stateDiff: [
+                  {
+                    slot: toHex(RollupContract.checkBlobStorageSlot, true),
+                    value: toHex(0n, true),
+                  },
+                ],
+              },
+            ],
+          );
         }
       } else {
-        errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(data, args);
+        logger.debug('Trying to get error from reverted tx without blob config');
+        errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(encodedForwarderData, args, undefined, []);
       }
 
       return { receipt, gasPrice, errorMsg };

package/src/contracts/governance_proposer.ts

@@ -8,13 +8,19 @@ import {
   type Hex,
   type HttpTransport,
   type PublicClient,
+  type TransactionReceipt,
+  encodeFunctionData,
   getContract,
 } from 'viem';
 
-export class GovernanceProposerContract {
+import type { L1Clients } from '../deploy_l1_contracts.js';
+import type { GasPrice, L1TxRequest, L1TxUtils } from '../l1_tx_utils.js';
+import { type IEmpireBase, encodeVote } from './empire_base.js';
+
+export class GovernanceProposerContract implements IEmpireBase {
   private readonly proposer: GetContractReturnType<typeof GovernanceProposerAbi, PublicClient<HttpTransport, Chain>>;
 
-  constructor(public readonly client: PublicClient<HttpTransport, Chain>, address: Hex) {
+  constructor(public readonly client: L1Clients['publicClient'], address: Hex) {
     this.proposer = getContract({ address, abi: GovernanceProposerAbi, client });
   }
 
@@ -31,11 +37,55 @@ export class GovernanceProposerContract {
     return EthAddress.fromString(await this.proposer.read.REGISTRY());
   }
 
-  public getQuorumSize() {
+  public getQuorumSize(): Promise<bigint> {
     return this.proposer.read.N();
   }
 
-  public getRoundSize() {
+  public getRoundSize(): Promise<bigint> {
     return this.proposer.read.M();
   }
+
+  public computeRound(slot: bigint): Promise<bigint> {
+    return this.proposer.read.computeRound([slot]);
+  }
+
+  public async getRoundInfo(
+    rollupAddress: Hex,
+    round: bigint,
+  ): Promise<{ lastVote: bigint; leader: Hex; executed: boolean }> {
+    const roundInfo = await this.proposer.read.rounds([rollupAddress, round]);
+    return {
+      lastVote: roundInfo[0],
+      leader: roundInfo[1],
+      executed: roundInfo[2],
+    };
+  }
+
+  public getProposalVotes(rollupAddress: Hex, round: bigint, proposal: Hex): Promise<bigint> {
+    return this.proposer.read.yeaCount([rollupAddress, round, proposal]);
+  }
+
+  public createVoteRequest(payload: Hex): L1TxRequest {
+    return {
+      to: this.address.toString(),
+      data: encodeVote(payload),
+    };
+  }
+
+  public executeProposal(
+    round: bigint,
+    l1TxUtils: L1TxUtils,
+  ): Promise<{
+    receipt: TransactionReceipt;
+    gasPrice: GasPrice;
+  }> {
+    return l1TxUtils.sendAndMonitorTransaction({
+      to: this.address.toString(),
+      data: encodeFunctionData({
+        abi: this.proposer.abi,
+        functionName: 'executeProposal',
+        args: [round],
+      }),
+    });
+  }
 }

package/src/contracts/index.ts

@@ -1,5 +1,6 @@
+export * from './empire_base.js';
 export * from './forwarder.js';
-export * from './rollup.js';
 export * from './governance.js';
 export * from './governance_proposer.js';
+export * from './rollup.js';
 export * from './slashing_proposer.js';

package/src/contracts/rollup.ts

@@ -1,7 +1,7 @@
 import { memoize } from '@aztec/foundation/decorators';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { ViemSignature } from '@aztec/foundation/eth-signature';
-import { RollupAbi, SlasherAbi } from '@aztec/l1-artifacts';
+import { RollupAbi, RollupStorage, SlasherAbi } from '@aztec/l1-artifacts';
 
 import {
   type Account,
@@ -45,6 +45,14 @@ export type EpochProofQuoteViemArgs = {
 export class RollupContract {
   private readonly rollup: GetContractReturnType<typeof RollupAbi, PublicClient<HttpTransport, Chain>>;
 
+  static get checkBlobStorageSlot(): bigint {
+    const asString = RollupStorage.find(storage => storage.label === 'checkBlob')?.slot;
+    if (asString === undefined) {
+      throw new Error('checkBlobStorageSlot not found');
+    }
+    return BigInt(asString);
+  }
+
   static getFromL1ContractsValues(deployL1ContractsValues: DeployL1Contracts) {
     const {
       publicClient,
@@ -72,7 +80,7 @@ export class RollupContract {
 
   @memoize
   public async getSlashingProposer() {
-    const slasherAddress = await this.rollup.read.SLASHER();
+    const slasherAddress = await this.rollup.read.getSlasher();
     const slasher = getContract({ address: slasherAddress, abi: SlasherAbi, client: this.client });
     const proposerAddress = await slasher.read.PROPOSER();
     return new SlashingProposerContract(this.client, proposerAddress);
@@ -85,7 +93,7 @@ export class RollupContract {
 
   @memoize
   getL1GenesisTime() {
-    return this.rollup.read.GENESIS_TIME();
+    return this.rollup.read.getGenesisTime();
   }
 
   @memoize
@@ -95,26 +103,26 @@ export class RollupContract {
 
   @memoize
   getEpochDuration() {
-    return this.rollup.read.EPOCH_DURATION();
+    return this.rollup.read.getEpochDuration();
   }
 
   @memoize
   getSlotDuration() {
-    return this.rollup.read.SLOT_DURATION();
+    return this.rollup.read.getSlotDuration();
   }
 
   @memoize
   getTargetCommitteeSize() {
-    return this.rollup.read.TARGET_COMMITTEE_SIZE();
+    return this.rollup.read.getTargetCommitteeSize();
   }
 
   @memoize
   getMinimumStake() {
-    return this.rollup.read.MINIMUM_STAKE();
+    return this.rollup.read.getMinimumStake();
   }
 
   public async getSlashingProposerAddress() {
-    const slasherAddress = await this.rollup.read.SLASHER();
+    const slasherAddress = await this.rollup.read.getSlasher();
     const slasher = getContract({
       address: getAddress(slasherAddress.toString()),
       abi: SlasherAbi,
@@ -171,6 +179,10 @@ export class RollupContract {
     return this.rollup.read.getTips();
   }
 
+  getTimestampForSlot(slot: bigint) {
+    return this.rollup.read.getTimestampForSlot([slot]);
+  }
+
   async getEpochNumber(blockNumber?: bigint) {
     blockNumber ??= await this.getBlockNumber();
     return this.rollup.read.getEpochForBlock([BigInt(blockNumber)]);
@@ -191,7 +203,7 @@ export class RollupContract {
         this.rollup.read.FEE_JUICE_PORTAL(),
         this.rollup.read.REWARD_DISTRIBUTOR(),
         this.rollup.read.ASSET(),
-        this.rollup.read.STAKING_ASSET(),
+        this.rollup.read.getStakingAsset(),
       ] as const)
     ).map(EthAddress.fromString);
 

package/src/contracts/slashing_proposer.ts

@@ -10,10 +10,14 @@ import {
   getContract,
 } from 'viem';
 
-export class SlashingProposerContract {
+import type { L1Clients } from '../deploy_l1_contracts.js';
+import type { L1TxRequest } from '../l1_tx_utils.js';
+import { type IEmpireBase, encodeVote } from './empire_base.js';
+
+export class SlashingProposerContract implements IEmpireBase {
   private readonly proposer: GetContractReturnType<typeof SlashingProposerAbi, PublicClient<HttpTransport, Chain>>;
 
-  constructor(public readonly client: PublicClient<HttpTransport, Chain>, address: Hex) {
+  constructor(public readonly client: L1Clients['publicClient'], address: Hex) {
     this.proposer = getContract({ address, abi: SlashingProposerAbi, client });
   }
 
@@ -28,4 +32,27 @@ export class SlashingProposerContract {
   public getRoundSize() {
     return this.proposer.read.M();
   }
+
+  public computeRound(slot: bigint): Promise<bigint> {
+    return this.proposer.read.computeRound([slot]);
+  }
+
+  public async getRoundInfo(
+    rollupAddress: Hex,
+    round: bigint,
+  ): Promise<{ lastVote: bigint; leader: Hex; executed: boolean }> {
+    const roundInfo = await this.proposer.read.rounds([rollupAddress, round]);
+    return {
+      lastVote: roundInfo[0],
+      leader: roundInfo[1],
+      executed: roundInfo[2],
+    };
+  }
+
+  public createVoteRequest(payload: Hex): L1TxRequest {
+    return {
+      to: this.address.toString(),
+      data: encodeVote(payload),
+    };
+  }
 }

package/src/deploy_l1_contracts.ts

@@ -28,6 +28,8 @@ import {
   RollupLinkReferences,
   SlashFactoryAbi,
   SlashFactoryBytecode,
+  StakingLibAbi,
+  StakingLibBytecode,
   TestERC20Abi,
   TestERC20Bytecode,
   ValidatorSelectionLibAbi,
@@ -146,6 +148,10 @@ export const l1Artifacts = {
           contractAbi: ExtRollupLibAbi,
           contractBytecode: ExtRollupLibBytecode as Hex,
         },
+        StakingLib: {
+          contractAbi: StakingLibAbi,
+          contractBytecode: StakingLibBytecode as Hex,
+        },
       },
     },
   },