updatde deps

unlock-protocol · Jan 17, 2024 · e4d1999 · e4d1999
2 parents 779427a + fd9e123
commit e4d1999
Show file tree

Hide file tree

Showing 120 changed files with 11,388 additions and 5,627 deletions.
diff --git a/.github/workflows/_subgraph.yml b/.github/workflows/_subgraph.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
       - run: yarn
       - run: yarn build
       - name: Deploying the subgraphs

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -15,7 +15,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'yarn'
           registry-url: 'https://registry.npmjs.org'
 

diff --git a/docs/package.json b/docs/package.json
@@ -4,9 +4,9 @@
   "private": true,
   "dependencies": {
     "@babel/helper-get-function-arity": "7.16.7",
-    "@docusaurus/core": "3.0.1",
-    "@docusaurus/plugin-client-redirects": "3.0.1",
-    "@docusaurus/plugin-content-docs": "3.0.1",
+    "@docusaurus/core": "3.1.0",
+    "@docusaurus/plugin-client-redirects": "3.1.0",
+    "@docusaurus/plugin-content-docs": "3.1.0",
     "@flockler/react-flockler-embed": "1.0.4",
     "@mdx-js/react": "3.0.0",
     "@unlock-protocol/networks": "workspace:./packages/networks",

diff --git a/governance/.openzeppelin/sepolia.json b/governance/.openzeppelin/sepolia.json
@@ -417,6 +417,274 @@
           }
         }
       }
