@boostxyz/sdk 0.0.0-alpha.8 → 0.0.0-alpha.9

package/src/Incentives/ERC20VariableIncentive.ts

@@ -15,25 +15,53 @@ import {
   writeErc20VariableIncentiveClawback,
 } from '@boostxyz/evm';
 import { bytecode } from '@boostxyz/evm/artifacts/contracts/incentives/ERC20VariableIncentive.sol/ERC20VariableIncentive.json';
-import type { Address, ContractEventName, Hex } from 'viem';
+import {
+  type Address,
+  type ContractEventName,
+  type Hex,
+  encodeAbiParameters,
+} from 'viem';
 import type {
   DeployableOptions,
   GenericDeployableParams,
 } from '../Deployable/Deployable';
 import { DeployableTarget } from '../Deployable/DeployableTarget';
+import { type ClaimPayload, prepareClaimPayload } from '../claiming';
 import {
-  type ClaimPayload,
-  type ERC20VariableIncentivePayload,
   type GenericLog,
   type ReadParams,
   RegistryType,
   type WriteParams,
-  prepareClaimPayload,
-  prepareERC20VariableIncentivePayload,
 } from '../utils';
 
 export { erc20VariableIncentiveAbi };
-export type { ERC20VariableIncentivePayload };
+/**
+ * The object representation of a `ERC20VariableIncentivePayload.InitPayload`
+ *
+ * @export
+ * @interface ERC20VariableIncentivePayload
+ * @typedef {ERC20VariableIncentivePayload}
+ */
+export interface ERC20VariableIncentivePayload {
+  /**
+   * The address of the incentivized asset.
+   *
+   * @type {Address}
+   */
+  asset: Address;
+  /**
+   * The amount of the asset to distribute.
+   *
+   * @type {bigint}
+   */
+  reward: bigint;
+  /**
+   * How many times can this incentive be claimed.
+   *
+   * @type {bigint}
+   */
+  limit: bigint;
+}
 
 /**
  * A generic `viem.Log` event with support for `ERC20VariableIncentive` event types.
@@ -92,7 +120,7 @@ export class ERC20VariableIncentive extends DeployableTarget<
   public async owner(
     params?: ReadParams<typeof erc20VariableIncentiveAbi, 'owner'>,
   ) {
-    return readErc20VariableIncentiveOwner(this._config, {
+    return await readErc20VariableIncentiveOwner(this._config, {
       address: this.assertValidAddress(),
       args: [],
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
@@ -111,7 +139,7 @@ export class ERC20VariableIncentive extends DeployableTarget<
   public async totalClaimed(
     params?: ReadParams<typeof erc20VariableIncentiveAbi, 'totalClaimed'>,
   ) {
-    return readErc20VariableIncentiveTotalClaimed(this._config, {
+    return await readErc20VariableIncentiveTotalClaimed(this._config, {
       address: this.assertValidAddress(),
       args: [],
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
@@ -130,7 +158,7 @@ export class ERC20VariableIncentive extends DeployableTarget<
   public async currentReward(
     params?: ReadParams<typeof erc20VariableIncentiveAbi, 'currentReward'>,
   ) {
-    return readErc20VariableIncentiveCurrentReward(this._config, {
+    return await readErc20VariableIncentiveCurrentReward(this._config, {
       address: this.assertValidAddress(),
       args: [],
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
@@ -149,7 +177,7 @@ export class ERC20VariableIncentive extends DeployableTarget<
   public async claims(
     params?: ReadParams<typeof erc20VariableIncentiveAbi, 'claims'>,
   ) {
-    return readErc20VariableIncentiveClaims(this._config, {
+    return await readErc20VariableIncentiveClaims(this._config, {
       address: this.assertValidAddress(),
       args: [],
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
@@ -170,7 +198,7 @@ export class ERC20VariableIncentive extends DeployableTarget<
     address: Address,
     params?: ReadParams<typeof erc20VariableIncentiveAbi, 'claimed'>,
   ) {
-    return readErc20VariableIncentiveClaimed(this._config, {
+    return await readErc20VariableIncentiveClaimed(this._config, {
       address: this.assertValidAddress(),
       args: [address],
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
@@ -189,7 +217,7 @@ export class ERC20VariableIncentive extends DeployableTarget<
   public async asset(
     params?: ReadParams<typeof erc20VariableIncentiveAbi, 'asset'>,
   ) {
-    return readErc20VariableIncentiveAsset(this._config, {
+    return await readErc20VariableIncentiveAsset(this._config, {
       address: this.assertValidAddress(),
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
       ...(params as any),
@@ -207,7 +235,7 @@ export class ERC20VariableIncentive extends DeployableTarget<
   public async reward(
     params?: ReadParams<typeof erc20VariableIncentiveAbi, 'reward'>,
   ) {
-    return readErc20VariableIncentiveReward(this._config, {
+    return await readErc20VariableIncentiveReward(this._config, {
       address: this.assertValidAddress(),
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
       ...(params as any),
@@ -225,7 +253,7 @@ export class ERC20VariableIncentive extends DeployableTarget<
   public async limit(
     params?: ReadParams<typeof erc20VariableIncentiveAbi, 'limit'>,
   ) {
-    return readErc20VariableIncentiveLimit(this._config, {
+    return await readErc20VariableIncentiveLimit(this._config, {
       address: this.assertValidAddress(),
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
       ...(params as any),
@@ -241,11 +269,11 @@ export class ERC20VariableIncentive extends DeployableTarget<
    * @param {?WriteParams<typeof erc20VariableIncentiveAbi, 'claim'>} [params]
    * @returns {Promise<boolean>} - Returns true if successfully claimed
    */
