Preparing packages for pnpm upgrade by adding missing deps and re-naming scripts to use clean names rather than overloaded binary names (ourzora#515)

iainnash · web-flow · commit 898c84a7ab16 · 2024-07-17T09:54:21.000-04:00
* Preparing packages for pnpm upgrade by adding missing deps and re-naming scripts to use clean names rather than overloaded binary names

* binary name update
diff --git a/.changeset/clever-peas-sip.md b/.changeset/clever-peas-sip.md
@@ -0,0 +1,17 @@
+---
+"@zoralabs/protocol-deployments-gen": patch
+"@zoralabs/protocol-deployments": patch
+"@zoralabs/mints-deployments": patch
+"@zoralabs/1155-deployments": patch
+"@zoralabs/protocol-rewards": patch
+"@zoralabs/shared-contracts": patch
+"@zoralabs/zora-1155-contracts": patch
+"@zoralabs/protocol-sdk": patch
+"smart-wallet": patch
+"@zoralabs/mints-contracts": patch
+"docs": patch
+---
+
+[chore] Update dependencies and runtime scripts
+
+This ensures jobs do not match binary names to make runs less ambigious and also that all deps are accounted for.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn lint-staged
+yarn run-lint-staged
diff --git a/.npmrc b/.npmrc
@@ -1 +1,2 @@
 auto-install-peers = true
+ignore-scripts = true
diff --git a/docs/package.json b/docs/package.json
@@ -23,8 +23,10 @@
     "yaml": "2.3.4"
   },
   "devDependencies": {
+    "@types/node": "^20.13.0",
     "@0xsplits/splits-sdk": "^4.0.2",
     "@zoralabs/protocol-sdk": "*",
+    "@zoralabs/protocol-deployments": "*",
     "zoralabs-tsconfig": "*"
   }
 }
diff --git a/package.json b/package.json
@@ -11,7 +11,8 @@
     "lint": "turbo run lint",
     "format": "turbo run format",
     "release": "turbo run build && changeset publish",
-    "prepare": "husky install"
+    "prepare": "husky install",
+    "run-lint-staged": "lint-staged"
   },
   "devDependencies": {
     "@changesets/cli": "2.26.2",
@@ -48,5 +49,11 @@
     "*.js": "prettier --write",
     "*.mjs": "prettier --write",
     "*.json": "prettier --write"
+  },
+  "ignore": [
+    "*.template.sol"
+  ],
+  "engines": {
+    "node": ">=16"
   }
 }
diff --git a/packages/1155-contracts/package.json b/packages/1155-contracts/package.json
@@ -21,13 +21,13 @@
     "test": "forge test -vv",
     "test-gas": "forge test --gas-report",
     "prettier:check": "prettier --check 'src/**/*.sol' 'test/**/*.sol' 'package/**/*.ts' 'wagmi.config.ts'",
-    "prettier": "prettier --write 'src/**/*.sol' 'test/**/*.sol' 'package/**/*.ts' 'script/**/*.ts' 'wagmi.config.ts'",
+    "prettier:write": "prettier --write 'src/**/*.sol' 'test/**/*.sol' 'package/**/*.ts' 'script/**/*.ts' 'wagmi.config.ts'",
     "copy-abis": "yarn tsx script/bundle-abis.ts",
     "lint": "yarn run prettier:check",
     "coverage": "forge coverage --report lcov",
     "write-gas-report": "forge test --gas-report > gasreport.ansi",
     "build:contracts": "forge build",
-    "build": "yarn wagmi && yarn copy-abis && yarn prettier && tsup",
+    "build": "yarn wagmi && yarn copy-abis && yarn prettier:write && tsup",
     "wagmi": "FOUNDRY_PROFILE=dev forge build && wagmi generate",
     "build:sizes": "forge build --sizes",
     "storage-inspect:check": "./script/storage-check.sh check ZoraCreator1155Impl ZoraCreator1155FactoryImpl",
@@ -48,11 +48,13 @@
     "es-main": "^1.2.0",
     "forge-std": "https://github.com/foundry-rs/forge-std#705263c95892a906d7af65f0f73ce8a4a0c80b80",
     "glob": "^10.2.2",
-    "prettier-plugin-solidity": "^1.3.1",
     "solmate": "6.1.0",
     "tsup": "^7.2.0",
     "tsx": "^3.13.0",
     "typescript": "^5.2.2",
