@boostxyz/sdk 0.0.0-alpha.9 → 1.1.0-alpha.23

package/src/BoostCore.ts

@@ -1,7 +1,6 @@
 import {
   boostCoreAbi,
   type iAuthAbi,
-  readBoostCoreClaimFee,
   readBoostCoreCreateBoostAuth,
   readBoostCoreGetBoost,
   readBoostCoreGetBoostCount,
@@ -10,17 +9,22 @@ import {
   readIAuthIsAuthorized,
   simulateBoostCoreClaimIncentive,
   simulateBoostCoreClaimIncentiveFor,
-  simulateBoostCoreSetClaimFee,
+  simulateBoostCoreCreateBoost,
   simulateBoostCoreSetCreateBoostAuth,
   simulateBoostCoreSetProtocolFeeReceiver,
   writeBoostCoreClaimIncentive,
   writeBoostCoreClaimIncentiveFor,
-  writeBoostCoreSetClaimFee,
   writeBoostCoreSetCreateBoostAuth,
   writeBoostCoreSetProtocolFeeReceiver,
 } from '@boostxyz/evm';
 import { bytecode } from '@boostxyz/evm/artifacts/contracts/BoostCore.sol/BoostCore.json';
-import { getAccount, waitForTransactionReceipt } from '@wagmi/core';
+import {
+  type GetTransactionReceiptParameters,
+  getAccount,
+  getTransactionReceipt,
+  waitForTransactionReceipt,
+} from '@wagmi/core';
+import type { SimulateContractReturnType } from '@wagmi/core/actions';
 import { createWriteContract } from '@wagmi/core/codegen';
 import {
   type Address,
@@ -31,9 +35,11 @@ import {
   zeroAddress,
   zeroHash,
 } from 'viem';
+import { BoostCore as BoostCoreBases } from '../dist/deployments.json';
 import { type Action, actionFromAddress } from './Actions/Action';
 import { EventAction, type EventActionPayload } from './Actions/EventAction';
 import { type AllowList, allowListFromAddress } from './AllowLists/AllowList';
+import { OpenAllowList } from './AllowLists/OpenAllowList';
 import {
   SimpleAllowList,
   type SimpleAllowListPayload,
@@ -46,6 +52,7 @@ import { type Auth, PassthroughAuth } from './Auth/Auth';
 import {
   Boost,
   type BoostPayload,
+  type RawBoost,
   type Target,
   prepareBoostPayload,
 } from './Boost';
@@ -72,6 +79,10 @@ import {
   ERC20Incentive,
   type ERC20IncentivePayload,
 } from './Incentives/ERC20Incentive';
+import {
+  ERC20VariableCriteriaIncentive,
+  type ERC20VariableCriteriaIncentivePayload,
+} from './Incentives/ERC20VariableCriteriaIncentive';
 import type { ERC20VariableIncentivePayload } from './Incentives/ERC20VariableIncentive';
 import {
   ERC20VariableIncentive,
@@ -89,13 +100,24 @@ import {
 import { type Validator, validatorFromAddress } from './Validators/Validator';
 import {
   BoostCoreNoIdentifierEmitted,
+  BoostNotFoundError,
   BudgetMustAuthorizeBoostCore,
   DeployableUnknownOwnerProvidedError,
   IncentiveNotCloneableError,
   MustInitializeBudgetError,
 } from './errors';
-import type { GenericLog, ReadParams, WriteParams } from './utils';
+import {
+  type GenericLog,
+  type ReadParams,
+  type WriteParams,
+  assertValidAddressByChainId,
+} from './utils';
 
+/**
+ * The ABI of the BoostCore contract, if needed for low level operations
+ *
+ * @type {typeof boostCoreAbi}
+ */
 export { boostCoreAbi };
 
 /**
@@ -106,13 +128,24 @@ export { boostCoreAbi };
 export const BOOST_CORE_CLAIM_FEE = parseEther('0.000075');
 
 /**
- * The fixed address for the deployed Boost Core.
- * By default, `new BoostCore` will use this address if not otherwise provided.
+ * The fixed addresses for the deployed Boost Core.
+ * By default, `new BoostCore` will use the address deployed to the currently connected chain, or `BOOST_CORE_ADDRESS` if not provided.
+ *
+ * @type {Record<number, Address>}
+ */
+export const BOOST_CORE_ADDRESSES: Record<number, Address> = {
+  31337: import.meta.env.VITE_BOOST_CORE_ADDRESS,
+  ...(BoostCoreBases as Record<number, Address>),
+};
+
+/**
+ * The address of the deployed BoostCore instance. In prerelease mode, this will be its sepolia address
  *
  * @type {Address}
  */
-export const BOOST_CORE_ADDRESS: Address = import.meta.env
-  .VITE_BOOST_CORE_ADDRESS;
+export const BOOST_CORE_ADDRESS =
+  BOOST_CORE_ADDRESSES[__DEFAULT_CHAIN_ID__ as unknown as number] ||
+  zeroAddress;
 
 /**
  * A generic `viem.Log` event with support for `BoostCore` event types.
@@ -210,11 +243,10 @@ export type BoostCoreConfig =
 export type CreateBoostPayload = {
   budget: Budget;
   action: Action;
-  validator: Validator;
-  allowList: AllowList;
+  validator?: Validator;
+  allowList?: AllowList;
   incentives: Array<Incentive>;
   protocolFee?: bigint;
-  referralFee?: bigint;
   maxParticipants?: bigint;
   owner?: Address;
 };
@@ -231,6 +263,26 @@ export class BoostCore extends Deployable<
   [Address, Address],
   typeof boostCoreAbi
 > {
+  /**
+   * A static property representing a map of stringified chain ID's to the address of the deployed implementation on chain
+   *
+   * @static
+   * @readonly
+   * @type {Record<string, Address>}
+   */
+  static readonly addresses: Record<number, Address> = BOOST_CORE_ADDRESSES;
+
+  /**
+   * A getter that will return Boost core's static addresses by numerical chain ID
+   *
+   * @public
+   * @readonly
+   * @type {Record<number, Address>}
+   */
+  public get addresses(): Record<number, Address> {
+    return (this.constructor as typeof BoostCore).addresses;
+  }
+
   /**
    * Creates an instance of BoostCore.
    *
@@ -249,63 +301,157 @@ export class BoostCore extends Deployable<
         options.protocolFeeReceiver,
       ]);
     } else {
-      super({ account, config }, BOOST_CORE_ADDRESS);
+      const { address } = assertValidAddressByChainId(
+        config,
+        BOOST_CORE_ADDRESSES,
+      );
+      super({ account, config }, address);
     }
     //@ts-expect-error I can't set this property on the class because for some reason it takes super out of constructor scope?
     this.abi = boostCoreAbi;
   }
+
   /**
    * Create a new Boost.
    *
    * @public
    * @async
    * @param {CreateBoostPayload} _boostPayload
-   * @param {?DeployableOptions} [_options]
-   * @returns {Boost}
+   * @param {?DeployableOptions} [_params]
+   * @returns {Promise<Boost>}
    */
   public async createBoost(
     _boostPayload: CreateBoostPayload,
-    _options?: DeployableOptions,
+    _params?: DeployableOptions &
+      WriteParams<typeof boostCoreAbi, 'createBoost'>,
   ) {
-    const coreAddress = this.assertValidAddress();
     const [payload, options] =
-      this.validateDeploymentConfig<CreateBoostPayload>(
-        _boostPayload,
-        _options,
-      );
-
-    let {
-      budget,
-      action,
-      validator,
-      allowList,
-      incentives,
-      protocolFee = 0n,
-      referralFee = 0n,
-      maxParticipants = 0n,
-      owner,
-    } = payload;
+      this.validateDeploymentConfig<CreateBoostPayload>(_boostPayload, _params);
+    const desiredChainId = _params?.chain?.id || _params?.chainId;
+    const { chainId, address: coreAddress } = assertValidAddressByChainId(
+      options.config,
+      this.addresses,
+      desiredChainId,
+    );
 
     const boostFactory = createWriteContract({
       abi: boostCoreAbi,
       functionName: 'createBoost',
-      address: this.address,
+      address: coreAddress,
+    });
+
+    const onChainPayload = await this.prepareCreateBoostPayload(
+      coreAddress,
+      chainId,
+      payload,
+      options,
+    );
+
+    console.log(onChainPayload);
+
+    const boostHash = await boostFactory(options.config, {
+      ...this.optionallyAttachAccount(options.account),
+      // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
+      ...(_params as any),
+      chainId,
+      args: [prepareBoostPayload(onChainPayload)],
+    });
+    const receipt = await waitForTransactionReceipt(options.config, {
+      hash: boostHash,
+    });
+    const boostCreatedLog = parseEventLogs({
+      abi: boostCoreAbi,
+      eventName: 'BoostCreated',
+      logs: receipt.logs,
+    }).at(0);
+    let boostId = 0n;
+    if (!boostCreatedLog) throw new BoostCoreNoIdentifierEmitted();
+    boostId = boostCreatedLog?.args.boostId;
+    const boost = await this.readBoost(boostId);
+    return new Boost({
+      id: boostId,
+      budget: payload.budget.at(boost.budget),
+      action: payload.action.at(boost.action),
+      validator: payload.validator!.at(boost.validator),
+      allowList: payload.allowList!.at(boost.allowList),
+      incentives: payload.incentives.map((incentive, i) =>
+        // biome-ignore lint/style/noNonNullAssertion: this will never be undefined
+        incentive.at(boost.incentives.at(i)!),
+      ),
+      protocolFee: boost.protocolFee,
+      maxParticipants: boost.maxParticipants,
+      owner: boost.owner,
     });
+  }
 
-    if (!owner) {
-      owner =
+  /**
+   * Returns a simulated Boost creation.
+   *
+   * @public
+   * @async
+   * @param {CreateBoostPayload} _boostPayload
+   * @param {?DeployableOptions} [_params]
+   * @returns {Promise<SimulateContractReturnType>}
+   */
+  public async simulateCreateBoost(
+    _boostPayload: CreateBoostPayload,
+    _params?: DeployableOptions &
+      WriteParams<typeof boostCoreAbi, 'createBoost'>,
+  ) {
+    const [payload, options] =
+      this.validateDeploymentConfig<CreateBoostPayload>(_boostPayload, _params);
+    const desiredChainId = _params?.chain?.id || _params?.chainId;
+    const { chainId, address: coreAddress } = assertValidAddressByChainId(
+      options.config,
+      this.addresses,
+      desiredChainId,
+    );
+
+    const onChainPayload = await this.prepareCreateBoostPayload(
+      coreAddress,
+      chainId,
+      payload,
+      options,
+    );
+
+    return await simulateBoostCoreCreateBoost(this._config, {
+      ...this.optionallyAttachAccount(),
+      // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
+      ...(_params as any),
+      address: coreAddress,
+      chainId,
+      args: [prepareBoostPayload(onChainPayload)],
+    });
+  }
+
+  // This function mutates payload, which isn't awesome but it's fine
+  private async prepareCreateBoostPayload(
+    coreAddress: Address,
+    chainId: number,
+    payload: CreateBoostPayload,
+    options: DeployableOptions,
+  ): Promise<Required<BoostPayload>> {
+    if (!payload.owner) {
+      payload.owner =
         this._account?.address ||
         getAccount(options.config).address ||
         zeroAddress;
-      if (owner === zeroAddress) {
+      if (payload.owner === zeroAddress) {
         throw new DeployableUnknownOwnerProvidedError();
       }
     }
 
+    if (!payload.validator) {
+      payload.validator = this.SignerValidator({
+        signers: [payload.owner],
+        validatorCaller: coreAddress,
+      });
+    }
+
     let budgetPayload: BoostPayload['budget'] = zeroAddress;
-    if (budget.address) {
-      budgetPayload = budget.address;
-      if (!(await budget.isAuthorized(coreAddress))) {
+    if (payload.budget.address) {
+      budgetPayload = payload.budget.address;
+      if (!(await payload.budget.isAuthorized(coreAddress))) {
         throw new BudgetMustAuthorizeBoostCore(coreAddress);
       }
     } else {
@@ -319,19 +465,25 @@ export class BoostCore extends Deployable<
       isBase: true,
       parameters: zeroHash,
     };
-    if (action.address) {
-      const isBase = action.address === action.base || action.isBase;
+    if (payload.action.address) {
+      const isBase = payload.action.isBase;
       actionPayload = {
         isBase: isBase,
-        instance: action.address,
+        instance: payload.action.address,
         parameters: isBase
-          ? action.buildParameters(undefined, options).args.at(0) || zeroHash
+          ? payload.action.buildParameters(undefined, options).args.at(0) ||
+            zeroHash
           : zeroHash,
       };
     } else {
       actionPayload.parameters =
-        action.buildParameters(undefined, options).args.at(0) || zeroHash;
-      actionPayload.instance = action.base;
+        payload.action.buildParameters(undefined, options).args.at(0) ||
+        zeroHash;
+      actionPayload.instance = assertValidAddressByChainId(
+        options.config,
+        payload.action.bases,
+        chainId,
+      ).address;
     }
 
     let validatorPayload: BoostPayload['validator'] = {
@@ -339,35 +491,25 @@ export class BoostCore extends Deployable<
       isBase: true,
       parameters: zeroHash,
     };
-    if (validator.address) {
-      const isBase = validator.address === validator.base || validator.isBase;
+    if (payload.validator.address) {
+      const isBase = payload.validator.isBase;
       validatorPayload = {
         isBase: isBase,
-        instance: validator.address,
+        instance: payload.validator.address,
         parameters: isBase
-          ? validator
-              .buildParameters(
-                {
-                  signers: [owner],
-                  validatorCaller: coreAddress,
-                },
-                options,
-              )
-              .args.at(0) || zeroHash
+          ? payload.validator.buildParameters(undefined, options).args.at(0) ||
+            zeroHash
           : zeroHash,
       };
     } else {
       validatorPayload.parameters =
-        validator
-          .buildParameters(
-            {
-              signers: [owner],
-              validatorCaller: coreAddress,
-            },
-            options,
-          )
-          .args.at(0) || zeroHash;
-      validatorPayload.instance = validator.base;
+        payload.validator.buildParameters(undefined, options).args.at(0) ||
+        zeroHash;
+      validatorPayload.instance = assertValidAddressByChainId(
+        options.config,
+        payload.validator.bases,
+        chainId,
+      ).address;
     }
 
     let allowListPayload: BoostPayload['allowList'] = {
@@ -375,31 +517,40 @@ export class BoostCore extends Deployable<
       isBase: true,
       parameters: zeroHash,
     };
-    if (allowList.address) {
-      const isBase = allowList.address === allowList.base || allowList.isBase;
+    // if allowlist not provided, assume open allowlist
+    if (!payload.allowList) {
+      payload.allowList = this.OpenAllowList();
+    }
+    if (payload.allowList.address) {
+      const isBase = payload.allowList.isBase;
       allowListPayload = {
         isBase: isBase,
-        instance: allowList.address,
+        instance: payload.allowList.address,
         parameters: isBase
           ? zeroHash // allowList.buildParameters(undefined, options).args.at(0) || zeroHash
           : zeroHash,
       };
     } else {
       allowListPayload.parameters =
-        allowList.buildParameters(undefined, options).args.at(0) || zeroHash;
-      allowListPayload.instance = allowList.base;
+        payload.allowList.buildParameters(undefined, options).args.at(0) ||
+        zeroHash;
+      allowListPayload.instance = assertValidAddressByChainId(
+        options.config,
+        payload.allowList.bases,
+        chainId,
+      ).address;
     }
 
-    let incentivesPayloads: Array<Target> = incentives.map(() => ({
+    const incentivesPayloads: Array<Target> = payload.incentives.map(() => ({
       instance: zeroAddress,
       isBase: true,
       parameters: zeroHash,
     }));
-    for (let i = 0; i < incentives.length; i++) {
+    for (let i = 0; i < payload.incentives.length; i++) {
       // biome-ignore lint/style/noNonNullAssertion: this will never be undefined
-      const incentive = incentives.at(i)!;
+      const incentive = payload.incentives.at(i)!;
       if (incentive.address) {
-        const isBase = incentive.address === incentive.base || incentive.isBase;
+        const isBase = incentive.isBase;
         if (!isBase) throw new IncentiveNotCloneableError(incentive);
         incentivesPayloads[i] = {
           isBase: isBase,
@@ -414,7 +565,11 @@ export class BoostCore extends Deployable<
         incentivesPayloads[i]!.parameters =
           incentive.buildParameters(undefined, options).args.at(0) || zeroHash;
         // biome-ignore lint/style/noNonNullAssertion: this will never be undefined
-        incentivesPayloads[i]!.instance = incentive.base;
+        incentivesPayloads[i]!.instance = assertValidAddressByChainId(
+          options.config,
+          incentive.bases,
+          chainId,
+        ).address;
       }
     }
 
@@ -424,43 +579,12 @@ export class BoostCore extends Deployable<
       validator: validatorPayload,
       allowList: allowListPayload,
       incentives: incentivesPayloads,
-      protocolFee,
-      referralFee,
-      maxParticipants,
-      owner,
+      protocolFee: payload.protocolFee || 0n,
+      maxParticipants: payload.maxParticipants || 0n,
+      owner: payload.owner,
     };
 
-    const boostHash = await boostFactory(options.config, {
-      args: [prepareBoostPayload(onChainPayload)],
-      ...this.optionallyAttachAccount(options.account),
-    });
-    const receipt = await waitForTransactionReceipt(options.config, {
-      hash: boostHash,
-    });
-    const boostCreatedLog = parseEventLogs({
-      abi: boostCoreAbi,
-      eventName: 'BoostCreated',
-      logs: receipt.logs,
-    }).at(0);
-    let boostId = 0n;
-    if (!boostCreatedLog) throw new BoostCoreNoIdentifierEmitted();
-    boostId = boostCreatedLog?.args.boostIndex;
-    const boost = await this.readBoost(boostId);
-    return new Boost({
-      id: boostId,
-      budget: budget.at(boost.budget),
-      action: action.at(boost.action),
-      validator: validator.at(boost.validator),
-      allowList: allowList.at(boost.allowList),
-      incentives: incentives.map((incentive, i) =>
-        // biome-ignore lint/style/noNonNullAssertion: this will never be undefined
-        incentive.at(boost.incentives.at(i)!),
-      ),
-      protocolFee: boost.protocolFee,
-      referralFee: boost.referralFee,
-      maxParticipants: boost.maxParticipants,
-      owner: boost.owner,
-    });
+    return onChainPayload;
   }
 
   /**
@@ -472,8 +596,8 @@ export class BoostCore extends Deployable<
    * @param {bigint} incentiveId
    * @param {Address} address
    * @param {Hex} data
-   * @param {?WriteParams<typeof boostCoreAbi, 'claimIncentive'>} [params]
-   * @returns {unknown}
+   * @param {?WriteParams} [params]
+   * @returns {Promise<void>}
    */
   public async claimIncentive(
     boostId: bigint,
@@ -496,8 +620,8 @@ export class BoostCore extends Deployable<
    * @param {bigint} incentiveId - The ID of the Incentive
    * @param {Address} referrer - The address of the referrer (if any)
    * @param {Hex} data- The data for the claim
-   * @param {?WriteParams<typeof boostCoreAbi, 'claimIncentive'>} [params]
-   * @returns {unknown}
+   * @param {?WriteParams} [params]
+   * @returns {Promise<{ hash: `0x${string}`; result: void; }>}
    */
   public async claimIncentiveRaw(
     boostId: bigint,
@@ -509,7 +633,11 @@ export class BoostCore extends Deployable<
     const { request, result } = await simulateBoostCoreClaimIncentive(
       this._config,
       {
-        address: this.assertValidAddress(),
+        ...assertValidAddressByChainId(
+          this._config,
+          this.addresses,
+          params?.chain?.id || params?.chainId,
+        ),
         args: [boostId, incentiveId, referrer, data],
         ...this.optionallyAttachAccount(),
         // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
@@ -530,8 +658,8 @@ export class BoostCore extends Deployable<
    * @param {Address} referrer
    * @param {Hex} data
    * @param {Address} claimant
-   * @param {?WriteParams<typeof boostCoreAbi, 'claimIncentiveFor'>} [params]
-   * @returns {unknown}
+   * @param {?WriteParams} [params]
+   * @returns {Promise<void>}
    */
   public async claimIncentiveFor(
     boostId: bigint,
@@ -563,8 +691,8 @@ export class BoostCore extends Deployable<
    * @param {Address} referrer - The address of the referrer (if any)
    * @param {Hex} data - The data for the claim
    * @param {Address} claimant - The address of the user eligible for the incentive payout
-   * @param {?WriteParams<typeof boostCoreAbi, 'claimIncentiveFor'>} [params]
-   * @returns {unknown}
+   * @param {?WriteParams} [params]
+   * @returns {Promise<{ hash: Hex; result: void; }>}
    */
   public async claimIncentiveForRaw(
     boostId: bigint,
@@ -577,7 +705,11 @@ export class BoostCore extends Deployable<
     const { request, result } = await simulateBoostCoreClaimIncentiveFor(
       this._config,
       {
-        address: this.assertValidAddress(),
+        ...assertValidAddressByChainId(
+          this._config,
+          this.addresses,
+          params?.chain?.id || params?.chainId,
+        ),
         args: [boostId, incentiveId, referrer, data, claimant],
         ...this.optionallyAttachAccount(),
         // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
@@ -593,21 +725,37 @@ export class BoostCore extends Deployable<
    *
    * @public
    * @async
-   * @param {bigint} id
-   * @param {?ReadParams<typeof boostCoreAbi, 'getBoost'>} [params]
-   * @returns {unknown}
+   * @param {bigint | string} id
+   * @param {?ReadParams} [params]
+   * @returns {Promise<RawBoost>}
+   * @throws {@link BoostNotFoundError}
    */
   public async readBoost(
-    id: bigint,
+    _id: string | bigint,
     params?: ReadParams<typeof boostCoreAbi, 'getBoost'>,
-  ) {
-    return await readBoostCoreGetBoost(this._config, {
-      address: this.assertValidAddress(),
-      args: [id],
-      ...this.optionallyAttachAccount(),
-      // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
-      ...(params as any),
-    });
+  ): Promise<RawBoost> {
+    try {
+      let id: bigint;
+      if (typeof _id === 'string') {
+        id = BigInt(_id);
+      } else id = _id;
+      return await readBoostCoreGetBoost(this._config, {
+        ...assertValidAddressByChainId(
+          this._config,
+          this.addresses,
+          params?.chainId,
+        ),
+        args: [id],
+        ...this.optionallyAttachAccount(),
+        // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
+        ...(params as any),
+      });
+      // biome-ignore lint/suspicious/noExplicitAny: unknown error
+    } catch (e: any) {
+      if (e?.message?.includes('bounds'))
+        throw new BoostNotFoundError(String(_id));
+      throw e;
+    }
   }
 
   /**
@@ -616,8 +764,9 @@ export class BoostCore extends Deployable<
    * @public
    * @async
    * @param {(string | bigint)} _id
-   * @param {?ReadParams<typeof boostCoreAbi, 'getBoost'>} [params]
-   * @returns {unknown}
+   * @param {?ReadParams} [params]
+   * @returns {Promise<Boost>}
+   * @throws {@link BoostNotFoundError}
    */
   public async getBoost(
     _id: string | bigint,
@@ -627,13 +776,8 @@ export class BoostCore extends Deployable<
     if (typeof _id === 'string') {
       id = BigInt(_id);
     } else id = _id;
-    const {
-      protocolFee,
-      referralFee,
-      maxParticipants,
-      owner,
-      ...boostPayload
-    } = await this.readBoost(id, params);
+    const { protocolFee, maxParticipants, owner, ...boostPayload } =
+      await this.readBoost(id, params);
     const options: DeployableOptions = {
       config: this._config,
       account: this._account,
@@ -658,7 +802,6 @@ export class BoostCore extends Deployable<
       allowList,
       incentives,
       protocolFee,
-      referralFee,
       maxParticipants,
       owner,
     });
@@ -669,14 +812,18 @@ export class BoostCore extends Deployable<
    *
    * @public
    * @async
-   * @param {?ReadParams<typeof boostCoreAbi, 'getBoostCount'>} [params]
+   * @param {?ReadParams} [params]
    * @returns {Promise<bigint>}
    */
   public async getBoostCount(
     params?: ReadParams<typeof boostCoreAbi, 'getBoostCount'>,
   ) {
     return await readBoostCoreGetBoostCount(this._config, {
-      address: this.assertValidAddress(),
+      ...assertValidAddressByChainId(
+        this._config,
+        this.addresses,
+        params?.chainId,
+      ),
       args: [],
       ...this.optionallyAttachAccount(),
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
@@ -690,7 +837,7 @@ export class BoostCore extends Deployable<
    * @public
    * @async
    * @param {Address} address
-   * @param {?ReadParams<typeof boostCoreAbi, 'createBoostAuth'> &
+   * @param {?ReadParams &
    *       ReadParams<typeof iAuthAbi, 'isAuthorized'>} [params]
    * @returns {Promise<boolean>}
    */
@@ -699,7 +846,7 @@ export class BoostCore extends Deployable<
     params?: ReadParams<typeof boostCoreAbi, 'createBoostAuth'> &
       ReadParams<typeof iAuthAbi, 'isAuthorized'>,
   ) {
-    const auth = await this.createBoostAuth();
+    const auth = await this.createBoostAuth(params);
     return readIAuthIsAuthorized(this._config, {
       address: auth,
       args: [address],
@@ -714,14 +861,18 @@ export class BoostCore extends Deployable<
    *
    * @public
    * @async
-   * @param {?ReadParams<typeof boostCoreAbi, 'createBoostAuth'>} [params]
-   * @returns {unknown}
+   * @param {?ReadParams} [params]
+   * @returns {Promise<Address>}
    */
   public async createBoostAuth(
     params?: ReadParams<typeof boostCoreAbi, 'createBoostAuth'>,
   ) {
     return await readBoostCoreCreateBoostAuth(this._config, {
-      address: this.assertValidAddress(),
+      ...assertValidAddressByChainId(
+        this._config,
+        this.addresses,
+        params?.chainId,
+      ),
       args: [],
       ...this.optionallyAttachAccount(),
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
@@ -735,8 +886,8 @@ export class BoostCore extends Deployable<
    * @public
    * @async
    * @param {Auth} auth
-   * @param {?WriteParams<typeof boostCoreAbi, 'setCreateBoostAuth'>} [params]
-   * @returns {unknown}
+   * @param {?WriteParams} [params]
+   * @returns {Promise<void>}
    */
   public async setCreateBoostAuth(
     auth: Auth,
@@ -755,8 +906,8 @@ export class BoostCore extends Deployable<
    * @public
    * @async
    * @param {Address} address
-   * @param {?WriteParams<typeof boostCoreAbi, 'setCreateBoostAuth'>} [params]
-   * @returns {unknown}
+   * @param {?WriteParams} [params]
+   * @returns {Promise<{ hash: `0x${string}`; result: void; }>}
    */
   public async setCreateBoostAuthRaw(
     address: Address,
@@ -765,7 +916,11 @@ export class BoostCore extends Deployable<
     const { request, result } = await simulateBoostCoreSetCreateBoostAuth(
       this._config,
       {
-        address: this.assertValidAddress(),
+        ...assertValidAddressByChainId(
+          this._config,
+          this.addresses,
+          params?.chainId,
+        ),
         args: [address],
         ...this.optionallyAttachAccount(),
         // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
@@ -781,14 +936,18 @@ export class BoostCore extends Deployable<
    *
    * @public
    * @async
-   * @param {?ReadParams<typeof boostCoreAbi, 'protocolFee'>} [params]
+   * @param {?ReadParams} [params]
    * @returns {unknown}
    */
   public async protocolFee(
     params?: ReadParams<typeof boostCoreAbi, 'protocolFee'>,
   ) {
     return await readBoostCoreProtocolFee(this._config, {
-      address: this.assertValidAddress(),
+      ...assertValidAddressByChainId(
+        this._config,
+        this.addresses,
+        params?.chainId,
+      ),
       args: [],
       ...this.optionallyAttachAccount(),
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
@@ -801,14 +960,18 @@ export class BoostCore extends Deployable<
    *
    * @public
    * @async
-   * @param {?ReadParams<typeof boostCoreAbi, 'protocolFeeReceiver'>} [params]
-   * @returns {unknown}
+   * @param {?ReadParams} [params]
+   * @returns {Promise<Address>}
    */
   public async protocolFeeReceiver(
     params?: ReadParams<typeof boostCoreAbi, 'protocolFeeReceiver'>,
   ) {
     return await readBoostCoreProtocolFeeReceiver(this._config, {
-      address: this.assertValidAddress(),
+      ...assertValidAddressByChainId(
+        this._config,
+        this.addresses,
+        params?.chainId,
+      ),
       args: [],
       ...this.optionallyAttachAccount(),
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
@@ -822,8 +985,8 @@ export class BoostCore extends Deployable<
    * @public
    * @async
    * @param {Address} address
-   * @param {?WriteParams<typeof boostCoreAbi, 'setProtocolFeeReceiver'>} [params]
-   * @returns {unknown}
+   * @param {?WriteParams} [params]
+   * @returns {Promise<void>}
    */
   public async setProcolFeeReceiver(
     address: Address,
@@ -842,8 +1005,8 @@ export class BoostCore extends Deployable<
    * @public
    * @async
    * @param {Address} address
-   * @param {?WriteParams<typeof boostCoreAbi, 'setProtocolFeeReceiver'>} [params]
-   * @returns {unknown}
+   * @param {?WriteParams} [params]
+   * @returns {Promise<{ hash: `0x${string}`; result: void; }>}
    */
   public async setProcolFeeReceiverRaw(
     address: Address,
@@ -852,7 +1015,11 @@ export class BoostCore extends Deployable<
     const { request, result } = await simulateBoostCoreSetProtocolFeeReceiver(
       this._config,
       {
-        address: this.assertValidAddress(),
+        ...assertValidAddressByChainId(
+          this._config,
+          this.addresses,
+          params?.chainId,
+        ),
         args: [address],
         ...this.optionallyAttachAccount(),
         // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
@@ -867,64 +1034,38 @@ export class BoostCore extends Deployable<
   }
 
   /**
-   * Get the claim fee.
+   * Retrieves the claim information from a transaction receipt.
    *
-   * @public
-   * @async
-   * @param {?ReadParams<typeof boostCoreAbi, 'claimFee'>} [params]
-   * @returns {unknown}
-   */
-  public async claimFee(params?: ReadParams<typeof boostCoreAbi, 'claimFee'>) {
-    return await readBoostCoreClaimFee(this._config, {
-      address: this.assertValidAddress(),
-      args: [],
-      ...this.optionallyAttachAccount(),
-      // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
-      ...(params as any),
-    });
-  }
-
-  /**
-   * Sets the claim fee.
+   * @param {GetTransactionReceiptParameters} params - The parameters required to get the transaction receipt.
+   * @returns {Promise<{ boostId: bigint, incentiveId: bigint, claimer: Address, amount: bigint } | undefined>} The claim information if found, undefined otherwise.
    *
-   * @public
-   * @async
-   * @param {bigint} claimFee
-   * @param {?WriteParams<typeof boostCoreAbi, 'setClaimFee'>} [params]
-   * @returns {unknown}
-   */
-  public async setClaimFee(
-    claimFee: bigint,
-    params?: WriteParams<typeof boostCoreAbi, 'setClaimFee'>,
-  ) {
-    return await this.awaitResult(this.setClaimFeeRaw(claimFee, params));
-  }
-
-  /**
-   * Sets the claim fee.
+   * @description
+   * This method retrieves the transaction receipt using the provided parameters,
+   * then parses the logs to find the 'BoostClaimed' event.
+   * If found, it returns the arguments of the event, which include the boost ID,
+   * incentive ID, claimer address, and claimed amount.
    *
-   * @public
-   * @async
-   * @param {bigint} claimFee
-   * @param {?WriteParams<typeof boostCoreAbi, 'setClaimFee'>} [params]
-   * @returns {unknown}
+   * @example
+   * ```ts
+   * const claimInfo = await boostCore.getClaimFromTransaction({
+   *   hash: '0x...',
+   *   chainId: 1
+   * });
+   * if (claimInfo) {
+   *   console.log(`Boost ${claimInfo.boostId} claimed by ${claimInfo.claimer}`);
+   * }
+   * ```
    */
-  public async setClaimFeeRaw(
-    claimFee: bigint,
-    params?: WriteParams<typeof boostCoreAbi, 'setClaimFee'>,
+  public async getClaimFromTransaction(
+    params: GetTransactionReceiptParameters,
   ) {
-    const { request, result } = await simulateBoostCoreSetClaimFee(
-      this._config,
-      {
-        address: this.assertValidAddress(),
-        args: [claimFee],
-        ...this.optionallyAttachAccount(),
-        // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
-        ...(params as any),
-      },
-    );
-    const hash = await writeBoostCoreSetClaimFee(this._config, request);
-    return { hash, result };
+    const receipt = await getTransactionReceipt(this._config, params);
+    const logs = parseEventLogs({
+      abi: boostCoreAbi,
+      eventName: 'BoostClaimed',
+      logs: receipt.logs,
+    });
+    return logs.at(0)?.args;
   }
 
   /**
@@ -1008,6 +1149,24 @@ export class BoostCore extends Deployable<
   //     isBase,
   //   );
   // }
+  /**
+   * Bound {@link OpenAllowList} constructor that reuses the same configuration as the Boost Core instance.
+   *
+   * @example
+   * ```ts
+   * const list = core.OpenAllowList('0x') // is roughly equivalent to
+   * const list = new OpenAllowList({ config: core._config, account: core._account }, '0x')
+   * ```
+   * @param {?boolean} [isBase]
+   * @returns {OpenAllowList}
+   */
+  OpenAllowList(isBase?: boolean) {
+    return new OpenAllowList(
+      { config: this._config, account: this._account },
+      undefined,
+      isBase,
+    );
+  }
   /**
    * Bound {@link SimpleAllowList} constructor that reuses the same configuration as the Boost Core instance.
    *
@@ -1212,6 +1371,30 @@ export class BoostCore extends Deployable<
       isBase,
     );
   }
+
+  /**
+   * Bound {@link ERC20VariableCriteriaIncentive} constructor that reuses the same configuration as the Boost Core instance.
+   *
+   * @example
+   * ```ts
+   * const validator = core.ERC20VariableCrtieriaIncentive({ ... }) // is roughly equivalent to
+   * const validator = new ERC20VariableCrtieriaIncentive({ config: core._config, account: core._account }, { ... })
+   * ```
+   * @param {DeployablePayloadOrAddress<ERC20VariableCrtieriaIncentivePayload>} options
+   * @param {?boolean} [isBase]
+   * @returns {ERC20VariableCrtieriaIncentive}
+   * */
+  ERC20VariableCriteriaIncentive(
+    options: DeployablePayloadOrAddress<ERC20VariableCriteriaIncentivePayload>,
+    isBase?: boolean,
+  ) {
+    return new ERC20VariableCriteriaIncentive(
+      { config: this._config, account: this._account },
+      options,
+      isBase,
+    );
+  }
+
   /**
    * Bound {@link ERC20VariableIncentive} constructor that reuses the same configuration as the Boost Core instance.
    *