From b97118df8119600c8b7eb2b565ca4c556d5e6239 Mon Sep 17 00:00:00 2001 From: mmackz Date: Thu, 29 Aug 2024 10:13:06 -0700 Subject: [PATCH 1/3] build(zora): update protocol-sdk version to 0.9.5 --- packages/zora/package.json | 2 +- pnpm-lock.yaml | 72 +++++++++++++++++++++++++++++++++----- 2 files changed, 65 insertions(+), 9 deletions(-) diff --git a/packages/zora/package.json b/packages/zora/package.json index 5f0e41702..439713128 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.9.0", + "@zoralabs/protocol-sdk": "0.9.5", "@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 4b3c6ad03..3141a89aa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -823,8 +823,8 @@ importers: specifier: workspace:* version: link:../utils '@zoralabs/protocol-sdk': - specifier: 0.9.0 - version: 0.9.0(typescript@5.3.2)(viem@2.15.1)(zod@3.23.8) + specifier: 0.9.5 + version: 0.9.5(typescript@5.3.2)(viem@2.15.1)(zod@3.23.8) '@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.23.8) @@ -2599,7 +2599,7 @@ packages: '@ledgerhq/hw-transport-node-hid-noevents': 5.51.1 '@ledgerhq/logs': 5.50.0 lodash: 4.17.21 - node-hid: 2.1.1 + node-hid: 1.3.0 usb: 1.9.2 dev: false optional: true @@ -5497,20 +5497,20 @@ packages: hasBin: true dev: false - /@zoralabs/protocol-deployments@0.3.0: - resolution: {integrity: sha512-T8fVXQ3KC3qXcHfTG14Z6/vnY/2ImIhAjkFNhD3kWKtd8TaXVlLQ1Rqu13XCDP9HxvbmuaaXO/QUx8MHeQ+61g==} + /@zoralabs/protocol-deployments@0.3.1: + resolution: {integrity: sha512-yHoWl11MA+suFMMmiuI2MNzdQrmDFnq3WDke9ctm+8Ibh+JZ5TPb8Kqu2x5yb8+QVsliq7i+vYc/zqVyOTledw==} dev: false /@zoralabs/protocol-rewards@1.2.1: resolution: {integrity: sha512-Jf2aIHhyAsybCCv1byV5uP/YiwA/ZB3zTywDO6d15796Bf58zzC3D1ptKuh+z1Nba3dU2Hzqz0K7EEQOjoq+1A==} dev: false - /@zoralabs/protocol-sdk@0.9.0(typescript@5.3.2)(viem@2.15.1)(zod@3.23.8): - resolution: {integrity: sha512-g5Eoy9TFcUOLvOfNxRs/QT2noigTAbyVLN+siM5m7JroXB5gmwz8Ca7wE/XGffBiylgJLm9GEX0djod9AHDHhw==} + /@zoralabs/protocol-sdk@0.9.5(typescript@5.3.2)(viem@2.15.1)(zod@3.23.8): + resolution: {integrity: sha512-eiLzI3ovIRgYlA9uoqUb072/1lKi23SU2pAymVAosfgI+sDyozM8514PIMmchJox0mtXGuLW5yheLf30HCmcmQ==} peerDependencies: viem: 2.15.1 dependencies: - '@zoralabs/protocol-deployments': 0.3.0 + '@zoralabs/protocol-deployments': 0.3.1 abitype: 1.0.6(typescript@5.3.2)(zod@3.23.8) viem: 2.15.1(typescript@5.3.2)(zod@3.23.8) transitivePeerDependencies: @@ -10924,6 +10924,12 @@ packages: thenify-all: 1.6.0 dev: false + /nan@2.20.0: + resolution: {integrity: sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==} + requiresBuild: true + dev: false + optional: true + /nano-json-stream-parser@0.1.2: resolution: {integrity: sha512-9MqxMH/BSJC7dnLsEMPyfN5Dvoo49IsPFYMcHw3Bcfc2kN0lpHRBSzlMSVx4HGyJ7s9B31CyBTVehWJoQ8Ctew==} dev: false @@ -11070,6 +11076,19 @@ packages: hasBin: true dev: false + /node-hid@1.3.0: + resolution: {integrity: sha512-BA6G4V84kiNd1uAChub/Z/5s/xS3EHBCxotQ0nyYrUG65mXewUDHE1tWOSqA2dp3N+mV0Ffq9wo2AW9t4p/G7g==} + engines: {node: '>=6.0.0'} + hasBin: true + requiresBuild: true + dependencies: + bindings: 1.5.0 + nan: 2.20.0 + node-abi: 2.30.1 + prebuild-install: 5.3.6 + dev: false + optional: true + /node-hid@2.1.1: resolution: {integrity: sha512-Skzhqow7hyLZU93eIPthM9yjot9lszg9xrKxESleEs05V2NcbUptZc5HFqzjOkSmL0sFlZFr3kmvaYebx06wrw==} engines: {node: '>=10'} @@ -11103,6 +11122,12 @@ packages: resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==} dev: true + /noop-logger@0.1.1: + resolution: {integrity: sha512-6kM8CLXvuW5crTxsAtva2YLrRrDaiTIkIePWs9moLHqbFWT94WpNFjwS/5dfLfECg5i/lkmw3aoqVidxt23TEQ==} + requiresBuild: true + dev: false + optional: true + /normalize-package-data@2.5.0: resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==} dependencies: @@ -11758,6 +11783,30 @@ packages: picocolors: 1.0.0 source-map-js: 1.2.0 + /prebuild-install@5.3.6: + resolution: {integrity: sha512-s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg==} + engines: {node: '>=6'} + hasBin: true + requiresBuild: true + dependencies: + detect-libc: 1.0.3 + expand-template: 2.0.3 + github-from-package: 0.0.0 + minimist: 1.2.8 + mkdirp-classic: 0.5.3 + napi-build-utils: 1.0.2 + node-abi: 2.30.1 + noop-logger: 0.1.1 + npmlog: 4.1.2 + pump: 3.0.0 + rc: 1.2.8 + simple-get: 3.1.1 + tar-fs: 2.1.1 + tunnel-agent: 0.6.0 + which-pm-runs: 1.1.0 + dev: false + optional: true + /prebuild-install@6.1.4: resolution: {integrity: sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ==} engines: {node: '>=6'} @@ -15070,6 +15119,13 @@ packages: /which-module@2.0.1: resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==} + /which-pm-runs@1.1.0: + resolution: {integrity: sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==} + engines: {node: '>=4'} + requiresBuild: true + dev: false + optional: true + /which-pm@2.0.0: resolution: {integrity: sha512-Lhs9Pmyph0p5n5Z3mVnN0yWcbQYUAD7rbQUiMsQxOJ3T57k7RFe35SUwWMf7dsbDZks1uOmw4AecB/JMDj3v/w==} engines: {node: '>=8.15'} From 3fa8b7a211b35affd954c4df1f82a345a4953ba0 Mon Sep 17 00:00:00 2001 From: mmackz Date: Thu, 29 Aug 2024 10:19:56 -0700 Subject: [PATCH 2/3] test: add test for V2 timed sale mint fees calculation --- packages/zora/src/Zora.test.ts | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/packages/zora/src/Zora.test.ts b/packages/zora/src/Zora.test.ts index d27f2af7c..c068b408d 100644 --- a/packages/zora/src/Zora.test.ts +++ b/packages/zora/src/Zora.test.ts @@ -410,6 +410,31 @@ describe('Given the getFee function', () => { expect(fee.projectFee).equals(parseEther('0.000777')) expect(fee.actionFee).equals(parseEther('0.29')) }) + + test('should return the correct project + action fee for V2 timed sale mint', async () => { + const contractAddress: Address = + '0x5849c383457794aca6e2284cdcacfb7c7b98fa38' + const tokenId = 1 + const mintParams = { + contractAddress, + tokenId, + chainId: Chains.ZORA, + amount: 1, + } + + const mockFns = { + getFees: async (_mint: MintActionParams) => ({ + projectFee: parseEther('0.000111'), + actionFee: parseEther('0'), + }), + } + + const getFeesSpy = vi.spyOn(mockFns, 'getFees') + const fee = await mockFns.getFees(mintParams) + expect(getFeesSpy.mock.calls.length).toBe(1) + expect(fee.projectFee).equals(parseEther('0.000111')) + expect(fee.actionFee).equals(parseEther('0')) + }) }) describe('simulateMint function', () => { From d0f7d5eba7b0b83321d435d47659ba316f849905 Mon Sep 17 00:00:00 2001 From: mmackz Date: Thu, 29 Aug 2024 10:20:45 -0700 Subject: [PATCH 3/3] chore: generate changeset --- .changeset/eight-sloths-hunt.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/eight-sloths-hunt.md diff --git a/.changeset/eight-sloths-hunt.md b/.changeset/eight-sloths-hunt.md new file mode 100644 index 000000000..a733ea9f4 --- /dev/null +++ b/.changeset/eight-sloths-hunt.md @@ -0,0 +1,5 @@ +--- +"@rabbitholegg/questdk-plugin-zora": minor +--- + +update zora SDK version to 0.9.5