-    "zoralabs-tsconfig": "*"
+    "zoralabs-tsconfig": "*",
+    "pathe": "^1.1.2",
+    "prettier": "^3.0.3",
+    "prettier-plugin-solidity": "^1.3.1"
   }
 }
diff --git a/packages/1155-deployments/package.json b/packages/1155-deployments/package.json
@@ -18,21 +18,23 @@
   },
   "dependencies": {},
   "devDependencies": {
+    "@openzeppelin/contracts": "4.9.2",
+    "@zoralabs/openzeppelin-contracts-upgradeable": "4.8.4",
     "@lavamoat/preinstall-always-fail": "2.0.0",
     "@turnkey/api-key-stamper": "^0.3.1",
     "@turnkey/http": "^2.5.1",
     "@turnkey/viem": "^0.4.4",
     "@types/node": "^20.1.2",
     "@zoralabs/chains": "^1.3.1",
     "@zoralabs/mints-contracts": "*",
+    "@zoralabs/protocol-rewards": "*",
     "@zoralabs/shared-contracts": "*",
     "@zoralabs/zora-1155-contracts": "*",
     "ds-test": "https://github.com/dapphub/ds-test#cd98eff28324bfac652e63a239a60632a761790b",
     "es-main": "^1.2.0",
     "forge-std": "https://github.com/foundry-rs/forge-std#705263c95892a906d7af65f0f73ce8a4a0c80b80",
     "glob": "^10.2.2",
     "handlebars": "^4.7.8",
-    "prettier-plugin-solidity": "^1.3.1",
     "solady": "0.0.132",
     "solmate": "6.1.0",
     "toml": "^3.0.0",
diff --git a/packages/mints-deployments/package.json b/packages/mints-deployments/package.json
@@ -11,7 +11,7 @@
   "scripts": {
     "dev": "FOUNDRY_PROFILE=dev forge test --watch -vvv",
     "test": "FORK_TEST_CHAINS=mainnet,goerli,optimism,optimism_goerli,zora,zora_goerli,sepolia,base_goerli,base,zora_sepolia forge test -vvv",
-    "prettier": "prettier --write 'src/**/*.sol' 'scripts/**/*.ts'",
+    "prettier:write": "prettier --write 'src/**/*.sol' 'scripts/**/*.ts'",
     "lint": "prettier --check 'src/**/*.sol' 'scripts/**/*.ts'",
     "copy-deployed-contracts": "yarn tsx script/copy-deployed-contracts.ts",
     "unlink-common": "rm -rf ./node_modules/@zoralabs/shared-contracts && cp -r ../shared-contracts ./node_modules/@zoralabs/shared-contracts",
@@ -24,6 +24,9 @@
     "@zoralabs/shared-contracts": "*"
   },
   "devDependencies": {
+    "@openzeppelin/contracts": "5.0.2",
+    "@openzeppelin/contracts-upgradeable": "5.0.2",
+    "prettier": "^3.0.3",
     "@inquirer/prompts": "^3.3.0",
     "viem": "^2.9.19",
     "@lavamoat/preinstall-always-fail": "2.0.0",
diff --git a/packages/mints/package.json b/packages/mints/package.json
@@ -16,11 +16,11 @@
     "test": "forge test",
     "build:contracts": "forge build",
     "prettier:check": "prettier --check 'src/**/*.sol' 'test/**/*.sol'",
-    "prettier": "prettier --write 'src/**/*.sol' 'test/**/*.sol' ",
+    "prettier:write": "prettier --write 'src/**/*.sol' 'test/**/*.sol'",
     "lint": "prettier --check 'src/**/*.sol' 'test/**/*.sol' ",
     "copy-abis": "yarn tsx script/bundle-abis.ts",
-    "build": "yarn wagmi && yarn copy-abis && yarn prettier && tsup",
-    "wagmi": "FOUNDRY_PROFILE=dev forge build && wagmi generate",
+    "build": "yarn wagmi:generate && yarn copy-abis && yarn prettier:write && tsup",
+    "wagmi:generate": "FOUNDRY_PROFILE=dev forge build && wagmi generate",
     "update-contract-version": "node script/update-contract-version.mjs"
   },
   "dependencies": {
@@ -33,8 +33,13 @@
   },
   "devDependencies": {
     "@lavamoat/preinstall-always-fail": "2.0.0",
+    "@wagmi/cli": "^1.0.1",
     "@types/node": "20.3.2",
+    "pathe": "^1.1.2",
+    "prettier": "^3.0.3",
+    "tsx": "^4.11.0",
     "typescript": "^5.2.2",
+    "zoralabs-tsconfig": "*",
     "glob": "^10.2.2",
     "tsup": "^7.2.0",
     "prettier-plugin-solidity": "^1.3.1"
diff --git a/packages/protocol-deployments-gen/package.json b/packages/protocol-deployments-gen/package.json
@@ -6,8 +6,8 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "build": "yarn wagmi",
-    "wagmi": "wagmi generate"
+    "build": "yarn wagmi:generate",
+    "wagmi:generate": "wagmi generate"
   },
   "dependencies": {},
   "devDependencies": {
@@ -18,6 +18,7 @@
     "es-main": "^1.2.0",
     "@wagmi/cli": "^1.0.1",
     "@types/node": "^20.1.2",
+    "viem": "^2.13.2",
     "@lavamoat/preinstall-always-fail": "2.0.0",
     "@zoralabs/1155-deployments": "*",
     "@zoralabs/zora-1155-contracts": "*",
diff --git a/packages/protocol-deployments/package.json b/packages/protocol-deployments/package.json
@@ -17,17 +17,20 @@
   },
   "scripts": {
     "build": "yarn bundle-configs && tsup",
-    "bundle-configs": "tsx scripts/bundle-configs.ts && yarn prettier",
-    "prettier": "prettier --write 'src/**/*.ts' 'scripts/*'",
+    "bundle-configs": "tsx scripts/bundle-configs.ts && yarn prettier:write",
+    "prettier:write": "prettier --write 'src/**/*.ts' 'scripts/*'",
     "lint": "prettier --check 'src/**/*.ts' 'scripts/*'"
   },
   "dependencies": {},
   "devDependencies": {
     "@lavamoat/preinstall-always-fail": "2.0.0",
-    "@types/node": "^20.1.2",
+    "@types/node": "^20.3.2",
+    "abitype": "^1.0.2",
     "es-main": "^1.2.0",
     "tsup": "^7.2.0",
     "tsx": "^3.13.0",
+    "prettier": "^3.2.5",
+    "prettier-plugin-solidity": "^1.1.3",
     "typescript": "^5.2.2",
     "viem": "^2.11.1",
     "zoralabs-tsconfig": "*"
diff --git a/packages/protocol-rewards/package.json b/packages/protocol-rewards/package.json
@@ -15,7 +15,7 @@
     "test": "forge test",
     "build:contracts": "forge build --extra-output-files abi",
     "prettier:check": "prettier --check 'src/**/*.sol' 'test/**/*.sol' 'script/**/*.sol'",
-    "prettier": "prettier --write 'src/**/*.sol' 'test/**/*.sol' 'script/**/*.sol'",
+    "prettier:write": "prettier --write 'src/**/*.sol' 'test/**/*.sol' 'script/**/*.sol'",
     "lint": "prettier --check 'src/**/*.sol' 'test/**/*.sol' 'script/**/*.sol'"
   },
   "dependencies": {
@@ -24,6 +24,7 @@
   },
   "devDependencies": {
     "@types/node": "20.3.2",
+    "prettier": "^3.0.3",
     "@lavamoat/preinstall-always-fail": "2.0.0",
     "prettier-plugin-solidity": "^1.3.1"
   }
diff --git a/packages/protocol-sdk/package.json b/packages/protocol-sdk/package.json
@@ -16,28 +16,32 @@
     }
   },
   "scripts": {
-    "build": "tsup",
+    "build": "yarn run tsup",
     "prepack": "yarn build",
     "test:js": "vitest src",
     "test:integration": "vitest test-integration",
     "generate-types": "echo 'npx is used here because this is a rare operation' && npx openapi-typescript https://api.zora.co/premint/openapi.json -o src/apis/generated/premint-api-types.ts",
-    "prettier": "prettier --write 'src/**/*.ts' 'test-integration/**/*.ts'",
+    "prettier:write": "prettier --write 'src/**/*.ts' 'test-integration/**/*.ts'",
     "lint": "prettier --check 'src/**/*.ts' 'test-integration/**/*.ts'"
   },
   "dependencies": {
     "@zoralabs/protocol-deployments": "*",
+    "abitype": "^1.0.2",
     "semver": "^7.6.2"
   },
   "peerDependencies": {
-    "viem": "^2.11.1"
+    "viem": "^2.13.2"
   },
   "devDependencies": {
+    "@types/node": "^20.13.0",
     "@fleekhq/fleek-storage-js": "^1.0.24",
     "@lavamoat/preinstall-always-fail": "2.0.0",
     "@reservoir0x/relay-sdk": "^0.3.8",
     "@reservoir0x/reservoir-sdk": "^2.0.11",
-    "abitype": "^1.0.2",
     "graphql-prettier": "^1.0.6",
+    "tsup": "^7.2.0",
+    "prettier": "^3.0.3",
+    "prettier-plugin-solidity": "^1.1.3",
     "typescript": "^5.2.2",
     "vite": "^4.5.0",
     "vitest": "^0.34.6",
diff --git a/packages/protocol-sdk/src/mints/mints-relay-example.ts b/packages/protocol-sdk/src/mints/mints-relay-example.ts
@@ -7,7 +7,6 @@ import {
   WalletClient,
   recoverTypedDataAddress,
 } from "viem";
-import axios from "axios";
 import { paths, TransactionStepItem } from "@reservoir0x/relay-sdk";
 import { PermitSafeTransferBatch } from "./mints-contracts";
 import {
@@ -32,8 +31,18 @@ const postToRelay = async ({
     data,
   };
 
-  return (await axios.post(request.url, request.data))
-    .data as RelayCallResponse;
+  const response = await fetch(request.url, {
+    method: "POST",
+    body: JSON.stringify(request.data),
+    headers: { "content-type": "application/json" },
+  });
+
+  if (response.ok) {
+    const responseJson = await response.json();
+    return responseJson as RelayCallResponse;
+  } else {
+    throw new Error("Bad response from relay");
+  }
 };
 
 export const getRelayCall = async ({
diff --git a/packages/shared-contracts/package.json b/packages/shared-contracts/package.json
@@ -8,7 +8,7 @@
   ],
   "scripts": {
     "prettier:check": "prettier --check 'src/**/*.sol'",
-    "prettier": "prettier --write 'src/**/*.sol'"
+    "prettier:write": "prettier --write 'src/**/*.sol'"
   },
   "dependencies": {
     "@openzeppelin/contracts": "^5.0.1",
@@ -17,6 +17,7 @@
     "solady": "^0.0.168"
   },
   "devDependencies": {
+    "prettier": "^3.0.3",
     "prettier-plugin-solidity": "^1.3.1"
   }
 }
diff --git a/packages/smart-wallet/package.json b/packages/smart-wallet/package.json
@@ -6,7 +6,7 @@
   "private": true,
   "scripts": {
     "prettier:check": "prettier --check 'src/**/*.sol' 'test/**/*.sol' 'script/**/*.sol'",
-    "prettier": "prettier --write 'src/**/*.sol' 'test/**/*.sol' 'script/**/*.sol'"
+    "prettier:write": "prettier --write 'src/**/*.sol' 'test/**/*.sol' 'script/**/*.sol'"
   },
   "dependencies": {
     "@openzeppelin/contracts": "5.0.2",
diff --git a/turbo.json b/turbo.json
@@ -28,8 +28,8 @@
     "test:fork": {
       "dependsOn": ["^test:fork"]
     },
-    "prettier": {
-      "dependsOn": ["^prettier"]
+    "prettier:write": {
+      "dependsOn": ["^prettier:write"]
     },
     "storage-inspect:check": {
       "dependsOn": ["^storage-inspect:check"]
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`auto-install-peers = true`
	`2`	`+ignore-scripts = true`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,10 @@`
`23`	`23`	`"yaml": "2.3.4"`
`24`	`24`	`},`
`25`	`25`	`"devDependencies": {`
	`26`	`+ "@types/node": "^20.13.0",`
`26`	`27`	`"@0xsplits/splits-sdk": "^4.0.2",`
`27`	`28`	`"@zoralabs/protocol-sdk": "*",`
	`29`	`+ "@zoralabs/protocol-deployments": "*",`
`28`	`30`	`"zoralabs-tsconfig": "*"`
`29`	`31`	`}`
`30`	`32`	`}`