+    },
+    "6063cad41a28ef6b0f50d8e6d8aad4850c1ac58dc9bc6cc3f2c2712e1efd7c45": {
+      "address": "0x5814B64C69ae89f152859d20f53B240df1AC5066",
+      "txHash": "0xc8b34b4fbb1794f25104b5ba3f185394953fd946672ea035ed74bd04cf854b89",
+      "layout": {
+        "solcVersion": "0.8.21",
+        "storage": [
+          {
+            "label": "initialized",
+            "offset": 0,
+            "slot": "0",
+            "type": "t_bool",
+            "contract": "UnlockInitializable",
+            "src": "contracts/past-versions/UnlockV13.sol:1360"
+          },
+          {
+            "label": "initializing",
+            "offset": 1,
+            "slot": "0",
+            "type": "t_bool",
+            "contract": "UnlockInitializable",
+            "src": "contracts/past-versions/UnlockV13.sol:1365"
+          },
+          {
+            "label": "______gap",
+            "offset": 0,
+            "slot": "1",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "UnlockContextUpgradeable",
+            "src": "contracts/past-versions/UnlockV13.sol:1438"
+          },
+          {
+            "label": "_owner",
+            "offset": 0,
+            "slot": "51",
+            "type": "t_address",
+            "contract": "UnlockOwnable",
+            "src": "contracts/past-versions/UnlockV13.sol:1465"
+          },
+          {
+            "label": "______gap",
+            "offset": 0,
+            "slot": "52",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "UnlockOwnable",
+            "src": "contracts/past-versions/UnlockV13.sol:1531"
+          },
+          {
+            "label": "grossNetworkProduct",
+            "offset": 0,
+            "slot": "102",
+            "type": "t_uint256",
+            "contract": "Unlock",
+            "src": "contracts/past-versions/UnlockV13.sol:2806"
+          },
+          {
+            "label": "totalDiscountGranted",
+            "offset": 0,
+            "slot": "103",
+            "type": "t_uint256",
+            "contract": "Unlock",
+            "src": "contracts/past-versions/UnlockV13.sol:2808"
+          },
+          {
+            "label": "locks",
+            "offset": 0,
+            "slot": "104",
+            "type": "t_mapping(t_address,t_struct(LockBalances)3109_storage)",
+            "contract": "Unlock",
+            "src": "contracts/past-versions/UnlockV13.sol:2811"
+          },
+          {
+            "label": "globalBaseTokenURI",
+            "offset": 0,
+            "slot": "105",
+            "type": "t_string_storage",
+            "contract": "Unlock",
+            "src": "contracts/past-versions/UnlockV13.sol:2815"
+          },
+          {
+            "label": "globalTokenSymbol",
+            "offset": 0,
+            "slot": "106",
+            "type": "t_string_storage",
+            "contract": "Unlock",
+            "src": "contracts/past-versions/UnlockV13.sol:2819"
+          },
+          {
+            "label": "publicLockAddress",
+            "offset": 0,
+            "slot": "107",
+            "type": "t_address",
+            "contract": "Unlock",
+            "src": "contracts/past-versions/UnlockV13.sol:2822"
+          },
+          {
+            "label": "uniswapOracles",
+            "offset": 0,
+            "slot": "108",
+            "type": "t_mapping(t_address,t_contract(IUniswapOracleV3)757)",
+            "contract": "Unlock",
+            "src": "contracts/past-versions/UnlockV13.sol:2826"
+          },
+          {
+            "label": "weth",
+            "offset": 0,
+            "slot": "109",
+            "type": "t_address",
+            "contract": "Unlock",
+            "src": "contracts/past-versions/UnlockV13.sol:2829"
+          },
+          {
+            "label": "udt",
+            "offset": 0,
+            "slot": "110",
+            "type": "t_address",
+            "contract": "Unlock",
+            "src": "contracts/past-versions/UnlockV13.sol:2832"
+          },
+          {
+            "label": "estimatedGasForPurchase",
+            "offset": 0,
+            "slot": "111",
+            "type": "t_uint256",
+            "contract": "Unlock",
+            "src": "contracts/past-versions/UnlockV13.sol:2835"
+          },
+          {
+            "label": "chainId",
+            "offset": 0,
+            "slot": "112",
+            "type": "t_uint256",
+            "contract": "Unlock",
+            "src": "contracts/past-versions/UnlockV13.sol:2838"
+          },
+          {
+            "label": "proxyAdminAddress",
+            "offset": 0,
+            "slot": "113",
+            "type": "t_address",
+            "contract": "Unlock",
+            "src": "contracts/past-versions/UnlockV13.sol:2841"
+          },
+          {
+            "label": "proxyAdmin",
+            "offset": 0,
+            "slot": "114",
+            "type": "t_contract(ProxyAdmin)3095",
+            "contract": "Unlock",
+            "src": "contracts/past-versions/UnlockV13.sol:2842"
+          },
+          {
+            "label": "_publicLockVersions",
+            "offset": 0,
+            "slot": "115",
+            "type": "t_mapping(t_address,t_uint16)",
+            "contract": "Unlock",
+            "src": "contracts/past-versions/UnlockV13.sol:2845"
+          },
+          {
+            "label": "_publicLockImpls",
+            "offset": 0,
+            "slot": "116",
+            "type": "t_mapping(t_uint16,t_address)",
+            "contract": "Unlock",
+            "src": "contracts/past-versions/UnlockV13.sol:2846"
+          },
+          {
+            "label": "publicLockLatestVersion",
+            "offset": 0,
+            "slot": "117",
+            "type": "t_uint16",
+            "contract": "Unlock",
+            "src": "contracts/past-versions/UnlockV13.sol:2847"
+          },
+          {
+            "label": "protocolFee",
+            "offset": 0,
+            "slot": "118",
+            "type": "t_uint256",
+            "contract": "Unlock",
+            "src": "contracts/past-versions/UnlockV13.sol:2850"
+          },
+          {
+            "label": "swapBurnerAddress",
+            "offset": 0,
+            "slot": "119",
+            "type": "t_address",
+            "contract": "Unlock",
+            "src": "contracts/past-versions/UnlockV13.sol:2853"
+          }
+        ],
+        "types": {
+          "t_address": {
+            "label": "address",
+            "numberOfBytes": "20"
+          },
+          "t_array(t_uint256)50_storage": {
+            "label": "uint256[50]",
+            "numberOfBytes": "1600"
+          },
+          "t_bool": {
+            "label": "bool",
+            "numberOfBytes": "1"
+          },
+          "t_contract(IUniswapOracleV3)757": {
+            "label": "contract IUniswapOracleV3",
+            "numberOfBytes": "20"
+          },
+          "t_contract(ProxyAdmin)3095": {
+            "label": "contract ProxyAdmin",
+            "numberOfBytes": "20"
+          },
+          "t_mapping(t_address,t_contract(IUniswapOracleV3)757)": {
+            "label": "mapping(address => contract IUniswapOracleV3)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_struct(LockBalances)3109_storage)": {
+            "label": "mapping(address => struct Unlock.LockBalances)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_uint16)": {
+            "label": "mapping(address => uint16)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint16,t_address)": {
+            "label": "mapping(uint16 => address)",
+            "numberOfBytes": "32"
+          },
+          "t_string_storage": {
+            "label": "string",
+            "numberOfBytes": "32"
+          },
+          "t_struct(LockBalances)3109_storage": {
+            "label": "struct Unlock.LockBalances",
+            "members": [
+              {
+                "label": "deployed",
+                "type": "t_bool",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "totalSales",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "1"
+              },
+              {
+                "label": "yieldedDiscountTokens",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "2"
+              }
+            ],
+            "numberOfBytes": "96"
+          },
+          "t_uint16": {
+            "label": "uint16",
+            "numberOfBytes": "2"
+          },
+          "t_uint256": {
+            "label": "uint256",
+            "numberOfBytes": "32"
+          }
+        },
+        "namespaces": {}
+      }
     }
   }
 }
diff --git a/governance/cache-zk/solidity-files-cache.json b/governance/cache-zk/solidity-files-cache.json
@@ -2,7 +2,7 @@
   "_format": "hh-sol-cache-2",
   "files": {
     "/Users/julien/repos/unlock/governance/contracts/past-versions/UnlockV12.sol": {
-      "lastModificationDate": 1704484176944,
+      "lastModificationDate": 1705504845596,
       "contentHash": "c257b5242e07f739f326327aa32760ef",
       "sourceName": "contracts/past-versions/UnlockV12.sol",
       "solcConfig": {
@@ -29,14 +29,14 @@
           "libraries": {}
         },
         "zksolc": {
-          "version": "1.3.21",
+          "version": "1.3.19",
           "compilerSource": "binary",
           "settings": {
             "optimizer": {
               "enabled": true,
               "mode": "3"
             },
-            "compilerPath": "/Users/julien/Library/Caches/hardhat-nodejs/compilers-v2/zksolc/zksolc-v1.3.21",
+            "compilerPath": "/Users/julien/Library/Caches/hardhat-nodejs/compilers-v2/zksolc/zksolc-v1.3.19",
             "missingLibrariesPath": "./.zksolc-libraries-cache/missingLibraryDependencies.json",
             "areLibrariesMissing": false,
             "experimental": {},

diff --git a/governance/hardhat.config.js b/governance/hardhat.config.js
@@ -7,6 +7,8 @@ require('@openzeppelin/hardhat-upgrades')
 
 require('@matterlabs/hardhat-zksync-deploy')
 require('@matterlabs/hardhat-zksync-solc')
+require('@matterlabs/hardhat-zksync-verify')
+// require('@matterlabs/hardhat-zksync-upgradable')
 
 // import helpers
 const {
@@ -54,7 +56,7 @@ module.exports = {
     compilers: [{ version: '0.8.21', settings }],
   },
   zksolc: {
-    version: 'latest',
+    version: '1.3.19',
     settings: {},
   },
 }
diff --git a/governance/package.json b/governance/package.json
@@ -8,12 +8,11 @@
     "@nomicfoundation/hardhat-verify": "2.0.3",
     "@nomiclabs/hardhat-ethers": "2.2.3",
     "@nomiclabs/hardhat-etherscan": "3.1.8",
-    "@openzeppelin/hardhat-upgrades": "3.0.1",
+    "@openzeppelin/hardhat-upgrades": "3.0.2",
     "@openzeppelin/test-helpers": "0.5.16",
     "@openzeppelin/upgrades-core": "1.32.2",
-    "@safe-global/safe-core-sdk": "3.3.5",
-    "@safe-global/safe-ethers-lib": "1.9.3",
-    "@safe-global/safe-service-client": "2.0.3",
+    "@safe-global/api-kit": "2.0.0",
+    "@safe-global/protocol-kit": "2.0.0",
     "@unlock-protocol/contracts": "workspace:./packages/contracts",
     "@unlock-protocol/eslint-config": "workspace:./packages/eslint-config",
     "@unlock-protocol/hardhat-helpers": "workspace:^",
@@ -34,7 +33,8 @@
     "lint": "yarn lint:contracts && yarn lint:code"
   },
   "devDependencies": {
-    "@matterlabs/hardhat-zksync-deploy": "0.6.5",
-    "@matterlabs/hardhat-zksync-solc": "0.4.2"
+    "@matterlabs/hardhat-zksync-deploy": "1.1.2",
+    "@matterlabs/hardhat-zksync-solc": "1.0.6",
+    "@matterlabs/hardhat-zksync-verify": "1.2.2"
   }
 }
diff --git a/governance/proposals/007-uniswap-v2-half-liquidity-tokens.js b/governance/proposals/007-uniswap-v2-half-liquidity-tokens.js
@@ -1,6 +1,6 @@
 /**
- * Example of a bridged proposal that will be sent across Connext to multisigs
- * on the other side of the network.
+ * Migrating 50% of Unlock DAO's existing UDT/WETH Liquidity Position
+ * from Uniswap v2 pool to the Uniswap v3 pool
  */
 const { ethers } = require('hardhat')
 const { getTokenInfo } = require('../helpers/uniswap')