Implement DKG Contracts

foundry.lock

@@ -1,23 +1,23 @@
 {
-  "lib/openzeppelin-foundry-upgrades": {
+  "lib/forge-std": {
     "tag": {
-      "name": "v0.4.0",
-      "rev": "cbce1e00305e943aa1661d43f41e5ac72c662b07"
+      "name": "v1.10.0",
+      "rev": "8bbcf6e3f8f62f419e5429a0bd89331c85c37824"
     }
   },
+  "lib/openzeppelin": {
+    "rev": "932fddf69a699a9a80fd2396fd1a2ab91cdda123"
+  },
   "lib/openzeppelin-contracts-upgradeable": {
     "tag": {
       "name": "v5.4.0",
       "rev": "e725abddf1e01cf05ace496e950fc8e243cc7cab"
     }
   },
-  "lib/openzeppelin": {
-    "rev": "932fddf69a699a9a80fd2396fd1a2ab91cdda123"
-  },
-  "lib/forge-std": {
+  "lib/openzeppelin-foundry-upgrades": {
     "tag": {
-      "name": "v1.10.0",
-      "rev": "8bbcf6e3f8f62f419e5429a0bd89331c85c37824"
+      "name": "v0.4.0",
+      "rev": "cbce1e00305e943aa1661d43f41e5ac72c662b07"
     }
   }
 }

gen_bindings.sh

@@ -9,6 +9,8 @@ CONTRACTS=(
     "src/common/KeyperSet.sol:KeyperSet"
     "src/common/EonKeyPublish.sol:EonKeyPublish"
     "src/common/KeyBroadcastContract.sol:KeyBroadcastContract"
+    "src/common/DKGContract.sol:DKGContract"
+    "src/common/ECIESKeyRegistry.sol:ECIESKeyRegistry"
     "src/shop/Inbox.sol:Inbox"
     "src/shutter-service/ShutterRegistry.sol:ShutterRegistry"
     "src/shutter-service/ShutterEventTriggerRegistry.sol:ShutterEventTriggerRegistryV1"

script/AddKeyperSet.gnosh.s.sol

@@ -41,6 +41,8 @@ contract AddKeyperSet is Script {
             keyBroadcastContractAddress
         );
 
+        address dkgContract = vm.envOr("DKG_CONTRACT_ADDRESS", address(0));
+
         address[] memory keypers = vm.envAddress("KEYPER_ADDRESSES", ",");
         uint256 threshold = vm.envUint("THRESHOLD");
         if (threshold > keypers.length) {
@@ -57,6 +59,9 @@ contract AddKeyperSet is Script {
         keyperSet.addMembers(keypers);
         keyperSet.setThreshold(uint64(threshold));
         keyperSet.setPublisher(address(eonKeyPublish));
+        if (dkgContract != address(0)) {
+            keyperSet.setDKGContract(dkgContract);
+        }
         keyperSet.setFinalized();
         console.log("keyperSet:", address(keyperSet));
         console.log("eonKeyPublish:", address(eonKeyPublish));

script/AddKeyperSet.s.sol

@@ -41,6 +41,8 @@ contract AddKeyperSet is Script {
             keyBroadcastContractAddress
         );
 
+        address dkgContract = vm.envAddress("DKG_CONTRACT_ADDRESS");
+
         address[] memory keypers = vm.envAddress("KEYPER_ADDRESSES", ",");
         uint256 threshold = vm.envUint("THRESHOLD");
         if (threshold > keypers.length) {
@@ -57,6 +59,7 @@ contract AddKeyperSet is Script {
         keyperSet.addMembers(keypers);
         keyperSet.setThreshold(uint64(threshold));
         keyperSet.setPublisher(address(eonKeyPublish));
+        keyperSet.setDKGContract(dkgContract);
         keyperSet.setFinalized();
         console.log("keyperSet:", address(keyperSet));
         console.log("eonKeyPublish:", address(eonKeyPublish));

script/AddKeyperSet.v2.s.sol

@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.22;
+
+import "forge-std/Script.sol";
+import {KeyperSet} from "../src/common/KeyperSet.sol";
+import {KeyperSetManager} from "../src/common/KeyperSetManager.sol";
+import {KeyBroadcastContract} from "../src/common/KeyBroadcastContract.sol";
+
+/// Variant of AddKeyperSet that wires the DKG contract itself as the
+/// KeyBroadcastContract publisher. The old script deployed a separate
+/// EonKeyPublish aggregator; with the current DKGContract this is
+/// redundant, because submitSuccessVote already tallies votes and, on
+/// crossing threshold, attempts KeyBroadcastContract.broadcastEonKey via
+/// try/catch. Setting publisher = address(dkg) lets that broadcast succeed,
+/// so the eon key ends up in KBC as a side effect of the last success vote
+/// and no extra contract is needed.
+
+error ActivationDeltaTooLow();
+error ThresholdExceedsKeyperSetSize(uint256 threshold, uint256 keyperSetSize);
+error UnexpectedKeyperSet(
+    uint256 index,
+    address expectedKeyperSet,
+    address actualKeyperSet
+);
+
+contract AddKeyperSetV2 is Script {
+    function run() public {
+        uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
+        address deployerAddress = vm.addr(deployerPrivateKey);
+        console.log("deployer:", deployerAddress);
+        vm.startBroadcast(deployerPrivateKey);
+
+        uint256 activationDelta = vm.envOr("ACTIVATION_DELTA", uint256(1));
+        if (activationDelta < 1) {
+            revert ActivationDeltaTooLow();
+        }
+
+        address keyperSetManagerAddress = vm.envAddress(
+            "KEYPERSETMANAGER_ADDRESS"
+        );
+        KeyperSetManager keyperSetManager = KeyperSetManager(
+            keyperSetManagerAddress
+        );
+
+        address dkgContract = vm.envAddress("DKG_CONTRACT_ADDRESS");
+
+        address[] memory keypers = vm.envAddress("KEYPER_ADDRESSES", ",");
+        uint256 threshold = vm.envUint("THRESHOLD");
+        if (threshold > keypers.length) {
+            revert ThresholdExceedsKeyperSetSize(threshold, keypers.length);
+        }
+
+        uint64 keyperSetIndex = keyperSetManager.getNumKeyperSets();
+        KeyperSet keyperSet = new KeyperSet();
+        keyperSet.addMembers(keypers);
+        keyperSet.setThreshold(uint64(threshold));
+        keyperSet.setPublisher(dkgContract);
+        keyperSet.setDKGContract(dkgContract);
+        keyperSet.setFinalized();
+        console.log("keyperSet:", address(keyperSet));
+        console.log("publisher (= dkgContract):", dkgContract);
+
+        uint64 activationBlock = uint64(block.number + activationDelta);
+        keyperSetManager.addKeyperSet(activationBlock, address(keyperSet));
+        console.log("activationBlock:", activationBlock);
+        console.log("keyperSetIndex:", keyperSetIndex);
+
+        address actualKeyperSet = keyperSetManager.getKeyperSetAddress(
+            keyperSetIndex
+        );
+        if (actualKeyperSet != address(keyperSet)) {
+            revert UnexpectedKeyperSet(
+                keyperSetIndex,
+                address(keyperSet),
+                actualKeyperSet
+            );
+        }
+
+        vm.stopBroadcast();
+    }
+}