@venusprotocol/governance-contracts 1.0.1-dev.6 → 1.1.0-dev.2

package/artifacts/contracts/legacy/GovernorAlpha2.sol/TimelockInterface.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../build-info/5ef7ba07b1e4b96d9b02042d36d229c2.json"
+}

package/artifacts/contracts/legacy/GovernorAlpha2.sol/TimelockInterface.json

@@ -0,0 +1,188 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "TimelockInterface",
+  "sourceName": "contracts/legacy/GovernorAlpha2.sol",
+  "abi": [
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "GRACE_PERIOD",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "constant": false,
+      "inputs": [],
+      "name": "acceptAdmin",
+      "outputs": [],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "target",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "value",
+          "type": "uint256"
+        },
+        {
+          "internalType": "string",
+          "name": "signature",
+          "type": "string"
+        },
+        {
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
+        },
+        {
+          "internalType": "uint256",
+          "name": "eta",
+          "type": "uint256"
+        }
+      ],
+      "name": "cancelTransaction",
+      "outputs": [],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "delay",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "target",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "value",
+          "type": "uint256"
+        },
+        {
+          "internalType": "string",
+          "name": "signature",
+          "type": "string"
+        },
+        {
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
+        },
+        {
+          "internalType": "uint256",
+          "name": "eta",
+          "type": "uint256"
+        }
+      ],
+      "name": "executeTransaction",
+      "outputs": [
+        {
+          "internalType": "bytes",
+          "name": "",
+          "type": "bytes"
+        }
+      ],
+      "payable": true,
+      "stateMutability": "payable",
+      "type": "function"
+    },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "target",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "value",
+          "type": "uint256"
+        },
+        {
+          "internalType": "string",
+          "name": "signature",
+          "type": "string"
+        },
+        {
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
+        },
+        {
+          "internalType": "uint256",
+          "name": "eta",
+          "type": "uint256"
+        }
+      ],
+      "name": "queueTransaction",
+      "outputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "internalType": "bytes32",
+          "name": "hash",
+          "type": "bytes32"
+        }
+      ],
+      "name": "queuedTransactions",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x",
+  "deployedBytecode": "0x",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

package/artifacts/contracts/legacy/GovernorAlpha2.sol/XVSInterface.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../build-info/5ef7ba07b1e4b96d9b02042d36d229c2.json"
+}

package/artifacts/contracts/legacy/GovernorAlpha2.sol/XVSInterface.json

@@ -0,0 +1,37 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "XVSInterface",
+  "sourceName": "contracts/legacy/GovernorAlpha2.sol",
+  "abi": [
+    {
+      "constant": true,
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "blockNumber",
+          "type": "uint256"
+        }
+      ],
+      "name": "getPriorVotes",
+      "outputs": [
+        {
+          "internalType": "uint96",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
+      "payable": false,
+      "stateMutability": "view",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x",
+  "deployedBytecode": "0x",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

package/contracts/Governance/GovernorBravoDelegate.sol

@@ -70,7 +70,7 @@ import "./GovernorBravoInterfaces.sol";
  * The delegation of votes happens through the `XVSVault` contract by calling the `delegate` or `delegateBySig` functions. These same functions can revert
  * vote delegation by calling the same function with a value of `0`.
  */
-contract GovernorBravoDelegate is GovernorBravoDelegateStorageV2, GovernorBravoEvents {
+contract GovernorBravoDelegate is GovernorBravoDelegateInterface, GovernorBravoDelegateStorageV2, GovernorBravoEvents {
     /// @notice The name of this contract
     string public constant name = "Venus Governor Bravo";
 

package/contracts/Governance/GovernorBravoDelegator.sol

@@ -10,13 +10,11 @@ import "./GovernorBravoInterfaces.sol";
  */
 contract GovernorBravoDelegator is GovernorBravoDelegatorStorage, GovernorBravoEvents {
     constructor(
-        address timelock_,
         address xvsVault_,
         address admin_,
         address implementation_,
-        uint votingPeriod_,
-        uint votingDelay_,
-        uint proposalThreshold_,
+        GovernorBravoDelegateInterface.ProposalConfig[] memory proposalConfigs_,
+        address[] memory timelocks_,
         address guardian_
     ) public {
         // Admin set to msg.sender for initialization
@@ -24,13 +22,11 @@ contract GovernorBravoDelegator is GovernorBravoDelegatorStorage, GovernorBravoE
 
         delegateTo(
             implementation_,
-            abi.encodeWithSignature(
-                "initialize(address,address,uint256,uint256,uint256,address)",
-                timelock_,
+            abi.encodeWithSelector(
+                GovernorBravoDelegateInterface(implementation_).initialize.selector,
                 xvsVault_,
-                votingPeriod_,
-                votingDelay_,
-                proposalThreshold_,
+                proposalConfigs_,
+                timelocks_,
                 guardian_
             )
         );

package/contracts/Governance/GovernorBravoInterfaces.sol

@@ -190,6 +190,19 @@ contract GovernorBravoDelegateStorageV2 is GovernorBravoDelegateStorageV1 {
         CRITICAL
     }
 
+    /// @notice mapping containing configuration for each proposal type
+    mapping(uint => GovernorBravoDelegateInterface.ProposalConfig) public proposalConfigs;
+
+    /// @notice mapping containing Timelock addresses for each proposal type
+    mapping(uint => TimelockInterface) public proposalTimelocks;
+}
+
+/**
+ * @title TimelockInterface
+ * @author Venus
+ * @notice Interface implemented by the GovernorBravoDelegate contract.
+ */
+interface GovernorBravoDelegateInterface {
     struct ProposalConfig {
         /// @notice The delay before voting on a proposal may take place, once proposed, in blocks
         uint256 votingDelay;
@@ -199,11 +212,12 @@ contract GovernorBravoDelegateStorageV2 is GovernorBravoDelegateStorageV1 {
         uint256 proposalThreshold;
     }
 
-    /// @notice mapping containing configuration for each proposal type
-    mapping(uint => ProposalConfig) public proposalConfigs;
-
-    /// @notice mapping containing Timelock addresses for each proposal type
-    mapping(uint => TimelockInterface) public proposalTimelocks;
+    function initialize(
+        address xvsVault_,
+        ProposalConfig[] calldata proposalConfigs_,
+        TimelockInterface[] calldata timelocks,
+        address guardian_
+    ) external;
 }
 
 /**