sdk changes for SuperMinterV2

.changeset/silly-pumpkins-prove.md

@@ -0,0 +1,5 @@
+---
+"@soundxyz/legacy-sdk": patch
+---
+
+Remove keccak dependency

.changeset/six-seas-approve.md

@@ -0,0 +1,5 @@
+---
+'@soundxyz/sdk': minor
+---
+
+support SuperMinterV2

examples/nextjs/package.json

@@ -21,7 +21,7 @@
     "superjson": "^2.0.0",
     "undici": "^5.26.3",
     "valtio": "^1.11.2",
-    "viem": "^1.16.6",
+    "viem": "^1.20.0",
     "wagmi": "^1.4.4",
     "zod": "^3.22.4"
   },

packages/legacy-sdk/package.json

@@ -36,7 +36,6 @@
     "tsc": "tsc -p tsconfig.build.json"
   },
   "dependencies": {
-    "keccak256": "^1.0.6",
     "zod": "^3.22.4"
   },
   "devDependencies": {
@@ -57,10 +56,10 @@
     "merkletreejs": "^0.3.10",
     "require-env-variable": "^4.0.2",
     "typescript": "5.2.2",
-    "viem": "^1.16.6"
+    "viem": "^1.20.0"
   },
   "peerDependencies": {
-    "viem": "^1.10.8"
+    "viem": "^1.20.0"
   },
   "publishConfig": {
     "access": "public",

packages/legacy-sdk/src/client/edition/create.ts

@@ -1,5 +1,5 @@
 import { type Address, type Chain } from 'viem'
-import { encodeFunctionData } from 'viem/utils'
+import { encodeFunctionData, keccak256, toHex } from 'viem/utils'
 import { soundCreatorV1Abi } from '../../abi/sound-creator-v1'
 import {
   InvalidEditionMaxMintableError,
@@ -10,7 +10,7 @@ import {
 } from '../../errors'
 import type { ContractCall, EditionConfig, MintConfig, TransactionGasOptions } from '../../types'
 import { editionInitFlags, MINTER_ROLE, NULL_ADDRESS, NULL_BYTES32, UINT32_MAX } from '../../utils/constants'
-import { getSaltAsBytes32, retry } from '../../utils/helpers'
+import { retry } from '../../utils/helpers'
 import { SoundClientInstance } from '../instance'
 import { soundEditionV1_2Abi } from '../../abi/sound-edition-v1_2'
 import { rangeEditionMinterV2_1Abi } from '../../abi/range-edition-minter-v2_1'
@@ -50,7 +50,7 @@ async function createEditionHelper(
     maxPriorityFeePerGas,
   }
 
-  const formattedSalt = getSaltAsBytes32(customSalt || Math.random() * 1_000_000_000_000_000)
+  const formattedSalt = keccak256(toHex(customSalt || Math.random() * 1_000_000_000_000_000))
 
   // Precompute the edition address.
   const [editionAddress, _] = await retry(
@@ -352,15 +352,16 @@ export async function expectedEditionAddress(
   }: {
     creatorAddress: Address
   },
-  { deployer, salt }: { deployer: Address; salt: string | number },
+  { deployer, salt: customSalt }: { deployer: Address; salt: string | number },
 ) {
   const { readContract } = await this.expectClient()
+  const formattedSalt = keccak256(toHex(customSalt || Math.random() * 1_000_000_000_000_000))
 
   const [editionAddress, exists] = await readContract({
     abi: soundCreatorV1Abi,
     address: creatorAddress,
     functionName: 'soundEditionAddress',
-    args: [deployer, getSaltAsBytes32(salt)],
+    args: [deployer, formattedSalt],
   })
 
   return {

packages/legacy-sdk/src/utils/helpers.ts

@@ -1,14 +1,9 @@
-import keccak256 from 'keccak256'
 import { isHex, type Hex } from 'viem'
 
 export function isHexList(list: string[]): list is Hex[] {
   return list.every((value) => isHex(value))
 }
 
-export function getSaltAsBytes32(salt: string | number) {
-  return `0x${keccak256(salt.toString()).toString('hex')}` as const
-}
-
 export function getLazyOption<T extends object>(option: T | (() => T | Promise<T>)) {
   return typeof option === 'function' ? option() : option
 }

packages/legacy-sdk/test/helpers/merkle.ts

@@ -1,5 +1,5 @@
 import { keccak256 as solidityKeccak256 } from '@ethersproject/solidity'
-import keccak256 from 'keccak256'
+import keccak256 from 'viem/utils'
 import { MerkleTree } from 'merkletreejs'
 import { type Address, type Hex } from 'viem'
 

packages/legacy-sdk/test/test-constants.ts

@@ -1,6 +1,7 @@
-import { getSaltAsBytes32 } from '../src/utils/helpers'
+import { keccak256, toHex } from 'viem/utils'
+
+export const DEFAULT_SALT = keccak256(toHex(12345678))
 
-export const DEFAULT_SALT = getSaltAsBytes32(12345678)
 export const SOUND_FEE = 0
 export const ONE_HOUR = 3600
 export const PRICE = 420420420n

packages/sdk/package.json

@@ -51,11 +51,11 @@
     "esbuild": "^0.19.4",
     "prettier": "^3.0.3",
     "typescript": "5.2.2",
-    "viem": "^1.16.6",
+    "viem": "^1.20.0",
     "zod": "^3.22.4"
   },
   "peerDependencies": {
-    "viem": "^1.16.6",
+    "viem": "^1.20.0",
     "zod": "^3.22.4"
   },
   "publishConfig": {

packages/sdk/src/contract/edition-v2/abi/super-minter.ts → packages/sdk/src/contract/edition-v2/abi/super-minter-v1.ts

@@ -1,6 +1,6 @@
-export const SUPER_MINTER_ADDRESS = '0x0000000000CF4558c36229ac0026ee16D3aE35Cd'
+export const SUPER_MINTER_V1_ADDRESS = '0x0000000000CF4558c36229ac0026ee16D3aE35Cd'
 
-export const SUPER_MINTER_ABI = [
+export const SUPER_MINTER_V1_ABI = [
   { inputs: [], name: 'CallerNotDelegated', type: 'error' },
   { inputs: [], name: 'ExceedsMaxPerAccount', type: 'error' },
   { inputs: [], name: 'ExceedsMintSupply', type: 'error' },
@@ -981,3 +981,9 @@ export const SUPER_MINTER_ABI = [
   },
   { stateMutability: 'payable', type: 'receive' },
 ] as const
+
+export const SUPER_MINTER_V1 = {
+  version: '1',
+  address: SUPER_MINTER_V1_ADDRESS,
+  abi: SUPER_MINTER_V1_ABI,
+} as const