Merge branch 'master' into v15-upgrade-proposal

unlock-protocol · Dec 11, 2024 · 1a4e07d · 1a4e07d
2 parents 057d991 + 8911556
commit 1a4e07d
Show file tree

Hide file tree

Showing 44 changed files with 485 additions and 1,164 deletions.
diff --git a/docs/package.json b/docs/package.json
@@ -15,7 +15,7 @@
     "@mdx-js/react": "3.1.0",
     "@mui/material": "6.1.9",
     "@mui/x-charts": "7.23.0",
-    "@privy-io/react-auth": "1.95.2",
+    "@privy-io/react-auth": "1.95.3",
     "@tanstack/react-query": "5.62.0",
     "@unlock-protocol/networks": "workspace:./packages/networks",
     "@unlock-protocol/ui": "workspace:./packages/ui",

diff --git a/governance/.openzeppelin/unknown-84532.json b/governance/.openzeppelin/unknown-84532.json
diff --git a/governance/hardhat.config.js b/governance/hardhat.config.js
@@ -74,7 +74,7 @@ const config = {
     compilers: [
       // required to compile oracle as Uniswap v3-periphery supports only solc < 0.8
       { version: '0.7.6', settings: { ...settings, evmVersion: 'istanbul' } },
-      { version: '0.8.21', settings },
+      { version: '0.8.21', settings: { ...settings, evmVersion: 'shanghai' } },
     ],
   },
   sourcify: {

diff --git a/governance/scripts/upgrade/prepare.js b/governance/scripts/upgrade/prepare.js
@@ -12,7 +12,9 @@ async function main({ proxyAddress, contractName, contractVersion }) {
     throw Error('Need a version number')
   }
 
-  console.log(`Setting up version ${contractVersion} from package`)
+  console.log(
+    `Setting up ${contractName} version ${contractVersion} from package`
+  )
   const [qualifiedPath] = await copyAndBuildContractsAtVersion(__dirname, [
     {
       contractName,
@@ -33,12 +35,12 @@ async function main({ proxyAddress, contractName, contractVersion }) {
     await copyAndBuildContractsAtVersion(__dirname, [
       {
         contractName,
-        version: contractVersion - 1,
+        version: contractVersion - 1n,
       },
     ])
     const PreviousContract = await ethers.getContractFactory(
       `contracts/past-versions/${contractName}V${
-        contractVersion - 1
+        contractVersion - 1n
       }.sol:${contractName}`
     )