fix sscript

allo-protocol · Dec 7, 2023 · da70b2f · da70b2f
1 parent ddf3213
commit da70b2f
Show file tree

Hide file tree

Showing 11 changed files with 12,934 additions and 315 deletions.
diff --git a/.upgradable/zkSync-testnet.json b/.upgradable/zkSync-testnet.json
@@ -1,253 +1,30 @@
 {
   "manifestVersion": "3.2",
   "admin": {
-    "address": "0x08Bfe6ec7831d4bbd48873fCDc89Ef3d2d8c2C4E",
-    "txHash": "0xc8fd90d2056a2a0eda2d5a42b8d9e267de1f0d199b77cb54899511a8eb1ece1e"
+    "address": "0x03f2d2fFd7D6192Bf3248aF454c233303D6791a4",
+    "txHash": "0xbaa8b461558d2e3fa7c6dd9ab6cbc65a7643590953a9ca63d787710cd848884f"
   },
   "proxies": [
     {
-      "address": "0xa1F116d1Cb73b6f8dDFD6DDD6E06386553B3af7b",
-      "txHash": "0xc572446d3cd6f1572a0b5c9dceb9daa20a3e063ee28bdeda0ade70140d92ddde",
+      "address": "0xA1d9DFbBD7CF30dE70E22e23245fc5849d661DfB",
+      "txHash": "0x5883b72662b2410f79e8c364040226f2a320a2e2190486ebf12ecfe3df4d45fe",
       "kind": "transparent"
     },
     {
-      "address": "0xE3710C11A5E06E987657A8ce665961362C079De3",
-      "txHash": "0xb6739e415c7fd98cfc5c3f6b41e893e54f23f84534e7651892b9863dcabac53f",
+      "address": "0xeC48DFcC3e5A9594229B5e2900b5b1De29f15F8D",
+      "txHash": "0xe8e374458c8afc4a768f9bd552970446c1811cbf88ff77a8793abeecee5e9748",
       "kind": "transparent"
     },
     {
-      "address": "0x5A7ea8C03C40e02A97B1901101e415Fdfc1aE64d",
-      "txHash": "0x0fd3091cc55805c3ebcc53b8473c4fcf5ec819a33c32519c32f2eb8b46075d92",
-      "kind": "transparent"
-    },
-    {
-      "address": "0xA86824AB3038daCfeB61e03f45CA1a02b77f1081",
-      "txHash": "0x15af4956d88aadd4b55122e106b57a027678a02a1c5c1ad8004232d3ddc50103",
-      "kind": "transparent"
-    },
-    {
-      "address": "0x590638033E8DeE4028244326c1ecA251c8022346",
-      "txHash": "0xbeb232d9192ed76cd374e6456340e18127c8974864f6a19794ea8fbdc025241d",
-      "kind": "transparent"
-    },
-    {
-      "address": "0x7f5D2e3aC29265a7E09A642b7e22421dc0Cd4075",
-      "txHash": "0x3bebfdfd92233167573dc15a414d5e501cf184bb3e93983ea9854435dcf39a52",
-      "kind": "transparent"
-    },
-    {
-      "address": "0x1a7f5eB2632A0DACA98a1CC5091887C1f4F5Fc0c",
-      "txHash": "0xf4d04a7d773c3b4c49867616e2984a71d479c5ff89a6a8412e48d95bee1ba124",
-      "kind": "transparent"
-    },
-    {
-      "address": "0x9c0f0600BF83d08EFfb1B8ff90c71B57c68c3B15",
-      "txHash": "0xfe8e573712e5dc4dcf191fdf94987fdede1c92a66e0a731fb4450e25c7524f9d",
-      "kind": "transparent"
-    },
-    {
-      "address": "0x8A777C2f88BCEF9ECC2F4B1f70E0262718D130e5",
-      "txHash": "0x0bf3a3bac8c59d735d9170bfec4945d392b6664b2982aa82bcf9f10611be3c1d",
-      "kind": "transparent"
-    },
-    {
-      "address": "0x993abb247BAA8b450BD88Ab212F3F3f9D05BdAE8",
-      "txHash": "0x3eac4aac5a303bdb8c015a86b0cbaacccb838148d44e6a97eca53b174b424b01",
-      "kind": "transparent"
-    },
-    {
-      "address": "0x1c58945a9A61a3390c56a24d42fEab7106E48d03",
-      "txHash": "0x339de88c0a2f73cdbf38d88978a92c8a02d987579ff43c0d86f43e412f0e51b7",
-      "kind": "transparent"
-    },
-    {
-      "address": "0x24076909f4ecDCAe328392E6ae077090101c48Cd",
-      "txHash": "0xc664f6b27aa229fb3c728a45bf60304c7be8dea501e90a211eb7f324595d26e0",
-      "kind": "transparent"
-    },
-    {
-      "address": "0x733847d96870f2Fa4789C4C8b6e78345F53919e2",
-      "txHash": "0xd9efd848d7c6846621647ed21373c6787f1a337a29c18c6e2f741ab9a2a77b17",
-      "kind": "transparent"
-    },
-    {
-      "address": "0xF8C1219192dfd6dd1dF2Dfd616285fB7Aa3D3525",
-      "txHash": "0x8e9341fa0d6b827676cd762641761f0cf46842407a8a7827cab0f06fcd6ed187",
+      "address": "0x6D341814Be4E2316142D9190E390b494F1dECFAf",
+      "txHash": "0x2441ec92e3f78064ebb95a71231f9a2159a847515b503075a453d051036d1d63",
       "kind": "transparent"
     }
   ],
   "impls": {
-    "aae8603567b3768ea2e8f5334c65ad0ba5e1fbeee71f3d4bcd0469994e306fac": {
-      "address": "0xe1b01395986bd93Cc9Fa62290987793c150a1AB2",
-      "txHash": "0x6dc73c9b6376fd03bbed6936807c015cd5c92162bf241c316ce495575f7a190f",
-      "layout": {
-        "solcVersion": "0.8.17",
-        "storage": [
-          {
-            "label": "_initialized",
-            "offset": 0,
-            "slot": "0",
-            "type": "t_uint8",
-            "contract": "Initializable",
-            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63",
-            "retypedFrom": "bool"
-          },
-          {
-            "label": "_initializing",
-            "offset": 1,
-            "slot": "0",
-            "type": "t_bool",
-            "contract": "Initializable",
-            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68"
-          },
-          {
-            "label": "__gap",
-            "offset": 0,
-            "slot": "1",
-            "type": "t_array(t_uint256)50_storage",
-            "contract": "ContextUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36"
-          },
-          {
-            "label": "_owner",
-            "offset": 0,
-            "slot": "51",
-            "type": "t_address",
-            "contract": "OwnableUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22"
-          },
-          {
-            "label": "__gap",
-            "offset": 0,
-            "slot": "52",
-            "type": "t_array(t_uint256)49_storage",
-            "contract": "OwnableUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94"
-          },
-          {
-            "label": "programContract",
-            "offset": 0,
-            "slot": "101",
-            "type": "t_address",
-            "contract": "ProgramFactory",
-            "src": "contracts/program/ProgramFactory.sol:12"
-          }
-        ],
-        "types": {
-          "t_address": {
-            "label": "address",
-            "numberOfBytes": "20"
-          },
-          "t_array(t_uint256)49_storage": {
-            "label": "uint256[49]",
-            "numberOfBytes": "1568"
-          },
-          "t_array(t_uint256)50_storage": {
-            "label": "uint256[50]",
-            "numberOfBytes": "1600"
-          },
-          "t_bool": {
-            "label": "bool",
-            "numberOfBytes": "1"
-          },
-          "t_uint256": {
-            "label": "uint256",
-            "numberOfBytes": "32"
-          },
-          "t_uint8": {
-            "label": "uint8",
-            "numberOfBytes": "1"
-          }
-        }
-      }
-    },
-    "3b918698381d5ee133f52f5b18e939c12b5fb00a8ad271c2406bffbb4f7deac5": {
-      "address": "0xF631C72e0C5837b794911DDaf167861d1A3eDBf5",
-      "txHash": "0x536fe1114745a4eaf02b3b8414aa130d3968202b4b179b30c040f57fb6a3f7f5",
-      "layout": {
-        "solcVersion": "0.8.17",
-        "storage": [
-          {
-            "label": "_initialized",
-            "offset": 0,
-            "slot": "0",
-            "type": "t_uint8",
-            "contract": "Initializable",
-            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62",
-            "retypedFrom": "bool"
-          },
-          {
-            "label": "_initializing",
-            "offset": 1,
-            "slot": "0",
-            "type": "t_bool",
-            "contract": "Initializable",
-            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67"
-          },
-          {
-            "label": "__gap",
-            "offset": 0,
-            "slot": "1",
-            "type": "t_array(t_uint256)50_storage",
-            "contract": "ContextUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36"
-          },
-          {
-            "label": "_owner",
-            "offset": 0,
-            "slot": "51",
-            "type": "t_address",
-            "contract": "OwnableUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22"
-          },
-          {
-            "label": "__gap",
-            "offset": 0,
-            "slot": "52",
-            "type": "t_array(t_uint256)49_storage",
-            "contract": "OwnableUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:87"
-          },
-          {
-            "label": "programContract",
-            "offset": 0,
-            "slot": "101",
-            "type": "t_address",
-            "contract": "ProgramFactory",
-            "src": "contracts/program/ProgramFactory.sol:12"
-          }
-        ],
-        "types": {
-          "t_address": {
-            "label": "address",
-            "numberOfBytes": "20"
-          },
-          "t_array(t_uint256)49_storage": {
-            "label": "uint256[49]",
-            "numberOfBytes": "1568"
-          },
-          "t_array(t_uint256)50_storage": {
-            "label": "uint256[50]",
-            "numberOfBytes": "1600"
-          },
-          "t_bool": {
-            "label": "bool",
-            "numberOfBytes": "1"
-          },
-          "t_uint256": {
-            "label": "uint256",
-            "numberOfBytes": "32"
-          },
-          "t_uint8": {
-            "label": "uint8",
-            "numberOfBytes": "1"
-          }
-        }
-      }
-    },
-    "972cf7e92998034f60767394b780fe2e895601180fc06680ef1ce2ff71b8397f": {
-      "address": "0x7470c1D9542CCA876Fbdfd1fe520b693020E587E",
-      "txHash": "0x53e40a04f62a4ab0861151ec2dba845973b3a0913831e12ad9d3314b80320b3e",
+    "b33f2f469bdc249af48debe29884079de44f3404c42fc09a338852a54364caf8": {
+      "address": "0x6A75d630f88647AB36869aba70947a9fE832706C",
+      "txHash": "0xf73afb16e8a6874a43638001d2ad58e70abd37312dba741a3071c3f39a246de4",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -291,14 +68,6 @@
             "type": "t_array(t_uint256)49_storage",
             "contract": "OwnableUpgradeable",
             "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94"
-          },
-          {
-            "label": "programContract",
-            "offset": 0,
-            "slot": "101",
-            "type": "t_address",
-            "contract": "ProgramFactoryZK",
-            "src": "contracts/program/ProgramFactoryZK.sol:9"
           }
         ],
         "types": {

diff --git a/contracts/program/ProgramFactoryZK.sol b/contracts/program/ProgramFactoryZK.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.17;
 import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import "./ProgramImplementation.sol";
 
-contract ProgramFactoryZK is OwnableUpgradeable {
+contract ProgramFactoryZk is OwnableUpgradeable {
 
   // --- Event ---
 

diff --git a/...racts/votingStrategy/QuadraticFundingStrategy/QuadraticFundingVotingStrategyFactoryZk.sol b/...racts/votingStrategy/QuadraticFundingStrategy/QuadraticFundingVotingStrategyFactoryZk.sol
@@ -5,7 +5,7 @@ import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import "../../utils/MetaPtr.sol";
 import "./QuadraticFundingVotingStrategyImplementation.sol";
 
-contract QuadraticFundingVotingStrategyFactoryZk, OwnableUpgradeable {
+contract QuadraticFundingVotingStrategyFactoryZk is OwnableUpgradeable {
 
   // --- Event ---
 

diff --git a/docs/CHAINS.md b/docs/CHAINS.md
@@ -316,37 +316,18 @@ These are contracts that are created/deployed once for goerli
 
 | Contract                              | Address                                    |
 |---------------------------------------|--------------------------------------------|
-| ProgramFactory                        | 0x1c58945a9A61a3390c56a24d42fEab7106E48d03 |
-| ProgramImplementation                 | 0x708DeC2fAC60D669066878dBe1229168c0e02E67 |
-| QuadraticFundingVotingStrategyFactory | 0x7DA751bb567D37fbd5311f8e37629c3355675bEe |
-| QFVotingStrategyImplementation        | 0xB061F5a7359B11320d554b6Cfb450b6fd5Fc70bF |
-| MerklePayoutStrategyFactory           | 0x898126eA2A581b94a7C08F828DF68B54e2063B7c |
-| MerklePayouStrategyImplementation     | 0x1D51B2796cF001239d9F0BFcE2b3C4EC1a0Be18F |
-| DirectPayoutStrategyFactory           | 0x5e3E56F81588220bC0b3827C49A9e9Babb3D8228 |
-| DirectPayoutStrategyImplementation    | 0x4Fc8AF1AE0197acB87BB6376d16666C4946E9030 |
-| AlloSettings                          | 0x0FD600678475C03f28baE59A2d55f7a911383e2B |
-| RoundFactory                          | 0x35E5f2abfaCdbe1bc7C2E09Fbe2e051Ea574Dd3b |
-| RoundImplementation                   | 0xcB0f55a192f0d504490eA5d14eaeE0600F956bb5 |
-| ProjectRegistry                       | 0x2C17D0FAb47bD87333714dC35f84BB669951cea6 |
-| DummyVotingStrategy                   | 0x1127EF659bF29bBe05C892D0Bd683a07AB350A09 |
+| ProgramFactoryZk                        | 0x6D341814Be4E2316142D9190E390b494F1dECFAf |
+| QuadraticFundingVotingStrategyFactoryZk | 0x8c28F21D2d8C53eedC58bF9cdCfb7DCF7d809d97 |
+| MerklePayoutStrategyFactoryZk           | 0xbA160C13F8F626e3232078aDFD6eD2f2B2289563 |
+| DirectPayoutStrategyFactoryZk           | 0x4170665B31bC10009f8a69CeaACf3265C3d66797 |
+| AlloSettings                          | 0x2891369Fb2DA2898B35b91dbd55b2489061abbE5 |
+| RoundFactoryZk                          | 0x0Bb6e2dfEaef0Db5809B3979717E99e053Cbae72 |
+| ProjectRegistry                       | 0xb0F4882184EB6e3ed120c5181651D50719329788 |
+| DummyVotingStrategy                   | 0x0c0B71BA1427cb46424d38133E8187365Cc5466b |
 
 ## ZkSync Era Mainnet 
 
-| Contract                              | Address                                    |
-|---------------------------------------|--------------------------------------------|
-| ProgramFactory                        | 0xe1b01395986bd93Cc9Fa62290987793c150a1AB2 |
-| ProgramImplementation                 | 0x08Bfe6ec7831d4bbd48873fCDc89Ef3d2d8c2C4E |
-| QuadraticFundingVotingStrategyFactory | 0xa1F116d1Cb73b6f8dDFD6DDD6E06386553B3af7b |
-| QFVotingStrategyImplementation        | 0x20717A4fEf86705210911c59d08dB8B6D2C593eE |
-| MerklePayoutStrategyFactory           | 0xE3710C11A5E06E987657A8ce665961362C079De3 |
-| MerklePayouStrategyImplementation     | 0x252E749Dca5bE43C5257577E6d37dB12419a1773 |
-| DirectPayoutStrategyFactory           | 0x5A7ea8C03C40e02A97B1901101e415Fdfc1aE64d |
-| DirectPayoutStrategyImplementation    | 0xB0c9320F2176bc69bf808FA9B5C816713dC6A44C |
-| AlloSettings                          | 0xA86824AB3038daCfeB61e03f45CA1a02b77f1081 |
-| RoundFactory                          | 0xF631C72e0C5837b794911DDaf167861d1A3eDBf5 |
-| RoundImplementation                   | 0x9569470C409E96d20435e277e30b94828DC4656d |
-| ProjectRegistry                       | 0x1593FAA41134544354a1509566DDf8D6596e7348 |
-| DummyVotingStrategy                   | 0x590638033E8DeE4028244326c1ecA251c8022346 |
+
 
 ## Base Mainnet