Initial setup for testnet-delegation contract #427

Malak67 · 2023-03-27T09:45:47Z

No description provided.

github-advanced-security

Slither found more than 10 potential problems in the proposed changes. Check the Files changed tab for more details.

packages/testnet-delegation/yarn.lock

packages/testnet-delegation/contracts/interfaces/IDelegation.sol

packages/testnet-delegation/contracts/mocks/MockIDPOS.sol

packages/testnet-delegation/contracts/DelegationOrchestrator.sol

rattrap

We should also check the internal validators balances before delegation to them. If they already have 2t+1, we don't need to delegate when registering new external validator

packages/testnet-delegation/contracts/DelegationOrchestrator.sol

packages/testnet-delegation/contracts/interfaces/IDPOS.sol

+    function registerValidator(
+        address validator,
+        bytes memory proof,
+        bytes memory vrf_key,


packages/testnet-delegation/contracts/interfaces/IDPOS.sol

+    function cancelUndelegate(address validator) external;
+
+    // Redelegates <amount> of tokens from one validator to the other
+    function reDelegate(address validator_from, address validator_to, uint256 amount) external;


packages/testnet-delegation/contracts/interfaces/IDPOS.sol

+    function cancelUndelegate(address validator) external;
+
+    // Redelegates <amount> of tokens from one validator to the other
+    function reDelegate(address validator_from, address validator_to, uint256 amount) external;


packages/testnet-delegation/contracts/DelegationOrchestrator.sol

+                internalStake += internalValidatorInfo.total_stake;
+            }
+            if (index < externalValidators.length) {
+                IDPOS.ValidatorBasicInfo memory externalValidatorInfo = dpos.getValidator(externalValidators[index]);


packages/testnet-delegation/contracts/DelegationOrchestrator.sol

packages/testnet-delegation/contracts/CallProxy.sol

packages/testnet-delegation/contracts/DelegationOrchestrator.sol

packages/testnet-delegation/contracts/CallProxy.sol

packages/testnet-delegation/contracts/DelegationOrchestrator.sol

packages/testnet-delegation/contracts/CallProxy.sol

+    function _delegate(address implementation) internal virtual returns (bytes memory returnData) {
+        assembly {
+            // Copy msg.data. We take full control of memory in this inline assembly
+            // block because it will not return to Solidity code. We overwrite the
+            // Solidity scratch pad at memory position 0.
+            calldatacopy(0, 0, calldatasize())
+
+            // Call the implementation.
+            // out and outsize are 0 because we don't know the size yet.
+            let result := call(gas(), implementation, callvalue(), 0, calldatasize(), 0, 0)
+
+            // Copy the returned data.
+            returndatacopy(0, 0, returndatasize())
+
+            switch result
+            // delegatecall returns 0 on error.
+            case 0 {
+                revert(0, returndatasize())
+            }
+            default {
+                return(0, returndatasize())
+            }
+        }
+    }


packages/testnet-delegation/contracts/DelegationOrchestrator.sol

+    // @note registrar of indexes+1 of validators in the internalValidators
+    mapping(address => uint256) public internalValidatorRegistered;
+    // @note registrar of indexes+1 of validators in the externalValidators
+    mapping(address => uint256) public externalValidatorRegistered;


packages/testnet-delegation/contracts/DelegationOrchestrator.sol

VargaElod23 · 2023-04-28T09:48:47Z

Implement the following shadowings:

// Returns validator basic info (everything except list of his delegators)
function getValidator(address validator)
external
view
returns (ValidatorBasicInfo memory validator_info);

function getValidators(uint32 batch)
    external
    view
    returns (ValidatorData[] memory validators, bool end);

/**
 * @notice Returns list of validators owned by an address
 *
 * @param owner        Owner address
 * @param batch        Batch number to be fetched. If the list is too big it cannot return all validators in one call. Instead, users are fetching batches of 100 account at a time
 *
 * @return validators  Batch of N validators basic info
 * @return end         Flag if there are no more accounts left. To get all accounts, caller should fetch all batches until he sees end == true
 **/
function getValidatorsFor(address owner, uint32 batch)
    external
    view
    returns (ValidatorData[] memory validators, bool end);

packages/testnet-delegation/contracts/DelegationOrchestrator.sol

+    function registerValidator(
+        address validator,
+        bytes memory proof,
+        bytes memory vrfKey,
+        uint16 commission,
+        string calldata description,
+        string calldata endpoint
+    ) external payable override nonReentrant {
+        uint256 delegationValue = (2 * msg.value) / internalValidators.length;
+        require(
+            externalValidatorRegistered[validator] == 0 && internalValidatorRegistered[validator] == 0,
+            "Validator already registered"
+        );
+        require(msg.value >= (MIN_REGISTRATION_DELEGATION), "Sent value less than minimal delegation for registration");
+        require(
+            address(this).balance >= delegationValue * internalValidators.length,
+            "Insufficient funds in contract for testnet rebalance"
+        );
+        uint256 internalStake = 0;
+        uint256 externalStake = 0;
+        (internalStake, externalStake) = _calculateStakes();
+        require(internalStake != 0 || externalStake != 0, "Calculating current stakes failed!");
+        uint256 majorityStake = 2 * externalStake + msg.value + MIN_REGISTRATION_DELEGATION;
+        if (internalStake < majorityStake) {
+            // Delegate 2*tokens to our validators
+            for (uint8 i = 0; i < internalValidators.length; ) {
+                (bool hasDelegated, ) = address(dpos).call{value: delegationValue}(
+                    abi.encodeWithSignature("delegate(address)", internalValidators[i])
+                );
+
+                require(hasDelegated, "Delegate call failed");
+                emit InternalValidatorDelegationIncreased(internalValidators[i], delegationValue);
+                unchecked {
+                    ++i;
+                }
+            }
+        }
+        externalValidatorsByOwners[msg.sender].push(validator);
+        externalValidators.push(validator);
+        externalValidatorRegistered[validator] = externalValidators.length;
+        externalValidatorOwners[validator] = msg.sender;
+        bytes memory input = abi.encodeWithSelector(
+            REGISTER_VALIDATOR_SELECTOR,
+            validator,
+            proof,
+            vrfKey,
+            commission,
+            description,
+            endpoint
+        );
+        (bool hasRegistered, ) = address(dpos).call{value: msg.value}(input);
+
+        require(hasRegistered, "Register validator call failed");
+
+        emit ExternalValidatorRegistered(validator, msg.sender, msg.value);
+    }


packages/testnet-delegation/contracts/DelegationOrchestrator.sol

+    function registerValidator(
+        address validator,
+        bytes memory proof,
+        bytes memory vrfKey,
+        uint16 commission,
+        string calldata description,
+        string calldata endpoint
+    ) external payable override nonReentrant {
+        uint256 delegationValue = (2 * msg.value) / internalValidators.length;
+        require(
+            externalValidatorRegistered[validator] == 0 && internalValidatorRegistered[validator] == 0,
+            "Validator already registered"
+        );
+        require(msg.value >= (MIN_REGISTRATION_DELEGATION), "Sent value less than minimal delegation for registration");
+        require(
+            address(this).balance >= delegationValue * internalValidators.length,
+            "Insufficient funds in contract for testnet rebalance"
+        );
+        uint256 internalStake = 0;
+        uint256 externalStake = 0;
+        (internalStake, externalStake) = _calculateStakes();
+        require(internalStake != 0 || externalStake != 0, "Calculating current stakes failed!");
+        uint256 majorityStake = 2 * externalStake + msg.value + MIN_REGISTRATION_DELEGATION;
+        if (internalStake < majorityStake) {
+            // Delegate 2*tokens to our validators
+            for (uint8 i = 0; i < internalValidators.length; ) {
+                (bool hasDelegated, ) = address(dpos).call{value: delegationValue}(
+                    abi.encodeWithSignature("delegate(address)", internalValidators[i])
+                );
+
+                require(hasDelegated, "Delegate call failed");
+                emit InternalValidatorDelegationIncreased(internalValidators[i], delegationValue);
+                unchecked {
+                    ++i;
+                }
+            }
+        }
+        externalValidatorsByOwners[msg.sender].push(validator);
+        externalValidators.push(validator);
+        externalValidatorRegistered[validator] = externalValidators.length;
+        externalValidatorOwners[validator] = msg.sender;
+        bytes memory input = abi.encodeWithSelector(
+            REGISTER_VALIDATOR_SELECTOR,
+            validator,
+            proof,
+            vrfKey,
+            commission,
+            description,
+            endpoint
+        );
+        (bool hasRegistered, ) = address(dpos).call{value: msg.value}(input);
+
+        require(hasRegistered, "Register validator call failed");
+
+        emit ExternalValidatorRegistered(validator, msg.sender, msg.value);
+    }


packages/testnet-delegation/contracts/DelegationOrchestrator.sol

+    function registerValidator(
+        address validator,
+        bytes memory proof,
+        bytes memory vrfKey,
+        uint16 commission,
+        string calldata description,
+        string calldata endpoint
+    ) external payable override nonReentrant {
+        uint256 delegationValue = (2 * msg.value) / internalValidators.length;
+        require(
+            externalValidatorRegistered[validator] == 0 && internalValidatorRegistered[validator] == 0,
+            "Validator already registered"
+        );
+        require(msg.value >= (MIN_REGISTRATION_DELEGATION), "Sent value less than minimal delegation for registration");
+        require(
+            address(this).balance >= delegationValue * internalValidators.length,
+            "Insufficient funds in contract for testnet rebalance"
+        );
+        uint256 internalStake = 0;
+        uint256 externalStake = 0;
+        (internalStake, externalStake) = _calculateStakes();
+        require(internalStake != 0 || externalStake != 0, "Calculating current stakes failed!");
+        uint256 majorityStake = 2 * externalStake + msg.value + MIN_REGISTRATION_DELEGATION;
+        if (internalStake < majorityStake) {
+            // Delegate 2*tokens to our validators
+            for (uint8 i = 0; i < internalValidators.length; ) {
+                (bool hasDelegated, ) = address(dpos).call{value: delegationValue}(
+                    abi.encodeWithSignature("delegate(address)", internalValidators[i])
+                );
+
+                require(hasDelegated, "Delegate call failed");
+                emit InternalValidatorDelegationIncreased(internalValidators[i], delegationValue);
+                unchecked {
+                    ++i;
+                }
+            }
+        }
+        externalValidatorsByOwners[msg.sender].push(validator);
+        externalValidators.push(validator);
+        externalValidatorRegistered[validator] = externalValidators.length;
+        externalValidatorOwners[validator] = msg.sender;
+        bytes memory input = abi.encodeWithSelector(
+            REGISTER_VALIDATOR_SELECTOR,
+            validator,
+            proof,
+            vrfKey,
+            commission,
+            description,
+            endpoint
+        );
+        (bool hasRegistered, ) = address(dpos).call{value: msg.value}(input);
+
+        require(hasRegistered, "Register validator call failed");
+
+        emit ExternalValidatorRegistered(validator, msg.sender, msg.value);
+    }


packages/testnet-delegation/contracts/DelegationOrchestrator.sol

+    function registerValidator(
+        address validator,
+        bytes memory proof,
+        bytes memory vrfKey,
+        uint16 commission,
+        string calldata description,
+        string calldata endpoint
+    ) external payable override nonReentrant {
+        uint256 delegationValue = (2 * msg.value) / internalValidators.length;
+        require(
+            externalValidatorRegistered[validator] == 0 && internalValidatorRegistered[validator] == 0,
+            "Validator already registered"
+        );
+        require(msg.value >= (MIN_REGISTRATION_DELEGATION), "Sent value less than minimal delegation for registration");
+        require(
+            address(this).balance >= delegationValue * internalValidators.length,
+            "Insufficient funds in contract for testnet rebalance"
+        );
+        uint256 internalStake = 0;
+        uint256 externalStake = 0;
+        (internalStake, externalStake) = _calculateStakes();
+        require(internalStake != 0 || externalStake != 0, "Calculating current stakes failed!");
+        uint256 majorityStake = 2 * externalStake + msg.value + MIN_REGISTRATION_DELEGATION;
+        if (internalStake < majorityStake) {
+            // Delegate 2*tokens to our validators
+            for (uint8 i = 0; i < internalValidators.length; ) {
+                (bool hasDelegated, ) = address(dpos).call{value: delegationValue}(
+                    abi.encodeWithSignature("delegate(address)", internalValidators[i])
+                );
+
+                require(hasDelegated, "Delegate call failed");
+                emit InternalValidatorDelegationIncreased(internalValidators[i], delegationValue);
+                unchecked {
+                    ++i;
+                }
+            }
+        }
+        externalValidatorsByOwners[msg.sender].push(validator);
+        externalValidators.push(validator);
+        externalValidatorRegistered[validator] = externalValidators.length;
+        externalValidatorOwners[validator] = msg.sender;
+        bytes memory input = abi.encodeWithSelector(
+            REGISTER_VALIDATOR_SELECTOR,
+            validator,
+            proof,
+            vrfKey,
+            commission,
+            description,
+            endpoint
+        );
+        (bool hasRegistered, ) = address(dpos).call{value: msg.value}(input);
+
+        require(hasRegistered, "Register validator call failed");
+
+        emit ExternalValidatorRegistered(validator, msg.sender, msg.value);
+    }


packages/testnet-delegation/contracts/DelegationOrchestrator.sol

+    function registerValidator(
+        address validator,
+        bytes memory proof,
+        bytes memory vrfKey,
+        uint16 commission,
+        string calldata description,
+        string calldata endpoint
+    ) external payable override nonReentrant {
+        uint256 delegationValue = (2 * msg.value) / internalValidators.length;
+        require(
+            externalValidatorRegistered[validator] == 0 && internalValidatorRegistered[validator] == 0,
+            "Validator already registered"
+        );
+        require(msg.value >= (MIN_REGISTRATION_DELEGATION), "Sent value less than minimal delegation for registration");
+        require(
+            address(this).balance >= delegationValue * internalValidators.length,
+            "Insufficient funds in contract for testnet rebalance"
+        );
+        uint256 internalStake = 0;
+        uint256 externalStake = 0;
+        (internalStake, externalStake) = _calculateStakes();
+        require(internalStake != 0 || externalStake != 0, "Calculating current stakes failed!");
+        uint256 majorityStake = 2 * externalStake + msg.value + MIN_REGISTRATION_DELEGATION;
+        if (internalStake < majorityStake) {
+            // Delegate 2*tokens to our validators
+            for (uint8 i = 0; i < internalValidators.length; ) {
+                (bool hasDelegated, ) = address(dpos).call{value: delegationValue}(
+                    abi.encodeWithSignature("delegate(address)", internalValidators[i])
+                );
+
+                require(hasDelegated, "Delegate call failed");
+                emit InternalValidatorDelegationIncreased(internalValidators[i], delegationValue);
+                unchecked {
+                    ++i;
+                }
+            }
+        }
+        externalValidatorsByOwners[msg.sender].push(validator);
+        externalValidators.push(validator);
+        externalValidatorRegistered[validator] = externalValidators.length;
+        externalValidatorOwners[validator] = msg.sender;
+        bytes memory input = abi.encodeWithSelector(
+            REGISTER_VALIDATOR_SELECTOR,
+            validator,
+            proof,
+            vrfKey,
+            commission,
+            description,
+            endpoint
+        );
+        (bool hasRegistered, ) = address(dpos).call{value: msg.value}(input);
+
+        require(hasRegistered, "Register validator call failed");
+
+        emit ExternalValidatorRegistered(validator, msg.sender, msg.value);
+    }


github-advanced-security · 2023-08-17T13:07:38Z

This pull request sets up GitHub code scanning for this repository. Once the scans have completed and the checks have passed, the analysis results for this pull request branch will appear on this overview. Once you merge this pull request, the 'Security' tab will show more code scanning analysis results (for example, for the default branch). Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results. For more information about GitHub code scanning, check out the documentation.

rattrap · 2023-08-24T14:25:45Z

Simplify internal state (we only need an array that contains our validator node addresses and a mapping between owner -> validator)
No need to send tokens to the register function.

Malak67 and others added 7 commits March 27, 2023 12:45

Initial setup for testnet-delegation contract

5662008

cleanup: add checks to constructor

ee1391f

implements initial regisration flow

1a9a76a

set up config and deployment

6cb3445

implement orchestrator and mocks for tests

4a15eff

implements addInternalValidator logic

75ee92c

finishes testnet dpos orchestrator tests and impl

0495d59

VargaElod23 linked an issue Apr 7, 2023 that may be closed by this pull request

[Delegation] New smart contract for testnet #412

Open

VargaElod23 added 3 commits April 13, 2023 14:05

adds reentrancyGuard to additions, fixes logic for own stake additions

674c68b

adds slither to analysis pipeline

2c2c398

change sol v to 0.8.19

2d3839d

github-advanced-security bot found potential problems Apr 17, 2023

View reviewed changes

VargaElod23 added 2 commits April 17, 2023 18:31

adds small improvements

42ee34e

reset sol version for analysis

8e634fb

rattrap requested changes Apr 18, 2023

View reviewed changes

VargaElod23 added 2 commits April 19, 2023 19:43

implements V2 of contract

af979e0

adds comments to V2

57f046b

VargaElod23 requested a review from rattrap April 19, 2023 16:50

rename parameters

d49d191

github-advanced-security bot found potential problems Apr 19, 2023

View reviewed changes

Implements proxy func for DPOS

e67f05e

github-advanced-security bot found potential problems Apr 21, 2023

View reviewed changes

packages/testnet-delegation/contracts/CallProxy.sol Fixed Show fixed Hide fixed

packages/testnet-delegation/contracts/CallProxy.sol Fixed Show fixed Hide fixed

packages/testnet-delegation/contracts/DelegationOrchestrator.sol Fixed Show fixed Hide fixed

VargaElod23 added 3 commits April 21, 2023 16:49

add zero address check in proxy constructor

650c18d

add release step

79e623e

adds event tests

f5e9c56

github-advanced-security bot found potential problems Apr 24, 2023

View reviewed changes

packages/testnet-delegation/contracts/CallProxy.sol Fixed Show fixed Hide fixed

adds some view functionality

2e53ad4

github-advanced-security bot found potential problems Apr 26, 2023

View reviewed changes

finalize version1

8f3a071

github-advanced-security bot found potential problems Apr 27, 2023

View reviewed changes

packages/testnet-delegation/contracts/DelegationOrchestrator.sol Fixed Show fixed Hide fixed

implements shadowing of view methods and registerValidator

9095a5c

github-advanced-security bot found potential problems Apr 28, 2023

View reviewed changes

VargaElod23 self-assigned this May 23, 2023

VargaElod23 added the deprioritized PR is required but reprioritized label May 23, 2023

VargaElod23 added 2 commits August 17, 2023 15:56

Merge branch 'develop' into feat/testnet-delegation

82d6ae3

bumps deps

25ad5f0

updates tests

f4fffa3

refactor: simplify contract

bebc1fd

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Initial setup for testnet-delegation contract #427

Initial setup for testnet-delegation contract #427

Malak67 commented Mar 27, 2023

github-advanced-security bot left a comment

rattrap left a comment

VargaElod23 commented Apr 28, 2023

github-advanced-security bot commented Aug 17, 2023

rattrap commented Aug 24, 2023

Initial setup for testnet-delegation contract #427

Are you sure you want to change the base?

Initial setup for testnet-delegation contract #427

Conversation

Malak67 commented Mar 27, 2023

github-advanced-security bot left a comment

Choose a reason for hiding this comment

rattrap left a comment

Choose a reason for hiding this comment

VargaElod23 commented Apr 28, 2023

github-advanced-security bot commented Aug 17, 2023

rattrap commented Aug 24, 2023