From 17874a43236e3092f92f64922ce5072e3169cac3 Mon Sep 17 00:00:00 2001 From: mmackz Date: Thu, 18 Jul 2024 19:12:14 -0700 Subject: [PATCH 1/5] chore: update zora sdk to 0.5.17 --- packages/zora/package.json | 2 +- pnpm-lock.yaml | 115 +++---------------------------------- 2 files changed, 8 insertions(+), 109 deletions(-) diff --git a/packages/zora/package.json b/packages/zora/package.json index fce1cd9e9..0ebae0369 100644 --- a/packages/zora/package.json +++ b/packages/zora/package.json @@ -31,7 +31,7 @@ "@rabbitholegg/questdk-plugin-utils": "workspace:*" }, "dependencies": { - "@zoralabs/protocol-sdk": "0.5.6-exports.0", + "@zoralabs/protocol-sdk": "0.5.17", "@zoralabs/universal-minter": "0.2.15", "@rabbitholegg/questdk-plugin-utils": "workspace:*", "@rabbitholegg/questdk": "workspace:*" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5e1ce8b6a..da3fbda6b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -819,8 +819,8 @@ importers: specifier: workspace:* version: link:../utils '@zoralabs/protocol-sdk': - specifier: 0.5.6-exports.0 - version: 0.5.6-exports.0(@types/node@20.4.5)(typescript@5.3.2)(viem@2.15.1)(zod@3.21.4) + specifier: 0.5.17 + version: 0.5.17(viem@2.15.1) '@zoralabs/universal-minter': specifier: 0.2.15 version: 0.2.15(@types/node@20.4.5)(ts-node@10.9.1)(typescript@5.3.2)(zod@3.21.4) @@ -5488,57 +5488,26 @@ packages: resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==} dev: true - /@zoralabs/1155-deployments@0.0.13: - resolution: {integrity: sha512-jC8nx3qQGbCGuE4ynBlYYV/VfyhrIAG+k3x0l2yCtEXIiW6oAECM6iZzzPLRcmIiIO3xoC4y70iwVddqzLR3QQ==} - dependencies: - '@zoralabs/zora-1155-contracts': 2.10.1 - ds-test: github.com/dapphub/ds-test/cd98eff28324bfac652e63a239a60632a761790b - forge-std: github.com/foundry-rs/forge-std/705263c95892a906d7af65f0f73ce8a4a0c80b80 - solmate: 6.1.0 - dev: false - /@zoralabs/openzeppelin-contracts-upgradeable@4.8.4: resolution: {integrity: sha512-5vhL88tz00Gv2+NUhLdYBRqb9RRekfyQAodXTQxJU2LYxxy6jr1mPycTZempQ1kmw5wIwFbSIoYzpaxOx6UK6Q==} hasBin: true dev: false - /@zoralabs/protocol-deployments@0.1.2-exports.0: - resolution: {integrity: sha512-p/NJovirBamdeFQ2DHHci4huKsJo0iwhA2arfnXV3jOWHTPGDIje0Df7dWIW3iBeqwaSZCMun0BfCCJCWXAD6Q==} - dependencies: - '@zoralabs/1155-deployments': 0.0.13 - '@zoralabs/zora-1155-contracts': 2.7.3-exports.0 + /@zoralabs/protocol-deployments@0.1.13: + resolution: {integrity: sha512-pAJ+rr7Q6RsulTl2EB+osUJMldGx+Sj/XfrkfOQsScL/RQlu+H6sL0sRVdaG3VLWVd9ua8szIRSeJ+RqwEZNyg==} dev: false /@zoralabs/protocol-rewards@1.2.1: resolution: {integrity: sha512-Jf2aIHhyAsybCCv1byV5uP/YiwA/ZB3zTywDO6d15796Bf58zzC3D1ptKuh+z1Nba3dU2Hzqz0K7EEQOjoq+1A==} dev: false - /@zoralabs/protocol-rewards@1.2.3: - resolution: {integrity: sha512-pfoF4DTLQeR9S9JXk6Eue5bj+4UEhsvb5Kg4Zg3CuuVdaASH4sI442XPej6v3JDLYJrdiVCoCFcqxDOb1VE+bA==} - dependencies: - ds-test: github.com/dapphub/ds-test/cd98eff28324bfac652e63a239a60632a761790b - forge-std: github.com/foundry-rs/forge-std/705263c95892a906d7af65f0f73ce8a4a0c80b80 - dev: false - - /@zoralabs/protocol-sdk@0.5.6-exports.0(@types/node@20.4.5)(typescript@5.3.2)(viem@2.15.1)(zod@3.21.4): - resolution: {integrity: sha512-YbQ4/a1vM0JN9Dz/qGkMqfOM6xI1Zi6/52KEQAmYY/kzSqBE8jkusN76Av/MYwKqnMIQ90kFAMebSPgyhWvUKA==} + /@zoralabs/protocol-sdk@0.5.17(viem@2.15.1): + resolution: {integrity: sha512-8N/g5+kg2R0zS6ecdkzwVgyKO4aV6jYUbBeuUy6D74lcQdK75pgq5VW3eIjqc80CBvR0DCq7uAzHdUCzX0mGsA==} peerDependencies: viem: 2.15.1 dependencies: - '@zoralabs/protocol-deployments': 0.1.2-exports.0 - abitype: 0.10.3(typescript@5.3.2)(zod@3.21.4) + '@zoralabs/protocol-deployments': 0.1.13 viem: 2.15.1(typescript@5.3.2)(zod@3.21.4) - vite: 4.5.0(@types/node@20.4.5) - transitivePeerDependencies: - - '@types/node' - - less - - lightningcss - - sass - - stylus - - sugarss - - terser - - typescript - - zod dev: false /@zoralabs/universal-minter@0.2.15(@types/node@20.4.5)(ts-node@10.9.1)(typescript@5.3.2)(zod@3.21.4): @@ -5624,42 +5593,12 @@ packages: - zod dev: false - /@zoralabs/zora-1155-contracts@2.10.1: - resolution: {integrity: sha512-/BzMWjqbEpdraIy3YXKKAy+HDbNF9zzOyTgpulQ7GeCPiv/zU7NxRBKiGY6Mq1kH1qkzEO6GQp6JqG5mzuGrzg==} - dev: false - - /@zoralabs/zora-1155-contracts@2.7.3-exports.0: - resolution: {integrity: sha512-9HSOmTws0ojtrjo+NLjL87xEdjtnyWqinbtvj0gYwpME0ZlZ5RxgBlZDDPr7eKi3TTgKvrX0mF8mJOvoc9jMDA==} - dependencies: - '@openzeppelin/contracts': 4.9.2 - '@zoralabs/openzeppelin-contracts-upgradeable': 4.8.4 - '@zoralabs/protocol-rewards': 1.2.3 - ds-test: github.com/dapphub/ds-test/cd98eff28324bfac652e63a239a60632a761790b - forge-std: github.com/foundry-rs/forge-std/705263c95892a906d7af65f0f73ce8a4a0c80b80 - solmate: 6.1.0 - dev: false - /@zxing/text-encoding@0.9.0: resolution: {integrity: sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==} requiresBuild: true dev: true optional: true - /abitype@0.10.3(typescript@5.3.2)(zod@3.21.4): - resolution: {integrity: sha512-tRN+7XIa7J9xugdbRzFv/95ka5ivR/sRe01eiWvM0HWWjHuigSZEACgKa0sj4wGuekTDtghCx+5Izk/cOi78pQ==} - peerDependencies: - typescript: '>=5.0.4' - zod: ^3 >=3.22.0 - peerDependenciesMeta: - typescript: - optional: true - zod: - optional: true - dependencies: - typescript: 5.3.2 - zod: 3.21.4 - dev: false - /abitype@0.8.11(typescript@5.3.2)(zod@3.21.4): resolution: {integrity: sha512-bM4v2dKvX08sZ9IU38IN5BKmN+ZkOSd2oI4a9f0ejHYZQYV6cDr7j+d95ga0z2XHG36Y4jzoG5Z7qDqxp7fi/A==} peerDependencies: @@ -12922,10 +12861,6 @@ packages: resolution: {integrity: sha512-htM7Vn6LhHreR+EglVMd2s+sZhcXAirB1Zlyrv5zBuTxieCvjfnRpd7iZk75m/u6NOlEyQ94C6TWbBn2cY7w8g==} dev: false - /solmate@6.1.0: - resolution: {integrity: sha512-gxG4YU5nnAQ+Ac23R44GS3Xo3+X0+8XCe4/P1KvVobL5ERBzQBG/xMv7NSvVo/pkHSYGufgUAPjiueYxujKJAA==} - dev: false - /solmate@6.2.0: resolution: {integrity: sha512-AM38ioQ2P8zRsA42zenb9or6OybRjOLXIu3lhIT8rhddUuduCt76pUEuLxOIg9GByGojGz+EbpFdCB6B+QZVVA==} dev: false @@ -14271,42 +14206,6 @@ packages: - terser dev: true - /vite@4.5.0(@types/node@20.4.5): - resolution: {integrity: sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==} - engines: {node: ^14.18.0 || >=16.0.0} - hasBin: true - peerDependencies: - '@types/node': '>= 14' - less: '*' - lightningcss: ^1.21.0 - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - lightningcss: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - dependencies: - '@types/node': 20.4.5 - esbuild: 0.18.20 - postcss: 8.4.38 - rollup: 3.29.4 - optionalDependencies: - fsevents: 2.3.3 - dev: false - /vite@4.5.3(@types/node@20.4.5): resolution: {integrity: sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==} engines: {node: ^14.18.0 || >=16.0.0} From ced42d289634f4a6a8ad1913ac612d2c78fcdf72 Mon Sep 17 00:00:00 2001 From: mmackz Date: Thu, 18 Jul 2024 19:15:28 -0700 Subject: [PATCH 2/5] refactor: update salesConfig property name in Zora.ts --- packages/zora/src/Zora.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/zora/src/Zora.ts b/packages/zora/src/Zora.ts index 51cd22bf0..dfb90561b 100644 --- a/packages/zora/src/Zora.ts +++ b/packages/zora/src/Zora.ts @@ -197,7 +197,7 @@ export const getMintIntent = async ( try { fixedPriceSaleStratAddress = ( await getSalesConfigAndTokenInfo(chainId, contractAddress, tokenId) - ).fixedPrice.address + ).salesConfig.address } catch { console.error( `Unable to fetch salesConfigAndTokenInfo, defaulting price sale strategy address to ${fixedPriceSaleStratAddress}`, @@ -289,7 +289,7 @@ export const simulateMint = async ( try { fixedPriceSaleStratAddress = ( await getSalesConfigAndTokenInfo(chainId, contractAddress, tokenId) - ).fixedPrice.address + ).salesConfig.address } catch { console.error('Unable to fetch salesConfigAndTokenInfo') } From 1b2e8d8fd281be371965c7a7a9a301546753c8ce Mon Sep 17 00:00:00 2001 From: mmackz Date: Thu, 18 Jul 2024 19:16:19 -0700 Subject: [PATCH 3/5] chore: generate changeset --- .changeset/strange-ducks-exist.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/strange-ducks-exist.md diff --git a/.changeset/strange-ducks-exist.md b/.changeset/strange-ducks-exist.md new file mode 100644 index 000000000..8f49f9c0d --- /dev/null +++ b/.changeset/strange-ducks-exist.md @@ -0,0 +1,5 @@ +--- +"@rabbitholegg/questdk-plugin-zora": minor +--- + +update zora protocol sdk From d0341c6e54db537209538db064aafacb475cef44 Mon Sep 17 00:00:00 2001 From: mmackz Date: Thu, 18 Jul 2024 19:42:01 -0700 Subject: [PATCH 4/5] feat(utils): add base sepolia as viem chain --- packages/utils/src/helpers/chain-id-to-viem-chain.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/utils/src/helpers/chain-id-to-viem-chain.ts b/packages/utils/src/helpers/chain-id-to-viem-chain.ts index 43957ef9e..50d0af231 100644 --- a/packages/utils/src/helpers/chain-id-to-viem-chain.ts +++ b/packages/utils/src/helpers/chain-id-to-viem-chain.ts @@ -1,6 +1,7 @@ import { arbitrum, base, + baseSepolia, blast, mainnet, optimism, @@ -15,6 +16,8 @@ export const chainIdToViemChain = (chainId: number) => { return arbitrum case base.id: return base + case baseSepolia.id: + return baseSepolia case blast.id: return blast case mainnet.id: From a5e3c75c461180ba1339ece4b73aab38f0ea6d59 Mon Sep 17 00:00:00 2001 From: mmackz Date: Thu, 18 Jul 2024 19:44:54 -0700 Subject: [PATCH 5/5] chore: generate changeset --- .changeset/slimy-trees-wink.md | 6 ++++++ .changeset/strange-ducks-exist.md | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 .changeset/slimy-trees-wink.md delete mode 100644 .changeset/strange-ducks-exist.md diff --git a/.changeset/slimy-trees-wink.md b/.changeset/slimy-trees-wink.md new file mode 100644 index 000000000..845a94a35 --- /dev/null +++ b/.changeset/slimy-trees-wink.md @@ -0,0 +1,6 @@ +--- +"@rabbitholegg/questdk-plugin-utils": minor +"@rabbitholegg/questdk-plugin-zora": minor +--- + +update zora protocol sdk and add base sepolia to viem chains diff --git a/.changeset/strange-ducks-exist.md b/.changeset/strange-ducks-exist.md deleted file mode 100644 index 8f49f9c0d..000000000 --- a/.changeset/strange-ducks-exist.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rabbitholegg/questdk-plugin-zora": minor ---- - -update zora protocol sdk