Upgradeable contract components implementation

config.toml.SAMPLE

@@ -11,10 +11,10 @@
 	KeyFile            = "/Users/someuser/ethereum/data/keystore/UTC--2018-03-11T01-37-33.202765887Z--AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAA"
 
 [ethereum.ContractAddresses]
-	# Hex-encoded address of KeepRandomBeacon contract
-	KeepRandomBeacon = "0xBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
-	# Hex-encoded address of KeepGroup contract
-	KeepGroup = "0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"
+	# Hex-encoded address of KeepRandomBeaconService contract
+	KeepRandomBeaconService = "0xBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
+	# Hex-encoded address of KeepRandomBeaconOperator contract
+	KeepRandomBeaconOperator = "0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"
 	# Hex-encoded address of StakingProxy contract
 	StakingProxy = "0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"
 

config/config_test.go

@@ -43,8 +43,8 @@ func TestReadConfig(t *testing.T) {
 		"Ethereum.ContractAddresses": {
 			readValueFunc: func(c *Config) interface{} { return c.Ethereum.ContractAddresses },
 			expectedValue: map[string]string{
-				"KeepRandomBeacon": "0x639deb0dd975af8e4cc91fe9053a37e4faf37649",
-				"KeepGroup":        "0xcf64c2a367341170cb4e09cf8c0ed137d8473ceb",
+				"KeepRandomBeaconService": "0x639deb0dd975af8e4cc91fe9053a37e4faf37649",
+				"KeepRandomBeaconOperator":  "0xcf64c2a367341170cb4e09cf8c0ed137d8473ceb",
 			},
 		},
 		"Storage.DataDir": {

contracts/solidity/contracts/DelayedWithdrawal.sol

@@ -0,0 +1,35 @@
+pragma solidity ^0.5.4;
+
+import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
+import "openzeppelin-solidity/contracts/math/SafeMath.sol";
+
+
+/**
+ * @title Delayed Withdrawal
+ * @dev A base contract to allow delayed funds withdrawal from the contract.
+ */
+contract DelayedWithdrawal is Ownable {
+    using SafeMath for uint256;
+
+    uint256 internal _withdrawalDelay;
+    uint256 internal _pendingWithdrawal;
+
+    /**
+     * @dev Initiate withdrawal of this contract balance to the owner.
+     */
+    function initiateWithdrawal() public onlyOwner {
+        _pendingWithdrawal = block.timestamp + _withdrawalDelay;
+    }
+
+    /**
+     * @dev Finish withdrawal of this contract balance to the owner.
+     */
+    function finishWithdrawal(address payable payee) public onlyOwner {
+        require(_pendingWithdrawal > 0, "Pending withdrawal timestamp must be set and be greater than zero.");
+        require(block.timestamp >= _pendingWithdrawal, "The current time must pass the pending withdrawal timestamp.");
+
+        // Reset pending withdrawal before sending to prevent re-entrancy attacks
+        _pendingWithdrawal = 0;
+        payee.transfer(address(this).balance);
+    }
+}