28: cleanup for review feedback

- naming things - configure using overload
collectivexyz · Nov 21, 2022 · 958f667 · 958f667
1 parent f4a617f
commit 958f667
Show file tree

Hide file tree

Showing 21 changed files with 282 additions and 258 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -119,12 +119,12 @@
     {
       "label": "verifycontract",
       "type": "shell",
-      "command": "forge verify-contract ${CONTRACT_ADDRESS} contracts/${CONTRACT_NAME}.sol:${CONTRACT_NAME} --chain-id ${CHAIN_ID} --watch ${ETHERSCAN_API_KEY}",
+      "command": "forge verify-contract -f --delay 30 ${CONTRACT_ADDRESS} contracts/${CONTRACT_NAME}.sol:${CONTRACT_NAME} --chain-id ${CHAIN_ID} --watch ${ETHERSCAN_API_KEY}",
       "options": {
         "cwd": "${workspaceFolder}",
         "env": {
           "CONTRACT_NAME": "GovernanceBuilder",
-          "CONTRACT_ADDRESS": "0x50Bee8889D2c52D49b19e7728242186D444e3f1D",
+          "CONTRACT_ADDRESS": "0x02dA9682cb0AEdD8e1f50F88E01eCFcdC44c6b9b",
           "CHAIN_ID": "5"
         }
       },

diff --git a/abi/Governance.json b/abi/Governance.json
@@ -103,7 +103,7 @@
         "type": "address"
       }
     ],
-    "name": "NotVoter",
+    "name": "NotSupervisor",
     "type": "error"
   },
   {
@@ -119,7 +119,7 @@
         "type": "address"
       }
     ],
-    "name": "ProposalSenderRequired",
+    "name": "NotVoter",
     "type": "error"
   },
   {
@@ -128,14 +128,14 @@
         "internalType": "uint256",
         "name": "proposalId",
         "type": "uint256"
+      },
+      {
+        "internalType": "address",
+        "name": "sender",
+        "type": "address"
       }
     ],
-    "name": "QuorumNotConfigured",
-    "type": "error"
-  },
-  {
-    "inputs": [],
-    "name": "SupervisorListEmpty",
+    "name": "ProposalNotSender",
     "type": "error"
   },
   {
@@ -144,14 +144,14 @@
         "internalType": "uint256",
         "name": "proposalId",
         "type": "uint256"
-      },
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
       }
     ],
-    "name": "SupervisorRequired",
+    "name": "QuorumNotConfigured",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "SupervisorListEmpty",
     "type": "error"
   },
   {
@@ -298,33 +298,39 @@
   {
     "anonymous": false,
     "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "sender",
+        "type": "address"
+      },
       {
         "indexed": false,
         "internalType": "uint256",
         "name": "proposalId",
         "type": "uint256"
       }
     ],
-    "name": "ProposalClosed",
+    "name": "ProposalCreated",
     "type": "event"
   },
   {
     "anonymous": false,
     "inputs": [
       {
         "indexed": false,
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
+        "internalType": "uint256",
+        "name": "voteDelay",
+        "type": "uint256"
       },
       {
         "indexed": false,
         "internalType": "uint256",
-        "name": "proposalId",
+        "name": "voteDuration",
         "type": "uint256"
       }
     ],
-    "name": "ProposalCreated",
+    "name": "ProposalDelay",
     "type": "event"
   },
   {
@@ -371,6 +377,25 @@
     "name": "ProposalExecuted",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "proposalId",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "quorum",
+        "type": "uint256"
+      }
+    ],
+    "name": "ProposalFinal",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -408,19 +433,6 @@
     "name": "ProposalMeta",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "proposalId",
-        "type": "uint256"
-      }
-    ],
-    "name": "ProposalOpen",
-    "type": "event"
-  },
   {
     "anonymous": false,
     "inputs": [
@@ -770,7 +782,17 @@
       },
       {
         "internalType": "uint256",
-        "name": "_quorumRequired",
+        "name": "_quorumThreshold",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_requiredDelay",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_requiredDuration",
         "type": "uint256"
       }
     ],
@@ -788,21 +810,11 @@
       },
       {
         "internalType": "uint256",
-        "name": "_quorumThreshold",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_requiredDelay",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_requiredDuration",
+        "name": "_quorumRequired",
         "type": "uint256"
       }
     ],
-    "name": "configureWithDelay",
+    "name": "configure",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"