-  public async claim(
+  protected async claim(
     payload: ClaimPayload,
     params?: WriteParams<typeof erc20VariableIncentiveAbi, 'claim'>,
   ) {
-    return this.awaitResult(this.claimRaw(payload, params));
+    return await this.awaitResult(this.claimRaw(payload, params));
   }
 
   /**
@@ -257,7 +285,7 @@ export class ERC20VariableIncentive extends DeployableTarget<
    * @param {?WriteParams<typeof erc20VariableIncentiveAbi, 'claim'>} [params]
    * @returns {Promise<boolean>} - Returns true if successfully claimed
    */
-  public async claimRaw(
+  protected async claimRaw(
     payload: ClaimPayload,
     params?: WriteParams<typeof erc20VariableIncentiveAbi, 'claim'>,
   ) {
@@ -288,7 +316,7 @@ export class ERC20VariableIncentive extends DeployableTarget<
     payload: ClaimPayload,
     params?: WriteParams<typeof erc20VariableIncentiveAbi, 'clawback'>,
   ) {
-    return this.awaitResult(this.clawbackRaw(payload, params));
+    return await this.awaitResult(this.clawbackRaw(payload, params));
   }
 
   /**
@@ -334,7 +362,7 @@ export class ERC20VariableIncentive extends DeployableTarget<
     payload: ClaimPayload,
     params?: ReadParams<typeof erc20VariableIncentiveAbi, 'isClaimable'>,
   ) {
-    return readErc20VariableIncentiveIsClaimable(this._config, {
+    return await readErc20VariableIncentiveIsClaimable(this._config, {
       address: this.assertValidAddress(),
       args: [prepareClaimPayload(payload)],
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
@@ -366,3 +394,27 @@ export class ERC20VariableIncentive extends DeployableTarget<
     };
   }
 }
+
+/**
+ * Given a {@link ERC20VariableIncentivePayload}, properly encode a ` ERC20VariableIncentive.InitPayload` for use with {@link ERC20VariableIncentive} initialization.
+ *
+ * @param {ERC20VariableIncentivePayload} param0
+ * @param {Address} param0.asset - The address of the incentivized asset.
+ * @param {bigint} param0.reward - The amount of the asset to distribute.
+ * @param {bigint} param0.limit - How many times can this incentive be claimed.
+ * @returns {*}
+ */
+export function prepareERC20VariableIncentivePayload({
+  asset,
+  reward,
+  limit,
+}: ERC20VariableIncentivePayload) {
+  return encodeAbiParameters(
+    [
+      { type: 'address', name: 'asset' },
+      { type: 'uint256', name: 'reward' },
+      { type: 'uint256', name: 'limit' },
+    ],
+    [asset, reward, limit],
+  );
+}

package/src/Incentives/Incentive.test.ts

@@ -1,7 +1,7 @@
 import { zeroAddress } from 'viem';
 import { describe, expect, test } from 'vitest';
 import { defaultOptions } from '../../test/helpers';
-import { StrategyType } from '../utils';
+import { StrategyType } from '../claiming';
 import {
   AllowListIncentive,
   CGDAIncentive,

package/src/Incentives/PointsIncentive.test.ts

@@ -1,6 +1,5 @@
 import { readPointsBalanceOf, writePointsGrantRoles } from '@boostxyz/evm';
 import { loadFixture } from '@nomicfoundation/hardhat-network-helpers';
-import { signMessage } from '@wagmi/core';
 import { isAddress, pad, parseEther, zeroAddress } from 'viem';
 import { beforeAll, beforeEach, describe, expect, test } from 'vitest';
 import type { MockPoints } from '../../test/MockPoints';
@@ -12,7 +11,7 @@ import {
   freshBoost,
   freshPoints,
 } from '../../test/helpers';
-import { bytes4, prepareSignerValidatorClaimDataPayload } from '../utils';
+import { bytes4 } from '../utils';
 import { PointsIncentive } from './PointsIncentive';
 
 let fixtures: Fixtures, points: MockPoints;
@@ -55,11 +54,10 @@ describe('PointsIncentive', () => {
     const claimant = trustedSigner.account;
     const incentiveData = pad('0xdef456232173821931823712381232131391321934');
     const incentiveQuantity = 1;
-    const claimDataPayload = await prepareSignerValidatorClaimDataPayload({
+    const claimDataPayload = await boost.validator.encodeClaimData({
       signer: trustedSigner,
       incentiveData,
       chainId: defaultOptions.config.chains[0].id,
-      validator: boost.validator.assertValidAddress(),
       incentiveQuantity,
       claimant,
       boostId: boost.id,
@@ -105,11 +103,10 @@ describe('PointsIncentive', () => {
     const claimant = trustedSigner.account;
     const incentiveData = pad('0xdef456232173821931823712381232131391321934');
     const incentiveQuantity = 1;
-    const claimDataPayload = await prepareSignerValidatorClaimDataPayload({
+    const claimDataPayload = await boost.validator.encodeClaimData({
       signer: trustedSigner,
       incentiveData,
       chainId: defaultOptions.config.chains[0].id,
-      validator: boost.validator.assertValidAddress(),
       incentiveQuantity,
       claimant,
       boostId: boost.id,

package/src/Incentives/PointsIncentive.ts

@@ -12,25 +12,60 @@ import {
   writePointsIncentiveClaim,
 } from '@boostxyz/evm';
 import { bytecode } from '@boostxyz/evm/artifacts/contracts/incentives/PointsIncentive.sol/PointsIncentive.json';
-import type { Address, ContractEventName, Hex } from 'viem';
+import {
+  type Address,
+  type ContractEventName,
+  type Hex,
+  encodeAbiParameters,
+} from 'viem';
 import type {
   DeployableOptions,
   GenericDeployableParams,
 } from '../Deployable/Deployable';
 import { DeployableTarget } from '../Deployable/DeployableTarget';
+import { type ClaimPayload, prepareClaimPayload } from '../claiming';
 import {
-  type ClaimPayload,
   type GenericLog,
-  type PointsIncentivePayload,
   type ReadParams,
   RegistryType,
   type WriteParams,
-  prepareClaimPayload,
-  preparePointsIncentivePayload,
 } from '../utils';
 
 export { pointsIncentiveAbi };
-export type { PointsIncentivePayload };
+
+/**
+ * The object representation of a `PointsIncentive.InitPayload`
+ *
+ * @export
+ * @interface PointsIncentivePayload
+ * @typedef {PointsIncentivePayload}
+ */
+export interface PointsIncentivePayload {
+  /**
+   * The address of the points contract
+   *
+   * @type {Address}
+   */
+  venue: Address;
+  /**
+   * The selector for the issuance function on the points contract
+   *
+   * @type {Hex}
+   */
+  selector: Hex;
+  /**
+   * The reward amount issued for each claim
+   *
+   * @type {bigint}
+   */
+  reward: bigint;
+  /**
+   *  The maximum number of claims that can be made (one per address)
+   *
+   * @type {bigint}
+   */
+  limit: bigint;
+}
 
 /**
  * A generic `viem.Log` event with support for `PointsIncentive` event types.
@@ -94,7 +129,7 @@ export class PointsIncentive extends DeployableTarget<
   public async claims(
     params?: ReadParams<typeof pointsIncentiveAbi, 'claims'>,
   ) {
-    return readPointsIncentiveClaims(this._config, {
+    return await readPointsIncentiveClaims(this._config, {
       address: this.assertValidAddress(),
       args: [],
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
@@ -113,7 +148,7 @@ export class PointsIncentive extends DeployableTarget<
   public async currentReward(
     params?: ReadParams<typeof pointsIncentiveAbi, 'currentReward'>,
   ) {
-    return readPointsIncentiveCurrentReward(this._config, {
+    return await readPointsIncentiveCurrentReward(this._config, {
       address: this.assertValidAddress(),
       args: [],
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
@@ -132,7 +167,7 @@ export class PointsIncentive extends DeployableTarget<
   public async reward(
     params?: ReadParams<typeof pointsIncentiveAbi, 'reward'>,
   ) {
-    return readPointsIncentiveReward(this._config, {
+    return await readPointsIncentiveReward(this._config, {
       address: this.assertValidAddress(),
       args: [],
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
@@ -153,7 +188,7 @@ export class PointsIncentive extends DeployableTarget<
     address: Address,
     params?: ReadParams<typeof pointsIncentiveAbi, 'claimed'>,
   ) {
-    return readPointsIncentiveClaimed(this._config, {
+    return await readPointsIncentiveClaimed(this._config, {
       address: this.assertValidAddress(),
       args: [address],
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
@@ -170,7 +205,7 @@ export class PointsIncentive extends DeployableTarget<
    * @returns {unknown}
    */
   public async venue(params?: ReadParams<typeof pointsIncentiveAbi, 'venue'>) {
-    return readPointsIncentiveVenue(this._config, {
+    return await readPointsIncentiveVenue(this._config, {
       address: this.assertValidAddress(),
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
       ...(params as any),
@@ -186,7 +221,7 @@ export class PointsIncentive extends DeployableTarget<
    * @returns {Promise<bigint>}
    */
   public async limit(params?: ReadParams<typeof pointsIncentiveAbi, 'limit'>) {
-    return readPointsIncentiveLimit(this._config, {
+    return await readPointsIncentiveLimit(this._config, {
       address: this.assertValidAddress(),
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
       ...(params as any),
@@ -204,7 +239,7 @@ export class PointsIncentive extends DeployableTarget<
   public async selector(
     params?: ReadParams<typeof pointsIncentiveAbi, 'selector'>,
   ) {
-    return readPointsIncentiveSelector(this._config, {
+    return await readPointsIncentiveSelector(this._config, {
       address: this.assertValidAddress(),
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
       ...(params as any),
@@ -220,11 +255,11 @@ export class PointsIncentive extends DeployableTarget<
    * @param {?WriteParams<typeof pointsIncentiveAbi, 'claim'>} [params]
    * @returns {Promise<boolean>} -  True if the incentive was successfully claimed
    */
-  public async claim(
+  protected async claim(
     payload: ClaimPayload,
     params?: WriteParams<typeof pointsIncentiveAbi, 'claim'>,
   ) {
-    return this.awaitResult(this.claimRaw(payload, params));
+    return await this.awaitResult(this.claimRaw(payload, params));
   }
 
   /**
@@ -236,7 +271,7 @@ export class PointsIncentive extends DeployableTarget<
    * @param {?WriteParams<typeof pointsIncentiveAbi, 'claim'>} [params]
    * @returns {Promise<boolean>} -  True if the incentive was successfully claimed
    */
-  public async claimRaw(
+  protected async claimRaw(
     payload: ClaimPayload,
     params?: WriteParams<typeof pointsIncentiveAbi, 'claim'>,
   ) {
@@ -269,7 +304,7 @@ export class PointsIncentive extends DeployableTarget<
     payload: ClaimPayload,
     params?: ReadParams<typeof pointsIncentiveAbi, 'isClaimable'>,
   ) {
-    return readPointsIncentiveIsClaimable(this._config, {
+    return await readPointsIncentiveIsClaimable(this._config, {
       address: this.assertValidAddress(),
       args: [prepareClaimPayload(payload)],
       // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
@@ -301,3 +336,30 @@ export class PointsIncentive extends DeployableTarget<
     };
   }
 }
+
+/**
+ * Given a {@link PointsIncentivePayload}, properly encode a `PointsIncentive.InitPayload` for use with {@link PointsIncentive} initialization.
+ *
+ * @param {PointsIncentivePayload} param0
+ * @param {Address} param0.venue - The address of the points contract
+ * @param {Hex} param0.selector - The selector for the issuance function on the points contract
+ * @param {bigint} param0.reward - The reward amount issued for each claim
+ * @param {bigint} param0.limit -  The maximum number of claims that can be made (one per address)
+ * @returns {*}
+ */
+export const preparePointsIncentivePayload = ({
+  venue,
+  selector,
+  reward,
+  limit,
+}: PointsIncentivePayload) => {
+  return encodeAbiParameters(
+    [
+      { type: 'address', name: 'venue' },
+      { type: 'bytes4', name: 'selector' },
+      { type: 'uint256', name: 'reward' },
+      { type: 'uint256', name: 'limit' },
+    ],
+    [venue, selector, reward, limit],
+  );
+};

package/src/Validators/SignerValidator.test.ts

@@ -8,7 +8,6 @@ import {
   deployFixtures,
 } from '../../test/helpers';
 import { testAccount } from '../../test/viem';
-import { prepareSignerValidatorClaimDataPayload } from '../utils';
 import { SignerValidator } from './SignerValidator';
 
 let fixtures: Fixtures;
@@ -65,21 +64,19 @@ describe('SignerValidator', () => {
     // biome-ignore lint/style/noNonNullAssertion: this will never be undefined
     const untrustedSigner = accounts.at(2)!;
 
-    const claimDataPayload = await prepareSignerValidatorClaimDataPayload({
+    const claimDataPayload = await validator.encodeClaimData({
       signer: trustedSigner,
       incentiveData,
       chainId: defaultOptions.config.chains[0].id,
-      validator: validator.assertValidAddress(),
       incentiveQuantity,
       claimant,
       boostId: boostId,
     });
 
-    const badClaimDataPayload = await prepareSignerValidatorClaimDataPayload({
+    const badClaimDataPayload = await validator.encodeClaimData({
       signer: untrustedSigner,
       incentiveData,
       chainId: defaultOptions.config.chains[0].id,
-      validator: validator.assertValidAddress(),
       incentiveQuantity,
       claimant,
       boostId: boostId,
@@ -120,11 +117,10 @@ describe('SignerValidator', () => {
     // biome-ignore lint/style/noNonNullAssertion: this will never be undefined
     const trustedSigner = accounts.at(0)!;
 
-    const claimDataPayload = await prepareSignerValidatorClaimDataPayload({
+    const claimDataPayload = await validator.encodeClaimData({
       signer: trustedSigner,
       incentiveData,
       chainId: defaultOptions.config.chains[0].id,
-      validator: validator.assertValidAddress(),
       incentiveQuantity,
       claimant,
       boostId: boostId,