[ADHOC] chore(sdk): better support for linking, (#216)

boostxyz · Oct 22, 2024 · 324a1c7 · 324a1c7
1 parent 43cb33f
commit 324a1c7
Show file tree

Hide file tree

Showing 26 changed files with 220 additions and 123 deletions.
diff --git a/.changeset/stale-snakes-search.md b/.changeset/stale-snakes-search.md
@@ -0,0 +1,6 @@
+---
+"@boostxyz/cli": minor
+"@boostxyz/sdk": minor
+---
+
+better support for pnpm linking w/ env specified contracts on all implementations
diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts
@@ -20,7 +20,7 @@ const args = arg({
   '--privateKey': String,
   '--out': String,
   '--cacheDir': String,
-  '--force': String,
+  '--force': Boolean,
   '--format': String,
   '-h': '--help',
   '-v': '--version',

diff --git a/packages/cli/src/commands/deploy.ts b/packages/cli/src/commands/deploy.ts
@@ -31,8 +31,14 @@ import {
   getDeployedContractAddress,
 } from '@boostxyz/sdk';
 import { createConfig, deployContract } from '@wagmi/core';
-import type { Hex } from 'viem';
-import { http, createWalletClient } from 'viem';
+import type { Client, Hex } from 'viem';
+import {
+  http,
+  createTestClient,
+  createWalletClient,
+  publicActions,
+  walletActions,
+} from 'viem';
 import { type Address, privateKeyToAccount } from 'viem/accounts';
 import * as _chains from 'viem/chains';
 import type { Command } from '../utils';
@@ -52,6 +58,8 @@ export type DeployResult = {
   ALLOWLIST_INCENTIVE_BASE: string;
   CGDA_INCENTIVE_BASE: string;
   ERC20_INCENTIVE_BASE: string;
+  ERC20_VARIABLE_INCENTIVE_BASE: string;
+  ERC20_VARIABLE_CRITERIA_INCENTIVE_BASE: string;
   ERC1155_INCENTIVE_BASE: string;
   POINTS_INCENTIVE_BASE: string;
   SIGNER_VALIDATOR_BASE: string;
@@ -69,11 +77,24 @@ export const deploy: Command<DeployResult> = async function deploy(opts) {
   const chain = chains[_chain];
 
   const account = privateKeyToAccount(privateKey as Hex);
-  const client = createWalletClient({
-    account,
-    chain,
-    transport: http(),
-  });
+  let client: Client;
+  if (chain === chains.hardhat || chain === chains.anvil) {
+    client = createTestClient({
+      transport: http('http://127.0.0.1:8545', { retryCount: 0 }),
+      chain: chain,
+      mode: chain === chains.hardhat ? 'hardhat' : 'anvil',
+      account,
+      key: privateKey,
+    })
+      .extend(publicActions)
+      .extend(walletActions);
+  } else {
+    client = createWalletClient({
+      account,
+      chain,
+      transport: http(),
+    }).extend(publicActions);
+  }
   const config = createConfig({
     // biome-ignore lint/style/noNonNullAssertion: Chain is checked above, false error
     chains: [chain!],
@@ -85,14 +106,25 @@ export const deploy: Command<DeployResult> = async function deploy(opts) {
 
   const chainId = chain!.id!;
 
-  const registry = await (
+  const _registry = await (
     new BoostRegistry({
       address: null,
       ...options,
       // biome-ignore lint/suspicious/noExplicitAny: we know what we're doing
     }) as any
   ).deploy();
 
+  class TBoostRegistry extends BoostRegistry {
+    public static override addresses: Record<number, Address> = {
+      [chainId]: _registry.assertValidAddress(),
+    };
+  }
+
+  const registry = new TBoostRegistry({
+    ...options,
+    address: _registry.assertValidAddress(),
+  });
+
   const core = await (
     new BoostCore({
       ...options,
@@ -305,7 +337,7 @@ export const deploy: Command<DeployResult> = async function deploy(opts) {
     await registry.register(
       deployable.registryType,
       name,
-      deployable.bases[chainId],
+      deployable.bases[chainId]!,
     );
   }
 

diff --git a/packages/cli/src/utils.ts b/packages/cli/src/utils.ts
@@ -5,7 +5,7 @@ export type Options = {
   privateKey?: string;
   out?: string;
   cacheDir?: string;
-  force?: string;
+  force?: boolean;
   format?: 'env' | 'json';
 };
 

diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
@@ -7,9 +7,6 @@
   },
   "exclude": ["dist", "build", "node_modules", "src/**/*.test.ts"],
   "references": [
-    {
-      "path": "../sdk/tsconfig.build.json"
-    },
     {
       "path": "../evm"
     }

diff --git a/packages/sdk/.env.sample b/packages/sdk/.env.sample
@@ -1,3 +1,5 @@
+DEFAULT_CHAIN_ID=31337
+VITE_TEST_NO_DEPLOY_FIXTURES=false
 VITE_BOOST_CORE_ADDRESS=
 VITE_BOOST_REGISTRY_ADDRESS=
 VITE_CONTRACT_ACTION_BASE=
@@ -6,9 +8,11 @@ VITE_ERC721_MINT_ACTION_BASE=
 VITE_SIMPLE_ALLOWLIST_BASE=
 VITE_SIMPLE_DENYLIST_BASE=
 VITE_VESTING_BUDGET_BASE=
+VITE_MANAGED_BUDGET_BASE=
 VITE_ALLOWLIST_INCENTIVE_BASE=
 VITE_CGDA_INCENTIVE_BASE=
 VITE_ERC20_INCENTIVE_BASE=
+VITE_ERC20_VARIABLE_CRITERIA_INCENTIVE_BASE=
 VITE_ERC20_VARIABLE_INCENTIVE_BASE=
 VITE_ERC1155_INCENTIVE_BASE=
 VITE_POINTS_INCENTIVE_BASE=

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

diff --git a/packages/sdk/src/AllowLists/SimpleAllowList.ts b/packages/sdk/src/AllowLists/SimpleAllowList.ts
@@ -99,6 +99,7 @@ export class SimpleAllowList extends DeployableTargetWithRBAC<
    * @type {Record<number, Address>}
    */
   public static override bases: Record<number, Address> = {
+    31337: import.meta.env.VITE_SIMPLE_ALLOWLIST_BASE,
     ...(SimpleAllowListBases as Record<number, Address>),
   };
   /**

diff --git a/packages/sdk/src/AllowLists/SimpleDenyList.ts b/packages/sdk/src/AllowLists/SimpleDenyList.ts
@@ -91,6 +91,7 @@ export class SimpleDenyList<
    * @type {Record<number, Address>}
    */
   public static override bases: Record<number, Address> = {
+    31337: import.meta.env.VITE_SIMPLE_DENYLIST_BASE,
     ...(SimpleDenyListBases as Record<number, Address>),
   };
   /**