Fixed premint client test by having it use the latest anvil fork block #

ourzora · Nov 27, 2023 · 3760350 · 3760350
1 parent d06a39b
commit 3760350
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/packages/protocol-sdk/src/premint/premint-client.test.ts b/packages/protocol-sdk/src/premint/premint-client.test.ts
@@ -1,11 +1,14 @@
 import { foundry } from "viem/chains";
 import { describe, expect, vi } from "vitest";
 import { createPremintClient } from "./premint-client";
-import { anvilTest } from "src/anvil";
+import { anvilTest, forkUrls, makeAnvilTest } from "src/anvil";
 import { BackendChainNamesLookup } from "src/apis/chain-constants";
 
 describe("ZoraCreator1155Premint", () => {
-  anvilTest(
+  makeAnvilTest({
+    forkUrl: forkUrls.zoraGoerli,
+    forkBlockNumber: 1763437,
+  })(
     "can sign on the forked premint contract",
     async ({ viemClients: { walletClient, publicClient } }) => {
       const [deployerAccount] = await walletClient.getAddresses();

diff --git a/packages/protocol-sdk/src/premint/premint-client.ts b/packages/protocol-sdk/src/premint/premint-client.ts
@@ -19,6 +19,7 @@ import {
   PremintConfigV1,
   PremintConfigV2,
   PremintConfigVersion,
+  getPremintExecutorAddress,
   isValidSignature,
   premintTypedDataDefinition,
 } from "./preminter";
@@ -389,7 +390,7 @@ class PremintClient extends ClientBase {
         tokenContract: verifyingContract,
         originalContractAdmin: collection.contractAdmin as Address,
         ...premintConfigAndVersion,
-        publicClient: this.getPublicClient(),
+        publicClient,
         signature
       });
       if (!isAuthorized) {
@@ -456,7 +457,7 @@ class PremintClient extends ClientBase {
     publicClient = this.getPublicClient(publicClient);
 
     const newContractAddress = await publicClient.readContract({
-      address: this.getExecutorAddress(),
+      address: getPremintExecutorAddress(),
       abi: zoraCreator1155PremintExecutorImplABI,
       functionName: "getContractAddress",
       args: [convertCollection(collection)],
@@ -484,7 +485,7 @@ class PremintClient extends ClientBase {
 
     let deleted = executionSettings?.deleted || false;
 
-    const premintConfig = {
+    const premintConfig: PremintConfigV1 = {
       tokenConfig: tokenConfig,
       uid,
       version: 1,

diff --git a/packages/protocol-sdk/src/premint/preminter.ts b/packages/protocol-sdk/src/premint/preminter.ts
@@ -228,7 +228,7 @@ export async function recoverAndValidateSignature({
   signature: Hex;
   publicClient: PublicClient;
 }): Promise<IsValidSignatureReturn> {
-  let recoveredAddress: Address;
+  let recoveredAddress: Address | undefined;
 
   try {
     recoveredAddress = await recoverTypedDataAddress({
@@ -243,12 +243,11 @@ export async function recoverAndValidateSignature({
     };
   }
 
-  // premint executor is same address on all chains
-  const premintExecutorAddress = getPremintExecutorAddress();
-
-  const isAuthorized = await publicClient.readContract({
+  let isAuthorized = false;
+  if (recoveredAddress)
+    isAuthorized = await publicClient.readContract({
     abi: preminterAbi,
-    address: premintExecutorAddress,
+    address: getPremintExecutorAddress(),
     functionName: "isAuthorizedToCreatePremint",
     args: [recoveredAddress, premintConfigContractAdmin, tokenContract],
   });