@zoralabs/comments-contracts 0.0.2-COMMENTS.0 → 0.0.3

package/package/wagmiGenerated.ts

@@ -4,7 +4,6 @@
 
 export const callerAndCommenterImplABI = [
   {
-    stateMutability: 'nonpayable',
     type: 'constructor',
     inputs: [
       { name: '_comments', internalType: 'address', type: 'address' },
@@ -12,23 +11,23 @@ export const callerAndCommenterImplABI = [
       { name: '_swapHelper', internalType: 'address', type: 'address' },
       { name: '_sparksValue', internalType: 'uint256', type: 'uint256' },
     ],
+    stateMutability: 'nonpayable',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'UPGRADE_INTERFACE_VERSION',
     outputs: [{ name: '', internalType: 'string', type: 'string' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'nonpayable',
     type: 'function',
     inputs: [],
     name: 'acceptOwnership',
     outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    stateMutability: 'payable',
     type: 'function',
     inputs: [
       { name: 'commenter', internalType: 'address', type: 'address' },
@@ -58,32 +57,32 @@ export const callerAndCommenterImplABI = [
         ],
       },
     ],
+    stateMutability: 'payable',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'comments',
     outputs: [
       { name: '', internalType: 'contract IComments', type: 'address' },
     ],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'pure',
     type: 'function',
     inputs: [],
     name: 'contractName',
     outputs: [{ name: '', internalType: 'string', type: 'string' }],
+    stateMutability: 'pure',
   },
   {
-    stateMutability: 'pure',
     type: 'function',
     inputs: [],
     name: 'contractVersion',
     outputs: [{ name: '', internalType: 'string', type: 'string' }],
+    stateMutability: 'pure',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'eip712Domain',
@@ -96,9 +95,9 @@ export const callerAndCommenterImplABI = [
       { name: 'salt', internalType: 'bytes32', type: 'bytes32' },
       { name: 'extensions', internalType: 'uint256[]', type: 'uint256[]' },
     ],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [
       {
@@ -131,9 +130,9 @@ export const callerAndCommenterImplABI = [
     ],
     name: 'hashPermitBuyOnSecondaryAndComment',
     outputs: [{ name: '', internalType: 'bytes32', type: 'bytes32' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [
       {
@@ -161,16 +160,16 @@ export const callerAndCommenterImplABI = [
     ],
     name: 'hashPermitTimedSaleMintAndComment',
     outputs: [{ name: '', internalType: 'bytes32', type: 'bytes32' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'nonpayable',
     type: 'function',
     inputs: [{ name: 'owner', internalType: 'address', type: 'address' }],
     name: 'initialize',
     outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [
       { name: 'owner', internalType: 'address', type: 'address' },
@@ -178,23 +177,23 @@ export const callerAndCommenterImplABI = [
     ],
     name: 'nonceUsed',
     outputs: [{ name: '', internalType: 'bool', type: 'bool' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'owner',
     outputs: [{ name: '', internalType: 'address', type: 'address' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'pendingOwner',
     outputs: [{ name: '', internalType: 'address', type: 'address' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'payable',
     type: 'function',
     inputs: [
       {
@@ -240,9 +239,9 @@ export const callerAndCommenterImplABI = [
         ],
       },
     ],
+    stateMutability: 'payable',
   },
   {
-    stateMutability: 'payable',
     type: 'function',
     inputs: [
       {
@@ -283,32 +282,32 @@ export const callerAndCommenterImplABI = [
         ],
       },
     ],
+    stateMutability: 'payable',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'proxiableUUID',
     outputs: [{ name: '', internalType: 'bytes32', type: 'bytes32' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'nonpayable',
     type: 'function',
     inputs: [],
     name: 'renounceOwnership',
     outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'secondarySwap',
     outputs: [
       { name: '', internalType: 'contract ISecondarySwap', type: 'address' },
     ],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'payable',
     type: 'function',
     inputs: [
       { name: 'commenter', internalType: 'address', type: 'address' },
@@ -334,16 +333,16 @@ export const callerAndCommenterImplABI = [
         ],
       },
     ],
+    stateMutability: 'payable',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'sparkValue',
     outputs: [{ name: '', internalType: 'uint256', type: 'uint256' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'payable',
     type: 'function',
     inputs: [
       { name: 'commenter', internalType: 'address', type: 'address' },
@@ -367,16 +366,16 @@ export const callerAndCommenterImplABI = [
         ],
       },
     ],
+    stateMutability: 'payable',
   },
   {
-    stateMutability: 'nonpayable',
     type: 'function',
     inputs: [{ name: 'newOwner', internalType: 'address', type: 'address' }],
     name: 'transferOwnership',
     outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    stateMutability: 'payable',
     type: 'function',
     inputs: [
       { name: 'newImplementation', internalType: 'address', type: 'address' },
@@ -384,9 +383,9 @@ export const callerAndCommenterImplABI = [
     ],
     name: 'upgradeToAndCall',
     outputs: [],
+    stateMutability: 'payable',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'zoraTimedSale',
@@ -397,6 +396,7 @@ export const callerAndCommenterImplABI = [
         type: 'address',
       },
     ],
+    stateMutability: 'view',
   },
   { type: 'event', anonymous: false, inputs: [], name: 'EIP712DomainChanged' },
   {
@@ -635,86 +635,85 @@ export const callerAndCommenterImplABI = [
 
 export const commentsImplABI = [
   {
-    stateMutability: 'nonpayable',
     type: 'constructor',
     inputs: [
       { name: '_sparkValue', internalType: 'uint256', type: 'uint256' },
       { name: '_protocolRewards', internalType: 'address', type: 'address' },
       { name: '_zoraRecipient', internalType: 'address', type: 'address' },
     ],
+    stateMutability: 'nonpayable',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'BACKFILLER_ROLE',
     outputs: [{ name: '', internalType: 'bytes32', type: 'bytes32' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'DEFAULT_ADMIN_ROLE',
     outputs: [{ name: '', internalType: 'bytes32', type: 'bytes32' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'DELEGATE_COMMENTER',
     outputs: [{ name: '', internalType: 'bytes32', type: 'bytes32' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'DOMAIN_NAME',
     outputs: [{ name: '', internalType: 'string', type: 'string' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'DOMAIN_VERSION',
     outputs: [{ name: '', internalType: 'string', type: 'string' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'PERMISSION_BIT_ADMIN',
     outputs: [{ name: '', internalType: 'uint256', type: 'uint256' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'REFERRER_REWARD_PCT',
     outputs: [{ name: '', internalType: 'uint256', type: 'uint256' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'UPGRADE_INTERFACE_VERSION',
     outputs: [{ name: '', internalType: 'string', type: 'string' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'ZORA_REWARD_NO_REFERRER_PCT',
     outputs: [{ name: '', internalType: 'uint256', type: 'uint256' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'ZORA_REWARD_PCT',
     outputs: [{ name: '', internalType: 'uint256', type: 'uint256' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'nonpayable',
     type: 'function',
     inputs: [
       {
@@ -738,9 +737,9 @@ export const commentsImplABI = [
     ],
     name: 'backfillBatchAddComment',
     outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    stateMutability: 'payable',
     type: 'function',
     inputs: [
       { name: 'commenter', internalType: 'address', type: 'address' },
@@ -779,9 +778,9 @@ export const commentsImplABI = [
         ],
       },
     ],
+    stateMutability: 'payable',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [
       {
@@ -798,23 +797,23 @@ export const commentsImplABI = [
     ],
     name: 'commentSparksQuantity',
     outputs: [{ name: '', internalType: 'uint256', type: 'uint256' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'pure',
     type: 'function',
     inputs: [],
     name: 'contractName',
     outputs: [{ name: '', internalType: 'string', type: 'string' }],
+    stateMutability: 'pure',
   },
   {
-    stateMutability: 'pure',
     type: 'function',
     inputs: [],
     name: 'contractVersion',
     outputs: [{ name: '', internalType: 'string', type: 'string' }],
+    stateMutability: 'pure',
   },
   {
-    stateMutability: 'payable',
     type: 'function',
     inputs: [
       { name: 'commenter', internalType: 'address', type: 'address' },
@@ -854,9 +853,9 @@ export const commentsImplABI = [
       },
       { name: 'commentId', internalType: 'bytes32', type: 'bytes32' },
     ],
+    stateMutability: 'payable',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'eip712Domain',
@@ -869,16 +868,16 @@ export const commentsImplABI = [
       { name: 'salt', internalType: 'bytes32', type: 'bytes32' },
       { name: 'extensions', internalType: 'uint256[]', type: 'uint256[]' },
     ],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [{ name: 'role', internalType: 'bytes32', type: 'bytes32' }],
     name: 'getRoleAdmin',
     outputs: [{ name: '', internalType: 'bytes32', type: 'bytes32' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'nonpayable',
     type: 'function',
     inputs: [
       { name: 'role', internalType: 'bytes32', type: 'bytes32' },
@@ -886,9 +885,9 @@ export const commentsImplABI = [
     ],
     name: 'grantRole',
     outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [
       { name: 'role', internalType: 'bytes32', type: 'bytes32' },
@@ -896,9 +895,9 @@ export const commentsImplABI = [
     ],
     name: 'hasRole',
     outputs: [{ name: '', internalType: 'bool', type: 'bool' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [
       {
@@ -918,9 +917,9 @@ export const commentsImplABI = [
       { name: 'commentId', internalType: 'bytes32', type: 'bytes32' },
       { name: 'exists', internalType: 'bool', type: 'bool' },
     ],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [
       {
@@ -937,9 +936,9 @@ export const commentsImplABI = [
     ],
     name: 'hashAndValidateCommentExists',
     outputs: [{ name: 'commentId', internalType: 'bytes32', type: 'bytes32' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'pure',
     type: 'function',
     inputs: [
       {
@@ -956,9 +955,9 @@ export const commentsImplABI = [
     ],
     name: 'hashCommentIdentifier',
     outputs: [{ name: '', internalType: 'bytes32', type: 'bytes32' }],
+    stateMutability: 'pure',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [
       {
@@ -1004,9 +1003,9 @@ export const commentsImplABI = [
     ],
     name: 'hashPermitComment',
     outputs: [{ name: '', internalType: 'bytes32', type: 'bytes32' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [
       {
@@ -1045,16 +1044,16 @@ export const commentsImplABI = [
     ],
     name: 'hashPermitSparkComment',
     outputs: [{ name: '', internalType: 'bytes32', type: 'bytes32' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'implementation',
     outputs: [{ name: '', internalType: 'address', type: 'address' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'nonpayable',
     type: 'function',
     inputs: [
       { name: 'defaultAdmin', internalType: 'address', type: 'address' },
@@ -1067,16 +1066,16 @@ export const commentsImplABI = [
     ],
     name: 'initialize',
     outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'nextNonce',
     outputs: [{ name: '', internalType: 'bytes32', type: 'bytes32' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [
       { name: 'owner', internalType: 'address', type: 'address' },
@@ -1084,9 +1083,9 @@ export const commentsImplABI = [
     ],
     name: 'nonceUsed',
     outputs: [{ name: '', internalType: 'bool', type: 'bool' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'payable',
     type: 'function',
     inputs: [
       {
@@ -1133,9 +1132,9 @@ export const commentsImplABI = [
     ],
     name: 'permitComment',
     outputs: [],
+    stateMutability: 'payable',
   },
   {
-    stateMutability: 'payable',
     type: 'function',
     inputs: [
       {
@@ -1175,25 +1174,25 @@ export const commentsImplABI = [
     ],
     name: 'permitSparkComment',
     outputs: [],
+    stateMutability: 'payable',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'protocolRewards',
     outputs: [
       { name: '', internalType: 'contract IProtocolRewards', type: 'address' },
     ],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'proxiableUUID',
     outputs: [{ name: '', internalType: 'bytes32', type: 'bytes32' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'nonpayable',
     type: 'function',
     inputs: [
       { name: 'role', internalType: 'bytes32', type: 'bytes32' },
@@ -1201,9 +1200,9 @@ export const commentsImplABI = [
     ],
     name: 'renounceRole',
     outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    stateMutability: 'nonpayable',
     type: 'function',
     inputs: [
       { name: 'role', internalType: 'bytes32', type: 'bytes32' },
@@ -1211,9 +1210,9 @@ export const commentsImplABI = [
     ],
     name: 'revokeRole',
     outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    stateMutability: 'payable',
     type: 'function',
     inputs: [
       {
@@ -1232,23 +1231,23 @@ export const commentsImplABI = [
     ],
     name: 'sparkComment',
     outputs: [],
+    stateMutability: 'payable',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [],
     name: 'sparkValue',
     outputs: [{ name: '', internalType: 'uint256', type: 'uint256' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'view',
     type: 'function',
     inputs: [{ name: 'interfaceId', internalType: 'bytes4', type: 'bytes4' }],
     name: 'supportsInterface',
     outputs: [{ name: '', internalType: 'bool', type: 'bool' }],
+    stateMutability: 'view',
   },
   {
-    stateMutability: 'payable',
     type: 'function',
     inputs: [
       { name: 'newImplementation', internalType: 'address', type: 'address' },
@@ -1256,6 +1255,7 @@ export const commentsImplABI = [
     ],
     name: 'upgradeToAndCall',
     outputs: [],
+    stateMutability: 'payable',
   },
   {
     type: 'event',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zoralabs/comments-contracts",
-  "version": "0.0.2-COMMENTS.0",
+  "version": "0.0.3",
   "author": "oveddan",
   "license": "MIT",
   "type": "module",
@@ -20,7 +20,7 @@
     "@openzeppelin/contracts-upgradeable": "5.0.2",
     "@turnkey/api-key-stamper": "^0.3.1",
     "@turnkey/http": "^2.5.1",
-    "@turnkey/viem": "^0.4.4",
+    "@turnkey/viem": "^0.6.8",
     "@types/node": "^20.1.2",
     "@wagmi/cli": "^1.0.1",
     "@zoralabs/chains": "^1.3.1",
@@ -35,11 +35,12 @@
     "tsx": "^3.13.0",
     "typescript": "^5.2.2",
     "viem": "^2.21.18",
-    "@zoralabs/sparks-contracts": "^0.2.4",
-    "@zoralabs/protocol-rewards": "^1.2.5-COMMENTS.0",
+    "@zoralabs/protocol-rewards": "^1.2.5",
     "@zoralabs/shared-contracts": "^0.0.1",
+    "@zoralabs/shared-scripts": "^0.0.0",
+    "@zoralabs/sparks-contracts": "^0.2.5",
     "@zoralabs/tsconfig": "^0.0.1",
-    "@zoralabs/zora-1155-contracts": "^2.13.0"
+    "@zoralabs/zora-1155-contracts": "^2.13.2"
   },
   "dependencies": {
     "abitype": "^1.0.2",
@@ -53,11 +54,11 @@
     "test-gas": "forge test --gas-report",
     "storage-inspect:check": "./script/storage-check.sh check ZoraTimedSaleStrategyImpl",
     "storage-inspect:generate": "./script/storage-check.sh generate ZoraTimedSaleStrategyImpl",
-    "build:sizes": "forge build --sizes",
-    "copy-abis": "pnpm tsx script/bundle-abis.ts",
+    "build:sizes": "forge build src/ --sizes",
+    "copy-abis": "pnpm exec bundle-abis",
     "coverage": "FOUNDRY_PROFILE=default forge coverage --report lcov",
     "build": "pnpm run wagmi:generate && pnpm run copy-abis && pnpm run prettier:write && tsup",
-    "wagmi:generate": "FOUNDRY_PROFILE=dev forge build && wagmi generate",
-    "update-contract-version": "pnpm tsx script/update-contract-version.ts"
+    "wagmi:generate": "FOUNDRY_PROFILE=dev forge build && wagmi generate && pnpm exec rename-generated-abi-casing ./package/wagmiGenerated.ts",
+    "update-contract-version": "pnpm exec update-contract-version"
   }
 }

package/script/CommentsDeployerBase.sol

@@ -122,6 +122,7 @@ contract CommentsDeployerBase is ProxyDeployerScript {
 
         // deploy caller and commenter impl
         deployment.callerAndCommenterImpl = address(deployCallerAndCommenterImpl(commentsAddress));
+        deployment.callerAndCommenterVersion = CallerAndCommenterImpl(deployment.callerAndCommenterImpl).contractVersion();
 
         bytes memory upgradeToAndCall = abi.encodeWithSelector(
             UUPSUpgradeable.upgradeToAndCall.selector,

package/script/DeployCallerAndCommenterImpl.s.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.13;
 import "forge-std/console2.sol";
 
 import {CommentsDeployerBase} from "./CommentsDeployerBase.sol";
+import {CallerAndCommenterImpl} from "../src/utils/CallerAndCommenterImpl.sol";
 import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 
 contract DeployCallerAndCommenterImpl is CommentsDeployerBase {
@@ -13,6 +14,7 @@ contract DeployCallerAndCommenterImpl is CommentsDeployerBase {
         vm.startBroadcast();
 
         config.callerAndCommenterImpl = deployCallerAndCommenterImpl(config.comments);
+        config.callerAndCommenterVersion = CallerAndCommenterImpl(config.callerAndCommenterImpl).contractVersion();
 
         vm.stopBroadcast();