chore(sdk,LimitedSigner): backfill refs into more places for compat

boostxyz · Oct 24, 2024 · c084cb9 · c084cb9
1 parent b9ac73b
commit c084cb9
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 3 deletions.
diff --git a/packages/cli/src/commands/deploy.ts b/packages/cli/src/commands/deploy.ts
@@ -12,6 +12,7 @@ import ERC20VariableCriteriaIncentiveArtifact from '@boostxyz/evm/artifacts/cont
 import ERC20VariableIncentiveArtifact from '@boostxyz/evm/artifacts/contracts/incentives/ERC20VariableIncentive.sol/ERC20VariableIncentive.json';
 import ERC1155IncentiveArtifact from '@boostxyz/evm/artifacts/contracts/incentives/ERC1155Incentive.sol/ERC1155Incentive.json';
 import PointsIncentiveArtifact from '@boostxyz/evm/artifacts/contracts/incentives/PointsIncentive.sol/PointsIncentive.json';
+import LimitedSignerValidatorArtifact from '@boostxyz/evm/artifacts/contracts/validators/LimitedSignerValidator.sol/LimitedSignerValidator.json';
 import SignerValidatorArtifact from '@boostxyz/evm/artifacts/contracts/validators/SignerValidator.sol/SignerValidator.json';
 import {
   AllowListIncentive,
@@ -23,6 +24,7 @@ import {
   ERC20VariableCriteriaIncentive,
   ERC20VariableIncentive,
   EventAction,
+  LimitedSignerValidator,
   ManagedBudget,
   PointsIncentive,
   SignerValidator,
@@ -63,6 +65,7 @@ export type DeployResult = {
   ERC1155_INCENTIVE_BASE: string;
   POINTS_INCENTIVE_BASE: string;
   SIGNER_VALIDATOR_BASE: string;
+  LIMITED_SIGNER_VALIDATOR_BASE: string;
 };
 
 export const deploy: Command<DeployResult> = async function deploy(opts) {
@@ -263,6 +266,15 @@ export const deploy: Command<DeployResult> = async function deploy(opts) {
     }),
   );
 
+  const limitedSignerValidatorBase = await getDeployedContractAddress(
+    config,
+    deployContract(config, {
+      abi: LimitedSignerValidatorArtifact.abi,
+      bytecode: LimitedSignerValidatorArtifact.bytecode as Hex,
+      account,
+    }),
+  );
+
   const bases = {
     // ContractAction: class TContractAction extends ContractAction {
     //   public static override base = contractActionBase;
@@ -331,6 +343,11 @@ export const deploy: Command<DeployResult> = async function deploy(opts) {
         [chainId]: signerValidatorBase,
       } as Record<number, Address>;
     },
+    LimitedSignerValidator: class TLimitedSignerValidator extends LimitedSignerValidator {
+      public static override bases: Record<number, Address> = {
+        [chainId]: limitedSignerValidatorBase,
+      } as Record<number, Address>;
+    },
   };
 
   for (const [name, deployable] of Object.entries(bases)) {
@@ -359,5 +376,6 @@ export const deploy: Command<DeployResult> = async function deploy(opts) {
     ERC1155_INCENTIVE_BASE: erc1155IncentiveBase,
     POINTS_INCENTIVE_BASE: pointsIncentiveBase,
     SIGNER_VALIDATOR_BASE: signerValidatorBase,
+    LIMITED_SIGNER_VALIDATOR_BASE: limitedSignerValidatorBase,
   };
 };
diff --git a/packages/sdk/.env.sample b/packages/sdk/.env.sample
@@ -17,4 +17,5 @@ VITE_ERC20_VARIABLE_INCENTIVE_BASE=
 VITE_ERC1155_INCENTIVE_BASE=
 VITE_POINTS_INCENTIVE_BASE=
 VITE_SIGNER_VALIDATOR_BASE=
+VITE_LIMITED_SIGNER_VALIDATOR_BASE=
 VITE_BASE_MAINNET_RPC=
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -189,6 +189,12 @@
       "import": "./dist/Validators/SignerValidator.js",
       "node": "./dist/Validators/SignerValidator.js",
       "types": "./dist/Validators/SignerValidator.d.ts"
+    },
+    "./Validators/LimitedSignerValidator": {
+      "require": "./dist/Validators/LimitedSignerValidator.cjs",
+      "import": "./dist/Validators/LimitedSignerValidator.js",
+      "node": "./dist/Validators/LimitedSignerValidator.js",
+      "types": "./dist/Validators/LimitedSignerValidator.d.ts"
     }
   },
   "scripts": {

diff --git a/packages/sdk/src/Validators/LimitedSignerValidator.ts b/packages/sdk/src/Validators/LimitedSignerValidator.ts
@@ -318,6 +318,7 @@ export class LimitedSignerValidator extends DeployableTarget<
    * @type {Record<number, Address>}
    */
   public static override bases: Record<number, Address> = {
+    31337: import.meta.env.VITE_LIMITED_SIGNER_VALIDATOR_BASE,
     ...(SignerValidatorBases as Record<number, Address>),
   };
   /**

diff --git a/packages/sdk/src/Validators/Validator.ts b/packages/sdk/src/Validators/Validator.ts
@@ -1,20 +1,25 @@
 import { aValidatorAbi } from '@boostxyz/evm';
-import { ASignerValidator } from '@boostxyz/evm/deploys/componentInterfaces.json';
+import {
+  ASignerValidator,
+  // TODO: bring this back in
+  // ALimitedSignerValidator,
+} from '@boostxyz/evm/deploys/componentInterfaces.json';
 import { readContract } from '@wagmi/core';
 import type { Address, Hex } from 'viem';
 import type { DeployableOptions } from '../Deployable/Deployable';
 import { InvalidComponentInterfaceError } from '../errors';
+import { LimitedSignerValidator } from './LimitedSignerValidator';
 import { SignerValidator } from './SignerValidator';
 
-export { SignerValidator };
+export { SignerValidator, LimitedSignerValidator };
 
 /**
  * A union type representing all valid protocol Validator implementations
  *
  * @export
  * @typedef {Validator}
  */
-export type Validator = SignerValidator;
+export type Validator = SignerValidator | LimitedSignerValidator;
 
 /**
  * A map of Validator component interfaces to their constructors.
@@ -23,6 +28,8 @@ export type Validator = SignerValidator;
  */
 export const ValidatorByComponentInterface = {
   [ASignerValidator as Hex]: SignerValidator,
+  // TODO bring this back in
+  // [ALimitedSignerValidator as Hex]: LimitedSignerValidator,
 };
 
 /**