Merge pull request #467 from rabbitholegg/mmackz/zora/amount-zero

fix(zora): amount zero fix

Author: mmackz

.changeset/little-insects-grin.md

@@ -0,0 +1,5 @@
+---
+"@rabbitholegg/questdk-plugin-zora": minor
+---
+
+amount zero fix

packages/zora/src/Zora.ts

@@ -12,13 +12,15 @@ import {
   ZORA_1155_FACTORY,
   ZORA_DEPLOYER_ADDRESS,
 } from './contract-addresses'
+import { AndArrayItem } from './types'
 import { validatePremint } from './validate'
 import {
   type MintActionParams,
   type CreateActionParams,
   type TransactionFilter,
   compressJson,
 } from '@rabbitholegg/questdk'
+import { formatAmount } from '@rabbitholegg/questdk-plugin-utils'
 import {
   ActionType,
   DEFAULT_ACCOUNT,
@@ -105,8 +107,12 @@ export const mint = async (
       ] as Address[])
     : contractAddress
 
-  const andArray721 = []
-  const andArray1155 = []
+  const quantityCheck = {
+    quantity: formatAmount(amount),
+  }
+  const andArray721: AndArrayItem[] = [quantityCheck]
+  const andArray1155: AndArrayItem[] = [quantityCheck]
+
   if (recipient) {
     andArray721.push({
       $or: [{ recipient }, { tokenRecipient: recipient }, { to: recipient }],
@@ -115,34 +121,30 @@ export const mint = async (
       $or: [{ recipient }, { tokenRecipient: recipient }, { to: recipient }],
     })
   }
-  if (tokenId || amount) {
-    andArray721.push({
-      quantity: amount,
-    })
+  if (tokenId) {
     andArray1155.push({
-      quantity: amount,
       tokenId,
     })
   }
 
   const ERC721_FILTER_ABSTRACT = {
     $abiAbstract: ZORA_MINTER_ABI_721,
-    $and: andArray721.length !== 0 ? andArray721 : undefined,
+    $and: andArray721,
   }
 
   const ERC1155_FILTER_ABSTRACT = {
     $abiAbstract: ZORA_MINTER_ABI_1155.concat(ZORA_MINTER_ABI_1155_LEGACY),
-    $and: andArray1155.length !== 0 ? andArray1155 : undefined,
+    $and: andArray1155,
   }
 
   const ERC721_FILTER = {
     $abi: ZORA_MINTER_ABI_721,
-    $and: andArray721.length !== 0 ? andArray721 : undefined,
+    $and: andArray721,
   }
 
   const ERC1155_FILTER = {
     $abi: ZORA_MINTER_ABI_1155.concat(ZORA_MINTER_ABI_1155_LEGACY),
-    $and: andArray1155.length !== 0 ? andArray1155 : undefined,
+    $and: andArray1155,
   }
 
   const UNIVERSAL_MINT_FILTER = {

packages/zora/src/abi.ts

@@ -323,30 +323,6 @@ export const ZORA_MINTER_ABI_1155 = [
     stateMutability: 'payable',
     type: 'function',
   }, // ZoraCreator1155Impl,
-  {
-    inputs: [
-      {
-        internalType: 'address',
-        name: 'tokenRecipient',
-        type: 'address',
-      },
-      {
-        internalType: 'string',
-        name: 'message',
-        type: 'string',
-      },
-    ],
-    name: 'purchase',
-    outputs: [
-      {
-        internalType: 'uint256',
-        name: 'tokenId',
-        type: 'uint256',
-      },
-    ],
-    stateMutability: 'payable',
-    type: 'function',
-  }, // Legacy WritingEditions
   // https://github.com/soundxyz/sound-protocol/blob/0c29ae2f5ce2f27f3823cacf66b5180906070805/contracts/core/SoundEditionV1_2.sol#L274
   {
     inputs: [

packages/zora/src/test-setup.ts

@@ -1,18 +1,17 @@
 import {
-  BASIC_PURCHASE,
   BATCH_MINT_ARB,
   CREATE_COLLECTION_BASE,
   CREATE_COLLECTION_ZORA,
   LAYER_ZERO_MINT,
   MINT_BATCH_WITHOUT_FEES,
   MINT_WITH_REWARDS,
   MINT_WITH_REWARDS_1155,
+  ZERO_QUANTITY,
 } from './test-transactions'
 import { createTestCase } from '@rabbitholegg/questdk-plugin-utils'
 import { getAddress } from 'viem'
 
 export const passingTestCasesMint = [
-  createTestCase(BASIC_PURCHASE, 'when doing a basic purchase'),
   createTestCase(MINT_WITH_REWARDS, 'Minting with rewards'),
   createTestCase(MINT_WITH_REWARDS_1155, 'Minting with rewards 1155'),
   createTestCase(MINT_BATCH_WITHOUT_FEES, 'When using the batch mint function'),
@@ -32,13 +31,13 @@ export const passingTestCasesMint = [
 ]
 
 export const failingTestCasesMint = [
-  createTestCase(BASIC_PURCHASE, 'when chainId is incorrect', {
-    chainId: 1,
+  createTestCase(MINT_WITH_REWARDS, 'when chainId is incorrect', {
+    chainId: 10,
   }),
-  createTestCase(BASIC_PURCHASE, 'when contractAddress is incorrect', {
-    contractAddress: '0x4f330940159fB3368F5b06b34212C0cDB4e2C032',
+  createTestCase(MINT_WITH_REWARDS, 'when contractAddress is incorrect', {
+    contractAddress: '0x323c74b3dae9844c113d41e9c3db2743c500a26d',
   }),
-  createTestCase(BASIC_PURCHASE, 'when recipient is incorrect', {
+  createTestCase(MINT_WITH_REWARDS, 'when recipient is incorrect', {
     recipient: '0xd31143Ca8503b25DdE780dc1B92E9aA61D0E326d',
   }),
   createTestCase(MINT_WITH_REWARDS_1155, 'when tokenId is incorrect', {
@@ -61,6 +60,7 @@ export const failingTestCasesMint = [
       tokenId: 10,
     },
   ),
+  createTestCase(ZERO_QUANTITY, 'when quantity minted is 0'),
 ]
 
 export const passingTestCasesCreate = [

packages/zora/src/test-transactions.ts

@@ -74,6 +74,23 @@ export const MINT_BATCH_WITHOUT_FEES: TestParams<MintActionParams> = {
   },
 }
 
+export const ZERO_QUANTITY: TestParams<MintActionParams> = {
+  transaction: {
+    chainId: 10, // Optimism
+    from: '0x1671b592610fb7427ed788b66fa3e9217ff41047',
+    to: '0x025b81bfcb62a02b7bd47520e0a28bbe5c5b262b',
+    hash: '0xc80ab930d86db58afbf4aa52b37e96d6ef041f0b51491a76ff38df8faee373e0',
+    input:
+      '0x9dbb844d0000000000000000000000003678862f04290e565cca2ef163baeb92bb76790c0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000f3d63166f0ca56c3c1a3508fce03ff0cf3fb691e000000000000000000000000000000000000000000000000000000000000006000000000000000000000000010a1db5d3a971cf1e565b28a86d5ce9e576a7b81000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000001d4da48b243cb5c30214f47d',
+    value: '0',
+  },
+  params: {
+    chainId: Chains.OPTIMISM,
+    contractAddress: '0x025b81bfcb62a02b7bd47520e0a28bbe5c5b262b',
+    tokenId: 1,
+  },
+}
+
 export const EXPECTED_ENCODED_DATA_721 =
   '0xefef39a1000000000000000000000000000000000000000000000000000000000000000a'
 export const EXPECTED_ENCODED_DATA_1155 =

packages/zora/src/types.ts

@@ -1,5 +1,8 @@
 import { z } from 'zod'
-import { EthAddressSchema } from '@rabbitholegg/questdk-plugin-utils'
+import {
+  type FilterOperator,
+  EthAddressSchema,
+} from '@rabbitholegg/questdk-plugin-utils'
 
 export const PremintResponseSchema = z.array(
   z.object({
@@ -33,3 +36,16 @@ export const PremintResponseSchema = z.array(
   }),
 )
 export type PremintResponse = z.infer<typeof PremintResponseSchema>
+
+type RecipientCondition = {
+  $or: Array<{
+    recipient?: string
+    tokenRecipient?: string
+    to?: string
+  }>
+}
+
+export type AndArrayItem =
+  | { quantity: string | number | bigint | FilterOperator }
+  | RecipientCondition
+  | { tokenId: string | number }