Make gnosh bindings generator work

konradkonrad · konradkonrad · commit 130f883d1cfd · 2024-08-19T14:40:52.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+	artifacts/
+	cache/
+	gnoshcontracts/
+	out/
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "src/common/lib/openzeppelin"]
-	path = src/common/lib/openzeppelin
+	path = lib/openzeppelin
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
 [submodule "forge-std"]
-	path = forge-std
+	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
diff --git a/foundry.toml b/foundry.toml
@@ -1,7 +1,7 @@
 [profile.default]
 src = "src"
 out = "out"
-libs = ["src/common/lib"]
+libs = ["lib"]
 solc = "0.8.22"
 
 extra_output = ['devdoc', 'userdoc', 'metadata', 'storageLayout']
@@ -12,4 +12,4 @@ build_info_path = 'artifacts/build-info'
 [rpc_endpoints]
 hardhat = "${HARDHAT_RPC_URL}"
 
-# See more config options https://github.com/foundry-rs/foundry/tree/master/config
+# See more config options https://github.com/foundry-rs/foundry/tree/master/config
diff --git a/gen_gnosh_bindings.sh b/gen_gnosh_bindings.sh
@@ -3,6 +3,10 @@
 CONTRACTS=(
     "Sequencer"
     "ValidatorRegistry"
+    "KeyperSetManager"
+    "KeyperSet"
+    "EonKeyPublish"
+    "KeyBroadcastContract"
 )
 OUTPUT_DIR="gnoshcontracts"
 PACKAGE_NAME="gnoshcontracts"
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin b/lib/openzeppelin
diff --git a/src/common/KeyperSet.sol b/src/common/KeyperSet.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.22;
 
-import "./lib/openzeppelin/contracts/access/Ownable.sol";
+import "openzeppelin/contracts/access/Ownable.sol";
 import "./intf/IKeyperSet.sol";
 
 error AlreadyFinalized();
diff --git a/src/common/KeyperSetManager.sol b/src/common/KeyperSetManager.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.22;
 
-import "./lib/openzeppelin/contracts/utils/math/Math.sol";
+import "openzeppelin/contracts/utils/math/Math.sol";
 import "./KeyperSet.sol";
-import "./lib/RestrictedPausable.sol";
+import "./RestrictedPausable.sol";
 import "./intf/IKeyperSetManager.sol";
 
 error AlreadyDeactivated();
diff --git a/src/common/RestrictedPausable.sol b/src/common/RestrictedPausable.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.22;
 
-import "./openzeppelin/contracts/access/AccessControl.sol";
-import "./openzeppelin/contracts/utils/Pausable.sol";
+import "openzeppelin/contracts/access/AccessControl.sol";
+import "openzeppelin/contracts/utils/Pausable.sol";
 
 error UnauthorizedInitializer();
 error AlreadyInitialized();
diff --git a/src/common/intf/IKeyBroadcastContract.sol b/src/common/intf/IKeyBroadcastContract.sol
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+error InvalidKey();
+error AlreadyHaveKey();
+error NotAllowed();
+
+interface IKeyBroadcastContract {
+    function broadcastEonKey(uint64 eon, bytes memory key) external;
+
+    function getEonKey(uint64 eon) external view returns (bytes memory);
+
+    event EonKeyBroadcast(uint64 eon, bytes key);
+}
diff --git a/src/common/intf/IKeyperSet.sol b/src/common/intf/IKeyperSet.sol
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+interface IKeyperSet {
+    function isFinalized() external view returns (bool);
+
+    function getNumMembers() external view returns (uint64);
+
+    function getMember(uint64 index) external view returns (address);
+
+    function getMembers() external view returns (address[] memory);
+
+    function getThreshold() external view returns (uint64);
+
+    function isAllowedToBroadcastEonKey(address a) external view returns (bool);
+}
diff --git a/src/common/intf/IKeyperSetManager.sol b/src/common/intf/IKeyperSetManager.sol
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+error KeyperSetNotFinalized();
+error AlreadyHaveKeyperSet();
+error NoActiveKeyperSet();
+
+interface IKeyperSetManager {
+    function addKeyperSet(
+        uint64 activationSlot,
+        address keyperSetContract
+    ) external;
+
+    function getNumKeyperSets() external view returns (uint64);
+
+    function getKeyperSetIndexByBlock(
+        uint64 slot
+    ) external view returns (uint64);
+
+    function getKeyperSetAddress(uint64 index) external view returns (address);
+
+    function getKeyperSetActivationBlock(
+        uint64 index
+    ) external view returns (uint64);
+
+    event KeyperSetAdded(uint64 activationSlot, address keyperSetContract);
+}
diff --git a/src/common/intf/ISequencer.sol b/src/common/intf/ISequencer.sol
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+error InsufficientFee();
+
+interface ISequencer {
+    function submitEncryptedTransaction(
+        uint64 eon,
+        bytes32 identityPrefix,
+        bytes memory encryptedTransaction,
+        uint256 gasLimit
+    ) external payable;
+
+    function submitDecryptionProgress(bytes memory message) external;
+
+    event TransactionSubmitted(
+        uint64 eon,
+        uint64 txIndex,
+        bytes32 identityPrefix,
+        address sender,
+        bytes encryptedTransaction,
+        uint256 gasLimit
+    );
+    event DecryptionProgressSubmitted(bytes message);
+}
diff --git a/src/common/intf/IValidatorRegistry.sol b/src/common/intf/IValidatorRegistry.sol
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+interface IValidatorRegistry {
+    struct Update {
+        bytes message;
+        bytes signature;
+    }
+
+    function getNumUpdates() external view returns (uint256);
+
+    function getUpdate(uint256 i) external view returns (Update memory);
+
+    function update(bytes memory message, bytes memory signature) external;
+
+    event Updated(bytes message, bytes signature);
+}
diff --git a/src/gnosh/Sequencer.sol b/src/gnosh/Sequencer.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import "./intf/ISequencer.sol";
+import "../common/intf/ISequencer.sol";
 
 contract Sequencer is ISequencer {
     mapping(uint64 eon => uint64 txCount) private txCounters;
diff --git a/src/gnosh/ValidatorRegistry.sol b/src/gnosh/ValidatorRegistry.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import "./intf/IValidatorRegistry.sol";
+import "../common/intf/IValidatorRegistry.sol";
 
 contract ValidatorRegistry is IValidatorRegistry {
     Update[] updates;
diff --git a/src/shop/Inbox.sol b/src/shop/Inbox.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.22;
 
-import "./RestrictedPausable.sol";
+import "../common/RestrictedPausable.sol";
 
 error InsufficientFunds();
 error BlockAlreadyFinalized();

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +	artifacts/
 +	cache/
 +	gnoshcontracts/
 +	out/