@boostxyz/sdk 8.0.0-canary.3 → 8.0.0-canary.5

package/src/Validators/SignerValidatorV2.ts

@@ -0,0 +1,635 @@
+import {
+  readSignerValidatorV2HashSignerData,
+  readSignerValidatorV2Signers,
+  signerValidatorV2Abi,
+  simulateSignerValidatorV2SetAuthorized,
+  simulateSignerValidatorV2SetValidatorCaller,
+  simulateSignerValidatorV2Validate,
+  writeSignerValidatorV2SetAuthorized,
+  writeSignerValidatorV2SetValidatorCaller,
+  writeSignerValidatorV2Validate,
+} from '@boostxyz/evm';
+import { bytecode } from '@boostxyz/evm/artifacts/contracts/validators/SignerValidatorV2.sol/SignerValidatorV2.json';
+import {
+  type Address,
+  type ContractEventName,
+  type Hex,
+  type PrivateKeyAccount,
+  encodeAbiParameters,
+} from 'viem';
+import { SignerValidatorV2 as SignerValidatorV2Bases } from '../../dist/deployments.json';
+import type {
+  DeployableOptions,
+  GenericDeployableParams,
+} from '../Deployable/Deployable';
+import { DeployableTarget } from '../Deployable/DeployableTarget';
+import {
+  type GenericLog,
+  type ReadParams,
+  RegistryType,
+  type WriteParams,
+} from '../utils';
+
+export { signerValidatorV2Abi };
+
+/**
+ * Object reprentation of a {@link SignerValidatorV2} initialization payload
+ *
+ * @export
+ * @interface SignerValidatorV2Payload
+ * @typedef {SignerValidatorV2Payload}
+ */
+export interface SignerValidatorV2Payload {
+  /**
+   * The list of authorized signers. The first address in the list will be the initial owner of the contract.
+   *
+   * @type {Address[]}
+   */
+  signers: Address[];
+  /**
+   * The authorized caller of the {@link prepareSignerValidatorV2} function
+   * @type {Address}
+   */
+  validatorCaller: Address;
+}
+
+/**
+ * Description placeholder
+ *
+ * @export
+ * @interface SignerValidatorV2ValidatePayload
+ * @typedef {SignerValidatorV2ValidatePayload}
+ */
+export interface SignerValidatorV2ValidatePayload {
+  /**
+   * The ID of the boost.
+   *
+   * @type {bigint}
+   */
+  boostId: bigint;
+  /**
+   * The ID of the incentive.
+   *
+   * @type {bigint}
+   */
+  incentiveId: bigint;
+  /**
+   * The address of the claimant.
+   *
+   * @type {Address}
+   */
+  claimant: Address;
+  /**
+   * The claim data.
+   *
+   * @type {Hex}
+   */
+  claimData: Hex;
+}
+
+/**
+ * Signer Validator Claim Data Payload
+ *
+ * @export
+ * @interface SignerValidatorV2ClaimDataParams
+ * @typedef {SignerValidatorV2ClaimDataParams}
+ */
+export interface SignerValidatorV2ClaimDataParams {
+  /**
+   * The signer with which to sign the input
+   *
+   * @type {{
+   *     account: Address;
+   *     key: Hex;
+   *     privateKey: PrivateKeyAccount;
+   *   }}
+   */
+  signer: {
+    account: Address;
+    key: Hex;
+    privateKey: PrivateKeyAccount;
+  };
+  /**
+   * The encoded data to provide the underlying incentive. You can use {@link prepareAllowListIncentivePayload}, {@link prepareCGDAIncentivePayload}, {@link prepareERC20IncentivePayload}, {@link prepareERC1155IncentivePayload}, or {@link preparePointsIncentivePayload}
+   *
+   * @type {Hex}
+   */
+  incentiveData: Hex;
+  /**
+   * The chain id to target
+   *
+   * @type {number}
+   */
+  chainId: number;
+  /**
+   * The address of the validator
+   *
+   * @type {Address}
+   */
+  validator: Address;
+  /**
+   * The total number of incentives on the Boost
+   *
+   * @type {number}
+   */
+  incentiveQuantity: number;
+  /**
+   * The address of the claimant
+   *
+   * @type {Address}
+   */
+  claimant: Address;
+  /**
+   * The ID of the boost
+   *
+   * @type {bigint}
+   */
+  boostId: bigint;
+  /**
+   * The address of the referrer
+   *
+   * @type {?Address}
+   */
+  referrer?: Address;
+}
+
+/**
+ * Object representation of a {@link SignerValidatorV2InputParams} initialization payload
+ *
+ * @export
+ * @interface SignerValidatorV2InputParams
+ * @typedef {SignerValidatorV2InputParams}
+ */
+export interface SignerValidatorV2InputParams {
+  /**
+   * The signer address.
+   *
+   * @type {Address}
+   */
+  signer: Address;
+
+  /**
+   * The signature data.
+   *
+   * @type {Hex}
+   */
+  signature: Hex;
+
+  /**
+   * The total number of incentives on the Boost
+   *
+   * @type {number}
+   */
+  incentiveQuantity: number;
+}
+
+/**
+ * Object representing the payload for signing before validaton.
+ *
+ * @export
+ * @interface SignerValidatorV2SignaturePayload
+ * @typedef {SignerValidatorV2SignaturePayload}
+ */
+export interface SignerValidatorV2SignaturePayload {
+  /**
+   * The ID of the boost.
+   *
+   * @type {bigint}
+   */
+  boostId: bigint;
+  /**
+   * The ID of the incentive.
+   *
+   * @type {number}
+   */
+  incentiveQuantity: number;
+  /**
+   * The address of the claimant.
+   *
+   * @type {Address}
+   */
+  claimant: Address;
+  /**
+   * The claim data.
+   *
+   * @type {Hex}
+   */
+  incentiveData: Hex;
+  /**
+   * The address of the referrer (defaults to claimant if omitted)
+   *
+   * @type {?Address}
+   */
+  referrer?: Address;
+}
+
+/**
+ * A generic `viem.Log` event with support for `BoostCore` event types.
+ *
+ * @export
+ * @typedef {SignerValidatorV2Log}
+ * @template {ContractEventName<
+ *     typeof signerValidatorV2Abi
+ *   >} [event=ContractEventName<typeof signerValidatorV2Abi>]
+ */
+export type SignerValidatorV2Log<
+  event extends ContractEventName<
+    typeof signerValidatorV2Abi
+  > = ContractEventName<typeof signerValidatorV2Abi>,
+> = GenericLog<typeof signerValidatorV2Abi, event>;
+
+/**
+ *  A simple implementation of a Validator that verifies a given signature and checks the recovered address against a set of authorized signers
+ *
+ * @export
+ * @class SignerValidatorV2
+ * @typedef {SignerValidatorV2}
+ * @extends {DeployableTarget<SignerValidatorV2Payload>}
+ */
+export class SignerValidatorV2 extends DeployableTarget<
+  SignerValidatorV2Payload,
+  typeof signerValidatorV2Abi
+> {
+  /**
+   * @inheritdoc
+   *
+   * @public
+   * @readonly
+   * @type {*}
+   */
+  public override readonly abi = signerValidatorV2Abi;
+  /**
+   * @inheritdoc
+   *
+   * @public
+   * @static
+   * @type {Record<number, Address>}
+   */
+  public static override bases: Record<number, Address> = {
+    ...(import.meta.env?.VITE_SIGNER_VALIDATOR_BASE
+      ? { 31337: import.meta.env.VITE_SIGNER_VALIDATOR_BASE }
+      : {}),
+    ...(SignerValidatorV2Bases as Record<number, Address>),
+  };
+  /**
+   * @inheritdoc
+   *
+   * @public
+   * @static
+   * @type {RegistryType}
+   */
+  public static override registryType: RegistryType = RegistryType.VALIDATOR;
+
+  /**
+   * The set of authorized signers
+   *
+   * @public
+   * @async
+   * @param {Address} address
+   * @param {?ReadParams} [params]
+   * @returns {Promise<boolean>}
+   */
+  public async signers(address: Address, params?: ReadParams) {
+    return await readSignerValidatorV2Signers(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
+      ...(params as any),
+    });
+  }
+
+  /**
+   * Retrieve the hash and signer data for a given hash
+   *
+   * @public
+   * @async
+   * @param {SignerValidatorV2SignaturePayload} payload
+   * @param {?ReadParams} [params]
+   * @returns {Promise<Hex>}
+   */
+  public async hashSignerData(
+    payload: SignerValidatorV2SignaturePayload,
+    params?: ReadParams,
+  ) {
+    const referrer = payload.referrer ?? payload.claimant;
+    return await readSignerValidatorV2HashSignerData(this._config, {
+      address: this.assertValidAddress(),
+      args: [
+        payload.boostId,
+        payload.incentiveQuantity,
+        payload.claimant,
+        payload.incentiveData,
+        referrer,
+      ],
+      // biome-ignore lint/suspicious/noExplicitAny: Accept any shape of valid wagmi/viem parameters, wagmi does the same thing internally
+      ...(params as any),
+    });
+  }
+
+  /**
+   * Validate that the action has been completed successfully. The data payload is expected to be a tuple of (address signer, bytes32 hash, bytes signature). The signature is expected to be a valid ECDSA or EIP-1271 signature of a unique hash by an authorized signer.
+   *
+   * @public
+   * @async
+   * @param {SignerValidatorV2ValidatePayload} payload
+   * @param {?WriteParams} [params]
+   * @returns {Promise<boolean>} - True if the action has been validated based on the data payload
+   */
+  public async validate(
+    payload: SignerValidatorV2ValidatePayload,
+    params?: WriteParams,
+  ) {
+    return await this.awaitResult(this.validateRaw(payload, params));
+  }
+
+  /**
+   * Validate that the action has been completed successfully. The data payload is expected to be a tuple of (address signer, bytes32 hash, bytes signature). The signature is expected to be a valid ECDSA or EIP-1271 signature of a unique hash by an authorized signer.
+   *
+   * @public
+   * @async
+   * @param {SignerValidatorV2ValidatePayload} payload
+   * @param {?WriteParams} [params]
+   * @returns {Promise<boolean>} - True if the action has been validated based on the data payload
+   */
+  public async validateRaw(
+    payload: SignerValidatorV2ValidatePayload,
+    params?: WriteParams,
+  ) {
+    const { request, result } = await simulateSignerValidatorV2Validate(
+      this._config,
+      {
+        address: this.assertValidAddress(),
+        args: [
+          payload.boostId,
+          payload.incentiveId,
+          payload.claimant,
+          payload.claimData,
+        ],
+        ...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 writeSignerValidatorV2Validate(this._config, request);
+    return { hash, result };
+  }
+
+  /**
+   * Set the authorized status of a signer
+   *
+   * @public
+   * @async
+   * @param {Address[]} addresses - The list of signers to update
+   * @param {boolean[]} allowed - The authorized status of each signer
+   * @param {?WriteParams} [params]
+   * @returns {Promise<void>}
+   */
+  public async setAuthorized(
+    addresses: Address[],
+    allowed: boolean[],
+    params?: WriteParams,
+  ) {
+    return await this.awaitResult(
+      this.setAuthorizedRaw(addresses, allowed, params),
+    );
+  }
+
+  /**
+   * Set the authorized status of a signer
+   *
+   * @public
+   * @async
+   * @param {Address[]} addresses - The list of signers to update
+   * @param {boolean[]} allowed - The authorized status of each signer
+   * @param {?WriteParams} [params]
+   * @returns {Promise<{ hash: `0x${string}`; result: void; }>}
+   */
+  public async setAuthorizedRaw(
+    addresses: Address[],
+    allowed: boolean[],
+    params?: WriteParams,
+  ) {
+    const { request, result } = await simulateSignerValidatorV2SetAuthorized(
+      this._config,
+      {
+        address: this.assertValidAddress(),
+        args: [addresses, allowed],
+        ...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 writeSignerValidatorV2SetAuthorized(
+      this._config,
+      request,
+    );
+    return { hash, result };
+  }
+
+  /**
+   * Update the authorized caller of the validator function
+   *
+   * @public
+   * @async
+   * @param {Address} address
+   * @param {?WriteParams} [params]
+   * @returns {Promise<{ hash: `0x${string}`; result: void; }>}
+   */
+  public async setValidatorCallerRaw(address: Address, params?: WriteParams) {
+    const { request, result } =
+      await simulateSignerValidatorV2SetValidatorCaller(this._config, {
+        address: this.assertValidAddress(),
+        args: [address],
+        ...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 writeSignerValidatorV2SetValidatorCaller(
+      this._config,
+      request,
+    );
+    return { hash, result };
+  }
+
+  /**
+   * Update the authorized caller of the validator function
+   *
+   * @public
+   * @async
+   * @param {Address} address
+   * @param {?WriteParams} [params]
+   * @returns {Promise<void>}
+   */
+  public async setValidatorCaller(address: Address, params?: WriteParams) {
+    return await this.awaitResult(this.setValidatorCallerRaw(address, params));
+  }
+
+  /**
+   * Properly encodes the data needed to claim
+   *
+   * @public
+   * @async
+   * @param {SignerValidatorV2ClaimDataParams} params
+   * @returns {Promise<Hex>}
+   */
+  public async encodeClaimData(
+    params: Omit<SignerValidatorV2ClaimDataParams, 'validator'>,
+  ): Promise<Hex> {
+    return await prepareSignerValidatorV2ClaimDataPayload({
+      ...params,
+      validator: this.assertValidAddress(),
+    });
+  }
+
+  /**
+   * @inheritdoc
+   *
+   * @public
+   * @param {?SignerValidatorV2Payload} [_payload]
+   * @param {?DeployableOptions} [_options]
+   * @returns {GenericDeployableParams}
+   */
+  public override buildParameters(
+    _payload?: SignerValidatorV2Payload,
+    _options?: DeployableOptions,
+  ): GenericDeployableParams {
+    const [payload, options] = this.validateDeploymentConfig(
+      _payload,
+      _options,
+    );
+    return {
+      abi: signerValidatorV2Abi,
+      bytecode: bytecode as Hex,
+      args: [prepareSignerValidatorV2Payload(payload)],
+      ...this.optionallyAttachAccount(options.account),
+    };
+  }
+}
+
+/**
+ * Signer Validator Claim Data Payload Preparation
+ *
+ * @export
+ * @async
+ * @param {SignerValidatorV2ClaimDataParams} param0
+ * @param {{ account: Address; key: Hex; privateKey: PrivateKeyAccount; }} param0.signer
+ * @param {Hex} param0.incentiveData
+ * @param {number} param0.chainId
+ * @param {Address} param0.validator
+ * @param {number} param0.incentiveQuantity
+ * @param {Address} param0.claimant
+ * @param {bigint} param0.boostId
+ * @returns {Promise<Hex>}
+ */
+export async function prepareSignerValidatorV2ClaimDataPayload({
+  signer,
+  incentiveData,
+  chainId,
+  validator,
+  incentiveQuantity,
+  claimant,
+  boostId,
+  referrer,
+}: SignerValidatorV2ClaimDataParams): Promise<Hex> {
+  const _referrer = referrer ?? claimant;
+  const trustedSignature = await signer.privateKey.signTypedData({
+    domain: {
+      name: 'SignerValidatorV2',
+      version: '1',
+      chainId: chainId,
+      verifyingContract: validator,
+    },
+    types: {
+      SignerValidatorData: [
+        { name: 'boostId', type: 'uint256' },
+        { name: 'incentiveQuantity', type: 'uint8' },
+        { name: 'claimant', type: 'address' },
+        { name: 'incentiveData', type: 'bytes' },
+        { name: 'referrer', type: 'address' },
+      ],
+    },
+    primaryType: 'SignerValidatorData' as const,
+    message: {
+      boostId,
+      incentiveQuantity,
+      claimant,
+      incentiveData,
+      referrer: _referrer,
+    },
+  });
+
+  // Prepare the claim data payload using the new helper
+  const validatorData = prepareSignerValidatorV2InputParams({
+    signer: signer.account,
+    signature: trustedSignature,
+    incentiveQuantity, // Adjust incentive quantity as necessary
+  });
+
+  const boostClaimDataPayload = encodeAbiParameters(
+    [
+      {
+        type: 'tuple',
+        name: 'BoostClaimDataWithReferrer',
+        components: [
+          { type: 'bytes', name: 'validatorData' },
+          { type: 'bytes', name: 'incentiveData' },
+          { type: 'address', name: 'referrer' },
+        ],
+      },
+    ],
+    [{ validatorData, incentiveData, referrer: _referrer }],
+  );
+
+  return boostClaimDataPayload;
+}
+
+/**
+ * Given a {@link SignerValidatorV2InputParams}, properly encode the initialization payload.
+ *
+ * @param {SignerValidatorV2InputParams} param0
+ * @param {Address} param0.signer
+ * @param {Hex} param0.signature
+ * @param {number} param0.incentiveQuantity
+ * @returns {Hex}
+ */
+export function prepareSignerValidatorV2InputParams({
+  signer,
+  signature,
+  incentiveQuantity,
+}: SignerValidatorV2InputParams) {
+  return encodeAbiParameters(
+    [
+      {
+        type: 'tuple',
+        name: 'SignerValidatorV2InputParams',
+        components: [
+          { type: 'address', name: 'signer' },
+          { type: 'bytes', name: 'signature' },
+          { type: 'uint8', name: 'incentiveQuantity' },
+        ],
+      },
+    ],
+    [{ signer, signature, incentiveQuantity }],
+  );
+}
+
+/**
+ * Given a {@link SignerValidatorV2Payload}, properly encode the initialization payload.
+ *
+ * @param {SignerValidatorV2Payload} param0
+ * @param {Address[]} param0.signers
+ * @param {Address} param0.validatorCaller
+ * @returns {Hex}
+ */
+export function prepareSignerValidatorV2Payload({
+  signers,
+  validatorCaller,
+}: SignerValidatorV2Payload) {
+  return encodeAbiParameters(
+    [
+      { type: 'address[]', name: 'signers' },
+      { type: 'address', name: 'validatorCaller' },
+    ],
+    [signers, validatorCaller],
+  );
+}

package/src/Validators/Validator.ts

@@ -1,8 +1,11 @@
 import { aValidatorAbi } from '@boostxyz/evm';
 import {
   ALimitedSignerValidator,
+  ALimitedSignerValidatorV2,
   APayableLimitedSignerValidator,
+  APayableLimitedSignerValidatorV2,
   ASignerValidator,
+  ASignerValidatorV2,
 } from '@boostxyz/evm/deploys/componentInterfaces.json';
 import { readContract } from '@wagmi/core';
 import { type Address, type Hex, decodeAbiParameters } from 'viem';
@@ -10,10 +13,20 @@ import type { DeployableOptions } from '../Deployable/Deployable';
 import { InvalidComponentInterfaceError } from '../errors';
 import type { ReadParams } from '../utils';
 import { LimitedSignerValidator } from './LimitedSignerValidator';
+import { LimitedSignerValidatorV2 } from './LimitedSignerValidatorV2';
 import { PayableLimitedSignerValidator } from './PayableLimitedSignerValidator';
+import { PayableLimitedSignerValidatorV2 } from './PayableLimitedSignerValidatorV2';
 import { SignerValidator } from './SignerValidator';
+import { SignerValidatorV2 } from './SignerValidatorV2';
 
-export { SignerValidator, LimitedSignerValidator };
+export {
+  SignerValidator,
+  LimitedSignerValidator,
+  PayableLimitedSignerValidator,
+  SignerValidatorV2,
+  LimitedSignerValidatorV2,
+  PayableLimitedSignerValidatorV2,
+};
 
 /**
  * A union type representing all valid protocol Validator implementations
@@ -24,7 +37,10 @@ export { SignerValidator, LimitedSignerValidator };
 export type Validator =
   | SignerValidator
   | LimitedSignerValidator
-  | PayableLimitedSignerValidator;
+  | PayableLimitedSignerValidator
+  | SignerValidatorV2
+  | LimitedSignerValidatorV2
+  | PayableLimitedSignerValidatorV2;
 
 /**
  * A map of Validator component interfaces to their constructors.
@@ -35,6 +51,9 @@ export const ValidatorByComponentInterface = {
   [ASignerValidator as Hex]: SignerValidator,
   [ALimitedSignerValidator as Hex]: LimitedSignerValidator,
   [APayableLimitedSignerValidator as Hex]: PayableLimitedSignerValidator,
+  [ASignerValidatorV2 as Hex]: SignerValidatorV2,
+  [ALimitedSignerValidatorV2 as Hex]: LimitedSignerValidatorV2,
+  [APayableLimitedSignerValidatorV2 as Hex]: PayableLimitedSignerValidatorV2,
 };
 
 /**
@@ -110,3 +129,27 @@ export function decodeClaimData(data: Hex) {
     data,
   )[0];
 }
+
+/**
+ * Decodes a claim data hex string into its validator data, incentive data, and referrer components.
+ *
+ * @export
+ * @param {Hex} data - The hex-encoded claim data to decode
+ * @returns {{ validatorData: Hex; incentiveData: Hex, referrer: Address }} The decoded claim data components
+ */
+export function decodeClaimDataWithReferrer(data: Hex) {
+  return decodeAbiParameters(
+    [
+      {
+        type: 'tuple',
+        name: 'BoostClaimDataWithReferrer',
+        components: [
+          { type: 'bytes', name: 'validatorData' },
+          { type: 'bytes', name: 'incentiveData' },
+          { type: 'address', name: 'referrer' },
+        ],
+      },
+    ],
+    data,
+  )[0];
+}