From 2ef85ceecdbd37058c21014353ef3c015c95e543 Mon Sep 17 00:00:00 2001 From: mortimr Date: Thu, 1 Dec 2022 16:28:09 +0100 Subject: [PATCH] fix: formatting --- src/contracts/ConsensusLayerFeeDispatcher.sol | 5 +- src/contracts/ExecutionLayerFeeDispatcher.sol | 19 +- src/contracts/StakingContract.sol | 170 +- src/contracts/TUPProxy.sol | 9 +- src/contracts/Treasury.sol | 8 +- src/contracts/libs/BytesLib.sol | 18 +- .../libs/StakingContractStorageLib.sol | 14 +- src/test/ConsensusLayerFeeDispatcher.t.sol | 4 +- src/test/ExecutionLayerFeeDispatcher.t.sol | 13 +- src/test/FeeRecipient.t.sol | 4 +- src/test/StakingContract.t.sol | 589 ++--- src/test/Treasury.t.sol | 2 +- src/test/console.sol | 2176 +++-------------- 13 files changed, 679 insertions(+), 2352 deletions(-) diff --git a/src/contracts/ConsensusLayerFeeDispatcher.sol b/src/contracts/ConsensusLayerFeeDispatcher.sol index a280eee..335b565 100644 --- a/src/contracts/ConsensusLayerFeeDispatcher.sol +++ b/src/contracts/ConsensusLayerFeeDispatcher.sol @@ -110,9 +110,8 @@ contract ConsensusLayerFeeDispatcher is IFeeDispatcher { /// @notice Retrieve the assigned withdrawer for the given public key root /// @param _publicKeyRoot Public key root to get the owner function getWithdrawer(bytes32 _publicKeyRoot) external view returns (address) { - IStakingContractFeeDetails stakingContract = IStakingContractFeeDetails( - STAKING_CONTRACT_ADDRESS_SLOT.getAddress() - ); + IStakingContractFeeDetails stakingContract = + IStakingContractFeeDetails(STAKING_CONTRACT_ADDRESS_SLOT.getAddress()); return stakingContract.getWithdrawerFromPublicKeyRoot(_publicKeyRoot); } diff --git a/src/contracts/ExecutionLayerFeeDispatcher.sol b/src/contracts/ExecutionLayerFeeDispatcher.sol index 9c409c0..e26d37b 100644 --- a/src/contracts/ExecutionLayerFeeDispatcher.sol +++ b/src/contracts/ExecutionLayerFeeDispatcher.sol @@ -61,9 +61,8 @@ contract ExecutionLayerFeeDispatcher is IFeeDispatcher { if (balance == 0) { revert ZeroBalanceWithdrawal(); } - IStakingContractFeeDetails stakingContract = IStakingContractFeeDetails( - STAKING_CONTRACT_ADDRESS_SLOT.getAddress() - ); + IStakingContractFeeDetails stakingContract = + IStakingContractFeeDetails(STAKING_CONTRACT_ADDRESS_SLOT.getAddress()); address withdrawer = stakingContract.getWithdrawerFromPublicKeyRoot(_publicKeyRoot); address operator = stakingContract.getOperatorFeeRecipient(_publicKeyRoot); address treasury = stakingContract.getTreasury(); @@ -86,14 +85,7 @@ contract ExecutionLayerFeeDispatcher is IFeeDispatcher { revert TreasuryReceiveError(data); } } - emit Withdrawal( - withdrawer, - operator, - _publicKeyRoot, - balance - globalFee, - operatorFee, - globalFee - operatorFee - ); + emit Withdrawal(withdrawer, operator, _publicKeyRoot, balance - globalFee, operatorFee, globalFee - operatorFee); } /// @notice Retrieve the staking contract address @@ -104,9 +96,8 @@ contract ExecutionLayerFeeDispatcher is IFeeDispatcher { /// @notice Retrieve the assigned withdrawer for the given public key root /// @param _publicKeyRoot Public key root to get the owner function getWithdrawer(bytes32 _publicKeyRoot) external view returns (address) { - IStakingContractFeeDetails stakingContract = IStakingContractFeeDetails( - STAKING_CONTRACT_ADDRESS_SLOT.getAddress() - ); + IStakingContractFeeDetails stakingContract = + IStakingContractFeeDetails(STAKING_CONTRACT_ADDRESS_SLOT.getAddress()); return stakingContract.getWithdrawerFromPublicKeyRoot(_publicKeyRoot); } diff --git a/src/contracts/StakingContract.sol b/src/contracts/StakingContract.sol index 6bd714a..3ad33ab 100644 --- a/src/contracts/StakingContract.sol +++ b/src/contracts/StakingContract.sol @@ -102,9 +102,8 @@ contract StakingContract { /// @notice Ensures that the caller is the operator fee recipient modifier onlyOperatorFeeRecipient(uint256 _operatorIndex) { - StakingContractStorageLib.OperatorInfo storage operatorInfo = StakingContractStorageLib.getOperators().value[ - _operatorIndex - ]; + StakingContractStorageLib.OperatorInfo storage operatorInfo = + StakingContractStorageLib.getOperators().value[_operatorIndex]; if (operatorInfo.deactivated) { revert Deactivated(); @@ -213,11 +212,8 @@ contract StakingContract { /// @notice Retrieve the Execution & Consensus Layer Fee operator recipient for a given public key function getOperatorFeeRecipient(bytes32 pubKeyRoot) external view returns (address) { - return - StakingContractStorageLib - .getOperators() - .value[StakingContractStorageLib.getOperatorIndexPerValidator().value[pubKeyRoot].operatorIndex] - .feeRecipient; + return StakingContractStorageLib.getOperators().value[StakingContractStorageLib.getOperatorIndexPerValidator() + .value[pubKeyRoot].operatorIndex].feeRecipient; } /// @notice Retrieve withdrawer of public key @@ -249,8 +245,8 @@ contract StakingContract { { StakingContractStorageLib.OperatorsSlot storage operators = StakingContractStorageLib.getOperators(); if (_operatorIndex < operators.value.length) { - StakingContractStorageLib.ValidatorsFundingInfo memory _operatorInfo = StakingContractStorageLib - .getValidatorsFundingInfo(_operatorIndex); + StakingContractStorageLib.ValidatorsFundingInfo memory _operatorInfo = + StakingContractStorageLib.getValidatorsFundingInfo(_operatorIndex); StakingContractStorageLib.OperatorInfo storage _operator = operators.value[_operatorIndex]; (operatorAddress, feeRecipientAddress, limit, keys, deactivated) = ( @@ -270,12 +266,7 @@ contract StakingContract { function getValidator(uint256 _operatorIndex, uint256 _validatorIndex) external view - returns ( - bytes memory publicKey, - bytes memory signature, - address withdrawer, - bool funded - ) + returns (bytes memory publicKey, bytes memory signature, address withdrawer, bool funded) { StakingContractStorageLib.OperatorsSlot storage operators = StakingContractStorageLib.getOperators(); publicKey = operators.value[_operatorIndex].publicKeys[_validatorIndex]; @@ -337,11 +328,10 @@ contract StakingContract { /// @param _operatorIndex Index of the operator to update /// @param _operatorAddress New operator address for operations management /// @param _feeRecipientAddress New operator address for reward management - function setOperatorAddresses( - uint256 _operatorIndex, - address _operatorAddress, - address _feeRecipientAddress - ) external onlyOperatorFeeRecipient(_operatorIndex) { + function setOperatorAddresses(uint256 _operatorIndex, address _operatorAddress, address _feeRecipientAddress) + external + onlyOperatorFeeRecipient(_operatorIndex) + { StakingContractStorageLib.OperatorsSlot storage operators = StakingContractStorageLib.getOperators(); operators.value[_operatorIndex].operator = _operatorAddress; @@ -460,10 +450,10 @@ contract StakingContract { } StakingContractStorageLib.OperatorsSlot storage operators = StakingContractStorageLib.getOperators(); - StakingContractStorageLib.OperatorIndexPerValidatorSlot - storage operatorIndexPerValidator = StakingContractStorageLib.getOperatorIndexPerValidator(); + StakingContractStorageLib.OperatorIndexPerValidatorSlot storage operatorIndexPerValidator = + StakingContractStorageLib.getOperatorIndexPerValidator(); - for (uint256 i; i < _keyCount; ) { + for (uint256 i; i < _keyCount;) { bytes memory publicKey = BytesLib.slice(_publicKeys, i * PUBLIC_KEY_LENGTH, PUBLIC_KEY_LENGTH); bytes memory signature = BytesLib.slice(_signatures, i * SIGNATURE_LENGTH, SIGNATURE_LENGTH); @@ -476,10 +466,8 @@ contract StakingContract { revert DuplicateValidatorKey(publicKey); } - operatorIndexPerValidator.value[pubKeyRoot] = StakingContractStorageLib.OperatorIndex({ - enabled: true, - operatorIndex: uint32(_operatorIndex) - }); + operatorIndexPerValidator.value[pubKeyRoot] = + StakingContractStorageLib.OperatorIndex({enabled: true, operatorIndex: uint32(_operatorIndex)}); unchecked { ++i; @@ -506,14 +494,14 @@ contract StakingContract { revert InvalidArgument(); } - StakingContractStorageLib.ValidatorsFundingInfo memory operatorInfo = StakingContractStorageLib - .getValidatorsFundingInfo(_operatorIndex); + StakingContractStorageLib.ValidatorsFundingInfo memory operatorInfo = + StakingContractStorageLib.getValidatorsFundingInfo(_operatorIndex); StakingContractStorageLib.OperatorsSlot storage operators = StakingContractStorageLib.getOperators(); if (_indexes[_indexes.length - 1] < operatorInfo.funded) { revert FundedValidatorDeletionAttempt(); } - for (uint256 i; i < _indexes.length; ) { + for (uint256 i; i < _indexes.length;) { if (i > 0 && _indexes[i] >= _indexes[i - 1]) { revert UnsortedIndexes(); } @@ -523,13 +511,11 @@ contract StakingContract { operators.value[_operatorIndex].publicKeys.pop(); operators.value[_operatorIndex].signatures.pop(); } else { - operators.value[_operatorIndex].publicKeys[_indexes[i]] = operators.value[_operatorIndex].publicKeys[ - operators.value[_operatorIndex].publicKeys.length - 1 - ]; + operators.value[_operatorIndex].publicKeys[_indexes[i]] = + operators.value[_operatorIndex].publicKeys[operators.value[_operatorIndex].publicKeys.length - 1]; operators.value[_operatorIndex].publicKeys.pop(); - operators.value[_operatorIndex].signatures[_indexes[i]] = operators.value[_operatorIndex].signatures[ - operators.value[_operatorIndex].signatures.length - 1 - ]; + operators.value[_operatorIndex].signatures[_indexes[i]] = + operators.value[_operatorIndex].signatures[operators.value[_operatorIndex].signatures.length - 1]; operators.value[_operatorIndex].signatures.pop(); } @@ -577,9 +563,8 @@ contract StakingContract { /// ██ ██ ████ ██ ███████ ██ ██ ██ ████ ██ ██ ███████ function _onlyActiveOperator(uint256 _operatorIndex) internal view { - StakingContractStorageLib.OperatorInfo storage operatorInfo = StakingContractStorageLib.getOperators().value[ - _operatorIndex - ]; + StakingContractStorageLib.OperatorInfo storage operatorInfo = + StakingContractStorageLib.getOperators().value[_operatorIndex]; if (operatorInfo.deactivated) { revert Deactivated(); @@ -599,8 +584,8 @@ contract StakingContract { } function _updateAvailableValidatorCount(uint256 _operatorIndex) internal { - StakingContractStorageLib.ValidatorsFundingInfo memory validatorFundingInfo = StakingContractStorageLib - .getValidatorsFundingInfo(_operatorIndex); + StakingContractStorageLib.ValidatorsFundingInfo memory validatorFundingInfo = + StakingContractStorageLib.getValidatorsFundingInfo(_operatorIndex); StakingContractStorageLib.OperatorsSlot storage operators = StakingContractStorageLib.getOperators(); uint32 oldAvailableCount = validatorFundingInfo.availableKeys; @@ -612,9 +597,7 @@ contract StakingContract { } else { newAvailableCount = uint32(cap - validatorFundingInfo.funded); StakingContractStorageLib.setValidatorsFundingInfo( - _operatorIndex, - newAvailableCount, - validatorFundingInfo.funded + _operatorIndex, newAvailableCount, validatorFundingInfo.funded ); } @@ -630,18 +613,15 @@ contract StakingContract { bytes32(uint256(uint160(_recipient)) + 0x0100000000000000000000000000000000000000000000000000000000000000); } - function _depositValidatorsOfOperator( - uint256 _operatorIndex, - uint256 _validatorCount, - address _withdrawer - ) internal { + function _depositValidatorsOfOperator(uint256 _operatorIndex, uint256 _validatorCount, address _withdrawer) + internal + { StakingContractStorageLib.OperatorsSlot storage operators = StakingContractStorageLib.getOperators(); StakingContractStorageLib.OperatorInfo storage operator = operators.value[_operatorIndex]; - StakingContractStorageLib.ValidatorsFundingInfo memory vfi = StakingContractStorageLib.getValidatorsFundingInfo( - _operatorIndex - ); + StakingContractStorageLib.ValidatorsFundingInfo memory vfi = + StakingContractStorageLib.getValidatorsFundingInfo(_operatorIndex); - for (uint256 i = vfi.funded; i < vfi.funded + _validatorCount; ) { + for (uint256 i = vfi.funded; i < vfi.funded + _validatorCount;) { bytes memory publicKey = operator.publicKeys[i]; bytes memory signature = operator.signatures[i]; address consensusLayerRecipient = _getDeterministicReceiver(publicKey, CONSENSUS_LAYER_SALT_PREFIX); @@ -656,9 +636,7 @@ contract StakingContract { } StakingContractStorageLib.setValidatorsFundingInfo( - _operatorIndex, - uint32(vfi.availableKeys - _validatorCount), - uint32(vfi.funded + _validatorCount) + _operatorIndex, uint32(vfi.availableKeys - _validatorCount), uint32(vfi.funded + _validatorCount) ); } @@ -666,11 +644,9 @@ contract StakingContract { /// @param _publicKey The Public Key to deposit /// @param _signature The Signature to deposit /// @param _withdrawalCredentials The Withdrawal Credentials to deposit - function _depositValidator( - bytes memory _publicKey, - bytes memory _signature, - bytes32 _withdrawalCredentials - ) internal { + function _depositValidator(bytes memory _publicKey, bytes memory _signature, bytes32 _withdrawalCredentials) + internal + { bytes32 pubkeyRoot = _getPubKeyRoot(_publicKey); bytes32 signatureRoot = sha256( abi.encodePacked( @@ -692,10 +668,7 @@ contract StakingContract { uint256 targetBalance = address(this).balance - DEPOSIT_SIZE; IDepositContract(StakingContractStorageLib.getDepositContract()).deposit{value: DEPOSIT_SIZE}( - _publicKey, - abi.encodePacked(_withdrawalCredentials), - _signature, - depositDataRoot + _publicKey, abi.encodePacked(_withdrawalCredentials), _signature, depositDataRoot ); if (address(this).balance != targetBalance) { @@ -703,24 +676,20 @@ contract StakingContract { } } - function _depositOnOneOperator( - address _withdrawer, - uint256 _depositCount, - uint256 _totalAvailableValidators - ) internal { + function _depositOnOneOperator(address _withdrawer, uint256 _depositCount, uint256 _totalAvailableValidators) + internal + { _depositValidatorsOfOperator(0, _depositCount, _withdrawer); StakingContractStorageLib.setTotalAvailableValidators(_totalAvailableValidators - _depositCount); } - function _depositOnTwoOperators( - address _withdrawer, - uint256 _depositCount, - uint256 _totalAvailableValidators - ) internal { - StakingContractStorageLib.ValidatorsFundingInfo memory oneOsi = StakingContractStorageLib - .getValidatorsFundingInfo(0); - StakingContractStorageLib.ValidatorsFundingInfo memory twoOsi = StakingContractStorageLib - .getValidatorsFundingInfo(1); + function _depositOnTwoOperators(address _withdrawer, uint256 _depositCount, uint256 _totalAvailableValidators) + internal + { + StakingContractStorageLib.ValidatorsFundingInfo memory oneOsi = + StakingContractStorageLib.getValidatorsFundingInfo(0); + StakingContractStorageLib.ValidatorsFundingInfo memory twoOsi = + StakingContractStorageLib.getValidatorsFundingInfo(1); uint256 oneDepositCount; uint256 twoDepositCount; @@ -753,11 +722,11 @@ contract StakingContract { ); } - function _getBaseSkip( - bytes32 blockHash, - uint256 index, - uint8 prime - ) internal pure returns (uint8 base, uint8 skip) { + function _getBaseSkip(bytes32 blockHash, uint256 index, uint8 prime) + internal + pure + returns (uint8 base, uint8 skip) + { base = uint8(blockHash[(index * 2) % 32]) % prime; skip = (uint8(blockHash[((index * 2) + 1) % 32]) % (prime - 1)) + 1; } @@ -771,8 +740,8 @@ contract StakingContract { return 0; } if (vd[operatorIndex].used == false) { - StakingContractStorageLib.ValidatorsFundingInfo memory osi = StakingContractStorageLib - .getValidatorsFundingInfo(operatorIndex); + StakingContractStorageLib.ValidatorsFundingInfo memory osi = + StakingContractStorageLib.getValidatorsFundingInfo(operatorIndex); vd[operatorIndex].used = true; vd[operatorIndex].funded = osi.funded; vd[operatorIndex].available = osi.availableKeys; @@ -789,8 +758,8 @@ contract StakingContract { return 0; } if (vd[operatorIndex].used == false) { - StakingContractStorageLib.ValidatorsFundingInfo memory osi = StakingContractStorageLib - .getValidatorsFundingInfo(operatorIndex); + StakingContractStorageLib.ValidatorsFundingInfo memory osi = + StakingContractStorageLib.getValidatorsFundingInfo(operatorIndex); vd[operatorIndex].used = true; vd[operatorIndex].funded = osi.funded; vd[operatorIndex].available = osi.availableKeys; @@ -824,12 +793,11 @@ contract StakingContract { } } - function _getElligibleOperators( - uint8 base, - uint8 skip, - uint8 prime, - ValidatorAllocationCache[] memory vd - ) internal view returns (uint8, uint8) { + function _getElligibleOperators(uint8 base, uint8 skip, uint8 prime, ValidatorAllocationCache[] memory vd) + internal + view + returns (uint8, uint8) + { int16 alphaIndex = -1; int16 betaIndex = -1; uint8 index = base; @@ -861,7 +829,7 @@ contract StakingContract { ValidatorAllocationCache[] memory vd = new ValidatorAllocationCache[](operatorCount); - for (uint256 index; index < _depositCount; ) { + for (uint256 index; index < _depositCount;) { // Retrieve base index and skip value based on block hash and current loop index (uint8 base, uint8 skip) = _getBaseSkip(blockHash, index, optimusPrime); // Retrieve two operator indexes pointing to two (or the same) operator(s) that have at least one available @@ -883,7 +851,7 @@ contract StakingContract { } // Loop through the cached operator values and deposit any pending deposits - for (uint256 index; index < vd.length; ) { + for (uint256 index; index < vd.length;) { if (vd[index].toDeposit > 0) { _depositValidatorsOfOperator(index, vd[index].toDeposit, _withdrawer); } @@ -977,7 +945,7 @@ contract StakingContract { function _getClosestPrimeAbove(uint8 _count) internal pure returns (uint8) { uint8[54] memory primes = _primes(); - for (uint256 i; i < primes.length; ) { + for (uint256 i; i < primes.length;) { if (primes[i] >= _count) { return primes[i]; } @@ -1009,11 +977,7 @@ contract StakingContract { /// @param _publicKey Public Key assigned to the receiver /// @param _prefix Prefix used to generate multiple receivers per public key /// @param _dispatcher Address of the dispatcher contract - function _deployAndWithdraw( - bytes calldata _publicKey, - uint256 _prefix, - address _dispatcher - ) internal { + function _deployAndWithdraw(bytes calldata _publicKey, uint256 _prefix, address _dispatcher) internal { bytes32 publicKeyRoot = _getPubKeyRoot(_publicKey); bytes32 feeRecipientSalt = sha256(abi.encodePacked(_prefix, publicKeyRoot)); address implementation = StakingContractStorageLib.getFeeRecipientImplementation(); diff --git a/src/contracts/TUPProxy.sol b/src/contracts/TUPProxy.sol index fa319d1..5e1aac1 100644 --- a/src/contracts/TUPProxy.sol +++ b/src/contracts/TUPProxy.sol @@ -12,11 +12,10 @@ contract TUPProxy is TransparentUpgradeableProxy { error CallWhenPaused(); - constructor( - address _logic, - address admin_, - bytes memory _data - ) payable TransparentUpgradeableProxy(_logic, admin_, _data) {} + constructor(address _logic, address admin_, bytes memory _data) + payable + TransparentUpgradeableProxy(_logic, admin_, _data) + {} /// @dev Retrieves Paused state /// @return Paused state diff --git a/src/contracts/Treasury.sol b/src/contracts/Treasury.sol index 24e99f6..cb04ead 100644 --- a/src/contracts/Treasury.sol +++ b/src/contracts/Treasury.sol @@ -21,11 +21,7 @@ contract Treasury { uint256[] public percents; uint256 internal locked = 1; - constructor( - address _admin, - address[] memory _beneficiaries, - uint256[] memory _percents - ) { + constructor(address _admin, address[] memory _beneficiaries, uint256[] memory _percents) { if (_beneficiaries.length != _percents.length) { revert InvalidArrayLengths(); } @@ -104,7 +100,7 @@ contract Treasury { /// @param _percents List of percents function _checkPercents(uint256[] memory _percents) internal pure { uint256 sum; - for (uint256 idx = 0; idx < _percents.length; ) { + for (uint256 idx = 0; idx < _percents.length;) { sum += _percents[idx]; unchecked { ++idx; diff --git a/src/contracts/libs/BytesLib.sol b/src/contracts/libs/BytesLib.sol index 4cfa5c0..406bf5d 100644 --- a/src/contracts/libs/BytesLib.sol +++ b/src/contracts/libs/BytesLib.sol @@ -68,14 +68,10 @@ library BytesLib { // length of the arrays. end := add(mc, length) - for { - let cc := add(_postBytes, 0x20) - } lt(mc, end) { + for { let cc := add(_postBytes, 0x20) } lt(mc, end) { mc := add(mc, 0x20) cc := add(cc, 0x20) - } { - mstore(mc, mload(cc)) - } + } { mstore(mc, mload(cc)) } // Update the free-memory pointer by padding our last write location // to 32 bytes: add 31 bytes to the end of tempBytes to move to the @@ -94,11 +90,7 @@ library BytesLib { return tempBytes; } - function slice( - bytes memory _bytes, - uint256 _start, - uint256 _length - ) internal pure returns (bytes memory) { + function slice(bytes memory _bytes, uint256 _start, uint256 _length) internal pure returns (bytes memory) { require(_length + 31 >= _length, "slice_overflow"); require(_bytes.length >= _start + _length, "slice_outOfBounds"); @@ -135,9 +127,7 @@ library BytesLib { } lt(mc, end) { mc := add(mc, 0x20) cc := add(cc, 0x20) - } { - mstore(mc, mload(cc)) - } + } { mstore(mc, mload(cc)) } mstore(tempBytes, _length) diff --git a/src/contracts/libs/StakingContractStorageLib.sol b/src/contracts/libs/StakingContractStorageLib.sol index fe337d1..602d105 100644 --- a/src/contracts/libs/StakingContractStorageLib.sol +++ b/src/contracts/libs/StakingContractStorageLib.sol @@ -159,11 +159,7 @@ library StakingContractStorageLib { vfi.funded = uint32(value >> 32); } - function setValidatorsFundingInfo( - uint256 _index, - uint32 _availableKeys, - uint32 _funded - ) internal { + function setValidatorsFundingInfo(uint256 _index, uint32 _availableKeys, uint32 _funded) internal { UintToUintMappingSlot storage p; bytes32 slot = VALIDATORS_FUNDING_INFO_SLOT; @@ -173,9 +169,8 @@ library StakingContractStorageLib { uint256 slotIndex = _index >> 2; uint256 innerIndex = (_index & 3) << 6; - p.value[slotIndex] = - (p.value[slotIndex] & (~(uint256(0xFFFFFFFFFFFFFFFF) << innerIndex))) | - ((uint256(_availableKeys) | (uint256(_funded) << 32)) << innerIndex); + p.value[slotIndex] = (p.value[slotIndex] & (~(uint256(0xFFFFFFFFFFFFFFFF) << innerIndex))) + | ((uint256(_availableKeys) | (uint256(_funded) << 32)) << innerIndex); } /* ======================================== @@ -222,8 +217,7 @@ library StakingContractStorageLib { mapping(bytes32 => OperatorIndex) value; } - bytes32 internal constant OPERATOR_INDEX_PER_VALIDATOR_SLOT = - keccak256("StakingContract.operatorIndexPerValidator"); + bytes32 internal constant OPERATOR_INDEX_PER_VALIDATOR_SLOT = keccak256("StakingContract.operatorIndexPerValidator"); function getOperatorIndexPerValidator() internal pure returns (OperatorIndexPerValidatorSlot storage p) { bytes32 slot = OPERATOR_INDEX_PER_VALIDATOR_SLOT; diff --git a/src/test/ConsensusLayerFeeDispatcher.t.sol b/src/test/ConsensusLayerFeeDispatcher.t.sol index 113c48a..18fadac 100644 --- a/src/test/ConsensusLayerFeeDispatcher.t.sol +++ b/src/test/ConsensusLayerFeeDispatcher.t.sol @@ -92,7 +92,7 @@ contract ConsensusLayerFeeDispatcherTest { function testSendFundsWithCall() external { vm.deal(bob, 1 ether); vm.startPrank(bob); - (bool status, ) = address(cld).call{value: 1 ether}(""); + (bool status,) = address(cld).call{value: 1 ether}(""); require(status == false); vm.stopPrank(); } @@ -100,7 +100,7 @@ contract ConsensusLayerFeeDispatcherTest { function testFallbackError() external { vm.deal(bob, 1 ether); vm.startPrank(bob); - (bool status, ) = address(cld).call{value: 1 ether}(abi.encodeWithSignature("thisMethodIsNotAvailable()")); + (bool status,) = address(cld).call{value: 1 ether}(abi.encodeWithSignature("thisMethodIsNotAvailable()")); require(status == false); vm.stopPrank(); } diff --git a/src/test/ExecutionLayerFeeDispatcher.t.sol b/src/test/ExecutionLayerFeeDispatcher.t.sol index aeba11a..6bdb9fd 100644 --- a/src/test/ExecutionLayerFeeDispatcher.t.sol +++ b/src/test/ExecutionLayerFeeDispatcher.t.sol @@ -92,7 +92,7 @@ contract ExecutionLayerFeeDispatcherTest { function testSendFundsWithCall() external { vm.deal(bob, 1 ether); vm.startPrank(bob); - (bool status, ) = address(eld).call{value: 1 ether}(""); + (bool status,) = address(eld).call{value: 1 ether}(""); require(status == false); vm.stopPrank(); } @@ -100,7 +100,7 @@ contract ExecutionLayerFeeDispatcherTest { function testFallbackError() external { vm.deal(bob, 1 ether); vm.startPrank(bob); - (bool status, ) = address(eld).call{value: 1 ether}(abi.encodeWithSignature("thisMethodIsNotAvailable()")); + (bool status,) = address(eld).call{value: 1 ether}(abi.encodeWithSignature("thisMethodIsNotAvailable()")); require(status == false); vm.stopPrank(); } @@ -146,13 +146,8 @@ contract ExecutionLayerFeeDispatcherTest { assert(address(0).balance == 0); vm.expectEmit(true, true, true, true); emit Withdrawal( - address(0), - operator, - bytes32(keccak256(bytes("another public key"))), - 0.9 ether, - 0.02 ether, - 0.08 ether - ); + address(0), operator, bytes32(keccak256(bytes("another public key"))), 0.9 ether, 0.02 ether, 0.08 ether + ); eld.dispatch{value: 1 ether}(bytes32(keccak256(bytes("another public key")))); assert(bob.balance == 0); assert(operator.balance == 0.02 ether); diff --git a/src/test/FeeRecipient.t.sol b/src/test/FeeRecipient.t.sol index fbc6086..f496dc8 100644 --- a/src/test/FeeRecipient.t.sol +++ b/src/test/FeeRecipient.t.sol @@ -78,7 +78,7 @@ contract FeeRecipientTest { address receiver = uint256(_publicKeyRoot) % 2 == 0 ? bob : alice; vm.deal(address(this), _amount); - (bool status, ) = address(feeRecipient).call{value: _amount}(""); + (bool status,) = address(feeRecipient).call{value: _amount}(""); assert(status == true); assert(receiver.balance == 0); @@ -93,7 +93,7 @@ contract FeeRecipientTest { address receiver = uint256(_publicKeyRoot) % 2 == 0 ? bob : alice; vm.deal(address(this), _amount); - (bool status, ) = address(feeRecipient).call{value: _amount}(abi.encodeWithSignature("pay()")); + (bool status,) = address(feeRecipient).call{value: _amount}(abi.encodeWithSignature("pay()")); assert(status == true); assert(receiver.balance == 0); diff --git a/src/test/StakingContract.t.sol b/src/test/StakingContract.t.sol index 68224c3..b780ba6 100644 --- a/src/test/StakingContract.t.sol +++ b/src/test/StakingContract.t.sol @@ -33,19 +33,17 @@ contract DepositContractMock is IDepositContract { ret[7] = bytesValue[0]; } - function deposit( - bytes calldata pubkey, - bytes calldata withdrawalCredentials, - bytes calldata signature, - bytes32 - ) external payable { + function deposit(bytes calldata pubkey, bytes calldata withdrawalCredentials, bytes calldata signature, bytes32) + external + payable + { emit DepositEvent( pubkey, withdrawalCredentials, to_little_endian_64(uint64(msg.value / 1 gwei)), signature, to_little_endian_64(uint64(counter)) - ); + ); counter += 1; } } @@ -91,7 +89,6 @@ contract StakingContractTest is DSTestPlus { lastMeasure = gasDelta; } - function testLoopedDeposit() external { for (uint256 idx = 0; idx < 250; ++idx) { vm.startPrank(operatorOne); @@ -107,6 +104,7 @@ contract StakingContractTest is DSTestPlus { vm.stopPrank(); } } + function genBytes(uint256 len) internal returns (bytes memory) { bytes memory res = ""; while (res.length < len) { @@ -129,14 +127,7 @@ contract StakingContractTest is DSTestPlus { stakingContract = new StakingContract(); depositContract = new DepositContractMock(); stakingContract.initialize_1( - admin, - address(treasury), - address(depositContract), - address(0), - address(0), - address(0), - 1000, - 2000 + admin, address(treasury), address(depositContract), address(0), address(0), address(0), 1000, 2000 ); vm.startPrank(admin); @@ -145,11 +136,11 @@ contract StakingContractTest is DSTestPlus { vm.stopPrank(); { - bytes - memory publicKeys = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759b0ce3fa164aae897adca509ed44429e7b1f91b7c46ddbe199cee848e09b1ccbb9736b78b68aacff1011b7266fe11e06014451b3fb9288549aff6dea9843b43e0c47a3b856f307732175230e254c0004e48b02414987088ac7003e148930017b49a1a8d4600f33d463c4afc07bbfc82703c9fcf81a5891f90a71c86a02faff443c6c3b2592bd44d5d3d7a93cb4aaaa105612496d61e68140a5418b468f872bf2f3e79f9cb0d9c3e889663fca02939b31e8ee3092203ee1417128e965c6406a07f68abf2ebe2689cf6c853ef126ffa8574c2a7d913e28de9147fa6b96706ea5bf9eacd1aba06edeaee155009fb912c00070774cc64136fcffde12ed731260bc5529df64da298f493561198e9d6acf42cf21e853ae7b2df85f27d2183149969d623b9237254c2cfe1d0082742eb042ac096d686dbe03c79ee31cbd03bb4682f8797043eed9f6e622814831ac5dfe1176552fb7f9b6ff38a149ae1d8414097a32fd96da6453c52fda13e3402a09e2fa6886daa4300f09c73e4bc2901b99c44744c5cfdca2994adc49ddccb195bda2510e50a4ae10de26cf96dee5e577689f51650a610a33da0a826ae47247d8d1189cb3386"; + bytes memory publicKeys = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759b0ce3fa164aae897adca509ed44429e7b1f91b7c46ddbe199cee848e09b1ccbb9736b78b68aacff1011b7266fe11e06014451b3fb9288549aff6dea9843b43e0c47a3b856f307732175230e254c0004e48b02414987088ac7003e148930017b49a1a8d4600f33d463c4afc07bbfc82703c9fcf81a5891f90a71c86a02faff443c6c3b2592bd44d5d3d7a93cb4aaaa105612496d61e68140a5418b468f872bf2f3e79f9cb0d9c3e889663fca02939b31e8ee3092203ee1417128e965c6406a07f68abf2ebe2689cf6c853ef126ffa8574c2a7d913e28de9147fa6b96706ea5bf9eacd1aba06edeaee155009fb912c00070774cc64136fcffde12ed731260bc5529df64da298f493561198e9d6acf42cf21e853ae7b2df85f27d2183149969d623b9237254c2cfe1d0082742eb042ac096d686dbe03c79ee31cbd03bb4682f8797043eed9f6e622814831ac5dfe1176552fb7f9b6ff38a149ae1d8414097a32fd96da6453c52fda13e3402a09e2fa6886daa4300f09c73e4bc2901b99c44744c5cfdca2994adc49ddccb195bda2510e50a4ae10de26cf96dee5e577689f51650a610a33da0a826ae47247d8d1189cb3386"; - bytes - memory signatures = hex"ccb81f4485957f440bc17dbe760f374cbb112c6f12fa10e8709fac4522b30440d918c7bb867fa04f6b3cfbd977455f8f2fde586fdf3d7baa429e98e497ff871f3b8db1528b2b964fa24d26e377c74746496cc719c50dbf391fb3f74f5ca4b93a02a9f0007cd7b7d2af2d1b07c8600ab86a5d27dc51a29c2e3007c7a69cb73bcaecc764641e02370955dba100428d259d6475ee3566872bd43b0e73e55b9669e50f2b1666e57b326a5dfad655c7921e0dfb421b1ec59c8fdb48eb77421fd06966f393d619cbf13ff427df11dcb17026df25f35268de5b168e359c16f2a3d5fbc6376db44638d773c851c875f21222448433d285920e8bdc4f5cbff130d7387c0a9589324286aea398e5aacad3bbfe3992dfce62571f0e282ed9c29e3fa5b07aa5c81749589b1170d3b85a84331e2f6b8e26eadebfd569b225759f40bbd12d6c3d253ed3f379b014b2ea44cce54d362072e2d020ff139a903b7d87fc3fddc2e6657c83e0b79851c22c6e0e477463463c97d6cc0e2e2de5e35b227bddb285521be3766358abaf3159d89f68c9770e28278f177088cfc4089b817effaaecabdffa4e66427868b105cb9348ea2d84eeea059a5d1ff3277d6f9cf656fc973d07cabed70fb8f8eb2798a65d207a8e1f8a26910949db9fa62d62bc15ecc097a93a27a1873405b8589a4ddf0ecf0303c6031484562b32eb7881975026524d6d4a9de6cd73fe2c324501586b9b6fa6bce950bbd21472278302f83dbfd6be036f2fc36d299d66578e844be3d6aa8314fab468f038fd6e130ada0a886fccfb2fd843f7dd07e8968401bbe2af7345fce52ba4b310b30af2d54b15669d06c206682c1730ab6b17787e361f04401f78dc5cbd5fac955df4e83c24cdabfabdb3f4ea40961d04a5ca166c17694fca144025b47131a68ddb230d36fe6e831e82624c9a925d706bff86982852b26ebf019a3f6ee36aedbbc6bec2d50531a233e09225493d3c5fd48379aec373baf622fb9feed6261e5296e5ae6601e7523c7f386801ed63a344b07106a0d03e5848209db5e114c0e67884916a43a1bfb77d9b8ea113c3ba8cad4b006aafeadcc31e70e85c5efecaf807154d011c1413340d4b592d2f270fb48b2050e08493c1427ddfac8dcc27fe434d32a35dcbddbcb1c4e22ead6734a4ac910f6768bc9ff6b355c1151695e41121cdcc9d9d3b18cf4d66ca3c1db0527c471a0dcf256590602a7269dcb26175e7eb370bd9794ac8ab558bea69e6a92d8e818b675a80e2df0516b8307291d93cb85d959ac60d47b46455a7ab0a38687c747c6d2d9e8c20ccf74dc6cdf145ec06805d4ac24a39aec2f5cd6e26e63e3d043a31c42411e4"; + bytes memory signatures = + hex"ccb81f4485957f440bc17dbe760f374cbb112c6f12fa10e8709fac4522b30440d918c7bb867fa04f6b3cfbd977455f8f2fde586fdf3d7baa429e98e497ff871f3b8db1528b2b964fa24d26e377c74746496cc719c50dbf391fb3f74f5ca4b93a02a9f0007cd7b7d2af2d1b07c8600ab86a5d27dc51a29c2e3007c7a69cb73bcaecc764641e02370955dba100428d259d6475ee3566872bd43b0e73e55b9669e50f2b1666e57b326a5dfad655c7921e0dfb421b1ec59c8fdb48eb77421fd06966f393d619cbf13ff427df11dcb17026df25f35268de5b168e359c16f2a3d5fbc6376db44638d773c851c875f21222448433d285920e8bdc4f5cbff130d7387c0a9589324286aea398e5aacad3bbfe3992dfce62571f0e282ed9c29e3fa5b07aa5c81749589b1170d3b85a84331e2f6b8e26eadebfd569b225759f40bbd12d6c3d253ed3f379b014b2ea44cce54d362072e2d020ff139a903b7d87fc3fddc2e6657c83e0b79851c22c6e0e477463463c97d6cc0e2e2de5e35b227bddb285521be3766358abaf3159d89f68c9770e28278f177088cfc4089b817effaaecabdffa4e66427868b105cb9348ea2d84eeea059a5d1ff3277d6f9cf656fc973d07cabed70fb8f8eb2798a65d207a8e1f8a26910949db9fa62d62bc15ecc097a93a27a1873405b8589a4ddf0ecf0303c6031484562b32eb7881975026524d6d4a9de6cd73fe2c324501586b9b6fa6bce950bbd21472278302f83dbfd6be036f2fc36d299d66578e844be3d6aa8314fab468f038fd6e130ada0a886fccfb2fd843f7dd07e8968401bbe2af7345fce52ba4b310b30af2d54b15669d06c206682c1730ab6b17787e361f04401f78dc5cbd5fac955df4e83c24cdabfabdb3f4ea40961d04a5ca166c17694fca144025b47131a68ddb230d36fe6e831e82624c9a925d706bff86982852b26ebf019a3f6ee36aedbbc6bec2d50531a233e09225493d3c5fd48379aec373baf622fb9feed6261e5296e5ae6601e7523c7f386801ed63a344b07106a0d03e5848209db5e114c0e67884916a43a1bfb77d9b8ea113c3ba8cad4b006aafeadcc31e70e85c5efecaf807154d011c1413340d4b592d2f270fb48b2050e08493c1427ddfac8dcc27fe434d32a35dcbddbcb1c4e22ead6734a4ac910f6768bc9ff6b355c1151695e41121cdcc9d9d3b18cf4d66ca3c1db0527c471a0dcf256590602a7269dcb26175e7eb370bd9794ac8ab558bea69e6a92d8e818b675a80e2df0516b8307291d93cb85d959ac60d47b46455a7ab0a38687c747c6d2d9e8c20ccf74dc6cdf145ec06805d4ac24a39aec2f5cd6e26e63e3d043a31c42411e4"; vm.startPrank(operatorOne); stakingContract.addValidators(0, 10, publicKeys, signatures); @@ -157,10 +148,10 @@ contract StakingContractTest is DSTestPlus { } { - bytes - memory publicKeys = hex"24046f7be8644e2b872363d5a4d58836deeb2deab6996a7e57f8c7583872786d1b81e378c4188ec3094236a31e31bd83c89e108b2d2e26e9dba2cc7a4f898c5f4b62d43f8e76c7cf64d02aab46afc436d7759d2b2e4d4aca97687b0022bec98307d1b050eafad3ba0fdf22cf645936ebd9e3c1ae913badc7307e02c38d778b10259b571237cc826a030b44a4fd53da790a84e6578890a7c801bbc2212bfccfecf88da5203e96c29b404fd9a61400f808e11a10fe39c9d97de43ad20867b3f5a71cc86d46d1058ab033c63c2369774cabe009231a85836abe39f9f5b41158a2505305d6e500cd64eb8e479e59c72945b9aaa177fd4a99d36dac27400609e098b8ce8638dc0ae641043107e47ccc495bdf7f40811e1c67103605241ea329ebd34e85d3184f79fe2b4642007709c2f4912853d72e0399930a62c915e50d4e1a1bd0fa26f021f37f519b86e168a181604c9c4b9af621932f09601bd9d5d0a9ee349076765d1baea4eef0fc16d4ebc861569ec37857c1d654ca442d2b0c85e97c5d56289a42afa5040cb1901bd03faf7011780599ed2cf826b8a2dd9deece7d9ecd7d7be2751bb42645f0253732447092311597a0f7672268125a95464c541e7fb1e3e08151f038adec85a60db0a9a9430ca80ffdbabe557aa2e0f69e6aed98527c91"; - bytes - memory signatures = hex"57412124b1730be9e30a395b5e7af34e7cecd16b8cc3a5b255f7b5e5cd92a3aa328401d07268d0ffaed8867d8a6288e569c547506b3f124f45f37d17bf0ec9c55917db458ba9cf8d498b0572b253435991f57f4e496763bbbbc3d92bd50c7f05304112ec1a45d0a8e5b3aa309dc4377ee8beb9d79b08f6bd60d0696b29acff9539cb836f2f00bbf888cfd28e4cfa4f317d6c3babdc0e121247789137eae3553de0c67ccbe2a5135f8f70dc5a79023544da8d608c825ef06ec32d315b4b026dd8f7f667af7368efead94f6f38418b1527a7c4500424410b8b09c580e89bc8cfba27eed8cea56311b9446313de80bb24f09072ee0ef5ceb504d7bdefed1e3fa5a8aee876b44302f7ff1b8a039033c3ed370a7b02a0cc23a5b7b4d7499649e6ee3f37d51fcbde910f6d10c1512eaf8924a8c7f150d280efb293e719ff07357c01482b1b6cc75a3d0118bdc058cccf67fbcbaad1423f2940d0191bb1d8257a2d827e74a3963ccbd316081105be05e8471d8fa466b4935c0dce7cb6bcb36dd1ef2a156841be9793a00a3aefb8e55ef91f6f17ba49cb9025dc441fd381ad5194de34d9032df1f26930537f0fcd509638403c3ce8df19f2106904cfd82e92627283fdc8ac5165848dabbf1b1566302ddeb72f70a17bb1520b8cc3b41c007e3bf334af34e900ef5fc0b3fb8642f7bd0b109c7cfd204c7e0039c10d1592ec02e8af9ea9653df70fed29d30c2784e3ff187caabb0a588db0fd2bb77565909cd5f5895a56d32510fb90735d5f1ca1dd4b9bbf7ce3e8d3745a879093e90d883875b865a69d7b79b2bf4cf42cedf084447c95e31d11c41adff8a9939550c87996d7f4002c9064bb2e6e675310caf556a7e44f07e92704c7589c2e335cbd4dc3fde2bfd7d79ad050bee3066e5aed5e97c445e0c54c9f5c5febbc5182aeaad91acc0e9b58bfed9049a2ccc09bf4b2534220f24c8c387306a498fffe66d3cd50c34296fb456fe2656999893ed1ac5ed8eb1845455412833e9abec7274714ccbef2c20172df5fdde1e1bb142c5987c8aec208fb11b383cf4b1c3851d8ef27561176605487b5c83923fa731e94ee6ec59fe8307df91c2552a1e318933f32c9b2f27896f932c69b9dc0c8860e78663a5be9480be01b19bc9f56b955e442af493f0d267d4ed8e466eaa345af4e476beade96d6460a4e701c1604f190eafc6c42ed751943cb7393b7bb871c9849f056bddf731fb1eed5b8f030330d245834834994f49d1ecb6eac952e02baa1298f482b622caaa4b6479afd6729cfc2c14ab571e4d32973016cded551becd595af5bcb1cf53db1b55ca1b580da6564f065ac8c8c1709ccdc30003125d54"; + bytes memory publicKeys = + hex"24046f7be8644e2b872363d5a4d58836deeb2deab6996a7e57f8c7583872786d1b81e378c4188ec3094236a31e31bd83c89e108b2d2e26e9dba2cc7a4f898c5f4b62d43f8e76c7cf64d02aab46afc436d7759d2b2e4d4aca97687b0022bec98307d1b050eafad3ba0fdf22cf645936ebd9e3c1ae913badc7307e02c38d778b10259b571237cc826a030b44a4fd53da790a84e6578890a7c801bbc2212bfccfecf88da5203e96c29b404fd9a61400f808e11a10fe39c9d97de43ad20867b3f5a71cc86d46d1058ab033c63c2369774cabe009231a85836abe39f9f5b41158a2505305d6e500cd64eb8e479e59c72945b9aaa177fd4a99d36dac27400609e098b8ce8638dc0ae641043107e47ccc495bdf7f40811e1c67103605241ea329ebd34e85d3184f79fe2b4642007709c2f4912853d72e0399930a62c915e50d4e1a1bd0fa26f021f37f519b86e168a181604c9c4b9af621932f09601bd9d5d0a9ee349076765d1baea4eef0fc16d4ebc861569ec37857c1d654ca442d2b0c85e97c5d56289a42afa5040cb1901bd03faf7011780599ed2cf826b8a2dd9deece7d9ecd7d7be2751bb42645f0253732447092311597a0f7672268125a95464c541e7fb1e3e08151f038adec85a60db0a9a9430ca80ffdbabe557aa2e0f69e6aed98527c91"; + bytes memory signatures = + hex"57412124b1730be9e30a395b5e7af34e7cecd16b8cc3a5b255f7b5e5cd92a3aa328401d07268d0ffaed8867d8a6288e569c547506b3f124f45f37d17bf0ec9c55917db458ba9cf8d498b0572b253435991f57f4e496763bbbbc3d92bd50c7f05304112ec1a45d0a8e5b3aa309dc4377ee8beb9d79b08f6bd60d0696b29acff9539cb836f2f00bbf888cfd28e4cfa4f317d6c3babdc0e121247789137eae3553de0c67ccbe2a5135f8f70dc5a79023544da8d608c825ef06ec32d315b4b026dd8f7f667af7368efead94f6f38418b1527a7c4500424410b8b09c580e89bc8cfba27eed8cea56311b9446313de80bb24f09072ee0ef5ceb504d7bdefed1e3fa5a8aee876b44302f7ff1b8a039033c3ed370a7b02a0cc23a5b7b4d7499649e6ee3f37d51fcbde910f6d10c1512eaf8924a8c7f150d280efb293e719ff07357c01482b1b6cc75a3d0118bdc058cccf67fbcbaad1423f2940d0191bb1d8257a2d827e74a3963ccbd316081105be05e8471d8fa466b4935c0dce7cb6bcb36dd1ef2a156841be9793a00a3aefb8e55ef91f6f17ba49cb9025dc441fd381ad5194de34d9032df1f26930537f0fcd509638403c3ce8df19f2106904cfd82e92627283fdc8ac5165848dabbf1b1566302ddeb72f70a17bb1520b8cc3b41c007e3bf334af34e900ef5fc0b3fb8642f7bd0b109c7cfd204c7e0039c10d1592ec02e8af9ea9653df70fed29d30c2784e3ff187caabb0a588db0fd2bb77565909cd5f5895a56d32510fb90735d5f1ca1dd4b9bbf7ce3e8d3745a879093e90d883875b865a69d7b79b2bf4cf42cedf084447c95e31d11c41adff8a9939550c87996d7f4002c9064bb2e6e675310caf556a7e44f07e92704c7589c2e335cbd4dc3fde2bfd7d79ad050bee3066e5aed5e97c445e0c54c9f5c5febbc5182aeaad91acc0e9b58bfed9049a2ccc09bf4b2534220f24c8c387306a498fffe66d3cd50c34296fb456fe2656999893ed1ac5ed8eb1845455412833e9abec7274714ccbef2c20172df5fdde1e1bb142c5987c8aec208fb11b383cf4b1c3851d8ef27561176605487b5c83923fa731e94ee6ec59fe8307df91c2552a1e318933f32c9b2f27896f932c69b9dc0c8860e78663a5be9480be01b19bc9f56b955e442af493f0d267d4ed8e466eaa345af4e476beade96d6460a4e701c1604f190eafc6c42ed751943cb7393b7bb871c9849f056bddf731fb1eed5b8f030330d245834834994f49d1ecb6eac952e02baa1298f482b622caaa4b6479afd6729cfc2c14ab571e4d32973016cded551becd595af5bcb1cf53db1b55ca1b580da6564f065ac8c8c1709ccdc30003125d54"; vm.startPrank(operatorTwo); stakingContract.addValidators(1, 10, publicKeys, signatures); @@ -206,14 +197,7 @@ contract StakingContractTest is DSTestPlus { function testReinitialization() public { vm.expectRevert(abi.encodeWithSignature("AlreadyInitialized()")); stakingContract.initialize_1( - admin, - address(treasury), - address(depositContract), - address(0), - address(0), - address(0), - 1000, - 2000 + admin, address(treasury), address(depositContract), address(0), address(0), address(0), 1000, 2000 ); } @@ -256,8 +240,8 @@ contract StakingContractTest is DSTestPlus { assertEq(available, 10); assert(deactivated == false); - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(1); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(1); assertEq(operatorAddress, operatorTwo); assertEq(feeRecipientAddress, feeRecipientTwo); assertEq(limit, 10); @@ -374,16 +358,13 @@ contract StakingContractTest is DSTestPlus { operatorIndex = stakingContract.addOperator(newOperator, newOperatorFeeRecipient); vm.stopPrank(); - (, , uint256 limit, , , , ) = stakingContract.getOperator(operatorIndex); + (,, uint256 limit,,,,) = stakingContract.getOperator(operatorIndex); assertEq(limit, 0); if (_limit > 0) { vm.startPrank(newOperator); stakingContract.addValidators( - operatorIndex, - _limit, - genBytes(48 * uint256(_limit)), - genBytes(96 * uint256(_limit)) + operatorIndex, _limit, genBytes(48 * uint256(_limit)), genBytes(96 * uint256(_limit)) ); vm.stopPrank(); } @@ -394,7 +375,7 @@ contract StakingContractTest is DSTestPlus { stakingContract.setOperatorLimit(operatorIndex, _limit); vm.stopPrank(); - (, , limit, , , , ) = stakingContract.getOperator(operatorIndex); + (,, limit,,,,) = stakingContract.getOperator(operatorIndex); assertEq(limit, _limit); } @@ -420,16 +401,13 @@ contract StakingContractTest is DSTestPlus { operatorIndex = stakingContract.addOperator(newOperator, newOperatorFeeRecipient); vm.stopPrank(); - (, , uint256 limit, , , , ) = stakingContract.getOperator(operatorIndex); + (,, uint256 limit,,,,) = stakingContract.getOperator(operatorIndex); assertEq(limit, 0); if (_limit > 0) { vm.startPrank(newOperator); stakingContract.addValidators( - operatorIndex, - _limit, - genBytes(48 * uint256(_limit)), - genBytes(96 * uint256(_limit)) + operatorIndex, _limit, genBytes(48 * uint256(_limit)), genBytes(96 * uint256(_limit)) ); vm.stopPrank(); } @@ -442,10 +420,10 @@ contract StakingContractTest is DSTestPlus { } function testAddValidatorsOperatorOne() public { - bytes - memory publicKeys = hex"0c74b6d3d877bbb2083f1bcc83b302f3ed533eaf3cd39cff97daf2c7b9b776168481aa7b51778df673a37049886f25b07f03dbc79d85fa9d41f9eefa8e598353b652aadf497673744527c73127f872b91cf31ec8041dae1b3a4238683cf442ea23a95fe68b400ab42b14e8c99280a057d1d840e80723c3622b38e6acd1f471bf247cf62312c9b863a75ac0d270cefa4f84fd8586dbda15c67c1a46e85cf56c60550f54cb082770baf3d2bbf4c33f5254bd0b93e017f3ed036b13baec41bb69085f9eff48651be38c8f9e1f67b643f84ec356864aaa057f0042b121b9d040ed9be3f5cc9cc659d8f8fc02575ed3c25708adac2c8d0c50ab7e4599ce9edf300d98e1cfcfc8e0022a24c712f0769de99a3389bac1cdca92ae20fba323142fe2e8d09ef2cb59c3f822779b3fe6410cddce7255d35db01093cc435c0a35bbb4cd8d4eb3bd2cc597c49a7a909c16f67fe8b6702d5d0c22ad189b1c45325190015b0017606f768c7aa2006cc19dfeb5f367eae9dd17a5c307705db1f5cec552fc038e5fa3a76352d9621a4d74b1fd7e1707c7bfb5e912e2b5a33a2f34a419055d0c4065aa787f743aff953d73441e96ffc9b0f5a3248c23398518a758aec8451b626bff7eed063a3b11bf661d10ad6dac5ee62f47be125e3c668e14b3c704d736b4fb1e"; - bytes - memory signatures = hex"fe41ffbe702fb08d01063c9cd99fac11a16e921c784e681e365db00c4bd6760df67cfc0d0555a8ee8bf534a2c0987b7949b18dba726ced579240fa063274bc7ab25e44b758c452c433debfebbc075cbe105f07502402a9591dc891640a9f2b34fe0863bf987ff4b5a601b0ffcecc185f04847e0b97d3fb9457c32efb9c3ce35520308cfcc8ca78d5d4da164f6d1575d32fe466b8076bc4056ad97fa3e3607a60e5e420bdec413e5ffcc3119b1b89a957b14a437e009a858c4c40c0f1fc7f3d1ad83bc96ada6c2c772260637774e5fbdc60791db6de3a31e136c28106b35c21932a8ed610306f0723675730e31d3deceff4f912e6070c9efcd6e3f0c9ad4a0e203f437f21679b87d46351714b5a1b6226f8ffadd19e18f85c918461ab67291e1c8cdfdc05280adf2b923f1269cf7de8bd351a7ede13524e836cbfc7ba22db91aaa5c9a0729a469985f5bd844347ba9a9b4019f4ad42c2025457cf48557494ac3ce6e311a1ded3e903cd3009d18133015d445d02a3ce3858781b582d28701a311ddb271f8a0c91c65b32cc13c512c35e5be9bb9dc556dfd3249a3733f58426718974820f17b3242a089e29b129fcea37c8b84996e2c725b59efccee24068625584e583700346f823ce92e11ac9db5964ca6300905c5e9f294330037ec1cb7d9b8fc28829b98fcc0fc405afcd54f43cb4a14e8cab3f5aa979fe2c3492fe295e1a50170e8857bd94e5b009bcec9626e6eb137b272882037202da7329dadcb5b99bbd7835b8875d696dab41774dcb559bfb4c79a5337efc5f1606bc7c2752389a49b6a578f0c7c58e2bf9efc55eef19beaf3de94da90c712ca3891ac71a6ff6d778a1c0c31f77fdde2c4b7f29adf8ccf000050e9e4829d2de36fda8d6b26020e6f0ece339e9ad96c01b166301238e1aaa30ddfb978968361a5f9d3fcaa381973c967c0dd88c6d54d00fa375ab4df3be57c4360b69d7634e95e4d4201da8f2348d0ce53be690146f0049d5d173a635d21406b10ed23ec9996bd0a43b812df363986fb8dedf5be1cdb3f85a5090460511af617507d24657e3733310b42e1406070a0316620037da35c5227bb85d3aacf3aebf750265838994e03a8770cdc1c31723ca1037232c32d21f31eee561575b18b1b4c0f027f270898aed60ab4bfe41160cd989cd5bdfeb795097ff01cd0ff41fea96311e92798c0a619aa957772cfd408747fc30dcb39210839a4c70b87d3ad881207fa5eee926bc2c6936ce10b382c7a37606d40bb1cf2637768255aae4a4cd18ed7004e3046520bea92c66a7074e4b46d3d566703e44d0c3f9ef49a2ff30632fe3f6a409178db66423809514cd7473f83d0c"; + bytes memory publicKeys = + hex"0c74b6d3d877bbb2083f1bcc83b302f3ed533eaf3cd39cff97daf2c7b9b776168481aa7b51778df673a37049886f25b07f03dbc79d85fa9d41f9eefa8e598353b652aadf497673744527c73127f872b91cf31ec8041dae1b3a4238683cf442ea23a95fe68b400ab42b14e8c99280a057d1d840e80723c3622b38e6acd1f471bf247cf62312c9b863a75ac0d270cefa4f84fd8586dbda15c67c1a46e85cf56c60550f54cb082770baf3d2bbf4c33f5254bd0b93e017f3ed036b13baec41bb69085f9eff48651be38c8f9e1f67b643f84ec356864aaa057f0042b121b9d040ed9be3f5cc9cc659d8f8fc02575ed3c25708adac2c8d0c50ab7e4599ce9edf300d98e1cfcfc8e0022a24c712f0769de99a3389bac1cdca92ae20fba323142fe2e8d09ef2cb59c3f822779b3fe6410cddce7255d35db01093cc435c0a35bbb4cd8d4eb3bd2cc597c49a7a909c16f67fe8b6702d5d0c22ad189b1c45325190015b0017606f768c7aa2006cc19dfeb5f367eae9dd17a5c307705db1f5cec552fc038e5fa3a76352d9621a4d74b1fd7e1707c7bfb5e912e2b5a33a2f34a419055d0c4065aa787f743aff953d73441e96ffc9b0f5a3248c23398518a758aec8451b626bff7eed063a3b11bf661d10ad6dac5ee62f47be125e3c668e14b3c704d736b4fb1e"; + bytes memory signatures = + hex"fe41ffbe702fb08d01063c9cd99fac11a16e921c784e681e365db00c4bd6760df67cfc0d0555a8ee8bf534a2c0987b7949b18dba726ced579240fa063274bc7ab25e44b758c452c433debfebbc075cbe105f07502402a9591dc891640a9f2b34fe0863bf987ff4b5a601b0ffcecc185f04847e0b97d3fb9457c32efb9c3ce35520308cfcc8ca78d5d4da164f6d1575d32fe466b8076bc4056ad97fa3e3607a60e5e420bdec413e5ffcc3119b1b89a957b14a437e009a858c4c40c0f1fc7f3d1ad83bc96ada6c2c772260637774e5fbdc60791db6de3a31e136c28106b35c21932a8ed610306f0723675730e31d3deceff4f912e6070c9efcd6e3f0c9ad4a0e203f437f21679b87d46351714b5a1b6226f8ffadd19e18f85c918461ab67291e1c8cdfdc05280adf2b923f1269cf7de8bd351a7ede13524e836cbfc7ba22db91aaa5c9a0729a469985f5bd844347ba9a9b4019f4ad42c2025457cf48557494ac3ce6e311a1ded3e903cd3009d18133015d445d02a3ce3858781b582d28701a311ddb271f8a0c91c65b32cc13c512c35e5be9bb9dc556dfd3249a3733f58426718974820f17b3242a089e29b129fcea37c8b84996e2c725b59efccee24068625584e583700346f823ce92e11ac9db5964ca6300905c5e9f294330037ec1cb7d9b8fc28829b98fcc0fc405afcd54f43cb4a14e8cab3f5aa979fe2c3492fe295e1a50170e8857bd94e5b009bcec9626e6eb137b272882037202da7329dadcb5b99bbd7835b8875d696dab41774dcb559bfb4c79a5337efc5f1606bc7c2752389a49b6a578f0c7c58e2bf9efc55eef19beaf3de94da90c712ca3891ac71a6ff6d778a1c0c31f77fdde2c4b7f29adf8ccf000050e9e4829d2de36fda8d6b26020e6f0ece339e9ad96c01b166301238e1aaa30ddfb978968361a5f9d3fcaa381973c967c0dd88c6d54d00fa375ab4df3be57c4360b69d7634e95e4d4201da8f2348d0ce53be690146f0049d5d173a635d21406b10ed23ec9996bd0a43b812df363986fb8dedf5be1cdb3f85a5090460511af617507d24657e3733310b42e1406070a0316620037da35c5227bb85d3aacf3aebf750265838994e03a8770cdc1c31723ca1037232c32d21f31eee561575b18b1b4c0f027f270898aed60ab4bfe41160cd989cd5bdfeb795097ff01cd0ff41fea96311e92798c0a619aa957772cfd408747fc30dcb39210839a4c70b87d3ad881207fa5eee926bc2c6936ce10b382c7a37606d40bb1cf2637768255aae4a4cd18ed7004e3046520bea92c66a7074e4b46d3d566703e44d0c3f9ef49a2ff30632fe3f6a409178db66423809514cd7473f83d0c"; ( address operatorAddress, @@ -470,8 +448,8 @@ contract StakingContractTest is DSTestPlus { stakingContract.addValidators(0, 10, publicKeys, signatures); vm.stopPrank(); - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(0); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(0); assertEq(operatorAddress, operatorOne); assertEq(feeRecipientAddress, feeRecipientOne); assertEq(limit, 10); @@ -484,8 +462,8 @@ contract StakingContractTest is DSTestPlus { stakingContract.setOperatorLimit(0, 20); vm.stopPrank(); - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(0); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(0); assertEq(operatorAddress, operatorOne); assertEq(feeRecipientAddress, feeRecipientOne); @@ -500,10 +478,10 @@ contract StakingContractTest is DSTestPlus { event ActivatedOperator(uint256 _operatorIndex); function testAddValidatorsDeactivatedOperatorOne() public { - bytes - memory publicKeys = hex"0c74b6d3d877bbb2083f1bcc83b302f3ed533eaf3cd39cff97daf2c7b9b776168481aa7b51778df673a37049886f25b07f03dbc79d85fa9d41f9eefa8e598353b652aadf497673744527c73127f872b91cf31ec8041dae1b3a4238683cf442ea23a95fe68b400ab42b14e8c99280a057d1d840e80723c3622b38e6acd1f471bf247cf62312c9b863a75ac0d270cefa4f84fd8586dbda15c67c1a46e85cf56c60550f54cb082770baf3d2bbf4c33f5254bd0b93e017f3ed036b13baec41bb69085f9eff48651be38c8f9e1f67b643f84ec356864aaa057f0042b121b9d040ed9be3f5cc9cc659d8f8fc02575ed3c25708adac2c8d0c50ab7e4599ce9edf300d98e1cfcfc8e0022a24c712f0769de99a3389bac1cdca92ae20fba323142fe2e8d09ef2cb59c3f822779b3fe6410cddce7255d35db01093cc435c0a35bbb4cd8d4eb3bd2cc597c49a7a909c16f67fe8b6702d5d0c22ad189b1c45325190015b0017606f768c7aa2006cc19dfeb5f367eae9dd17a5c307705db1f5cec552fc038e5fa3a76352d9621a4d74b1fd7e1707c7bfb5e912e2b5a33a2f34a419055d0c4065aa787f743aff953d73441e96ffc9b0f5a3248c23398518a758aec8451b626bff7eed063a3b11bf661d10ad6dac5ee62f47be125e3c668e14b3c704d736b4fb1e"; - bytes - memory signatures = hex"fe41ffbe702fb08d01063c9cd99fac11a16e921c784e681e365db00c4bd6760df67cfc0d0555a8ee8bf534a2c0987b7949b18dba726ced579240fa063274bc7ab25e44b758c452c433debfebbc075cbe105f07502402a9591dc891640a9f2b34fe0863bf987ff4b5a601b0ffcecc185f04847e0b97d3fb9457c32efb9c3ce35520308cfcc8ca78d5d4da164f6d1575d32fe466b8076bc4056ad97fa3e3607a60e5e420bdec413e5ffcc3119b1b89a957b14a437e009a858c4c40c0f1fc7f3d1ad83bc96ada6c2c772260637774e5fbdc60791db6de3a31e136c28106b35c21932a8ed610306f0723675730e31d3deceff4f912e6070c9efcd6e3f0c9ad4a0e203f437f21679b87d46351714b5a1b6226f8ffadd19e18f85c918461ab67291e1c8cdfdc05280adf2b923f1269cf7de8bd351a7ede13524e836cbfc7ba22db91aaa5c9a0729a469985f5bd844347ba9a9b4019f4ad42c2025457cf48557494ac3ce6e311a1ded3e903cd3009d18133015d445d02a3ce3858781b582d28701a311ddb271f8a0c91c65b32cc13c512c35e5be9bb9dc556dfd3249a3733f58426718974820f17b3242a089e29b129fcea37c8b84996e2c725b59efccee24068625584e583700346f823ce92e11ac9db5964ca6300905c5e9f294330037ec1cb7d9b8fc28829b98fcc0fc405afcd54f43cb4a14e8cab3f5aa979fe2c3492fe295e1a50170e8857bd94e5b009bcec9626e6eb137b272882037202da7329dadcb5b99bbd7835b8875d696dab41774dcb559bfb4c79a5337efc5f1606bc7c2752389a49b6a578f0c7c58e2bf9efc55eef19beaf3de94da90c712ca3891ac71a6ff6d778a1c0c31f77fdde2c4b7f29adf8ccf000050e9e4829d2de36fda8d6b26020e6f0ece339e9ad96c01b166301238e1aaa30ddfb978968361a5f9d3fcaa381973c967c0dd88c6d54d00fa375ab4df3be57c4360b69d7634e95e4d4201da8f2348d0ce53be690146f0049d5d173a635d21406b10ed23ec9996bd0a43b812df363986fb8dedf5be1cdb3f85a5090460511af617507d24657e3733310b42e1406070a0316620037da35c5227bb85d3aacf3aebf750265838994e03a8770cdc1c31723ca1037232c32d21f31eee561575b18b1b4c0f027f270898aed60ab4bfe41160cd989cd5bdfeb795097ff01cd0ff41fea96311e92798c0a619aa957772cfd408747fc30dcb39210839a4c70b87d3ad881207fa5eee926bc2c6936ce10b382c7a37606d40bb1cf2637768255aae4a4cd18ed7004e3046520bea92c66a7074e4b46d3d566703e44d0c3f9ef49a2ff30632fe3f6a409178db66423809514cd7473f83d0c"; + bytes memory publicKeys = + hex"0c74b6d3d877bbb2083f1bcc83b302f3ed533eaf3cd39cff97daf2c7b9b776168481aa7b51778df673a37049886f25b07f03dbc79d85fa9d41f9eefa8e598353b652aadf497673744527c73127f872b91cf31ec8041dae1b3a4238683cf442ea23a95fe68b400ab42b14e8c99280a057d1d840e80723c3622b38e6acd1f471bf247cf62312c9b863a75ac0d270cefa4f84fd8586dbda15c67c1a46e85cf56c60550f54cb082770baf3d2bbf4c33f5254bd0b93e017f3ed036b13baec41bb69085f9eff48651be38c8f9e1f67b643f84ec356864aaa057f0042b121b9d040ed9be3f5cc9cc659d8f8fc02575ed3c25708adac2c8d0c50ab7e4599ce9edf300d98e1cfcfc8e0022a24c712f0769de99a3389bac1cdca92ae20fba323142fe2e8d09ef2cb59c3f822779b3fe6410cddce7255d35db01093cc435c0a35bbb4cd8d4eb3bd2cc597c49a7a909c16f67fe8b6702d5d0c22ad189b1c45325190015b0017606f768c7aa2006cc19dfeb5f367eae9dd17a5c307705db1f5cec552fc038e5fa3a76352d9621a4d74b1fd7e1707c7bfb5e912e2b5a33a2f34a419055d0c4065aa787f743aff953d73441e96ffc9b0f5a3248c23398518a758aec8451b626bff7eed063a3b11bf661d10ad6dac5ee62f47be125e3c668e14b3c704d736b4fb1e"; + bytes memory signatures = + hex"fe41ffbe702fb08d01063c9cd99fac11a16e921c784e681e365db00c4bd6760df67cfc0d0555a8ee8bf534a2c0987b7949b18dba726ced579240fa063274bc7ab25e44b758c452c433debfebbc075cbe105f07502402a9591dc891640a9f2b34fe0863bf987ff4b5a601b0ffcecc185f04847e0b97d3fb9457c32efb9c3ce35520308cfcc8ca78d5d4da164f6d1575d32fe466b8076bc4056ad97fa3e3607a60e5e420bdec413e5ffcc3119b1b89a957b14a437e009a858c4c40c0f1fc7f3d1ad83bc96ada6c2c772260637774e5fbdc60791db6de3a31e136c28106b35c21932a8ed610306f0723675730e31d3deceff4f912e6070c9efcd6e3f0c9ad4a0e203f437f21679b87d46351714b5a1b6226f8ffadd19e18f85c918461ab67291e1c8cdfdc05280adf2b923f1269cf7de8bd351a7ede13524e836cbfc7ba22db91aaa5c9a0729a469985f5bd844347ba9a9b4019f4ad42c2025457cf48557494ac3ce6e311a1ded3e903cd3009d18133015d445d02a3ce3858781b582d28701a311ddb271f8a0c91c65b32cc13c512c35e5be9bb9dc556dfd3249a3733f58426718974820f17b3242a089e29b129fcea37c8b84996e2c725b59efccee24068625584e583700346f823ce92e11ac9db5964ca6300905c5e9f294330037ec1cb7d9b8fc28829b98fcc0fc405afcd54f43cb4a14e8cab3f5aa979fe2c3492fe295e1a50170e8857bd94e5b009bcec9626e6eb137b272882037202da7329dadcb5b99bbd7835b8875d696dab41774dcb559bfb4c79a5337efc5f1606bc7c2752389a49b6a578f0c7c58e2bf9efc55eef19beaf3de94da90c712ca3891ac71a6ff6d778a1c0c31f77fdde2c4b7f29adf8ccf000050e9e4829d2de36fda8d6b26020e6f0ece339e9ad96c01b166301238e1aaa30ddfb978968361a5f9d3fcaa381973c967c0dd88c6d54d00fa375ab4df3be57c4360b69d7634e95e4d4201da8f2348d0ce53be690146f0049d5d173a635d21406b10ed23ec9996bd0a43b812df363986fb8dedf5be1cdb3f85a5090460511af617507d24657e3733310b42e1406070a0316620037da35c5227bb85d3aacf3aebf750265838994e03a8770cdc1c31723ca1037232c32d21f31eee561575b18b1b4c0f027f270898aed60ab4bfe41160cd989cd5bdfeb795097ff01cd0ff41fea96311e92798c0a619aa957772cfd408747fc30dcb39210839a4c70b87d3ad881207fa5eee926bc2c6936ce10b382c7a37606d40bb1cf2637768255aae4a4cd18ed7004e3046520bea92c66a7074e4b46d3d566703e44d0c3f9ef49a2ff30632fe3f6a409178db66423809514cd7473f83d0c"; ( address operatorAddress, @@ -576,10 +554,10 @@ contract StakingContractTest is DSTestPlus { } function testAddValidatorsOperatorOneDuplicateKeys() public { - bytes - memory publicKeys = hex"0c74b6d3d877bbb2083f1bcc83b302f3ed533eaf3cd39cff97daf2c7b9b776168481aa7b51778df673a37049886f25b07f03dbc79d85fa9d41f9eefa8e598353b652aadf497673744527c73127f872b91cf31ec8041dae1b3a4238683cf442ea23a95fe68b400ab42b14e8c99280a057d1d840e80723c3622b38e6acd1f471bf247cf62312c9b863a75ac0d270cefa4f84fd8586dbda15c67c1a46e85cf56c60550f54cb082770baf3d2bbf4c33f5254bd0b93e017f3ed036b13baec41bb69085f9eff48651be38c8f9e1f67b643f84ec356864aaa057f0042b121b9d040ed9be3f5cc9cc659d8f8fc02575ed3c25708adac2c8d0c50ab7e4599ce9edf300d98e1cfcfc8e0022a24c712f0769de99a3389bac1cdca92ae20fba323142fe2e8d09ef2cb59c3f822779b3fe6410cddce7255d35db01093cc435c0a35bbb4cd8d4eb3bd2cc597c49a7a909c16f67fe8b6702d5d0c22ad189b1c45325190015b0017606f768c7aa2006cc19dfeb5f367eae9dd17a5c307705db1f5cec552fc038e5fa3a76352d9621a4d74b1fd7e1707c7bfb5e912e2b5a33a2f34a419055d0c4065aa787f743aff953d73441e96ffc9b0f5a3248c23398518a758aec8451b626bff7eed063a3b11bf661d10ad6dac5ee62f47be125e3c668e14b3c704d736b4fb1e"; - bytes - memory signatures = hex"fe41ffbe702fb08d01063c9cd99fac11a16e921c784e681e365db00c4bd6760df67cfc0d0555a8ee8bf534a2c0987b7949b18dba726ced579240fa063274bc7ab25e44b758c452c433debfebbc075cbe105f07502402a9591dc891640a9f2b34fe0863bf987ff4b5a601b0ffcecc185f04847e0b97d3fb9457c32efb9c3ce35520308cfcc8ca78d5d4da164f6d1575d32fe466b8076bc4056ad97fa3e3607a60e5e420bdec413e5ffcc3119b1b89a957b14a437e009a858c4c40c0f1fc7f3d1ad83bc96ada6c2c772260637774e5fbdc60791db6de3a31e136c28106b35c21932a8ed610306f0723675730e31d3deceff4f912e6070c9efcd6e3f0c9ad4a0e203f437f21679b87d46351714b5a1b6226f8ffadd19e18f85c918461ab67291e1c8cdfdc05280adf2b923f1269cf7de8bd351a7ede13524e836cbfc7ba22db91aaa5c9a0729a469985f5bd844347ba9a9b4019f4ad42c2025457cf48557494ac3ce6e311a1ded3e903cd3009d18133015d445d02a3ce3858781b582d28701a311ddb271f8a0c91c65b32cc13c512c35e5be9bb9dc556dfd3249a3733f58426718974820f17b3242a089e29b129fcea37c8b84996e2c725b59efccee24068625584e583700346f823ce92e11ac9db5964ca6300905c5e9f294330037ec1cb7d9b8fc28829b98fcc0fc405afcd54f43cb4a14e8cab3f5aa979fe2c3492fe295e1a50170e8857bd94e5b009bcec9626e6eb137b272882037202da7329dadcb5b99bbd7835b8875d696dab41774dcb559bfb4c79a5337efc5f1606bc7c2752389a49b6a578f0c7c58e2bf9efc55eef19beaf3de94da90c712ca3891ac71a6ff6d778a1c0c31f77fdde2c4b7f29adf8ccf000050e9e4829d2de36fda8d6b26020e6f0ece339e9ad96c01b166301238e1aaa30ddfb978968361a5f9d3fcaa381973c967c0dd88c6d54d00fa375ab4df3be57c4360b69d7634e95e4d4201da8f2348d0ce53be690146f0049d5d173a635d21406b10ed23ec9996bd0a43b812df363986fb8dedf5be1cdb3f85a5090460511af617507d24657e3733310b42e1406070a0316620037da35c5227bb85d3aacf3aebf750265838994e03a8770cdc1c31723ca1037232c32d21f31eee561575b18b1b4c0f027f270898aed60ab4bfe41160cd989cd5bdfeb795097ff01cd0ff41fea96311e92798c0a619aa957772cfd408747fc30dcb39210839a4c70b87d3ad881207fa5eee926bc2c6936ce10b382c7a37606d40bb1cf2637768255aae4a4cd18ed7004e3046520bea92c66a7074e4b46d3d566703e44d0c3f9ef49a2ff30632fe3f6a409178db66423809514cd7473f83d0c"; + bytes memory publicKeys = + hex"0c74b6d3d877bbb2083f1bcc83b302f3ed533eaf3cd39cff97daf2c7b9b776168481aa7b51778df673a37049886f25b07f03dbc79d85fa9d41f9eefa8e598353b652aadf497673744527c73127f872b91cf31ec8041dae1b3a4238683cf442ea23a95fe68b400ab42b14e8c99280a057d1d840e80723c3622b38e6acd1f471bf247cf62312c9b863a75ac0d270cefa4f84fd8586dbda15c67c1a46e85cf56c60550f54cb082770baf3d2bbf4c33f5254bd0b93e017f3ed036b13baec41bb69085f9eff48651be38c8f9e1f67b643f84ec356864aaa057f0042b121b9d040ed9be3f5cc9cc659d8f8fc02575ed3c25708adac2c8d0c50ab7e4599ce9edf300d98e1cfcfc8e0022a24c712f0769de99a3389bac1cdca92ae20fba323142fe2e8d09ef2cb59c3f822779b3fe6410cddce7255d35db01093cc435c0a35bbb4cd8d4eb3bd2cc597c49a7a909c16f67fe8b6702d5d0c22ad189b1c45325190015b0017606f768c7aa2006cc19dfeb5f367eae9dd17a5c307705db1f5cec552fc038e5fa3a76352d9621a4d74b1fd7e1707c7bfb5e912e2b5a33a2f34a419055d0c4065aa787f743aff953d73441e96ffc9b0f5a3248c23398518a758aec8451b626bff7eed063a3b11bf661d10ad6dac5ee62f47be125e3c668e14b3c704d736b4fb1e"; + bytes memory signatures = + hex"fe41ffbe702fb08d01063c9cd99fac11a16e921c784e681e365db00c4bd6760df67cfc0d0555a8ee8bf534a2c0987b7949b18dba726ced579240fa063274bc7ab25e44b758c452c433debfebbc075cbe105f07502402a9591dc891640a9f2b34fe0863bf987ff4b5a601b0ffcecc185f04847e0b97d3fb9457c32efb9c3ce35520308cfcc8ca78d5d4da164f6d1575d32fe466b8076bc4056ad97fa3e3607a60e5e420bdec413e5ffcc3119b1b89a957b14a437e009a858c4c40c0f1fc7f3d1ad83bc96ada6c2c772260637774e5fbdc60791db6de3a31e136c28106b35c21932a8ed610306f0723675730e31d3deceff4f912e6070c9efcd6e3f0c9ad4a0e203f437f21679b87d46351714b5a1b6226f8ffadd19e18f85c918461ab67291e1c8cdfdc05280adf2b923f1269cf7de8bd351a7ede13524e836cbfc7ba22db91aaa5c9a0729a469985f5bd844347ba9a9b4019f4ad42c2025457cf48557494ac3ce6e311a1ded3e903cd3009d18133015d445d02a3ce3858781b582d28701a311ddb271f8a0c91c65b32cc13c512c35e5be9bb9dc556dfd3249a3733f58426718974820f17b3242a089e29b129fcea37c8b84996e2c725b59efccee24068625584e583700346f823ce92e11ac9db5964ca6300905c5e9f294330037ec1cb7d9b8fc28829b98fcc0fc405afcd54f43cb4a14e8cab3f5aa979fe2c3492fe295e1a50170e8857bd94e5b009bcec9626e6eb137b272882037202da7329dadcb5b99bbd7835b8875d696dab41774dcb559bfb4c79a5337efc5f1606bc7c2752389a49b6a578f0c7c58e2bf9efc55eef19beaf3de94da90c712ca3891ac71a6ff6d778a1c0c31f77fdde2c4b7f29adf8ccf000050e9e4829d2de36fda8d6b26020e6f0ece339e9ad96c01b166301238e1aaa30ddfb978968361a5f9d3fcaa381973c967c0dd88c6d54d00fa375ab4df3be57c4360b69d7634e95e4d4201da8f2348d0ce53be690146f0049d5d173a635d21406b10ed23ec9996bd0a43b812df363986fb8dedf5be1cdb3f85a5090460511af617507d24657e3733310b42e1406070a0316620037da35c5227bb85d3aacf3aebf750265838994e03a8770cdc1c31723ca1037232c32d21f31eee561575b18b1b4c0f027f270898aed60ab4bfe41160cd989cd5bdfeb795097ff01cd0ff41fea96311e92798c0a619aa957772cfd408747fc30dcb39210839a4c70b87d3ad881207fa5eee926bc2c6936ce10b382c7a37606d40bb1cf2637768255aae4a4cd18ed7004e3046520bea92c66a7074e4b46d3d566703e44d0c3f9ef49a2ff30632fe3f6a409178db66423809514cd7473f83d0c"; ( address operatorAddress, @@ -614,10 +592,10 @@ contract StakingContractTest is DSTestPlus { } function testAddValidatorsInvalidPubKey() public { - bytes - memory publicKeys = hex"0c74b6d3d877bbb2083f1bcc83b302f3ed533eaf3cd39cff97daf2c7b9b776168481aa7b51778df673a37049886f25b07f03dbc79d85fa9d41f9eefa8e598353b652aadf497673744527c73127f872b91cf31ec8041dae1b3a4238683cf442ea23a95fe68b400ab42b14e8c99280a057d1d840e80723c3622b38e6acd1f471bf247cf62312c9b863a75ac0d270cefa4f84fd8586dbda15c67c1a46e85cf56c60550f54cb082770baf3d2bbf4c33f5254bd0b93e017f3ed036b13baec41bb69085f9eff48651be38c8f9e1f67b643f84ec356864aaa057f0042b121b9d040ed9be3f5cc9cc659d8f8fc02575ed3c25708adac2c8d0c50ab7e4599ce9edf300d98e1cfcfc8e0022a24c712f0769de99a3389bac1cdca92ae20fba323142fe2e8d09ef2cb59c3f822779b3fe6410cddce7255d35db01093cc435c0a35bbb4cd8d4eb3bd2cc597c49a7a909c16f67fe8b6702d5d0c22ad189b1c45325190015b0017606f768c7aa2006cc19dfeb5f367eae9dd17a5c307705db1f5cec552fc038e5fa3a76352d9621a4d74b1fd7e1707c7bfb5e912e2b5a33a2f34a419055d0c4065aa787f743aff953d73441e96ffc9b0f5a3248c23398518a758aec8451b626bff7eed063a3b11bf661d10ad6dac5ee62f47be125e3c668e14b3c704d736b4fb"; - bytes - memory signatures = hex"fe41ffbe702fb08d01063c9cd99fac11a16e921c784e681e365db00c4bd6760df67cfc0d0555a8ee8bf534a2c0987b7949b18dba726ced579240fa063274bc7ab25e44b758c452c433debfebbc075cbe105f07502402a9591dc891640a9f2b34fe0863bf987ff4b5a601b0ffcecc185f04847e0b97d3fb9457c32efb9c3ce35520308cfcc8ca78d5d4da164f6d1575d32fe466b8076bc4056ad97fa3e3607a60e5e420bdec413e5ffcc3119b1b89a957b14a437e009a858c4c40c0f1fc7f3d1ad83bc96ada6c2c772260637774e5fbdc60791db6de3a31e136c28106b35c21932a8ed610306f0723675730e31d3deceff4f912e6070c9efcd6e3f0c9ad4a0e203f437f21679b87d46351714b5a1b6226f8ffadd19e18f85c918461ab67291e1c8cdfdc05280adf2b923f1269cf7de8bd351a7ede13524e836cbfc7ba22db91aaa5c9a0729a469985f5bd844347ba9a9b4019f4ad42c2025457cf48557494ac3ce6e311a1ded3e903cd3009d18133015d445d02a3ce3858781b582d28701a311ddb271f8a0c91c65b32cc13c512c35e5be9bb9dc556dfd3249a3733f58426718974820f17b3242a089e29b129fcea37c8b84996e2c725b59efccee24068625584e583700346f823ce92e11ac9db5964ca6300905c5e9f294330037ec1cb7d9b8fc28829b98fcc0fc405afcd54f43cb4a14e8cab3f5aa979fe2c3492fe295e1a50170e8857bd94e5b009bcec9626e6eb137b272882037202da7329dadcb5b99bbd7835b8875d696dab41774dcb559bfb4c79a5337efc5f1606bc7c2752389a49b6a578f0c7c58e2bf9efc55eef19beaf3de94da90c712ca3891ac71a6ff6d778a1c0c31f77fdde2c4b7f29adf8ccf000050e9e4829d2de36fda8d6b26020e6f0ece339e9ad96c01b166301238e1aaa30ddfb978968361a5f9d3fcaa381973c967c0dd88c6d54d00fa375ab4df3be57c4360b69d7634e95e4d4201da8f2348d0ce53be690146f0049d5d173a635d21406b10ed23ec9996bd0a43b812df363986fb8dedf5be1cdb3f85a5090460511af617507d24657e3733310b42e1406070a0316620037da35c5227bb85d3aacf3aebf750265838994e03a8770cdc1c31723ca1037232c32d21f31eee561575b18b1b4c0f027f270898aed60ab4bfe41160cd989cd5bdfeb795097ff01cd0ff41fea96311e92798c0a619aa957772cfd408747fc30dcb39210839a4c70b87d3ad881207fa5eee926bc2c6936ce10b382c7a37606d40bb1cf2637768255aae4a4cd18ed7004e3046520bea92c66a7074e4b46d3d566703e44d0c3f9ef49a2ff30632fe3f6a409178db66423809514cd7473f83d0c"; + bytes memory publicKeys = + hex"0c74b6d3d877bbb2083f1bcc83b302f3ed533eaf3cd39cff97daf2c7b9b776168481aa7b51778df673a37049886f25b07f03dbc79d85fa9d41f9eefa8e598353b652aadf497673744527c73127f872b91cf31ec8041dae1b3a4238683cf442ea23a95fe68b400ab42b14e8c99280a057d1d840e80723c3622b38e6acd1f471bf247cf62312c9b863a75ac0d270cefa4f84fd8586dbda15c67c1a46e85cf56c60550f54cb082770baf3d2bbf4c33f5254bd0b93e017f3ed036b13baec41bb69085f9eff48651be38c8f9e1f67b643f84ec356864aaa057f0042b121b9d040ed9be3f5cc9cc659d8f8fc02575ed3c25708adac2c8d0c50ab7e4599ce9edf300d98e1cfcfc8e0022a24c712f0769de99a3389bac1cdca92ae20fba323142fe2e8d09ef2cb59c3f822779b3fe6410cddce7255d35db01093cc435c0a35bbb4cd8d4eb3bd2cc597c49a7a909c16f67fe8b6702d5d0c22ad189b1c45325190015b0017606f768c7aa2006cc19dfeb5f367eae9dd17a5c307705db1f5cec552fc038e5fa3a76352d9621a4d74b1fd7e1707c7bfb5e912e2b5a33a2f34a419055d0c4065aa787f743aff953d73441e96ffc9b0f5a3248c23398518a758aec8451b626bff7eed063a3b11bf661d10ad6dac5ee62f47be125e3c668e14b3c704d736b4fb"; + bytes memory signatures = + hex"fe41ffbe702fb08d01063c9cd99fac11a16e921c784e681e365db00c4bd6760df67cfc0d0555a8ee8bf534a2c0987b7949b18dba726ced579240fa063274bc7ab25e44b758c452c433debfebbc075cbe105f07502402a9591dc891640a9f2b34fe0863bf987ff4b5a601b0ffcecc185f04847e0b97d3fb9457c32efb9c3ce35520308cfcc8ca78d5d4da164f6d1575d32fe466b8076bc4056ad97fa3e3607a60e5e420bdec413e5ffcc3119b1b89a957b14a437e009a858c4c40c0f1fc7f3d1ad83bc96ada6c2c772260637774e5fbdc60791db6de3a31e136c28106b35c21932a8ed610306f0723675730e31d3deceff4f912e6070c9efcd6e3f0c9ad4a0e203f437f21679b87d46351714b5a1b6226f8ffadd19e18f85c918461ab67291e1c8cdfdc05280adf2b923f1269cf7de8bd351a7ede13524e836cbfc7ba22db91aaa5c9a0729a469985f5bd844347ba9a9b4019f4ad42c2025457cf48557494ac3ce6e311a1ded3e903cd3009d18133015d445d02a3ce3858781b582d28701a311ddb271f8a0c91c65b32cc13c512c35e5be9bb9dc556dfd3249a3733f58426718974820f17b3242a089e29b129fcea37c8b84996e2c725b59efccee24068625584e583700346f823ce92e11ac9db5964ca6300905c5e9f294330037ec1cb7d9b8fc28829b98fcc0fc405afcd54f43cb4a14e8cab3f5aa979fe2c3492fe295e1a50170e8857bd94e5b009bcec9626e6eb137b272882037202da7329dadcb5b99bbd7835b8875d696dab41774dcb559bfb4c79a5337efc5f1606bc7c2752389a49b6a578f0c7c58e2bf9efc55eef19beaf3de94da90c712ca3891ac71a6ff6d778a1c0c31f77fdde2c4b7f29adf8ccf000050e9e4829d2de36fda8d6b26020e6f0ece339e9ad96c01b166301238e1aaa30ddfb978968361a5f9d3fcaa381973c967c0dd88c6d54d00fa375ab4df3be57c4360b69d7634e95e4d4201da8f2348d0ce53be690146f0049d5d173a635d21406b10ed23ec9996bd0a43b812df363986fb8dedf5be1cdb3f85a5090460511af617507d24657e3733310b42e1406070a0316620037da35c5227bb85d3aacf3aebf750265838994e03a8770cdc1c31723ca1037232c32d21f31eee561575b18b1b4c0f027f270898aed60ab4bfe41160cd989cd5bdfeb795097ff01cd0ff41fea96311e92798c0a619aa957772cfd408747fc30dcb39210839a4c70b87d3ad881207fa5eee926bc2c6936ce10b382c7a37606d40bb1cf2637768255aae4a4cd18ed7004e3046520bea92c66a7074e4b46d3d566703e44d0c3f9ef49a2ff30632fe3f6a409178db66423809514cd7473f83d0c"; vm.startPrank(operatorOne); vm.expectRevert(abi.encodeWithSignature("InvalidPublicKeys()")); @@ -626,10 +604,10 @@ contract StakingContractTest is DSTestPlus { } function testAddValidatorsInvalidSignature() public { - bytes - memory publicKeys = hex"0c74b6d3d877bbb2083f1bcc83b302f3ed533eaf3cd39cff97daf2c7b9b776168481aa7b51778df673a37049886f25b07f03dbc79d85fa9d41f9eefa8e598353b652aadf497673744527c73127f872b91cf31ec8041dae1b3a4238683cf442ea23a95fe68b400ab42b14e8c99280a057d1d840e80723c3622b38e6acd1f471bf247cf62312c9b863a75ac0d270cefa4f84fd8586dbda15c67c1a46e85cf56c60550f54cb082770baf3d2bbf4c33f5254bd0b93e017f3ed036b13baec41bb69085f9eff48651be38c8f9e1f67b643f84ec356864aaa057f0042b121b9d040ed9be3f5cc9cc659d8f8fc02575ed3c25708adac2c8d0c50ab7e4599ce9edf300d98e1cfcfc8e0022a24c712f0769de99a3389bac1cdca92ae20fba323142fe2e8d09ef2cb59c3f822779b3fe6410cddce7255d35db01093cc435c0a35bbb4cd8d4eb3bd2cc597c49a7a909c16f67fe8b6702d5d0c22ad189b1c45325190015b0017606f768c7aa2006cc19dfeb5f367eae9dd17a5c307705db1f5cec552fc038e5fa3a76352d9621a4d74b1fd7e1707c7bfb5e912e2b5a33a2f34a419055d0c4065aa787f743aff953d73441e96ffc9b0f5a3248c23398518a758aec8451b626bff7eed063a3b11bf661d10ad6dac5ee62f47be125e3c668e14b3c704d736b4fbff"; - bytes - memory signatures = hex"fe41ffbe702fb08d01063c9cd99fac11a16e921c784e681e365db00c4bd6760df67cfc0d0555a8ee8bf534a2c0987b7949b18dba726ced579240fa063274bc7ab25e44b758c452c433debfebbc075cbe105f07502402a9591dc891640a9f2b34fe0863bf987ff4b5a601b0ffcecc185f04847e0b97d3fb9457c32efb9c3ce35520308cfcc8ca78d5d4da164f6d1575d32fe466b8076bc4056ad97fa3e3607a60e5e420bdec413e5ffcc3119b1b89a957b14a437e009a858c4c40c0f1fc7f3d1ad83bc96ada6c2c772260637774e5fbdc60791db6de3a31e136c28106b35c21932a8ed610306f0723675730e31d3deceff4f912e6070c9efcd6e3f0c9ad4a0e203f437f21679b87d46351714b5a1b6226f8ffadd19e18f85c918461ab67291e1c8cdfdc05280adf2b923f1269cf7de8bd351a7ede13524e836cbfc7ba22db91aaa5c9a0729a469985f5bd844347ba9a9b4019f4ad42c2025457cf48557494ac3ce6e311a1ded3e903cd3009d18133015d445d02a3ce3858781b582d28701a311ddb271f8a0c91c65b32cc13c512c35e5be9bb9dc556dfd3249a3733f58426718974820f17b3242a089e29b129fcea37c8b84996e2c725b59efccee24068625584e583700346f823ce92e11ac9db5964ca6300905c5e9f294330037ec1cb7d9b8fc28829b98fcc0fc405afcd54f43cb4a14e8cab3f5aa979fe2c3492fe295e1a50170e8857bd94e5b009bcec9626e6eb137b272882037202da7329dadcb5b99bbd7835b8875d696dab41774dcb559bfb4c79a5337efc5f1606bc7c2752389a49b6a578f0c7c58e2bf9efc55eef19beaf3de94da90c712ca3891ac71a6ff6d778a1c0c31f77fdde2c4b7f29adf8ccf000050e9e4829d2de36fda8d6b26020e6f0ece339e9ad96c01b166301238e1aaa30ddfb978968361a5f9d3fcaa381973c967c0dd88c6d54d00fa375ab4df3be57c4360b69d7634e95e4d4201da8f2348d0ce53be690146f0049d5d173a635d21406b10ed23ec9996bd0a43b812df363986fb8dedf5be1cdb3f85a5090460511af617507d24657e3733310b42e1406070a0316620037da35c5227bb85d3aacf3aebf750265838994e03a8770cdc1c31723ca1037232c32d21f31eee561575b18b1b4c0f027f270898aed60ab4bfe41160cd989cd5bdfeb795097ff01cd0ff41fea96311e92798c0a619aa957772cfd408747fc30dcb39210839a4c70b87d3ad881207fa5eee926bc2c6936ce10b382c7a37606d40bb1cf2637768255aae4a4cd18ed7004e3046520bea92c66a7074e4b46d3d566703e44d0c3f9ef49a2ff30632fe3f6a409178db66423809514cd7473f83d"; + bytes memory publicKeys = + hex"0c74b6d3d877bbb2083f1bcc83b302f3ed533eaf3cd39cff97daf2c7b9b776168481aa7b51778df673a37049886f25b07f03dbc79d85fa9d41f9eefa8e598353b652aadf497673744527c73127f872b91cf31ec8041dae1b3a4238683cf442ea23a95fe68b400ab42b14e8c99280a057d1d840e80723c3622b38e6acd1f471bf247cf62312c9b863a75ac0d270cefa4f84fd8586dbda15c67c1a46e85cf56c60550f54cb082770baf3d2bbf4c33f5254bd0b93e017f3ed036b13baec41bb69085f9eff48651be38c8f9e1f67b643f84ec356864aaa057f0042b121b9d040ed9be3f5cc9cc659d8f8fc02575ed3c25708adac2c8d0c50ab7e4599ce9edf300d98e1cfcfc8e0022a24c712f0769de99a3389bac1cdca92ae20fba323142fe2e8d09ef2cb59c3f822779b3fe6410cddce7255d35db01093cc435c0a35bbb4cd8d4eb3bd2cc597c49a7a909c16f67fe8b6702d5d0c22ad189b1c45325190015b0017606f768c7aa2006cc19dfeb5f367eae9dd17a5c307705db1f5cec552fc038e5fa3a76352d9621a4d74b1fd7e1707c7bfb5e912e2b5a33a2f34a419055d0c4065aa787f743aff953d73441e96ffc9b0f5a3248c23398518a758aec8451b626bff7eed063a3b11bf661d10ad6dac5ee62f47be125e3c668e14b3c704d736b4fbff"; + bytes memory signatures = + hex"fe41ffbe702fb08d01063c9cd99fac11a16e921c784e681e365db00c4bd6760df67cfc0d0555a8ee8bf534a2c0987b7949b18dba726ced579240fa063274bc7ab25e44b758c452c433debfebbc075cbe105f07502402a9591dc891640a9f2b34fe0863bf987ff4b5a601b0ffcecc185f04847e0b97d3fb9457c32efb9c3ce35520308cfcc8ca78d5d4da164f6d1575d32fe466b8076bc4056ad97fa3e3607a60e5e420bdec413e5ffcc3119b1b89a957b14a437e009a858c4c40c0f1fc7f3d1ad83bc96ada6c2c772260637774e5fbdc60791db6de3a31e136c28106b35c21932a8ed610306f0723675730e31d3deceff4f912e6070c9efcd6e3f0c9ad4a0e203f437f21679b87d46351714b5a1b6226f8ffadd19e18f85c918461ab67291e1c8cdfdc05280adf2b923f1269cf7de8bd351a7ede13524e836cbfc7ba22db91aaa5c9a0729a469985f5bd844347ba9a9b4019f4ad42c2025457cf48557494ac3ce6e311a1ded3e903cd3009d18133015d445d02a3ce3858781b582d28701a311ddb271f8a0c91c65b32cc13c512c35e5be9bb9dc556dfd3249a3733f58426718974820f17b3242a089e29b129fcea37c8b84996e2c725b59efccee24068625584e583700346f823ce92e11ac9db5964ca6300905c5e9f294330037ec1cb7d9b8fc28829b98fcc0fc405afcd54f43cb4a14e8cab3f5aa979fe2c3492fe295e1a50170e8857bd94e5b009bcec9626e6eb137b272882037202da7329dadcb5b99bbd7835b8875d696dab41774dcb559bfb4c79a5337efc5f1606bc7c2752389a49b6a578f0c7c58e2bf9efc55eef19beaf3de94da90c712ca3891ac71a6ff6d778a1c0c31f77fdde2c4b7f29adf8ccf000050e9e4829d2de36fda8d6b26020e6f0ece339e9ad96c01b166301238e1aaa30ddfb978968361a5f9d3fcaa381973c967c0dd88c6d54d00fa375ab4df3be57c4360b69d7634e95e4d4201da8f2348d0ce53be690146f0049d5d173a635d21406b10ed23ec9996bd0a43b812df363986fb8dedf5be1cdb3f85a5090460511af617507d24657e3733310b42e1406070a0316620037da35c5227bb85d3aacf3aebf750265838994e03a8770cdc1c31723ca1037232c32d21f31eee561575b18b1b4c0f027f270898aed60ab4bfe41160cd989cd5bdfeb795097ff01cd0ff41fea96311e92798c0a619aa957772cfd408747fc30dcb39210839a4c70b87d3ad881207fa5eee926bc2c6936ce10b382c7a37606d40bb1cf2637768255aae4a4cd18ed7004e3046520bea92c66a7074e4b46d3d566703e44d0c3f9ef49a2ff30632fe3f6a409178db66423809514cd7473f83d"; vm.startPrank(operatorOne); vm.expectRevert(abi.encodeWithSignature("InvalidSignatures()")); @@ -638,10 +616,10 @@ contract StakingContractTest is DSTestPlus { } function testAddValidatorsUnauthorized() public { - bytes - memory publicKeys = hex"0c74b6d3d877bbb2083f1bcc83b302f3ed533eaf3cd39cff97daf2c7b9b776168481aa7b51778df673a37049886f25b07f03dbc79d85fa9d41f9eefa8e598353b652aadf497673744527c73127f872b91cf31ec8041dae1b3a4238683cf442ea23a95fe68b400ab42b14e8c99280a057d1d840e80723c3622b38e6acd1f471bf247cf62312c9b863a75ac0d270cefa4f84fd8586dbda15c67c1a46e85cf56c60550f54cb082770baf3d2bbf4c33f5254bd0b93e017f3ed036b13baec41bb69085f9eff48651be38c8f9e1f67b643f84ec356864aaa057f0042b121b9d040ed9be3f5cc9cc659d8f8fc02575ed3c25708adac2c8d0c50ab7e4599ce9edf300d98e1cfcfc8e0022a24c712f0769de99a3389bac1cdca92ae20fba323142fe2e8d09ef2cb59c3f822779b3fe6410cddce7255d35db01093cc435c0a35bbb4cd8d4eb3bd2cc597c49a7a909c16f67fe8b6702d5d0c22ad189b1c45325190015b0017606f768c7aa2006cc19dfeb5f367eae9dd17a5c307705db1f5cec552fc038e5fa3a76352d9621a4d74b1fd7e1707c7bfb5e912e2b5a33a2f34a419055d0c4065aa787f743aff953d73441e96ffc9b0f5a3248c23398518a758aec8451b626bff7eed063a3b11bf661d10ad6dac5ee62f47be125e3c668e14b3c704d736b4fbff"; - bytes - memory signatures = hex"fe41ffbe702fb08d01063c9cd99fac11a16e921c784e681e365db00c4bd6760df67cfc0d0555a8ee8bf534a2c0987b7949b18dba726ced579240fa063274bc7ab25e44b758c452c433debfebbc075cbe105f07502402a9591dc891640a9f2b34fe0863bf987ff4b5a601b0ffcecc185f04847e0b97d3fb9457c32efb9c3ce35520308cfcc8ca78d5d4da164f6d1575d32fe466b8076bc4056ad97fa3e3607a60e5e420bdec413e5ffcc3119b1b89a957b14a437e009a858c4c40c0f1fc7f3d1ad83bc96ada6c2c772260637774e5fbdc60791db6de3a31e136c28106b35c21932a8ed610306f0723675730e31d3deceff4f912e6070c9efcd6e3f0c9ad4a0e203f437f21679b87d46351714b5a1b6226f8ffadd19e18f85c918461ab67291e1c8cdfdc05280adf2b923f1269cf7de8bd351a7ede13524e836cbfc7ba22db91aaa5c9a0729a469985f5bd844347ba9a9b4019f4ad42c2025457cf48557494ac3ce6e311a1ded3e903cd3009d18133015d445d02a3ce3858781b582d28701a311ddb271f8a0c91c65b32cc13c512c35e5be9bb9dc556dfd3249a3733f58426718974820f17b3242a089e29b129fcea37c8b84996e2c725b59efccee24068625584e583700346f823ce92e11ac9db5964ca6300905c5e9f294330037ec1cb7d9b8fc28829b98fcc0fc405afcd54f43cb4a14e8cab3f5aa979fe2c3492fe295e1a50170e8857bd94e5b009bcec9626e6eb137b272882037202da7329dadcb5b99bbd7835b8875d696dab41774dcb559bfb4c79a5337efc5f1606bc7c2752389a49b6a578f0c7c58e2bf9efc55eef19beaf3de94da90c712ca3891ac71a6ff6d778a1c0c31f77fdde2c4b7f29adf8ccf000050e9e4829d2de36fda8d6b26020e6f0ece339e9ad96c01b166301238e1aaa30ddfb978968361a5f9d3fcaa381973c967c0dd88c6d54d00fa375ab4df3be57c4360b69d7634e95e4d4201da8f2348d0ce53be690146f0049d5d173a635d21406b10ed23ec9996bd0a43b812df363986fb8dedf5be1cdb3f85a5090460511af617507d24657e3733310b42e1406070a0316620037da35c5227bb85d3aacf3aebf750265838994e03a8770cdc1c31723ca1037232c32d21f31eee561575b18b1b4c0f027f270898aed60ab4bfe41160cd989cd5bdfeb795097ff01cd0ff41fea96311e92798c0a619aa957772cfd408747fc30dcb39210839a4c70b87d3ad881207fa5eee926bc2c6936ce10b382c7a37606d40bb1cf2637768255aae4a4cd18ed7004e3046520bea92c66a7074e4b46d3d566703e44d0c3f9ef49a2ff30632fe3f6a409178db66423809514cd7473f83d0c"; + bytes memory publicKeys = + hex"0c74b6d3d877bbb2083f1bcc83b302f3ed533eaf3cd39cff97daf2c7b9b776168481aa7b51778df673a37049886f25b07f03dbc79d85fa9d41f9eefa8e598353b652aadf497673744527c73127f872b91cf31ec8041dae1b3a4238683cf442ea23a95fe68b400ab42b14e8c99280a057d1d840e80723c3622b38e6acd1f471bf247cf62312c9b863a75ac0d270cefa4f84fd8586dbda15c67c1a46e85cf56c60550f54cb082770baf3d2bbf4c33f5254bd0b93e017f3ed036b13baec41bb69085f9eff48651be38c8f9e1f67b643f84ec356864aaa057f0042b121b9d040ed9be3f5cc9cc659d8f8fc02575ed3c25708adac2c8d0c50ab7e4599ce9edf300d98e1cfcfc8e0022a24c712f0769de99a3389bac1cdca92ae20fba323142fe2e8d09ef2cb59c3f822779b3fe6410cddce7255d35db01093cc435c0a35bbb4cd8d4eb3bd2cc597c49a7a909c16f67fe8b6702d5d0c22ad189b1c45325190015b0017606f768c7aa2006cc19dfeb5f367eae9dd17a5c307705db1f5cec552fc038e5fa3a76352d9621a4d74b1fd7e1707c7bfb5e912e2b5a33a2f34a419055d0c4065aa787f743aff953d73441e96ffc9b0f5a3248c23398518a758aec8451b626bff7eed063a3b11bf661d10ad6dac5ee62f47be125e3c668e14b3c704d736b4fbff"; + bytes memory signatures = + hex"fe41ffbe702fb08d01063c9cd99fac11a16e921c784e681e365db00c4bd6760df67cfc0d0555a8ee8bf534a2c0987b7949b18dba726ced579240fa063274bc7ab25e44b758c452c433debfebbc075cbe105f07502402a9591dc891640a9f2b34fe0863bf987ff4b5a601b0ffcecc185f04847e0b97d3fb9457c32efb9c3ce35520308cfcc8ca78d5d4da164f6d1575d32fe466b8076bc4056ad97fa3e3607a60e5e420bdec413e5ffcc3119b1b89a957b14a437e009a858c4c40c0f1fc7f3d1ad83bc96ada6c2c772260637774e5fbdc60791db6de3a31e136c28106b35c21932a8ed610306f0723675730e31d3deceff4f912e6070c9efcd6e3f0c9ad4a0e203f437f21679b87d46351714b5a1b6226f8ffadd19e18f85c918461ab67291e1c8cdfdc05280adf2b923f1269cf7de8bd351a7ede13524e836cbfc7ba22db91aaa5c9a0729a469985f5bd844347ba9a9b4019f4ad42c2025457cf48557494ac3ce6e311a1ded3e903cd3009d18133015d445d02a3ce3858781b582d28701a311ddb271f8a0c91c65b32cc13c512c35e5be9bb9dc556dfd3249a3733f58426718974820f17b3242a089e29b129fcea37c8b84996e2c725b59efccee24068625584e583700346f823ce92e11ac9db5964ca6300905c5e9f294330037ec1cb7d9b8fc28829b98fcc0fc405afcd54f43cb4a14e8cab3f5aa979fe2c3492fe295e1a50170e8857bd94e5b009bcec9626e6eb137b272882037202da7329dadcb5b99bbd7835b8875d696dab41774dcb559bfb4c79a5337efc5f1606bc7c2752389a49b6a578f0c7c58e2bf9efc55eef19beaf3de94da90c712ca3891ac71a6ff6d778a1c0c31f77fdde2c4b7f29adf8ccf000050e9e4829d2de36fda8d6b26020e6f0ece339e9ad96c01b166301238e1aaa30ddfb978968361a5f9d3fcaa381973c967c0dd88c6d54d00fa375ab4df3be57c4360b69d7634e95e4d4201da8f2348d0ce53be690146f0049d5d173a635d21406b10ed23ec9996bd0a43b812df363986fb8dedf5be1cdb3f85a5090460511af617507d24657e3733310b42e1406070a0316620037da35c5227bb85d3aacf3aebf750265838994e03a8770cdc1c31723ca1037232c32d21f31eee561575b18b1b4c0f027f270898aed60ab4bfe41160cd989cd5bdfeb795097ff01cd0ff41fea96311e92798c0a619aa957772cfd408747fc30dcb39210839a4c70b87d3ad881207fa5eee926bc2c6936ce10b382c7a37606d40bb1cf2637768255aae4a4cd18ed7004e3046520bea92c66a7074e4b46d3d566703e44d0c3f9ef49a2ff30632fe3f6a409178db66423809514cd7473f83d0c"; vm.expectRevert(abi.encodeWithSignature("Unauthorized()")); stakingContract.addValidators(0, 10, publicKeys, signatures); @@ -680,14 +658,13 @@ contract StakingContractTest is DSTestPlus { vm.startPrank(operatorOne); vm.expectEmit(true, true, true, true); emit ValidatorKeyRemoved( - 0, - hex"fdca2994adc49ddccb195bda2510e50a4ae10de26cf96dee5e577689f51650a610a33da0a826ae47247d8d1189cb3386" - ); + 0, hex"fdca2994adc49ddccb195bda2510e50a4ae10de26cf96dee5e577689f51650a610a33da0a826ae47247d8d1189cb3386" + ); stakingContract.removeValidators(0, indexes); vm.stopPrank(); - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(0); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(0); assertEq(operatorAddress, operatorOne); assertEq(limit, 0); @@ -736,8 +713,8 @@ contract StakingContractTest is DSTestPlus { stakingContract.removeValidators(0, indexes); vm.stopPrank(); - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(0); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(0); assertEq(operatorAddress, operatorOne); assertEq(feeRecipientAddress, address(1)); @@ -751,8 +728,8 @@ contract StakingContractTest is DSTestPlus { stakingContract.removeValidators(0, indexes); vm.stopPrank(); - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(0); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(0); assertEq(operatorAddress, operatorOne); assertEq(feeRecipientAddress, address(1)); @@ -804,7 +781,7 @@ contract StakingContractTest is DSTestPlus { vm.deal(user, 32 * 3 ether); vm.startPrank(user); - (bool _success, ) = address(stakingContract).call{value: 32 * 3 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 * 3 ether}(""); assert(_success == true); vm.stopPrank(); @@ -849,7 +826,7 @@ contract StakingContractTest is DSTestPlus { vm.roll(99999); vm.startPrank(user); - (bool _success, ) = address(stakingContract).call{value: 32 * 3 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 * 3 ether}(""); assert(_success == true); vm.stopPrank(); @@ -881,14 +858,14 @@ contract StakingContractTest is DSTestPlus { vm.deal(user, 32 * 3 ether); vm.startPrank(user); - (bool _success, ) = address(stakingContract).call{value: 32 * 3 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 * 3 ether}(""); assert(_success == true); vm.stopPrank(); assertEq(user.balance, 0); - bytes - memory pk = hex"24046f7be8644e2b872363d5a4d58836deeb2deab6996a7e57f8c7583872786d1b81e378c4188ec3094236a31e31bd83"; + bytes memory pk = + hex"24046f7be8644e2b872363d5a4d58836deeb2deab6996a7e57f8c7583872786d1b81e378c4188ec3094236a31e31bd83"; assertEq(stakingContract.getWithdrawer(pk), user); @@ -909,14 +886,14 @@ contract StakingContractTest is DSTestPlus { vm.deal(user, 32 * 3 ether); vm.startPrank(user); - (bool _success, ) = address(stakingContract).call{value: 32 * 3 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 * 3 ether}(""); assert(_success == true); vm.stopPrank(); assertEq(user.balance, 0); - bytes - memory pk = hex"24046f7be8644e2b872363d5a4d58836deeb2deab6996a7e57f8c7583872786d1b81e378c4188ec3094236a31e31bd83"; + bytes memory pk = + hex"24046f7be8644e2b872363d5a4d58836deeb2deab6996a7e57f8c7583872786d1b81e378c4188ec3094236a31e31bd83"; assertEq(stakingContract.getWithdrawer(pk), user); @@ -932,7 +909,7 @@ contract StakingContractTest is DSTestPlus { vm.deal(user, 32 * 3 ether); vm.startPrank(user); - (bool _success, ) = address(stakingContract).call{value: 32 * 3 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 * 3 ether}(""); assert(_success == true); vm.stopPrank(); @@ -942,8 +919,8 @@ contract StakingContractTest is DSTestPlus { stakingContract.setWithdrawerCustomizationEnabled(true); vm.stopPrank(); - bytes - memory pk = hex"24046f7be8644e2b872363d5a4d58836deeb2deab6996a7e57f8c7583872786d1b81e378c4188ec3094236a31e31bd83"; + bytes memory pk = + hex"24046f7be8644e2b872363d5a4d58836deeb2deab6996a7e57f8c7583872786d1b81e378c4188ec3094236a31e31bd83"; assertEq(stakingContract.getWithdrawer(pk), user); @@ -1000,26 +977,12 @@ contract StakingContractInitializationTest is DSTestPlus { function testFeeValidation() public { vm.expectRevert(abi.encodeWithSignature("InvalidFee()")); stakingContract.initialize_1( - admin, - address(treasury), - address(depositContract), - address(0), - address(0), - address(0), - 10001, - 2000 + admin, address(treasury), address(depositContract), address(0), address(0), address(0), 10001, 2000 ); vm.expectRevert(abi.encodeWithSignature("InvalidFee()")); stakingContract.initialize_1( - admin, - address(treasury), - address(depositContract), - address(0), - address(0), - address(0), - 10000, - 10001 + admin, address(treasury), address(depositContract), address(0), address(0), address(0), 10000, 10001 ); } } @@ -1045,14 +1008,7 @@ contract StakingContractOperatorTest is DSTestPlus { stakingContract = new StakingContract(); depositContract = new DepositContractMock(); stakingContract.initialize_1( - admin, - address(treasury), - address(depositContract), - address(0), - address(0), - address(0), - 1000, - 2000 + admin, address(treasury), address(depositContract), address(0), address(0), address(0), 1000, 2000 ); } @@ -1076,11 +1032,11 @@ contract StakingContractOperatorTest is DSTestPlus { assertEq(i, operatorIndex); } - bytes - memory publicKeys = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759b0ce3fa164aae897adca509ed44429e7b1f91b7c46ddbe199cee848e09b1ccbb9736b78b68aacff1011b7266fe11e06014451b3fb9288549aff6dea9843b43e0c47a3b856f307732175230e254c0004e48b02414987088ac7003e148930017b49a1a8d4600f33d463c4afc07bbfc82703c9fcf81a5891f90a71c86a02faff443c6c3b2592bd44d5d3d7a93cb4aaaa105612496d61e68140a5418b468f872bf2f3e79f9cb0d9c3e889663fca02939b31e8ee3092203ee1417128e965c6406a07f68abf2ebe2689cf6c853ef126ffa8574c2a7d913e28de9147fa6b96706ea5bf9eacd1aba06edeaee155009fb912c00070774cc64136fcffde12ed731260bc5529df64da298f493561198e9d6acf42cf21e853ae7b2df85f27d2183149969d623b9237254c2cfe1d0082742eb042ac096d686dbe03c79ee31cbd03bb4682f8797043eed9f6e622814831ac5dfe1176552fb7f9b6ff38a149ae1d8414097a32fd96da6453c52fda13e3402a09e2fa6886daa4300f09c73e4bc2901b99c44744c5cfdca2994adc49ddccb195bda2510e50a4ae10de26cf96dee5e577689f51650a610a33da0a826ae47247d8d1189cb3386"; + bytes memory publicKeys = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759b0ce3fa164aae897adca509ed44429e7b1f91b7c46ddbe199cee848e09b1ccbb9736b78b68aacff1011b7266fe11e06014451b3fb9288549aff6dea9843b43e0c47a3b856f307732175230e254c0004e48b02414987088ac7003e148930017b49a1a8d4600f33d463c4afc07bbfc82703c9fcf81a5891f90a71c86a02faff443c6c3b2592bd44d5d3d7a93cb4aaaa105612496d61e68140a5418b468f872bf2f3e79f9cb0d9c3e889663fca02939b31e8ee3092203ee1417128e965c6406a07f68abf2ebe2689cf6c853ef126ffa8574c2a7d913e28de9147fa6b96706ea5bf9eacd1aba06edeaee155009fb912c00070774cc64136fcffde12ed731260bc5529df64da298f493561198e9d6acf42cf21e853ae7b2df85f27d2183149969d623b9237254c2cfe1d0082742eb042ac096d686dbe03c79ee31cbd03bb4682f8797043eed9f6e622814831ac5dfe1176552fb7f9b6ff38a149ae1d8414097a32fd96da6453c52fda13e3402a09e2fa6886daa4300f09c73e4bc2901b99c44744c5cfdca2994adc49ddccb195bda2510e50a4ae10de26cf96dee5e577689f51650a610a33da0a826ae47247d8d1189cb3386"; - bytes - memory signatures = hex"ccb81f4485957f440bc17dbe760f374cbb112c6f12fa10e8709fac4522b30440d918c7bb867fa04f6b3cfbd977455f8f2fde586fdf3d7baa429e98e497ff871f3b8db1528b2b964fa24d26e377c74746496cc719c50dbf391fb3f74f5ca4b93a02a9f0007cd7b7d2af2d1b07c8600ab86a5d27dc51a29c2e3007c7a69cb73bcaecc764641e02370955dba100428d259d6475ee3566872bd43b0e73e55b9669e50f2b1666e57b326a5dfad655c7921e0dfb421b1ec59c8fdb48eb77421fd06966f393d619cbf13ff427df11dcb17026df25f35268de5b168e359c16f2a3d5fbc6376db44638d773c851c875f21222448433d285920e8bdc4f5cbff130d7387c0a9589324286aea398e5aacad3bbfe3992dfce62571f0e282ed9c29e3fa5b07aa5c81749589b1170d3b85a84331e2f6b8e26eadebfd569b225759f40bbd12d6c3d253ed3f379b014b2ea44cce54d362072e2d020ff139a903b7d87fc3fddc2e6657c83e0b79851c22c6e0e477463463c97d6cc0e2e2de5e35b227bddb285521be3766358abaf3159d89f68c9770e28278f177088cfc4089b817effaaecabdffa4e66427868b105cb9348ea2d84eeea059a5d1ff3277d6f9cf656fc973d07cabed70fb8f8eb2798a65d207a8e1f8a26910949db9fa62d62bc15ecc097a93a27a1873405b8589a4ddf0ecf0303c6031484562b32eb7881975026524d6d4a9de6cd73fe2c324501586b9b6fa6bce950bbd21472278302f83dbfd6be036f2fc36d299d66578e844be3d6aa8314fab468f038fd6e130ada0a886fccfb2fd843f7dd07e8968401bbe2af7345fce52ba4b310b30af2d54b15669d06c206682c1730ab6b17787e361f04401f78dc5cbd5fac955df4e83c24cdabfabdb3f4ea40961d04a5ca166c17694fca144025b47131a68ddb230d36fe6e831e82624c9a925d706bff86982852b26ebf019a3f6ee36aedbbc6bec2d50531a233e09225493d3c5fd48379aec373baf622fb9feed6261e5296e5ae6601e7523c7f386801ed63a344b07106a0d03e5848209db5e114c0e67884916a43a1bfb77d9b8ea113c3ba8cad4b006aafeadcc31e70e85c5efecaf807154d011c1413340d4b592d2f270fb48b2050e08493c1427ddfac8dcc27fe434d32a35dcbddbcb1c4e22ead6734a4ac910f6768bc9ff6b355c1151695e41121cdcc9d9d3b18cf4d66ca3c1db0527c471a0dcf256590602a7269dcb26175e7eb370bd9794ac8ab558bea69e6a92d8e818b675a80e2df0516b8307291d93cb85d959ac60d47b46455a7ab0a38687c747c6d2d9e8c20ccf74dc6cdf145ec06805d4ac24a39aec2f5cd6e26e63e3d043a31c42411e4"; + bytes memory signatures = + hex"ccb81f4485957f440bc17dbe760f374cbb112c6f12fa10e8709fac4522b30440d918c7bb867fa04f6b3cfbd977455f8f2fde586fdf3d7baa429e98e497ff871f3b8db1528b2b964fa24d26e377c74746496cc719c50dbf391fb3f74f5ca4b93a02a9f0007cd7b7d2af2d1b07c8600ab86a5d27dc51a29c2e3007c7a69cb73bcaecc764641e02370955dba100428d259d6475ee3566872bd43b0e73e55b9669e50f2b1666e57b326a5dfad655c7921e0dfb421b1ec59c8fdb48eb77421fd06966f393d619cbf13ff427df11dcb17026df25f35268de5b168e359c16f2a3d5fbc6376db44638d773c851c875f21222448433d285920e8bdc4f5cbff130d7387c0a9589324286aea398e5aacad3bbfe3992dfce62571f0e282ed9c29e3fa5b07aa5c81749589b1170d3b85a84331e2f6b8e26eadebfd569b225759f40bbd12d6c3d253ed3f379b014b2ea44cce54d362072e2d020ff139a903b7d87fc3fddc2e6657c83e0b79851c22c6e0e477463463c97d6cc0e2e2de5e35b227bddb285521be3766358abaf3159d89f68c9770e28278f177088cfc4089b817effaaecabdffa4e66427868b105cb9348ea2d84eeea059a5d1ff3277d6f9cf656fc973d07cabed70fb8f8eb2798a65d207a8e1f8a26910949db9fa62d62bc15ecc097a93a27a1873405b8589a4ddf0ecf0303c6031484562b32eb7881975026524d6d4a9de6cd73fe2c324501586b9b6fa6bce950bbd21472278302f83dbfd6be036f2fc36d299d66578e844be3d6aa8314fab468f038fd6e130ada0a886fccfb2fd843f7dd07e8968401bbe2af7345fce52ba4b310b30af2d54b15669d06c206682c1730ab6b17787e361f04401f78dc5cbd5fac955df4e83c24cdabfabdb3f4ea40961d04a5ca166c17694fca144025b47131a68ddb230d36fe6e831e82624c9a925d706bff86982852b26ebf019a3f6ee36aedbbc6bec2d50531a233e09225493d3c5fd48379aec373baf622fb9feed6261e5296e5ae6601e7523c7f386801ed63a344b07106a0d03e5848209db5e114c0e67884916a43a1bfb77d9b8ea113c3ba8cad4b006aafeadcc31e70e85c5efecaf807154d011c1413340d4b592d2f270fb48b2050e08493c1427ddfac8dcc27fe434d32a35dcbddbcb1c4e22ead6734a4ac910f6768bc9ff6b355c1151695e41121cdcc9d9d3b18cf4d66ca3c1db0527c471a0dcf256590602a7269dcb26175e7eb370bd9794ac8ab558bea69e6a92d8e818b675a80e2df0516b8307291d93cb85d959ac60d47b46455a7ab0a38687c747c6d2d9e8c20ccf74dc6cdf145ec06805d4ac24a39aec2f5cd6e26e63e3d043a31c42411e4"; vm.stopPrank(); vm.startPrank(operatorZero); stakingContract.addValidators(0, 10, publicKeys, signatures); @@ -1130,14 +1086,7 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { stakingContract = new StakingContract(); depositContract = new DepositContractMock(); stakingContract.initialize_1( - admin, - address(treasury), - address(depositContract), - address(0), - address(0), - address(0), - 1000, - 2000 + admin, address(treasury), address(depositContract), address(0), address(0), address(0), 1000, 2000 ); vm.startPrank(admin); @@ -1147,11 +1096,11 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { vm.stopPrank(); { - bytes - memory publicKeys = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759b0ce3fa164aae897adca509ed44429e7b1f91b7c46ddbe199cee848e09b1ccbb9736b78b68aacff1011b7266fe11e06014451b3fb9288549aff6dea9843b43e0c47a3b856f307732175230e254c0004e48b02414987088ac7003e148930017b49a1a8d4600f33d463c4afc07bbfc82703c9fcf81a5891f90a71c86a02faff443c6c3b2592bd44d5d3d7a93cb4aaaa105612496d61e68140a5418b468f872bf2f3e79f9cb0d9c3e889663fca02939b31e8ee3092203ee1417128e965c6406a07f68abf2ebe2689cf6c853ef126ffa8574c2a7d913e28de9147fa6b96706ea5bf9eacd1aba06edeaee155009fb912c00070774cc64136fcffde12ed731260bc5529df64da298f493561198e9d6acf42cf21e853ae7b2df85f27d2183149969d623b9237254c2cfe1d0082742eb042ac096d686dbe03c79ee31cbd03bb4682f8797043eed9f6e622814831ac5dfe1176552fb7f9b6ff38a149ae1d8414097a32fd96da6453c52fda13e3402a09e2fa6886daa4300f09c73e4bc2901b99c44744c5cfdca2994adc49ddccb195bda2510e50a4ae10de26cf96dee5e577689f51650a610a33da0a826ae47247d8d1189cb3386"; + bytes memory publicKeys = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759b0ce3fa164aae897adca509ed44429e7b1f91b7c46ddbe199cee848e09b1ccbb9736b78b68aacff1011b7266fe11e06014451b3fb9288549aff6dea9843b43e0c47a3b856f307732175230e254c0004e48b02414987088ac7003e148930017b49a1a8d4600f33d463c4afc07bbfc82703c9fcf81a5891f90a71c86a02faff443c6c3b2592bd44d5d3d7a93cb4aaaa105612496d61e68140a5418b468f872bf2f3e79f9cb0d9c3e889663fca02939b31e8ee3092203ee1417128e965c6406a07f68abf2ebe2689cf6c853ef126ffa8574c2a7d913e28de9147fa6b96706ea5bf9eacd1aba06edeaee155009fb912c00070774cc64136fcffde12ed731260bc5529df64da298f493561198e9d6acf42cf21e853ae7b2df85f27d2183149969d623b9237254c2cfe1d0082742eb042ac096d686dbe03c79ee31cbd03bb4682f8797043eed9f6e622814831ac5dfe1176552fb7f9b6ff38a149ae1d8414097a32fd96da6453c52fda13e3402a09e2fa6886daa4300f09c73e4bc2901b99c44744c5cfdca2994adc49ddccb195bda2510e50a4ae10de26cf96dee5e577689f51650a610a33da0a826ae47247d8d1189cb3386"; - bytes - memory signatures = hex"ccb81f4485957f440bc17dbe760f374cbb112c6f12fa10e8709fac4522b30440d918c7bb867fa04f6b3cfbd977455f8f2fde586fdf3d7baa429e98e497ff871f3b8db1528b2b964fa24d26e377c74746496cc719c50dbf391fb3f74f5ca4b93a02a9f0007cd7b7d2af2d1b07c8600ab86a5d27dc51a29c2e3007c7a69cb73bcaecc764641e02370955dba100428d259d6475ee3566872bd43b0e73e55b9669e50f2b1666e57b326a5dfad655c7921e0dfb421b1ec59c8fdb48eb77421fd06966f393d619cbf13ff427df11dcb17026df25f35268de5b168e359c16f2a3d5fbc6376db44638d773c851c875f21222448433d285920e8bdc4f5cbff130d7387c0a9589324286aea398e5aacad3bbfe3992dfce62571f0e282ed9c29e3fa5b07aa5c81749589b1170d3b85a84331e2f6b8e26eadebfd569b225759f40bbd12d6c3d253ed3f379b014b2ea44cce54d362072e2d020ff139a903b7d87fc3fddc2e6657c83e0b79851c22c6e0e477463463c97d6cc0e2e2de5e35b227bddb285521be3766358abaf3159d89f68c9770e28278f177088cfc4089b817effaaecabdffa4e66427868b105cb9348ea2d84eeea059a5d1ff3277d6f9cf656fc973d07cabed70fb8f8eb2798a65d207a8e1f8a26910949db9fa62d62bc15ecc097a93a27a1873405b8589a4ddf0ecf0303c6031484562b32eb7881975026524d6d4a9de6cd73fe2c324501586b9b6fa6bce950bbd21472278302f83dbfd6be036f2fc36d299d66578e844be3d6aa8314fab468f038fd6e130ada0a886fccfb2fd843f7dd07e8968401bbe2af7345fce52ba4b310b30af2d54b15669d06c206682c1730ab6b17787e361f04401f78dc5cbd5fac955df4e83c24cdabfabdb3f4ea40961d04a5ca166c17694fca144025b47131a68ddb230d36fe6e831e82624c9a925d706bff86982852b26ebf019a3f6ee36aedbbc6bec2d50531a233e09225493d3c5fd48379aec373baf622fb9feed6261e5296e5ae6601e7523c7f386801ed63a344b07106a0d03e5848209db5e114c0e67884916a43a1bfb77d9b8ea113c3ba8cad4b006aafeadcc31e70e85c5efecaf807154d011c1413340d4b592d2f270fb48b2050e08493c1427ddfac8dcc27fe434d32a35dcbddbcb1c4e22ead6734a4ac910f6768bc9ff6b355c1151695e41121cdcc9d9d3b18cf4d66ca3c1db0527c471a0dcf256590602a7269dcb26175e7eb370bd9794ac8ab558bea69e6a92d8e818b675a80e2df0516b8307291d93cb85d959ac60d47b46455a7ab0a38687c747c6d2d9e8c20ccf74dc6cdf145ec06805d4ac24a39aec2f5cd6e26e63e3d043a31c42411e4"; + bytes memory signatures = + hex"ccb81f4485957f440bc17dbe760f374cbb112c6f12fa10e8709fac4522b30440d918c7bb867fa04f6b3cfbd977455f8f2fde586fdf3d7baa429e98e497ff871f3b8db1528b2b964fa24d26e377c74746496cc719c50dbf391fb3f74f5ca4b93a02a9f0007cd7b7d2af2d1b07c8600ab86a5d27dc51a29c2e3007c7a69cb73bcaecc764641e02370955dba100428d259d6475ee3566872bd43b0e73e55b9669e50f2b1666e57b326a5dfad655c7921e0dfb421b1ec59c8fdb48eb77421fd06966f393d619cbf13ff427df11dcb17026df25f35268de5b168e359c16f2a3d5fbc6376db44638d773c851c875f21222448433d285920e8bdc4f5cbff130d7387c0a9589324286aea398e5aacad3bbfe3992dfce62571f0e282ed9c29e3fa5b07aa5c81749589b1170d3b85a84331e2f6b8e26eadebfd569b225759f40bbd12d6c3d253ed3f379b014b2ea44cce54d362072e2d020ff139a903b7d87fc3fddc2e6657c83e0b79851c22c6e0e477463463c97d6cc0e2e2de5e35b227bddb285521be3766358abaf3159d89f68c9770e28278f177088cfc4089b817effaaecabdffa4e66427868b105cb9348ea2d84eeea059a5d1ff3277d6f9cf656fc973d07cabed70fb8f8eb2798a65d207a8e1f8a26910949db9fa62d62bc15ecc097a93a27a1873405b8589a4ddf0ecf0303c6031484562b32eb7881975026524d6d4a9de6cd73fe2c324501586b9b6fa6bce950bbd21472278302f83dbfd6be036f2fc36d299d66578e844be3d6aa8314fab468f038fd6e130ada0a886fccfb2fd843f7dd07e8968401bbe2af7345fce52ba4b310b30af2d54b15669d06c206682c1730ab6b17787e361f04401f78dc5cbd5fac955df4e83c24cdabfabdb3f4ea40961d04a5ca166c17694fca144025b47131a68ddb230d36fe6e831e82624c9a925d706bff86982852b26ebf019a3f6ee36aedbbc6bec2d50531a233e09225493d3c5fd48379aec373baf622fb9feed6261e5296e5ae6601e7523c7f386801ed63a344b07106a0d03e5848209db5e114c0e67884916a43a1bfb77d9b8ea113c3ba8cad4b006aafeadcc31e70e85c5efecaf807154d011c1413340d4b592d2f270fb48b2050e08493c1427ddfac8dcc27fe434d32a35dcbddbcb1c4e22ead6734a4ac910f6768bc9ff6b355c1151695e41121cdcc9d9d3b18cf4d66ca3c1db0527c471a0dcf256590602a7269dcb26175e7eb370bd9794ac8ab558bea69e6a92d8e818b675a80e2df0516b8307291d93cb85d959ac60d47b46455a7ab0a38687c747c6d2d9e8c20ccf74dc6cdf145ec06805d4ac24a39aec2f5cd6e26e63e3d043a31c42411e4"; vm.startPrank(operatorOne); stakingContract.addValidators(0, 10, publicKeys, signatures); @@ -1159,10 +1108,10 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { } { - bytes - memory publicKeys = hex"24046f7be8644e2b872363d5a4d58836deeb2deab6996a7e57f8c7583872786d1b81e378c4188ec3094236a31e31bd83c89e108b2d2e26e9dba2cc7a4f898c5f4b62d43f8e76c7cf64d02aab46afc436d7759d2b2e4d4aca97687b0022bec98307d1b050eafad3ba0fdf22cf645936ebd9e3c1ae913badc7307e02c38d778b10259b571237cc826a030b44a4fd53da790a84e6578890a7c801bbc2212bfccfecf88da5203e96c29b404fd9a61400f808e11a10fe39c9d97de43ad20867b3f5a71cc86d46d1058ab033c63c2369774cabe009231a85836abe39f9f5b41158a2505305d6e500cd64eb8e479e59c72945b9aaa177fd4a99d36dac27400609e098b8ce8638dc0ae641043107e47ccc495bdf7f40811e1c67103605241ea329ebd34e85d3184f79fe2b4642007709c2f4912853d72e0399930a62c915e50d4e1a1bd0fa26f021f37f519b86e168a181604c9c4b9af621932f09601bd9d5d0a9ee349076765d1baea4eef0fc16d4ebc861569ec37857c1d654ca442d2b0c85e97c5d56289a42afa5040cb1901bd03faf7011780599ed2cf826b8a2dd9deece7d9ecd7d7be2751bb42645f0253732447092311597a0f7672268125a95464c541e7fb1e3e08151f038adec85a60db0a9a9430ca80ffdbabe557aa2e0f69e6aed98527c91"; - bytes - memory signatures = hex"57412124b1730be9e30a395b5e7af34e7cecd16b8cc3a5b255f7b5e5cd92a3aa328401d07268d0ffaed8867d8a6288e569c547506b3f124f45f37d17bf0ec9c55917db458ba9cf8d498b0572b253435991f57f4e496763bbbbc3d92bd50c7f05304112ec1a45d0a8e5b3aa309dc4377ee8beb9d79b08f6bd60d0696b29acff9539cb836f2f00bbf888cfd28e4cfa4f317d6c3babdc0e121247789137eae3553de0c67ccbe2a5135f8f70dc5a79023544da8d608c825ef06ec32d315b4b026dd8f7f667af7368efead94f6f38418b1527a7c4500424410b8b09c580e89bc8cfba27eed8cea56311b9446313de80bb24f09072ee0ef5ceb504d7bdefed1e3fa5a8aee876b44302f7ff1b8a039033c3ed370a7b02a0cc23a5b7b4d7499649e6ee3f37d51fcbde910f6d10c1512eaf8924a8c7f150d280efb293e719ff07357c01482b1b6cc75a3d0118bdc058cccf67fbcbaad1423f2940d0191bb1d8257a2d827e74a3963ccbd316081105be05e8471d8fa466b4935c0dce7cb6bcb36dd1ef2a156841be9793a00a3aefb8e55ef91f6f17ba49cb9025dc441fd381ad5194de34d9032df1f26930537f0fcd509638403c3ce8df19f2106904cfd82e92627283fdc8ac5165848dabbf1b1566302ddeb72f70a17bb1520b8cc3b41c007e3bf334af34e900ef5fc0b3fb8642f7bd0b109c7cfd204c7e0039c10d1592ec02e8af9ea9653df70fed29d30c2784e3ff187caabb0a588db0fd2bb77565909cd5f5895a56d32510fb90735d5f1ca1dd4b9bbf7ce3e8d3745a879093e90d883875b865a69d7b79b2bf4cf42cedf084447c95e31d11c41adff8a9939550c87996d7f4002c9064bb2e6e675310caf556a7e44f07e92704c7589c2e335cbd4dc3fde2bfd7d79ad050bee3066e5aed5e97c445e0c54c9f5c5febbc5182aeaad91acc0e9b58bfed9049a2ccc09bf4b2534220f24c8c387306a498fffe66d3cd50c34296fb456fe2656999893ed1ac5ed8eb1845455412833e9abec7274714ccbef2c20172df5fdde1e1bb142c5987c8aec208fb11b383cf4b1c3851d8ef27561176605487b5c83923fa731e94ee6ec59fe8307df91c2552a1e318933f32c9b2f27896f932c69b9dc0c8860e78663a5be9480be01b19bc9f56b955e442af493f0d267d4ed8e466eaa345af4e476beade96d6460a4e701c1604f190eafc6c42ed751943cb7393b7bb871c9849f056bddf731fb1eed5b8f030330d245834834994f49d1ecb6eac952e02baa1298f482b622caaa4b6479afd6729cfc2c14ab571e4d32973016cded551becd595af5bcb1cf53db1b55ca1b580da6564f065ac8c8c1709ccdc30003125d54"; + bytes memory publicKeys = + hex"24046f7be8644e2b872363d5a4d58836deeb2deab6996a7e57f8c7583872786d1b81e378c4188ec3094236a31e31bd83c89e108b2d2e26e9dba2cc7a4f898c5f4b62d43f8e76c7cf64d02aab46afc436d7759d2b2e4d4aca97687b0022bec98307d1b050eafad3ba0fdf22cf645936ebd9e3c1ae913badc7307e02c38d778b10259b571237cc826a030b44a4fd53da790a84e6578890a7c801bbc2212bfccfecf88da5203e96c29b404fd9a61400f808e11a10fe39c9d97de43ad20867b3f5a71cc86d46d1058ab033c63c2369774cabe009231a85836abe39f9f5b41158a2505305d6e500cd64eb8e479e59c72945b9aaa177fd4a99d36dac27400609e098b8ce8638dc0ae641043107e47ccc495bdf7f40811e1c67103605241ea329ebd34e85d3184f79fe2b4642007709c2f4912853d72e0399930a62c915e50d4e1a1bd0fa26f021f37f519b86e168a181604c9c4b9af621932f09601bd9d5d0a9ee349076765d1baea4eef0fc16d4ebc861569ec37857c1d654ca442d2b0c85e97c5d56289a42afa5040cb1901bd03faf7011780599ed2cf826b8a2dd9deece7d9ecd7d7be2751bb42645f0253732447092311597a0f7672268125a95464c541e7fb1e3e08151f038adec85a60db0a9a9430ca80ffdbabe557aa2e0f69e6aed98527c91"; + bytes memory signatures = + hex"57412124b1730be9e30a395b5e7af34e7cecd16b8cc3a5b255f7b5e5cd92a3aa328401d07268d0ffaed8867d8a6288e569c547506b3f124f45f37d17bf0ec9c55917db458ba9cf8d498b0572b253435991f57f4e496763bbbbc3d92bd50c7f05304112ec1a45d0a8e5b3aa309dc4377ee8beb9d79b08f6bd60d0696b29acff9539cb836f2f00bbf888cfd28e4cfa4f317d6c3babdc0e121247789137eae3553de0c67ccbe2a5135f8f70dc5a79023544da8d608c825ef06ec32d315b4b026dd8f7f667af7368efead94f6f38418b1527a7c4500424410b8b09c580e89bc8cfba27eed8cea56311b9446313de80bb24f09072ee0ef5ceb504d7bdefed1e3fa5a8aee876b44302f7ff1b8a039033c3ed370a7b02a0cc23a5b7b4d7499649e6ee3f37d51fcbde910f6d10c1512eaf8924a8c7f150d280efb293e719ff07357c01482b1b6cc75a3d0118bdc058cccf67fbcbaad1423f2940d0191bb1d8257a2d827e74a3963ccbd316081105be05e8471d8fa466b4935c0dce7cb6bcb36dd1ef2a156841be9793a00a3aefb8e55ef91f6f17ba49cb9025dc441fd381ad5194de34d9032df1f26930537f0fcd509638403c3ce8df19f2106904cfd82e92627283fdc8ac5165848dabbf1b1566302ddeb72f70a17bb1520b8cc3b41c007e3bf334af34e900ef5fc0b3fb8642f7bd0b109c7cfd204c7e0039c10d1592ec02e8af9ea9653df70fed29d30c2784e3ff187caabb0a588db0fd2bb77565909cd5f5895a56d32510fb90735d5f1ca1dd4b9bbf7ce3e8d3745a879093e90d883875b865a69d7b79b2bf4cf42cedf084447c95e31d11c41adff8a9939550c87996d7f4002c9064bb2e6e675310caf556a7e44f07e92704c7589c2e335cbd4dc3fde2bfd7d79ad050bee3066e5aed5e97c445e0c54c9f5c5febbc5182aeaad91acc0e9b58bfed9049a2ccc09bf4b2534220f24c8c387306a498fffe66d3cd50c34296fb456fe2656999893ed1ac5ed8eb1845455412833e9abec7274714ccbef2c20172df5fdde1e1bb142c5987c8aec208fb11b383cf4b1c3851d8ef27561176605487b5c83923fa731e94ee6ec59fe8307df91c2552a1e318933f32c9b2f27896f932c69b9dc0c8860e78663a5be9480be01b19bc9f56b955e442af493f0d267d4ed8e466eaa345af4e476beade96d6460a4e701c1604f190eafc6c42ed751943cb7393b7bb871c9849f056bddf731fb1eed5b8f030330d245834834994f49d1ecb6eac952e02baa1298f482b622caaa4b6479afd6729cfc2c14ab571e4d32973016cded551becd595af5bcb1cf53db1b55ca1b580da6564f065ac8c8c1709ccdc30003125d54"; vm.startPrank(operatorTwo); stakingContract.addValidators(1, 10, publicKeys, signatures); @@ -1170,10 +1119,10 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { } { - bytes - memory publicKeys = hex"9513f9219894d2daca9cfee1179107fee1ba7bd3ecba34bf0307d206797d2289e93494c41c083fb0dcf755981957dbf4eef0d296ace474a8855e6a7868c804350c8f4513ce184bdcb91098af5cce79c3af6700fdc4fb5d12c7f118615372f35b01e9c5cf390e68d2830258b008fbe6a0d9c3f6873d15d08699702246428d9c6c0a39af18f14b0264a7619d902b8e515d49b2266f5eb393853bd1d44b2cde121ef385c60112803cc6642f5728f27e6ab46f74837ed5007ff43225217c3addb664012c02d12be4431885fb93a49d416d8a6ee912c01991ea90176f65a9d1f29d163c8b73b6a576f6b88f7c5172800d7fe45f425cf7f9a45dc575015d613b91816203ccd534e877ba65b3734ef5abe02e11e75fc3c7513f233997370317fbe2eb27e0cba3ffbd488f9da412b12926e20ded36d79ae5eeed81279e89dae9003d64e2f70b169fafd291674e6a0b4ff3c092a4bc06b05a6a6aac393a1f27390bc8cc3cd5dcd489706aa0fb2d0f432d5eac172ea97887d94ff90d011cf091f07888726e0de8d1295b3a1fafa25cd4b45a644c1b55043dd3cfefb79502642e7c3d57998416829729bc3dc00d8f8b45a0f0a2e2a91c388030557eaaf95ced94fe4a416295a7d15b1917c1b152d5dcbe92f50ff06c2973c3bc1245f2b6eb4e1506d4b428a3"; - bytes - memory signatures = hex"26a2d42cda4543a2b3f070966ccc51efe5427bc633150ea6ae2d87724d7a60c18d3a10d4291aa29a338b51ee4f29bbfd9905aaaad3325a24b36a7c18fc9923ec877879c18d4f96300aa47cb81a009218b1e4c6851581a0d7ed01490b94522563726b0e7ab6261e077468ff8faec162c13836a0f94ddf2659be04688fa085b70a9d2667b80d25fd11b0eb3b67e56a300a6a01578457d55d2e6f4f1fc82bee3c9168d488cfcb437453f55e9481ce5920bed8ad176f466f95ceb3c8779d3240889266ac73078992260ee340ac971c8c57dcdda6a944103beae2d499119b9d78d8c5e679ad67669d8cba29396ae18d7162715c79d8514db18e97860017553c7205fcfc70ab165f3c956dc9c8f20b5975db4f6d4b615776fbaf64367e1dd68a29a6d09123a07becfbead75d132250d4c396b34212ad9eebce7e7bc02b63cb4deaed700cad0a0b521db258e019db921c1f81b619f4848fb9ab9f87e4029f673d21cf9fad9c3ea548763552880b962c7767af192ff7aaada11b76bc2e1b1dd1c9d849884c616037ec265e5aee843e8cc718ceb60f7f1d92829db0fd9ac0bee42025bd5fe1f3f7584e6f1b27fe837bc2559a61b2dbae6188c903d4a4435c1d8562d79da202b3ff9e625112442ae86dc709a3a9662ac3e53f8e001f62133bbb42091f0649af49ad28999990707178e87a6dde37d2a577a3c8db46866dd3c4977e290f367454effa0f10dd609ea929738eaf7a9068fd802378230f844358432dcd6995f0857c12ccb076b40d64f7edfbf5b5805878a13445b8cf99d4a66ced66d0029fde05507c75d14d54be0ef3f710b2fbaceca5d55898319a20bd806d689c0bce461a42c5200d214202c588a7bb4a04493207210f0af210c1abc58e6fda929080541762e6657a411291d16403768c3c492a47707676a15e34e12caab1e607acdf7bb857f04bb5130a88d2e01138f196c2ab6de7da0e47bde1b05c2e1e5e6e7f23cf9196b4271179456e4e6427110e9edd2531b5ea3570b51f9c67f2563591f2eb3eef79d15656c7232a10a4d9ea47878007af6687932878b26bd2430384f5b02cf4b4be55dfa54a3f73d024f6984c39c341b22cf10783326a8421f904ae373a187c2fcd0c49d7c5b5931d5db84fca2006cce5a5eda906dd4945b55375eb65735a43455b44646256b87899a6e725a5f36a3d4d922ca44db1c883dc3cfe36a42c7b0d4b284af0cfa49e8bec7b43b4e8a01afc53af8b2059ab5f47daede24c9720e33a243d2b57707f8c7ec33fdec66f1f7fca5d82f75c6bd4d633ef877c3e271b534b7424a61d47d0c041e400c96b0e3dde1dd8e050146d2af665ff505fdcf37ad07c7130"; + bytes memory publicKeys = + hex"9513f9219894d2daca9cfee1179107fee1ba7bd3ecba34bf0307d206797d2289e93494c41c083fb0dcf755981957dbf4eef0d296ace474a8855e6a7868c804350c8f4513ce184bdcb91098af5cce79c3af6700fdc4fb5d12c7f118615372f35b01e9c5cf390e68d2830258b008fbe6a0d9c3f6873d15d08699702246428d9c6c0a39af18f14b0264a7619d902b8e515d49b2266f5eb393853bd1d44b2cde121ef385c60112803cc6642f5728f27e6ab46f74837ed5007ff43225217c3addb664012c02d12be4431885fb93a49d416d8a6ee912c01991ea90176f65a9d1f29d163c8b73b6a576f6b88f7c5172800d7fe45f425cf7f9a45dc575015d613b91816203ccd534e877ba65b3734ef5abe02e11e75fc3c7513f233997370317fbe2eb27e0cba3ffbd488f9da412b12926e20ded36d79ae5eeed81279e89dae9003d64e2f70b169fafd291674e6a0b4ff3c092a4bc06b05a6a6aac393a1f27390bc8cc3cd5dcd489706aa0fb2d0f432d5eac172ea97887d94ff90d011cf091f07888726e0de8d1295b3a1fafa25cd4b45a644c1b55043dd3cfefb79502642e7c3d57998416829729bc3dc00d8f8b45a0f0a2e2a91c388030557eaaf95ced94fe4a416295a7d15b1917c1b152d5dcbe92f50ff06c2973c3bc1245f2b6eb4e1506d4b428a3"; + bytes memory signatures = + hex"26a2d42cda4543a2b3f070966ccc51efe5427bc633150ea6ae2d87724d7a60c18d3a10d4291aa29a338b51ee4f29bbfd9905aaaad3325a24b36a7c18fc9923ec877879c18d4f96300aa47cb81a009218b1e4c6851581a0d7ed01490b94522563726b0e7ab6261e077468ff8faec162c13836a0f94ddf2659be04688fa085b70a9d2667b80d25fd11b0eb3b67e56a300a6a01578457d55d2e6f4f1fc82bee3c9168d488cfcb437453f55e9481ce5920bed8ad176f466f95ceb3c8779d3240889266ac73078992260ee340ac971c8c57dcdda6a944103beae2d499119b9d78d8c5e679ad67669d8cba29396ae18d7162715c79d8514db18e97860017553c7205fcfc70ab165f3c956dc9c8f20b5975db4f6d4b615776fbaf64367e1dd68a29a6d09123a07becfbead75d132250d4c396b34212ad9eebce7e7bc02b63cb4deaed700cad0a0b521db258e019db921c1f81b619f4848fb9ab9f87e4029f673d21cf9fad9c3ea548763552880b962c7767af192ff7aaada11b76bc2e1b1dd1c9d849884c616037ec265e5aee843e8cc718ceb60f7f1d92829db0fd9ac0bee42025bd5fe1f3f7584e6f1b27fe837bc2559a61b2dbae6188c903d4a4435c1d8562d79da202b3ff9e625112442ae86dc709a3a9662ac3e53f8e001f62133bbb42091f0649af49ad28999990707178e87a6dde37d2a577a3c8db46866dd3c4977e290f367454effa0f10dd609ea929738eaf7a9068fd802378230f844358432dcd6995f0857c12ccb076b40d64f7edfbf5b5805878a13445b8cf99d4a66ced66d0029fde05507c75d14d54be0ef3f710b2fbaceca5d55898319a20bd806d689c0bce461a42c5200d214202c588a7bb4a04493207210f0af210c1abc58e6fda929080541762e6657a411291d16403768c3c492a47707676a15e34e12caab1e607acdf7bb857f04bb5130a88d2e01138f196c2ab6de7da0e47bde1b05c2e1e5e6e7f23cf9196b4271179456e4e6427110e9edd2531b5ea3570b51f9c67f2563591f2eb3eef79d15656c7232a10a4d9ea47878007af6687932878b26bd2430384f5b02cf4b4be55dfa54a3f73d024f6984c39c341b22cf10783326a8421f904ae373a187c2fcd0c49d7c5b5931d5db84fca2006cce5a5eda906dd4945b55375eb65735a43455b44646256b87899a6e725a5f36a3d4d922ca44db1c883dc3cfe36a42c7b0d4b284af0cfa49e8bec7b43b4e8a01afc53af8b2059ab5f47daede24c9720e33a243d2b57707f8c7ec33fdec66f1f7fca5d82f75c6bd4d633ef877c3e271b534b7424a61d47d0c041e400c96b0e3dde1dd8e050146d2af665ff505fdcf37ad07c7130"; vm.startPrank(operatorThree); stakingContract.addValidators(2, 10, publicKeys, signatures); @@ -1198,17 +1147,17 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { uint256 operatorIndex = 1; { - (bytes memory publicKey, bytes memory signature, address _withdrawer, bool _funded) = stakingContract - .getValidator(operatorIndex, 0); + (bytes memory publicKey, bytes memory signature, address _withdrawer, bool _funded) = + stakingContract.getValidator(operatorIndex, 0); assert( - keccak256(publicKey) == - keccak256( + keccak256(publicKey) + == keccak256( hex"24046f7be8644e2b872363d5a4d58836deeb2deab6996a7e57f8c7583872786d1b81e378c4188ec3094236a31e31bd83" ) ); assert( - keccak256(signature) == - keccak256( + keccak256(signature) + == keccak256( hex"57412124b1730be9e30a395b5e7af34e7cecd16b8cc3a5b255f7b5e5cd92a3aa328401d07268d0ffaed8867d8a6288e569c547506b3f124f45f37d17bf0ec9c55917db458ba9cf8d498b0572b253435991f57f4e496763bbbbc3d92bd50c7f05" ) ); @@ -1221,17 +1170,17 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { vm.stopPrank(); { - (bytes memory publicKey, bytes memory signature, address _withdrawer, bool _funded) = stakingContract - .getValidator(operatorIndex, 0); + (bytes memory publicKey, bytes memory signature, address _withdrawer, bool _funded) = + stakingContract.getValidator(operatorIndex, 0); assert( - keccak256(publicKey) == - keccak256( + keccak256(publicKey) + == keccak256( hex"24046f7be8644e2b872363d5a4d58836deeb2deab6996a7e57f8c7583872786d1b81e378c4188ec3094236a31e31bd83" ) ); assert( - keccak256(signature) == - keccak256( + keccak256(signature) + == keccak256( hex"57412124b1730be9e30a395b5e7af34e7cecd16b8cc3a5b255f7b5e5cd92a3aa328401d07268d0ffaed8867d8a6288e569c547506b3f124f45f37d17bf0ec9c55917db458ba9cf8d498b0572b253435991f57f4e496763bbbbc3d92bd50c7f05" ) ); @@ -1241,8 +1190,8 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { assertEq(user.balance, 0); - (, , uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = stakingContract - .getOperator(operatorIndex); + (,, uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = + stakingContract.getOperator(operatorIndex); assertEq(limit, 10); assertEq(keys, 10); assertEq(funded, 1); @@ -1262,8 +1211,8 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { assertEq(user.balance, 0); - (, , uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = stakingContract - .getOperator(operatorIndex); + (,, uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = + stakingContract.getOperator(operatorIndex); assertEq(limit, 10); assertEq(keys, 10); assertEq(funded, 1); @@ -1300,8 +1249,8 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { assert(deactivated == false); sum += funded; - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(1); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(1); assertEq(operatorAddress, operatorTwo); assertEq(feeRecipientAddress, feeRecipientTwo); assertEq(limit, 10); @@ -1309,8 +1258,8 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { assert(deactivated == false); sum += funded; - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(2); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(2); assertEq(operatorAddress, operatorThree); assertEq(feeRecipientAddress, feeRecipientThree); assertEq(limit, 10); @@ -1348,8 +1297,8 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { assertEq(available, 0); assert(deactivated == false); - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(1); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(1); assertEq(operatorAddress, operatorTwo); assertEq(feeRecipientAddress, feeRecipientTwo); assertEq(limit, 10); @@ -1358,8 +1307,8 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { assertEq(available, 0); assert(deactivated == false); - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(2); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(2); assertEq(operatorAddress, operatorThree); assertEq(feeRecipientAddress, feeRecipientThree); assertEq(limit, 10); @@ -1414,8 +1363,8 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { assertEq(user.balance, 0); - (, , uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = stakingContract - .getOperator(operatorIndex); + (,, uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = + stakingContract.getOperator(operatorIndex); assertEq(limit, 10); assertEq(keys, 10); assertEq(funded, 1); @@ -1450,8 +1399,8 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { assert(deactivated == false); sum += funded; - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(1); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(1); assertEq(operatorAddress, operatorTwo); assertEq(feeRecipientAddress, feeRecipientTwo); assertEq(limit, 10); @@ -1459,8 +1408,8 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { assert(deactivated == false); sum += funded; - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(2); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(2); assertEq(operatorAddress, operatorThree); assertEq(feeRecipientAddress, feeRecipientThree); assertEq(limit, 10); @@ -1498,8 +1447,8 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { assertEq(available, 0); assert(deactivated == false); - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(1); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(1); assertEq(operatorAddress, operatorTwo); assertEq(feeRecipientAddress, feeRecipientTwo); assertEq(limit, 10); @@ -1508,8 +1457,8 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { assertEq(available, 0); assert(deactivated == false); - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(2); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(2); assertEq(operatorAddress, operatorThree); assertEq(feeRecipientAddress, feeRecipientThree); assertEq(limit, 10); @@ -1559,14 +1508,14 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { uint256 operatorIndex = 1; vm.startPrank(user); - (bool _success, ) = address(stakingContract).call{value: 32 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 ether}(""); assert(_success == true); vm.stopPrank(); assertEq(user.balance, 0); - (, , uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = stakingContract - .getOperator(operatorIndex); + (,, uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = + stakingContract.getOperator(operatorIndex); assertEq(limit, 10); assertEq(keys, 10); assertEq(funded, 1); @@ -1579,7 +1528,7 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { vm.deal(user, 32 * 3 ether); vm.startPrank(user); - (bool _success, ) = address(stakingContract).call{value: 32 * 3 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 * 3 ether}(""); assert(_success == true); vm.stopPrank(); @@ -1602,8 +1551,8 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { assert(deactivated == false); sum += funded; - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(1); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(1); assertEq(operatorAddress, operatorTwo); assertEq(feeRecipientAddress, feeRecipientTwo); assertEq(limit, 10); @@ -1611,8 +1560,8 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { assert(deactivated == false); sum += funded; - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(2); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(2); assertEq(operatorAddress, operatorThree); assertEq(feeRecipientAddress, feeRecipientThree); assertEq(limit, 10); @@ -1628,7 +1577,7 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { vm.deal(user, 32 * 30 ether); vm.startPrank(user); - (bool _success, ) = address(stakingContract).call{value: 32 * 30 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 * 30 ether}(""); assert(_success == true); vm.stopPrank(); @@ -1651,8 +1600,8 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { assertEq(available, 0); assert(deactivated == false); - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(1); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(1); assertEq(operatorAddress, operatorTwo); assertEq(feeRecipientAddress, feeRecipientTwo); assertEq(limit, 10); @@ -1661,8 +1610,8 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { assertEq(available, 0); assert(deactivated == false); - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(2); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(2); assertEq(operatorAddress, operatorThree); assertEq(feeRecipientAddress, feeRecipientThree); assertEq(limit, 10); @@ -1678,7 +1627,7 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { vm.startPrank(user); vm.expectRevert(abi.encodeWithSignature("NotEnoughValidators()")); - (bool _success, ) = address(stakingContract).call{value: 32 * 31 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 * 31 ether}(""); assert(_success == true); vm.stopPrank(); } @@ -1688,12 +1637,12 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { vm.deal(user, 32 * 31 ether); vm.startPrank(user); - (bool _success, ) = address(stakingContract).call{value: 32 * 30 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 * 30 ether}(""); assert(_success == true); vm.stopPrank(); vm.startPrank(user); vm.expectRevert(abi.encodeWithSignature("NotEnoughValidators()")); - (_success, ) = address(stakingContract).call{value: 32 ether}(""); + (_success,) = address(stakingContract).call{value: 32 ether}(""); assert(_success == true); vm.stopPrank(); } @@ -1704,7 +1653,7 @@ contract StakingContractThreeValidatorsTest is DSTestPlus { vm.startPrank(user); vm.expectRevert(abi.encodeWithSignature("InvalidDepositValue()")); - (bool _success, ) = address(stakingContract).call{value: 31.9 ether}(""); + (bool _success,) = address(stakingContract).call{value: 31.9 ether}(""); assert(_success == true); vm.stopPrank(); } @@ -1733,14 +1682,7 @@ contract StakingContractDistributionTest is DSTestPlus { stakingContract = new StakingContract(); depositContract = new DepositContractMock(); stakingContract.initialize_1( - admin, - address(treasury), - address(depositContract), - address(0), - address(0), - address(0), - 1000, - 2000 + admin, address(treasury), address(depositContract), address(0), address(0), address(0), 1000, 2000 ); } @@ -1789,7 +1731,7 @@ contract StakingContractDistributionTest is DSTestPlus { vm.stopPrank(); } - for (uint256 i; i < depositCount; ) { + for (uint256 i; i < depositCount;) { // +1 To prevent underflow. vm.roll(i + 1); uint256 availableKeys = stakingContract.getAvailableValidatorCount(); @@ -1810,7 +1752,7 @@ contract StakingContractDistributionTest is DSTestPlus { uint256 availableSum; for (uint256 i; i < newOps; ++i) { - (, , , , uint256 funded, uint256 available, bool deactivated) = stakingContract.getOperator(i); + (,,,, uint256 funded, uint256 available, bool deactivated) = stakingContract.getOperator(i); sum += funded; availableSum += available; assert(deactivated == false); @@ -1847,14 +1789,7 @@ contract StakingContractTwoValidatorsTest is DSTestPlus { stakingContract = new StakingContract(); depositContract = new DepositContractMock(); stakingContract.initialize_1( - admin, - address(treasury), - address(depositContract), - address(0), - address(0), - address(0), - 1000, - 2000 + admin, address(treasury), address(depositContract), address(0), address(0), address(0), 1000, 2000 ); vm.startPrank(admin); @@ -1863,11 +1798,11 @@ contract StakingContractTwoValidatorsTest is DSTestPlus { vm.stopPrank(); { - bytes - memory publicKeys = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759b0ce3fa164aae897adca509ed44429e7b1f91b7c46ddbe199cee848e09b1ccbb9736b78b68aacff1011b7266fe11e06014451b3fb9288549aff6dea9843b43e0c47a3b856f307732175230e254c0004e48b02414987088ac7003e148930017b49a1a8d4600f33d463c4afc07bbfc82703c9fcf81a5891f90a71c86a02faff443c6c3b2592bd44d5d3d7a93cb4aaaa105612496d61e68140a5418b468f872bf2f3e79f9cb0d9c3e889663fca02939b31e8ee3092203ee1417128e965c6406a07f68abf2ebe2689cf6c853ef126ffa8574c2a7d913e28de9147fa6b96706ea5bf9eacd1aba06edeaee155009fb912c00070774cc64136fcffde12ed731260bc5529df64da298f493561198e9d6acf42cf21e853ae7b2df85f27d2183149969d623b9237254c2cfe1d0082742eb042ac096d686dbe03c79ee31cbd03bb4682f8797043eed9f6e622814831ac5dfe1176552fb7f9b6ff38a149ae1d8414097a32fd96da6453c52fda13e3402a09e2fa6886daa4300f09c73e4bc2901b99c44744c5cfdca2994adc49ddccb195bda2510e50a4ae10de26cf96dee5e577689f51650a610a33da0a826ae47247d8d1189cb3386"; + bytes memory publicKeys = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759b0ce3fa164aae897adca509ed44429e7b1f91b7c46ddbe199cee848e09b1ccbb9736b78b68aacff1011b7266fe11e06014451b3fb9288549aff6dea9843b43e0c47a3b856f307732175230e254c0004e48b02414987088ac7003e148930017b49a1a8d4600f33d463c4afc07bbfc82703c9fcf81a5891f90a71c86a02faff443c6c3b2592bd44d5d3d7a93cb4aaaa105612496d61e68140a5418b468f872bf2f3e79f9cb0d9c3e889663fca02939b31e8ee3092203ee1417128e965c6406a07f68abf2ebe2689cf6c853ef126ffa8574c2a7d913e28de9147fa6b96706ea5bf9eacd1aba06edeaee155009fb912c00070774cc64136fcffde12ed731260bc5529df64da298f493561198e9d6acf42cf21e853ae7b2df85f27d2183149969d623b9237254c2cfe1d0082742eb042ac096d686dbe03c79ee31cbd03bb4682f8797043eed9f6e622814831ac5dfe1176552fb7f9b6ff38a149ae1d8414097a32fd96da6453c52fda13e3402a09e2fa6886daa4300f09c73e4bc2901b99c44744c5cfdca2994adc49ddccb195bda2510e50a4ae10de26cf96dee5e577689f51650a610a33da0a826ae47247d8d1189cb3386"; - bytes - memory signatures = hex"ccb81f4485957f440bc17dbe760f374cbb112c6f12fa10e8709fac4522b30440d918c7bb867fa04f6b3cfbd977455f8f2fde586fdf3d7baa429e98e497ff871f3b8db1528b2b964fa24d26e377c74746496cc719c50dbf391fb3f74f5ca4b93a02a9f0007cd7b7d2af2d1b07c8600ab86a5d27dc51a29c2e3007c7a69cb73bcaecc764641e02370955dba100428d259d6475ee3566872bd43b0e73e55b9669e50f2b1666e57b326a5dfad655c7921e0dfb421b1ec59c8fdb48eb77421fd06966f393d619cbf13ff427df11dcb17026df25f35268de5b168e359c16f2a3d5fbc6376db44638d773c851c875f21222448433d285920e8bdc4f5cbff130d7387c0a9589324286aea398e5aacad3bbfe3992dfce62571f0e282ed9c29e3fa5b07aa5c81749589b1170d3b85a84331e2f6b8e26eadebfd569b225759f40bbd12d6c3d253ed3f379b014b2ea44cce54d362072e2d020ff139a903b7d87fc3fddc2e6657c83e0b79851c22c6e0e477463463c97d6cc0e2e2de5e35b227bddb285521be3766358abaf3159d89f68c9770e28278f177088cfc4089b817effaaecabdffa4e66427868b105cb9348ea2d84eeea059a5d1ff3277d6f9cf656fc973d07cabed70fb8f8eb2798a65d207a8e1f8a26910949db9fa62d62bc15ecc097a93a27a1873405b8589a4ddf0ecf0303c6031484562b32eb7881975026524d6d4a9de6cd73fe2c324501586b9b6fa6bce950bbd21472278302f83dbfd6be036f2fc36d299d66578e844be3d6aa8314fab468f038fd6e130ada0a886fccfb2fd843f7dd07e8968401bbe2af7345fce52ba4b310b30af2d54b15669d06c206682c1730ab6b17787e361f04401f78dc5cbd5fac955df4e83c24cdabfabdb3f4ea40961d04a5ca166c17694fca144025b47131a68ddb230d36fe6e831e82624c9a925d706bff86982852b26ebf019a3f6ee36aedbbc6bec2d50531a233e09225493d3c5fd48379aec373baf622fb9feed6261e5296e5ae6601e7523c7f386801ed63a344b07106a0d03e5848209db5e114c0e67884916a43a1bfb77d9b8ea113c3ba8cad4b006aafeadcc31e70e85c5efecaf807154d011c1413340d4b592d2f270fb48b2050e08493c1427ddfac8dcc27fe434d32a35dcbddbcb1c4e22ead6734a4ac910f6768bc9ff6b355c1151695e41121cdcc9d9d3b18cf4d66ca3c1db0527c471a0dcf256590602a7269dcb26175e7eb370bd9794ac8ab558bea69e6a92d8e818b675a80e2df0516b8307291d93cb85d959ac60d47b46455a7ab0a38687c747c6d2d9e8c20ccf74dc6cdf145ec06805d4ac24a39aec2f5cd6e26e63e3d043a31c42411e4"; + bytes memory signatures = + hex"ccb81f4485957f440bc17dbe760f374cbb112c6f12fa10e8709fac4522b30440d918c7bb867fa04f6b3cfbd977455f8f2fde586fdf3d7baa429e98e497ff871f3b8db1528b2b964fa24d26e377c74746496cc719c50dbf391fb3f74f5ca4b93a02a9f0007cd7b7d2af2d1b07c8600ab86a5d27dc51a29c2e3007c7a69cb73bcaecc764641e02370955dba100428d259d6475ee3566872bd43b0e73e55b9669e50f2b1666e57b326a5dfad655c7921e0dfb421b1ec59c8fdb48eb77421fd06966f393d619cbf13ff427df11dcb17026df25f35268de5b168e359c16f2a3d5fbc6376db44638d773c851c875f21222448433d285920e8bdc4f5cbff130d7387c0a9589324286aea398e5aacad3bbfe3992dfce62571f0e282ed9c29e3fa5b07aa5c81749589b1170d3b85a84331e2f6b8e26eadebfd569b225759f40bbd12d6c3d253ed3f379b014b2ea44cce54d362072e2d020ff139a903b7d87fc3fddc2e6657c83e0b79851c22c6e0e477463463c97d6cc0e2e2de5e35b227bddb285521be3766358abaf3159d89f68c9770e28278f177088cfc4089b817effaaecabdffa4e66427868b105cb9348ea2d84eeea059a5d1ff3277d6f9cf656fc973d07cabed70fb8f8eb2798a65d207a8e1f8a26910949db9fa62d62bc15ecc097a93a27a1873405b8589a4ddf0ecf0303c6031484562b32eb7881975026524d6d4a9de6cd73fe2c324501586b9b6fa6bce950bbd21472278302f83dbfd6be036f2fc36d299d66578e844be3d6aa8314fab468f038fd6e130ada0a886fccfb2fd843f7dd07e8968401bbe2af7345fce52ba4b310b30af2d54b15669d06c206682c1730ab6b17787e361f04401f78dc5cbd5fac955df4e83c24cdabfabdb3f4ea40961d04a5ca166c17694fca144025b47131a68ddb230d36fe6e831e82624c9a925d706bff86982852b26ebf019a3f6ee36aedbbc6bec2d50531a233e09225493d3c5fd48379aec373baf622fb9feed6261e5296e5ae6601e7523c7f386801ed63a344b07106a0d03e5848209db5e114c0e67884916a43a1bfb77d9b8ea113c3ba8cad4b006aafeadcc31e70e85c5efecaf807154d011c1413340d4b592d2f270fb48b2050e08493c1427ddfac8dcc27fe434d32a35dcbddbcb1c4e22ead6734a4ac910f6768bc9ff6b355c1151695e41121cdcc9d9d3b18cf4d66ca3c1db0527c471a0dcf256590602a7269dcb26175e7eb370bd9794ac8ab558bea69e6a92d8e818b675a80e2df0516b8307291d93cb85d959ac60d47b46455a7ab0a38687c747c6d2d9e8c20ccf74dc6cdf145ec06805d4ac24a39aec2f5cd6e26e63e3d043a31c42411e4"; vm.startPrank(operatorOne); stakingContract.addValidators(0, 10, publicKeys, signatures); @@ -1875,10 +1810,10 @@ contract StakingContractTwoValidatorsTest is DSTestPlus { } { - bytes - memory publicKeys = hex"24046f7be8644e2b872363d5a4d58836deeb2deab6996a7e57f8c7583872786d1b81e378c4188ec3094236a31e31bd83c89e108b2d2e26e9dba2cc7a4f898c5f4b62d43f8e76c7cf64d02aab46afc436d7759d2b2e4d4aca97687b0022bec98307d1b050eafad3ba0fdf22cf645936ebd9e3c1ae913badc7307e02c38d778b10259b571237cc826a030b44a4fd53da790a84e6578890a7c801bbc2212bfccfecf88da5203e96c29b404fd9a61400f808e11a10fe39c9d97de43ad20867b3f5a71cc86d46d1058ab033c63c2369774cabe009231a85836abe39f9f5b41158a2505305d6e500cd64eb8e479e59c72945b9aaa177fd4a99d36dac27400609e098b8ce8638dc0ae641043107e47ccc495bdf7f40811e1c67103605241ea329ebd34e85d3184f79fe2b4642007709c2f4912853d72e0399930a62c915e50d4e1a1bd0fa26f021f37f519b86e168a181604c9c4b9af621932f09601bd9d5d0a9ee349076765d1baea4eef0fc16d4ebc861569ec37857c1d654ca442d2b0c85e97c5d56289a42afa5040cb1901bd03faf7011780599ed2cf826b8a2dd9deece7d9ecd7d7be2751bb42645f0253732447092311597a0f7672268125a95464c541e7fb1e3e08151f038adec85a60db0a9a9430ca80ffdbabe557aa2e0f69e6aed98527c91"; - bytes - memory signatures = hex"57412124b1730be9e30a395b5e7af34e7cecd16b8cc3a5b255f7b5e5cd92a3aa328401d07268d0ffaed8867d8a6288e569c547506b3f124f45f37d17bf0ec9c55917db458ba9cf8d498b0572b253435991f57f4e496763bbbbc3d92bd50c7f05304112ec1a45d0a8e5b3aa309dc4377ee8beb9d79b08f6bd60d0696b29acff9539cb836f2f00bbf888cfd28e4cfa4f317d6c3babdc0e121247789137eae3553de0c67ccbe2a5135f8f70dc5a79023544da8d608c825ef06ec32d315b4b026dd8f7f667af7368efead94f6f38418b1527a7c4500424410b8b09c580e89bc8cfba27eed8cea56311b9446313de80bb24f09072ee0ef5ceb504d7bdefed1e3fa5a8aee876b44302f7ff1b8a039033c3ed370a7b02a0cc23a5b7b4d7499649e6ee3f37d51fcbde910f6d10c1512eaf8924a8c7f150d280efb293e719ff07357c01482b1b6cc75a3d0118bdc058cccf67fbcbaad1423f2940d0191bb1d8257a2d827e74a3963ccbd316081105be05e8471d8fa466b4935c0dce7cb6bcb36dd1ef2a156841be9793a00a3aefb8e55ef91f6f17ba49cb9025dc441fd381ad5194de34d9032df1f26930537f0fcd509638403c3ce8df19f2106904cfd82e92627283fdc8ac5165848dabbf1b1566302ddeb72f70a17bb1520b8cc3b41c007e3bf334af34e900ef5fc0b3fb8642f7bd0b109c7cfd204c7e0039c10d1592ec02e8af9ea9653df70fed29d30c2784e3ff187caabb0a588db0fd2bb77565909cd5f5895a56d32510fb90735d5f1ca1dd4b9bbf7ce3e8d3745a879093e90d883875b865a69d7b79b2bf4cf42cedf084447c95e31d11c41adff8a9939550c87996d7f4002c9064bb2e6e675310caf556a7e44f07e92704c7589c2e335cbd4dc3fde2bfd7d79ad050bee3066e5aed5e97c445e0c54c9f5c5febbc5182aeaad91acc0e9b58bfed9049a2ccc09bf4b2534220f24c8c387306a498fffe66d3cd50c34296fb456fe2656999893ed1ac5ed8eb1845455412833e9abec7274714ccbef2c20172df5fdde1e1bb142c5987c8aec208fb11b383cf4b1c3851d8ef27561176605487b5c83923fa731e94ee6ec59fe8307df91c2552a1e318933f32c9b2f27896f932c69b9dc0c8860e78663a5be9480be01b19bc9f56b955e442af493f0d267d4ed8e466eaa345af4e476beade96d6460a4e701c1604f190eafc6c42ed751943cb7393b7bb871c9849f056bddf731fb1eed5b8f030330d245834834994f49d1ecb6eac952e02baa1298f482b622caaa4b6479afd6729cfc2c14ab571e4d32973016cded551becd595af5bcb1cf53db1b55ca1b580da6564f065ac8c8c1709ccdc30003125d54"; + bytes memory publicKeys = + hex"24046f7be8644e2b872363d5a4d58836deeb2deab6996a7e57f8c7583872786d1b81e378c4188ec3094236a31e31bd83c89e108b2d2e26e9dba2cc7a4f898c5f4b62d43f8e76c7cf64d02aab46afc436d7759d2b2e4d4aca97687b0022bec98307d1b050eafad3ba0fdf22cf645936ebd9e3c1ae913badc7307e02c38d778b10259b571237cc826a030b44a4fd53da790a84e6578890a7c801bbc2212bfccfecf88da5203e96c29b404fd9a61400f808e11a10fe39c9d97de43ad20867b3f5a71cc86d46d1058ab033c63c2369774cabe009231a85836abe39f9f5b41158a2505305d6e500cd64eb8e479e59c72945b9aaa177fd4a99d36dac27400609e098b8ce8638dc0ae641043107e47ccc495bdf7f40811e1c67103605241ea329ebd34e85d3184f79fe2b4642007709c2f4912853d72e0399930a62c915e50d4e1a1bd0fa26f021f37f519b86e168a181604c9c4b9af621932f09601bd9d5d0a9ee349076765d1baea4eef0fc16d4ebc861569ec37857c1d654ca442d2b0c85e97c5d56289a42afa5040cb1901bd03faf7011780599ed2cf826b8a2dd9deece7d9ecd7d7be2751bb42645f0253732447092311597a0f7672268125a95464c541e7fb1e3e08151f038adec85a60db0a9a9430ca80ffdbabe557aa2e0f69e6aed98527c91"; + bytes memory signatures = + hex"57412124b1730be9e30a395b5e7af34e7cecd16b8cc3a5b255f7b5e5cd92a3aa328401d07268d0ffaed8867d8a6288e569c547506b3f124f45f37d17bf0ec9c55917db458ba9cf8d498b0572b253435991f57f4e496763bbbbc3d92bd50c7f05304112ec1a45d0a8e5b3aa309dc4377ee8beb9d79b08f6bd60d0696b29acff9539cb836f2f00bbf888cfd28e4cfa4f317d6c3babdc0e121247789137eae3553de0c67ccbe2a5135f8f70dc5a79023544da8d608c825ef06ec32d315b4b026dd8f7f667af7368efead94f6f38418b1527a7c4500424410b8b09c580e89bc8cfba27eed8cea56311b9446313de80bb24f09072ee0ef5ceb504d7bdefed1e3fa5a8aee876b44302f7ff1b8a039033c3ed370a7b02a0cc23a5b7b4d7499649e6ee3f37d51fcbde910f6d10c1512eaf8924a8c7f150d280efb293e719ff07357c01482b1b6cc75a3d0118bdc058cccf67fbcbaad1423f2940d0191bb1d8257a2d827e74a3963ccbd316081105be05e8471d8fa466b4935c0dce7cb6bcb36dd1ef2a156841be9793a00a3aefb8e55ef91f6f17ba49cb9025dc441fd381ad5194de34d9032df1f26930537f0fcd509638403c3ce8df19f2106904cfd82e92627283fdc8ac5165848dabbf1b1566302ddeb72f70a17bb1520b8cc3b41c007e3bf334af34e900ef5fc0b3fb8642f7bd0b109c7cfd204c7e0039c10d1592ec02e8af9ea9653df70fed29d30c2784e3ff187caabb0a588db0fd2bb77565909cd5f5895a56d32510fb90735d5f1ca1dd4b9bbf7ce3e8d3745a879093e90d883875b865a69d7b79b2bf4cf42cedf084447c95e31d11c41adff8a9939550c87996d7f4002c9064bb2e6e675310caf556a7e44f07e92704c7589c2e335cbd4dc3fde2bfd7d79ad050bee3066e5aed5e97c445e0c54c9f5c5febbc5182aeaad91acc0e9b58bfed9049a2ccc09bf4b2534220f24c8c387306a498fffe66d3cd50c34296fb456fe2656999893ed1ac5ed8eb1845455412833e9abec7274714ccbef2c20172df5fdde1e1bb142c5987c8aec208fb11b383cf4b1c3851d8ef27561176605487b5c83923fa731e94ee6ec59fe8307df91c2552a1e318933f32c9b2f27896f932c69b9dc0c8860e78663a5be9480be01b19bc9f56b955e442af493f0d267d4ed8e466eaa345af4e476beade96d6460a4e701c1604f190eafc6c42ed751943cb7393b7bb871c9849f056bddf731fb1eed5b8f030330d245834834994f49d1ecb6eac952e02baa1298f482b622caaa4b6479afd6729cfc2c14ab571e4d32973016cded551becd595af5bcb1cf53db1b55ca1b580da6564f065ac8c8c1709ccdc30003125d54"; vm.startPrank(operatorTwo); stakingContract.addValidators(1, 10, publicKeys, signatures); @@ -1907,8 +1842,8 @@ contract StakingContractTwoValidatorsTest is DSTestPlus { assertEq(user.balance, 0); - (, , uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = stakingContract - .getOperator(0); + (,, uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = + stakingContract.getOperator(0); assertEq(limit, 10); assertEq(keys, 10); assertEq(funded, 1); @@ -1927,7 +1862,7 @@ contract StakingContractTwoValidatorsTest is DSTestPlus { user, hex"24046f7be8644e2b872363d5a4d58836deeb2deab6996a7e57f8c7583872786d1b81e378c4188ec3094236a31e31bd83", hex"57412124b1730be9e30a395b5e7af34e7cecd16b8cc3a5b255f7b5e5cd92a3aa328401d07268d0ffaed8867d8a6288e569c547506b3f124f45f37d17bf0ec9c55917db458ba9cf8d498b0572b253435991f57f4e496763bbbbc3d92bd50c7f05" - ); + ); stakingContract.deposit{value: 32 * 2 ether}(); vm.stopPrank(); @@ -1950,8 +1885,8 @@ contract StakingContractTwoValidatorsTest is DSTestPlus { assertEq(available, 9); assert(deactivated == false); - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(1); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(1); assertEq(operatorAddress, operatorTwo); assertEq(feeRecipientAddress, feeRecipientTwo); assertEq(limit, 10); @@ -1988,8 +1923,8 @@ contract StakingContractTwoValidatorsTest is DSTestPlus { assertEq(available, 0); assert(deactivated == false); - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(1); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(1); assertEq(operatorAddress, operatorTwo); assertEq(feeRecipientAddress, feeRecipientTwo); assertEq(limit, 10); @@ -2039,14 +1974,14 @@ contract StakingContractTwoValidatorsTest is DSTestPlus { vm.roll(1000); vm.startPrank(user); - (bool _success, ) = address(stakingContract).call{value: 32 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 ether}(""); assert(_success == true); vm.stopPrank(); assertEq(user.balance, 0); - (, , uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = stakingContract - .getOperator(1); + (,, uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = + stakingContract.getOperator(1); assertEq(limit, 10); assertEq(keys, 10); assertEq(funded, 1); @@ -2065,8 +2000,8 @@ contract StakingContractTwoValidatorsTest is DSTestPlus { user, hex"24046f7be8644e2b872363d5a4d58836deeb2deab6996a7e57f8c7583872786d1b81e378c4188ec3094236a31e31bd83", hex"57412124b1730be9e30a395b5e7af34e7cecd16b8cc3a5b255f7b5e5cd92a3aa328401d07268d0ffaed8867d8a6288e569c547506b3f124f45f37d17bf0ec9c55917db458ba9cf8d498b0572b253435991f57f4e496763bbbbc3d92bd50c7f05" - ); - (bool _success, ) = address(stakingContract).call{value: 32 * 2 ether}(""); + ); + (bool _success,) = address(stakingContract).call{value: 32 * 2 ether}(""); assert(_success == true); vm.stopPrank(); @@ -2089,8 +2024,8 @@ contract StakingContractTwoValidatorsTest is DSTestPlus { assertEq(available, 9); assert(deactivated == false); - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(1); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(1); assertEq(operatorAddress, operatorTwo); assertEq(feeRecipientAddress, feeRecipientTwo); assertEq(limit, 10); @@ -2105,7 +2040,7 @@ contract StakingContractTwoValidatorsTest is DSTestPlus { vm.deal(user, 32 * 20 ether); vm.startPrank(user); - (bool _success, ) = address(stakingContract).call{value: 32 * 20 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 * 20 ether}(""); assert(_success == true); vm.stopPrank(); @@ -2128,8 +2063,8 @@ contract StakingContractTwoValidatorsTest is DSTestPlus { assertEq(available, 0); assert(deactivated == false); - (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = stakingContract - .getOperator(1); + (operatorAddress, feeRecipientAddress, limit, keys, funded, available, deactivated) = + stakingContract.getOperator(1); assertEq(operatorAddress, operatorTwo); assertEq(feeRecipientAddress, feeRecipientTwo); assertEq(limit, 10); @@ -2145,7 +2080,7 @@ contract StakingContractTwoValidatorsTest is DSTestPlus { vm.startPrank(user); vm.expectRevert(abi.encodeWithSignature("NotEnoughValidators()")); - (bool _success, ) = address(stakingContract).call{value: 32 * 21 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 * 21 ether}(""); assert(_success == true); vm.stopPrank(); } @@ -2155,12 +2090,12 @@ contract StakingContractTwoValidatorsTest is DSTestPlus { vm.deal(user, 32 * 21 ether); vm.startPrank(user); - (bool _success, ) = address(stakingContract).call{value: 32 * 20 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 * 20 ether}(""); assert(_success == true); vm.stopPrank(); vm.startPrank(user); vm.expectRevert(abi.encodeWithSignature("NotEnoughValidators()")); - (_success, ) = address(stakingContract).call{value: 32 ether}(""); + (_success,) = address(stakingContract).call{value: 32 ether}(""); assert(_success == true); vm.stopPrank(); } @@ -2171,7 +2106,7 @@ contract StakingContractTwoValidatorsTest is DSTestPlus { vm.startPrank(user); vm.expectRevert(abi.encodeWithSignature("InvalidDepositValue()")); - (bool _success, ) = address(stakingContract).call{value: 31.9 ether}(""); + (bool _success,) = address(stakingContract).call{value: 31.9 ether}(""); assert(_success == true); vm.stopPrank(); } @@ -2235,11 +2170,11 @@ contract StakingContractOneValidatorTest is DSTestPlus { vm.stopPrank(); { - bytes - memory publicKeys = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759b0ce3fa164aae897adca509ed44429e7b1f91b7c46ddbe199cee848e09b1ccbb9736b78b68aacff1011b7266fe11e06014451b3fb9288549aff6dea9843b43e0c47a3b856f307732175230e254c0004e48b02414987088ac7003e148930017b49a1a8d4600f33d463c4afc07bbfc82703c9fcf81a5891f90a71c86a02faff443c6c3b2592bd44d5d3d7a93cb4aaaa105612496d61e68140a5418b468f872bf2f3e79f9cb0d9c3e889663fca02939b31e8ee3092203ee1417128e965c6406a07f68abf2ebe2689cf6c853ef126ffa8574c2a7d913e28de9147fa6b96706ea5bf9eacd1aba06edeaee155009fb912c00070774cc64136fcffde12ed731260bc5529df64da298f493561198e9d6acf42cf21e853ae7b2df85f27d2183149969d623b9237254c2cfe1d0082742eb042ac096d686dbe03c79ee31cbd03bb4682f8797043eed9f6e622814831ac5dfe1176552fb7f9b6ff38a149ae1d8414097a32fd96da6453c52fda13e3402a09e2fa6886daa4300f09c73e4bc2901b99c44744c5cfdca2994adc49ddccb195bda2510e50a4ae10de26cf96dee5e577689f51650a610a33da0a826ae47247d8d1189cb3386"; + bytes memory publicKeys = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759b0ce3fa164aae897adca509ed44429e7b1f91b7c46ddbe199cee848e09b1ccbb9736b78b68aacff1011b7266fe11e06014451b3fb9288549aff6dea9843b43e0c47a3b856f307732175230e254c0004e48b02414987088ac7003e148930017b49a1a8d4600f33d463c4afc07bbfc82703c9fcf81a5891f90a71c86a02faff443c6c3b2592bd44d5d3d7a93cb4aaaa105612496d61e68140a5418b468f872bf2f3e79f9cb0d9c3e889663fca02939b31e8ee3092203ee1417128e965c6406a07f68abf2ebe2689cf6c853ef126ffa8574c2a7d913e28de9147fa6b96706ea5bf9eacd1aba06edeaee155009fb912c00070774cc64136fcffde12ed731260bc5529df64da298f493561198e9d6acf42cf21e853ae7b2df85f27d2183149969d623b9237254c2cfe1d0082742eb042ac096d686dbe03c79ee31cbd03bb4682f8797043eed9f6e622814831ac5dfe1176552fb7f9b6ff38a149ae1d8414097a32fd96da6453c52fda13e3402a09e2fa6886daa4300f09c73e4bc2901b99c44744c5cfdca2994adc49ddccb195bda2510e50a4ae10de26cf96dee5e577689f51650a610a33da0a826ae47247d8d1189cb3386"; - bytes - memory signatures = hex"ccb81f4485957f440bc17dbe760f374cbb112c6f12fa10e8709fac4522b30440d918c7bb867fa04f6b3cfbd977455f8f2fde586fdf3d7baa429e98e497ff871f3b8db1528b2b964fa24d26e377c74746496cc719c50dbf391fb3f74f5ca4b93a02a9f0007cd7b7d2af2d1b07c8600ab86a5d27dc51a29c2e3007c7a69cb73bcaecc764641e02370955dba100428d259d6475ee3566872bd43b0e73e55b9669e50f2b1666e57b326a5dfad655c7921e0dfb421b1ec59c8fdb48eb77421fd06966f393d619cbf13ff427df11dcb17026df25f35268de5b168e359c16f2a3d5fbc6376db44638d773c851c875f21222448433d285920e8bdc4f5cbff130d7387c0a9589324286aea398e5aacad3bbfe3992dfce62571f0e282ed9c29e3fa5b07aa5c81749589b1170d3b85a84331e2f6b8e26eadebfd569b225759f40bbd12d6c3d253ed3f379b014b2ea44cce54d362072e2d020ff139a903b7d87fc3fddc2e6657c83e0b79851c22c6e0e477463463c97d6cc0e2e2de5e35b227bddb285521be3766358abaf3159d89f68c9770e28278f177088cfc4089b817effaaecabdffa4e66427868b105cb9348ea2d84eeea059a5d1ff3277d6f9cf656fc973d07cabed70fb8f8eb2798a65d207a8e1f8a26910949db9fa62d62bc15ecc097a93a27a1873405b8589a4ddf0ecf0303c6031484562b32eb7881975026524d6d4a9de6cd73fe2c324501586b9b6fa6bce950bbd21472278302f83dbfd6be036f2fc36d299d66578e844be3d6aa8314fab468f038fd6e130ada0a886fccfb2fd843f7dd07e8968401bbe2af7345fce52ba4b310b30af2d54b15669d06c206682c1730ab6b17787e361f04401f78dc5cbd5fac955df4e83c24cdabfabdb3f4ea40961d04a5ca166c17694fca144025b47131a68ddb230d36fe6e831e82624c9a925d706bff86982852b26ebf019a3f6ee36aedbbc6bec2d50531a233e09225493d3c5fd48379aec373baf622fb9feed6261e5296e5ae6601e7523c7f386801ed63a344b07106a0d03e5848209db5e114c0e67884916a43a1bfb77d9b8ea113c3ba8cad4b006aafeadcc31e70e85c5efecaf807154d011c1413340d4b592d2f270fb48b2050e08493c1427ddfac8dcc27fe434d32a35dcbddbcb1c4e22ead6734a4ac910f6768bc9ff6b355c1151695e41121cdcc9d9d3b18cf4d66ca3c1db0527c471a0dcf256590602a7269dcb26175e7eb370bd9794ac8ab558bea69e6a92d8e818b675a80e2df0516b8307291d93cb85d959ac60d47b46455a7ab0a38687c747c6d2d9e8c20ccf74dc6cdf145ec06805d4ac24a39aec2f5cd6e26e63e3d043a31c42411e4"; + bytes memory signatures = + hex"ccb81f4485957f440bc17dbe760f374cbb112c6f12fa10e8709fac4522b30440d918c7bb867fa04f6b3cfbd977455f8f2fde586fdf3d7baa429e98e497ff871f3b8db1528b2b964fa24d26e377c74746496cc719c50dbf391fb3f74f5ca4b93a02a9f0007cd7b7d2af2d1b07c8600ab86a5d27dc51a29c2e3007c7a69cb73bcaecc764641e02370955dba100428d259d6475ee3566872bd43b0e73e55b9669e50f2b1666e57b326a5dfad655c7921e0dfb421b1ec59c8fdb48eb77421fd06966f393d619cbf13ff427df11dcb17026df25f35268de5b168e359c16f2a3d5fbc6376db44638d773c851c875f21222448433d285920e8bdc4f5cbff130d7387c0a9589324286aea398e5aacad3bbfe3992dfce62571f0e282ed9c29e3fa5b07aa5c81749589b1170d3b85a84331e2f6b8e26eadebfd569b225759f40bbd12d6c3d253ed3f379b014b2ea44cce54d362072e2d020ff139a903b7d87fc3fddc2e6657c83e0b79851c22c6e0e477463463c97d6cc0e2e2de5e35b227bddb285521be3766358abaf3159d89f68c9770e28278f177088cfc4089b817effaaecabdffa4e66427868b105cb9348ea2d84eeea059a5d1ff3277d6f9cf656fc973d07cabed70fb8f8eb2798a65d207a8e1f8a26910949db9fa62d62bc15ecc097a93a27a1873405b8589a4ddf0ecf0303c6031484562b32eb7881975026524d6d4a9de6cd73fe2c324501586b9b6fa6bce950bbd21472278302f83dbfd6be036f2fc36d299d66578e844be3d6aa8314fab468f038fd6e130ada0a886fccfb2fd843f7dd07e8968401bbe2af7345fce52ba4b310b30af2d54b15669d06c206682c1730ab6b17787e361f04401f78dc5cbd5fac955df4e83c24cdabfabdb3f4ea40961d04a5ca166c17694fca144025b47131a68ddb230d36fe6e831e82624c9a925d706bff86982852b26ebf019a3f6ee36aedbbc6bec2d50531a233e09225493d3c5fd48379aec373baf622fb9feed6261e5296e5ae6601e7523c7f386801ed63a344b07106a0d03e5848209db5e114c0e67884916a43a1bfb77d9b8ea113c3ba8cad4b006aafeadcc31e70e85c5efecaf807154d011c1413340d4b592d2f270fb48b2050e08493c1427ddfac8dcc27fe434d32a35dcbddbcb1c4e22ead6734a4ac910f6768bc9ff6b355c1151695e41121cdcc9d9d3b18cf4d66ca3c1db0527c471a0dcf256590602a7269dcb26175e7eb370bd9794ac8ab558bea69e6a92d8e818b675a80e2df0516b8307291d93cb85d959ac60d47b46455a7ab0a38687c747c6d2d9e8c20ccf74dc6cdf145ec06805d4ac24a39aec2f5cd6e26e63e3d043a31c42411e4"; vm.startPrank(operatorOne); stakingContract.addValidators(0, 10, publicKeys, signatures); @@ -2279,14 +2214,14 @@ contract StakingContractOneValidatorTest is DSTestPlus { hex"0040597307000000", hex"ccb81f4485957f440bc17dbe760f374cbb112c6f12fa10e8709fac4522b30440d918c7bb867fa04f6b3cfbd977455f8f2fde586fdf3d7baa429e98e497ff871f3b8db1528b2b964fa24d26e377c74746496cc719c50dbf391fb3f74f5ca4b93a", hex"0000000000000000" - ); + ); stakingContract.deposit{value: 32 ether}(); vm.stopPrank(); assertEq(user.balance, 0); - (, , uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = stakingContract - .getOperator(0); + (,, uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = + stakingContract.getOperator(0); assertEq(limit, 10); assertEq(keys, 10); assertEq(funded, 1); @@ -2304,8 +2239,8 @@ contract StakingContractOneValidatorTest is DSTestPlus { assertEq(user.balance, 0); - (, , uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = stakingContract - .getOperator(0); + (,, uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = + stakingContract.getOperator(0); assertEq(limit, 10); assertEq(keys, 10); assertEq(funded, 1); @@ -2324,7 +2259,7 @@ contract StakingContractOneValidatorTest is DSTestPlus { user, hex"b0ce3fa164aae897adca509ed44429e7b1f91b7c46ddbe199cee848e09b1ccbb9736b78b68aacff1011b7266fe11e060", hex"02a9f0007cd7b7d2af2d1b07c8600ab86a5d27dc51a29c2e3007c7a69cb73bcaecc764641e02370955dba100428d259d6475ee3566872bd43b0e73e55b9669e50f2b1666e57b326a5dfad655c7921e0dfb421b1ec59c8fdb48eb77421fd06966" - ); + ); stakingContract.deposit{value: 32 * 2 ether}(); vm.stopPrank(); @@ -2414,14 +2349,14 @@ contract StakingContractOneValidatorTest is DSTestPlus { vm.deal(user, 32 ether); vm.startPrank(user); - (bool _success, ) = address(stakingContract).call{value: 32 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 ether}(""); assert(_success == true); vm.stopPrank(); assertEq(user.balance, 0); - (, , uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = stakingContract - .getOperator(0); + (,, uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = + stakingContract.getOperator(0); assertEq(limit, 10); assertEq(keys, 10); assertEq(funded, 1); @@ -2440,8 +2375,8 @@ contract StakingContractOneValidatorTest is DSTestPlus { user, hex"b0ce3fa164aae897adca509ed44429e7b1f91b7c46ddbe199cee848e09b1ccbb9736b78b68aacff1011b7266fe11e060", hex"02a9f0007cd7b7d2af2d1b07c8600ab86a5d27dc51a29c2e3007c7a69cb73bcaecc764641e02370955dba100428d259d6475ee3566872bd43b0e73e55b9669e50f2b1666e57b326a5dfad655c7921e0dfb421b1ec59c8fdb48eb77421fd06966" - ); - (bool _success, ) = address(stakingContract).call{value: 32 * 2 ether}(""); + ); + (bool _success,) = address(stakingContract).call{value: 32 * 2 ether}(""); assert(_success == true); vm.stopPrank(); @@ -2470,7 +2405,7 @@ contract StakingContractOneValidatorTest is DSTestPlus { vm.deal(user, 32 * 10 ether); vm.startPrank(user); - (bool _success, ) = address(stakingContract).call{value: 32 * 10 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 * 10 ether}(""); assert(_success == true); vm.stopPrank(); @@ -2500,7 +2435,7 @@ contract StakingContractOneValidatorTest is DSTestPlus { vm.startPrank(user); vm.expectRevert(abi.encodeWithSignature("NotEnoughValidators()")); - (bool _success, ) = address(stakingContract).call{value: 32 * 11 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 * 11 ether}(""); assert(_success == true); vm.stopPrank(); } @@ -2510,12 +2445,12 @@ contract StakingContractOneValidatorTest is DSTestPlus { vm.deal(user, 32 * 11 ether); vm.startPrank(user); - (bool _success, ) = address(stakingContract).call{value: 32 * 10 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 * 10 ether}(""); assert(_success == true); vm.stopPrank(); vm.startPrank(user); vm.expectRevert(abi.encodeWithSignature("NotEnoughValidators()")); - (_success, ) = address(stakingContract).call{value: 32 ether}(""); + (_success,) = address(stakingContract).call{value: 32 ether}(""); assert(_success == true); vm.stopPrank(); } @@ -2526,7 +2461,7 @@ contract StakingContractOneValidatorTest is DSTestPlus { vm.startPrank(user); vm.expectRevert(abi.encodeWithSignature("InvalidDepositValue()")); - (bool _success, ) = address(stakingContract).call{value: 31.9 ether}(""); + (bool _success,) = address(stakingContract).call{value: 31.9 ether}(""); assert(_success == true); vm.stopPrank(); } @@ -2556,8 +2491,8 @@ contract StakingContractOneValidatorTest is DSTestPlus { } function testFeeRecipients() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); address _elfr = stakingContract.getELFeeRecipient(publicKey); @@ -2566,8 +2501,8 @@ contract StakingContractOneValidatorTest is DSTestPlus { } function testWithdrawELFees() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -2591,8 +2526,8 @@ contract StakingContractOneValidatorTest is DSTestPlus { vm.startPrank(admin); stakingContract.setOperatorFee(5000); vm.stopPrank(); - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -2614,8 +2549,8 @@ contract StakingContractOneValidatorTest is DSTestPlus { } function testWithdrawELFeesAlreadyDeployed() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -2642,8 +2577,8 @@ contract StakingContractOneValidatorTest is DSTestPlus { } function testWithdrawELFeesEmptyWithdrawal() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -2654,8 +2589,8 @@ contract StakingContractOneValidatorTest is DSTestPlus { } function testWithdrawCLFeesExitedValidator() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -2683,8 +2618,8 @@ contract StakingContractOneValidatorTest is DSTestPlus { vm.startPrank(admin); stakingContract.setOperatorFee(5000); vm.stopPrank(); - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -2709,8 +2644,8 @@ contract StakingContractOneValidatorTest is DSTestPlus { } function testWithdrawCLFeesSkimmedValidator() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -2735,8 +2670,8 @@ contract StakingContractOneValidatorTest is DSTestPlus { } function testWithdrawCLFeesSlashedValidator() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -2757,8 +2692,8 @@ contract StakingContractOneValidatorTest is DSTestPlus { } function testWithdrawCLFeesAlreadyDeployed() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -2788,8 +2723,8 @@ contract StakingContractOneValidatorTest is DSTestPlus { } function testWithdrawCLFeesEmptyWithdrawal() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -2801,8 +2736,8 @@ contract StakingContractOneValidatorTest is DSTestPlus { } function testWithdrawAllFees() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -2893,11 +2828,11 @@ contract StakingContractBehindProxyTest is DSTestPlus { vm.stopPrank(); { - bytes - memory publicKeys = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759b0ce3fa164aae897adca509ed44429e7b1f91b7c46ddbe199cee848e09b1ccbb9736b78b68aacff1011b7266fe11e06014451b3fb9288549aff6dea9843b43e0c47a3b856f307732175230e254c0004e48b02414987088ac7003e148930017b49a1a8d4600f33d463c4afc07bbfc82703c9fcf81a5891f90a71c86a02faff443c6c3b2592bd44d5d3d7a93cb4aaaa105612496d61e68140a5418b468f872bf2f3e79f9cb0d9c3e889663fca02939b31e8ee3092203ee1417128e965c6406a07f68abf2ebe2689cf6c853ef126ffa8574c2a7d913e28de9147fa6b96706ea5bf9eacd1aba06edeaee155009fb912c00070774cc64136fcffde12ed731260bc5529df64da298f493561198e9d6acf42cf21e853ae7b2df85f27d2183149969d623b9237254c2cfe1d0082742eb042ac096d686dbe03c79ee31cbd03bb4682f8797043eed9f6e622814831ac5dfe1176552fb7f9b6ff38a149ae1d8414097a32fd96da6453c52fda13e3402a09e2fa6886daa4300f09c73e4bc2901b99c44744c5cfdca2994adc49ddccb195bda2510e50a4ae10de26cf96dee5e577689f51650a610a33da0a826ae47247d8d1189cb3386"; + bytes memory publicKeys = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759b0ce3fa164aae897adca509ed44429e7b1f91b7c46ddbe199cee848e09b1ccbb9736b78b68aacff1011b7266fe11e06014451b3fb9288549aff6dea9843b43e0c47a3b856f307732175230e254c0004e48b02414987088ac7003e148930017b49a1a8d4600f33d463c4afc07bbfc82703c9fcf81a5891f90a71c86a02faff443c6c3b2592bd44d5d3d7a93cb4aaaa105612496d61e68140a5418b468f872bf2f3e79f9cb0d9c3e889663fca02939b31e8ee3092203ee1417128e965c6406a07f68abf2ebe2689cf6c853ef126ffa8574c2a7d913e28de9147fa6b96706ea5bf9eacd1aba06edeaee155009fb912c00070774cc64136fcffde12ed731260bc5529df64da298f493561198e9d6acf42cf21e853ae7b2df85f27d2183149969d623b9237254c2cfe1d0082742eb042ac096d686dbe03c79ee31cbd03bb4682f8797043eed9f6e622814831ac5dfe1176552fb7f9b6ff38a149ae1d8414097a32fd96da6453c52fda13e3402a09e2fa6886daa4300f09c73e4bc2901b99c44744c5cfdca2994adc49ddccb195bda2510e50a4ae10de26cf96dee5e577689f51650a610a33da0a826ae47247d8d1189cb3386"; - bytes - memory signatures = hex"ccb81f4485957f440bc17dbe760f374cbb112c6f12fa10e8709fac4522b30440d918c7bb867fa04f6b3cfbd977455f8f2fde586fdf3d7baa429e98e497ff871f3b8db1528b2b964fa24d26e377c74746496cc719c50dbf391fb3f74f5ca4b93a02a9f0007cd7b7d2af2d1b07c8600ab86a5d27dc51a29c2e3007c7a69cb73bcaecc764641e02370955dba100428d259d6475ee3566872bd43b0e73e55b9669e50f2b1666e57b326a5dfad655c7921e0dfb421b1ec59c8fdb48eb77421fd06966f393d619cbf13ff427df11dcb17026df25f35268de5b168e359c16f2a3d5fbc6376db44638d773c851c875f21222448433d285920e8bdc4f5cbff130d7387c0a9589324286aea398e5aacad3bbfe3992dfce62571f0e282ed9c29e3fa5b07aa5c81749589b1170d3b85a84331e2f6b8e26eadebfd569b225759f40bbd12d6c3d253ed3f379b014b2ea44cce54d362072e2d020ff139a903b7d87fc3fddc2e6657c83e0b79851c22c6e0e477463463c97d6cc0e2e2de5e35b227bddb285521be3766358abaf3159d89f68c9770e28278f177088cfc4089b817effaaecabdffa4e66427868b105cb9348ea2d84eeea059a5d1ff3277d6f9cf656fc973d07cabed70fb8f8eb2798a65d207a8e1f8a26910949db9fa62d62bc15ecc097a93a27a1873405b8589a4ddf0ecf0303c6031484562b32eb7881975026524d6d4a9de6cd73fe2c324501586b9b6fa6bce950bbd21472278302f83dbfd6be036f2fc36d299d66578e844be3d6aa8314fab468f038fd6e130ada0a886fccfb2fd843f7dd07e8968401bbe2af7345fce52ba4b310b30af2d54b15669d06c206682c1730ab6b17787e361f04401f78dc5cbd5fac955df4e83c24cdabfabdb3f4ea40961d04a5ca166c17694fca144025b47131a68ddb230d36fe6e831e82624c9a925d706bff86982852b26ebf019a3f6ee36aedbbc6bec2d50531a233e09225493d3c5fd48379aec373baf622fb9feed6261e5296e5ae6601e7523c7f386801ed63a344b07106a0d03e5848209db5e114c0e67884916a43a1bfb77d9b8ea113c3ba8cad4b006aafeadcc31e70e85c5efecaf807154d011c1413340d4b592d2f270fb48b2050e08493c1427ddfac8dcc27fe434d32a35dcbddbcb1c4e22ead6734a4ac910f6768bc9ff6b355c1151695e41121cdcc9d9d3b18cf4d66ca3c1db0527c471a0dcf256590602a7269dcb26175e7eb370bd9794ac8ab558bea69e6a92d8e818b675a80e2df0516b8307291d93cb85d959ac60d47b46455a7ab0a38687c747c6d2d9e8c20ccf74dc6cdf145ec06805d4ac24a39aec2f5cd6e26e63e3d043a31c42411e4"; + bytes memory signatures = + hex"ccb81f4485957f440bc17dbe760f374cbb112c6f12fa10e8709fac4522b30440d918c7bb867fa04f6b3cfbd977455f8f2fde586fdf3d7baa429e98e497ff871f3b8db1528b2b964fa24d26e377c74746496cc719c50dbf391fb3f74f5ca4b93a02a9f0007cd7b7d2af2d1b07c8600ab86a5d27dc51a29c2e3007c7a69cb73bcaecc764641e02370955dba100428d259d6475ee3566872bd43b0e73e55b9669e50f2b1666e57b326a5dfad655c7921e0dfb421b1ec59c8fdb48eb77421fd06966f393d619cbf13ff427df11dcb17026df25f35268de5b168e359c16f2a3d5fbc6376db44638d773c851c875f21222448433d285920e8bdc4f5cbff130d7387c0a9589324286aea398e5aacad3bbfe3992dfce62571f0e282ed9c29e3fa5b07aa5c81749589b1170d3b85a84331e2f6b8e26eadebfd569b225759f40bbd12d6c3d253ed3f379b014b2ea44cce54d362072e2d020ff139a903b7d87fc3fddc2e6657c83e0b79851c22c6e0e477463463c97d6cc0e2e2de5e35b227bddb285521be3766358abaf3159d89f68c9770e28278f177088cfc4089b817effaaecabdffa4e66427868b105cb9348ea2d84eeea059a5d1ff3277d6f9cf656fc973d07cabed70fb8f8eb2798a65d207a8e1f8a26910949db9fa62d62bc15ecc097a93a27a1873405b8589a4ddf0ecf0303c6031484562b32eb7881975026524d6d4a9de6cd73fe2c324501586b9b6fa6bce950bbd21472278302f83dbfd6be036f2fc36d299d66578e844be3d6aa8314fab468f038fd6e130ada0a886fccfb2fd843f7dd07e8968401bbe2af7345fce52ba4b310b30af2d54b15669d06c206682c1730ab6b17787e361f04401f78dc5cbd5fac955df4e83c24cdabfabdb3f4ea40961d04a5ca166c17694fca144025b47131a68ddb230d36fe6e831e82624c9a925d706bff86982852b26ebf019a3f6ee36aedbbc6bec2d50531a233e09225493d3c5fd48379aec373baf622fb9feed6261e5296e5ae6601e7523c7f386801ed63a344b07106a0d03e5848209db5e114c0e67884916a43a1bfb77d9b8ea113c3ba8cad4b006aafeadcc31e70e85c5efecaf807154d011c1413340d4b592d2f270fb48b2050e08493c1427ddfac8dcc27fe434d32a35dcbddbcb1c4e22ead6734a4ac910f6768bc9ff6b355c1151695e41121cdcc9d9d3b18cf4d66ca3c1db0527c471a0dcf256590602a7269dcb26175e7eb370bd9794ac8ab558bea69e6a92d8e818b675a80e2df0516b8307291d93cb85d959ac60d47b46455a7ab0a38687c747c6d2d9e8c20ccf74dc6cdf145ec06805d4ac24a39aec2f5cd6e26e63e3d043a31c42411e4"; vm.startPrank(operatorOne); stakingContract.addValidators(0, 10, publicKeys, signatures); @@ -2937,14 +2872,14 @@ contract StakingContractBehindProxyTest is DSTestPlus { hex"0040597307000000", hex"ccb81f4485957f440bc17dbe760f374cbb112c6f12fa10e8709fac4522b30440d918c7bb867fa04f6b3cfbd977455f8f2fde586fdf3d7baa429e98e497ff871f3b8db1528b2b964fa24d26e377c74746496cc719c50dbf391fb3f74f5ca4b93a", hex"0000000000000000" - ); + ); stakingContract.deposit{value: 32 ether}(); vm.stopPrank(); assertEq(user.balance, 0); - (, , uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = stakingContract - .getOperator(0); + (,, uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = + stakingContract.getOperator(0); assertEq(limit, 10); assertEq(keys, 10); assertEq(funded, 1); @@ -2962,8 +2897,8 @@ contract StakingContractBehindProxyTest is DSTestPlus { assertEq(user.balance, 0); - (, , uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = stakingContract - .getOperator(0); + (,, uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = + stakingContract.getOperator(0); assertEq(limit, 10); assertEq(keys, 10); assertEq(funded, 1); @@ -2982,7 +2917,7 @@ contract StakingContractBehindProxyTest is DSTestPlus { user, hex"b0ce3fa164aae897adca509ed44429e7b1f91b7c46ddbe199cee848e09b1ccbb9736b78b68aacff1011b7266fe11e060", hex"02a9f0007cd7b7d2af2d1b07c8600ab86a5d27dc51a29c2e3007c7a69cb73bcaecc764641e02370955dba100428d259d6475ee3566872bd43b0e73e55b9669e50f2b1666e57b326a5dfad655c7921e0dfb421b1ec59c8fdb48eb77421fd06966" - ); + ); stakingContract.deposit{value: 32 * 2 ether}(); vm.stopPrank(); @@ -3072,14 +3007,14 @@ contract StakingContractBehindProxyTest is DSTestPlus { vm.deal(user, 32 ether); vm.startPrank(user); - (bool _success, ) = address(stakingContract).call{value: 32 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 ether}(""); assert(_success == true); vm.stopPrank(); assertEq(user.balance, 0); - (, , uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = stakingContract - .getOperator(0); + (,, uint256 limit, uint256 keys, uint256 funded, uint256 available, bool deactivated) = + stakingContract.getOperator(0); assertEq(limit, 10); assertEq(keys, 10); assertEq(funded, 1); @@ -3098,8 +3033,8 @@ contract StakingContractBehindProxyTest is DSTestPlus { user, hex"b0ce3fa164aae897adca509ed44429e7b1f91b7c46ddbe199cee848e09b1ccbb9736b78b68aacff1011b7266fe11e060", hex"02a9f0007cd7b7d2af2d1b07c8600ab86a5d27dc51a29c2e3007c7a69cb73bcaecc764641e02370955dba100428d259d6475ee3566872bd43b0e73e55b9669e50f2b1666e57b326a5dfad655c7921e0dfb421b1ec59c8fdb48eb77421fd06966" - ); - (bool _success, ) = address(stakingContract).call{value: 32 * 2 ether}(""); + ); + (bool _success,) = address(stakingContract).call{value: 32 * 2 ether}(""); assert(_success == true); vm.stopPrank(); @@ -3128,7 +3063,7 @@ contract StakingContractBehindProxyTest is DSTestPlus { vm.deal(user, 32 * 10 ether); vm.startPrank(user); - (bool _success, ) = address(stakingContract).call{value: 32 * 10 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 * 10 ether}(""); assert(_success == true); vm.stopPrank(); @@ -3158,7 +3093,7 @@ contract StakingContractBehindProxyTest is DSTestPlus { vm.startPrank(user); vm.expectRevert(abi.encodeWithSignature("NotEnoughValidators()")); - (bool _success, ) = address(stakingContract).call{value: 32 * 11 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 * 11 ether}(""); assert(_success == true); vm.stopPrank(); } @@ -3168,12 +3103,12 @@ contract StakingContractBehindProxyTest is DSTestPlus { vm.deal(user, 32 * 11 ether); vm.startPrank(user); - (bool _success, ) = address(stakingContract).call{value: 32 * 10 ether}(""); + (bool _success,) = address(stakingContract).call{value: 32 * 10 ether}(""); assert(_success == true); vm.stopPrank(); vm.startPrank(user); vm.expectRevert(abi.encodeWithSignature("NotEnoughValidators()")); - (_success, ) = address(stakingContract).call{value: 32 ether}(""); + (_success,) = address(stakingContract).call{value: 32 ether}(""); assert(_success == true); vm.stopPrank(); } @@ -3184,7 +3119,7 @@ contract StakingContractBehindProxyTest is DSTestPlus { vm.startPrank(user); vm.expectRevert(abi.encodeWithSignature("InvalidDepositValue()")); - (bool _success, ) = address(stakingContract).call{value: 31.9 ether}(""); + (bool _success,) = address(stakingContract).call{value: 31.9 ether}(""); assert(_success == true); vm.stopPrank(); } @@ -3206,8 +3141,8 @@ contract StakingContractBehindProxyTest is DSTestPlus { } function testFeeRecipients() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); address _elfr = stakingContract.getELFeeRecipient(publicKey); @@ -3216,8 +3151,8 @@ contract StakingContractBehindProxyTest is DSTestPlus { } function testWithdrawELFees() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -3241,8 +3176,8 @@ contract StakingContractBehindProxyTest is DSTestPlus { vm.startPrank(admin); stakingContract.setOperatorFee(5000); vm.stopPrank(); - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -3264,8 +3199,8 @@ contract StakingContractBehindProxyTest is DSTestPlus { } function testWithdrawELFeesAlreadyDeployed() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -3292,8 +3227,8 @@ contract StakingContractBehindProxyTest is DSTestPlus { } function testWithdrawELFeesEmptyWithdrawal() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -3304,8 +3239,8 @@ contract StakingContractBehindProxyTest is DSTestPlus { } function testWithdrawCLFeesExitedValidator() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -3333,8 +3268,8 @@ contract StakingContractBehindProxyTest is DSTestPlus { vm.startPrank(admin); stakingContract.setOperatorFee(5000); vm.stopPrank(); - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -3359,8 +3294,8 @@ contract StakingContractBehindProxyTest is DSTestPlus { } function testWithdrawCLFeesSkimmedValidator() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -3385,8 +3320,8 @@ contract StakingContractBehindProxyTest is DSTestPlus { } function testWithdrawCLFeesSlashedValidator() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -3407,8 +3342,8 @@ contract StakingContractBehindProxyTest is DSTestPlus { } function testWithdrawCLFeesAlreadyDeployed() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -3438,8 +3373,8 @@ contract StakingContractBehindProxyTest is DSTestPlus { } function testWithdrawCLFeesEmptyWithdrawal() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); @@ -3451,8 +3386,8 @@ contract StakingContractBehindProxyTest is DSTestPlus { } function testWithdrawAllFees() public { - bytes - memory publicKey = hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; + bytes memory publicKey = + hex"21d2e725aef3a8f9e09d8f4034948bb7f79505fc7c40e7a7ca15734bad4220a594bf0c6257cef7db88d9fc3fd4360759"; vm.deal(bob, 32 ether); vm.startPrank(bob); stakingContract.deposit{value: 32 ether}(); diff --git a/src/test/Treasury.t.sol b/src/test/Treasury.t.sol index 5826441..789d749 100644 --- a/src/test/Treasury.t.sol +++ b/src/test/Treasury.t.sol @@ -81,7 +81,7 @@ contract TreasuryTest { vm.startPrank(claude); assert(address(treasury).balance == 0); - (bool status, ) = address(treasury).call{value: 1 ether}(""); + (bool status,) = address(treasury).call{value: 1 ether}(""); assert(status); payable(address(treasury)).transfer(1 ether); status = payable(address(treasury)).send(1 ether); diff --git a/src/test/console.sol b/src/test/console.sol index feb58e0..0a32f69 100644 --- a/src/test/console.sol +++ b/src/test/console.sol @@ -249,2819 +249,1283 @@ library console { _sendLogPayload(abi.encodeWithSignature("log(address,address)", p0, p1)); } - function log( - uint256 p0, - uint256 p1, - uint256 p2 - ) internal view { + function log(uint256 p0, uint256 p1, uint256 p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,uint)", p0, p1, p2)); } - function log( - uint256 p0, - uint256 p1, - string memory p2 - ) internal view { + function log(uint256 p0, uint256 p1, string memory p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,string)", p0, p1, p2)); } - function log( - uint256 p0, - uint256 p1, - bool p2 - ) internal view { + function log(uint256 p0, uint256 p1, bool p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,bool)", p0, p1, p2)); } - function log( - uint256 p0, - uint256 p1, - address p2 - ) internal view { + function log(uint256 p0, uint256 p1, address p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,address)", p0, p1, p2)); } - function log( - uint256 p0, - string memory p1, - uint256 p2 - ) internal view { + function log(uint256 p0, string memory p1, uint256 p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,uint)", p0, p1, p2)); } - function log( - uint256 p0, - string memory p1, - string memory p2 - ) internal view { + function log(uint256 p0, string memory p1, string memory p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,string)", p0, p1, p2)); } - function log( - uint256 p0, - string memory p1, - bool p2 - ) internal view { + function log(uint256 p0, string memory p1, bool p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,bool)", p0, p1, p2)); } - function log( - uint256 p0, - string memory p1, - address p2 - ) internal view { + function log(uint256 p0, string memory p1, address p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,address)", p0, p1, p2)); } - function log( - uint256 p0, - bool p1, - uint256 p2 - ) internal view { + function log(uint256 p0, bool p1, uint256 p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,uint)", p0, p1, p2)); } - function log( - uint256 p0, - bool p1, - string memory p2 - ) internal view { + function log(uint256 p0, bool p1, string memory p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,string)", p0, p1, p2)); } - function log( - uint256 p0, - bool p1, - bool p2 - ) internal view { + function log(uint256 p0, bool p1, bool p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,bool)", p0, p1, p2)); } - function log( - uint256 p0, - bool p1, - address p2 - ) internal view { + function log(uint256 p0, bool p1, address p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,address)", p0, p1, p2)); } - function log( - uint256 p0, - address p1, - uint256 p2 - ) internal view { + function log(uint256 p0, address p1, uint256 p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,uint)", p0, p1, p2)); } - function log( - uint256 p0, - address p1, - string memory p2 - ) internal view { + function log(uint256 p0, address p1, string memory p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,string)", p0, p1, p2)); } - function log( - uint256 p0, - address p1, - bool p2 - ) internal view { + function log(uint256 p0, address p1, bool p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,bool)", p0, p1, p2)); } - function log( - uint256 p0, - address p1, - address p2 - ) internal view { + function log(uint256 p0, address p1, address p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,address)", p0, p1, p2)); } - function log( - string memory p0, - uint256 p1, - uint256 p2 - ) internal view { + function log(string memory p0, uint256 p1, uint256 p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,uint)", p0, p1, p2)); } - function log( - string memory p0, - uint256 p1, - string memory p2 - ) internal view { + function log(string memory p0, uint256 p1, string memory p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,string)", p0, p1, p2)); } - function log( - string memory p0, - uint256 p1, - bool p2 - ) internal view { + function log(string memory p0, uint256 p1, bool p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,bool)", p0, p1, p2)); } - function log( - string memory p0, - uint256 p1, - address p2 - ) internal view { + function log(string memory p0, uint256 p1, address p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,address)", p0, p1, p2)); } - function log( - string memory p0, - string memory p1, - uint256 p2 - ) internal view { + function log(string memory p0, string memory p1, uint256 p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,uint)", p0, p1, p2)); } - function log( - string memory p0, - string memory p1, - string memory p2 - ) internal view { + function log(string memory p0, string memory p1, string memory p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,string)", p0, p1, p2)); } - function log( - string memory p0, - string memory p1, - bool p2 - ) internal view { + function log(string memory p0, string memory p1, bool p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,bool)", p0, p1, p2)); } - function log( - string memory p0, - string memory p1, - address p2 - ) internal view { + function log(string memory p0, string memory p1, address p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,address)", p0, p1, p2)); } - function log( - string memory p0, - bool p1, - uint256 p2 - ) internal view { + function log(string memory p0, bool p1, uint256 p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,uint)", p0, p1, p2)); } - function log( - string memory p0, - bool p1, - string memory p2 - ) internal view { + function log(string memory p0, bool p1, string memory p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,string)", p0, p1, p2)); } - function log( - string memory p0, - bool p1, - bool p2 - ) internal view { + function log(string memory p0, bool p1, bool p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,bool)", p0, p1, p2)); } - function log( - string memory p0, - bool p1, - address p2 - ) internal view { + function log(string memory p0, bool p1, address p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,address)", p0, p1, p2)); } - function log( - string memory p0, - address p1, - uint256 p2 - ) internal view { + function log(string memory p0, address p1, uint256 p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,uint)", p0, p1, p2)); } - function log( - string memory p0, - address p1, - string memory p2 - ) internal view { + function log(string memory p0, address p1, string memory p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,string)", p0, p1, p2)); } - function log( - string memory p0, - address p1, - bool p2 - ) internal view { + function log(string memory p0, address p1, bool p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,bool)", p0, p1, p2)); } - function log( - string memory p0, - address p1, - address p2 - ) internal view { + function log(string memory p0, address p1, address p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,address)", p0, p1, p2)); } - function log( - bool p0, - uint256 p1, - uint256 p2 - ) internal view { + function log(bool p0, uint256 p1, uint256 p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,uint)", p0, p1, p2)); } - function log( - bool p0, - uint256 p1, - string memory p2 - ) internal view { + function log(bool p0, uint256 p1, string memory p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,string)", p0, p1, p2)); } - function log( - bool p0, - uint256 p1, - bool p2 - ) internal view { + function log(bool p0, uint256 p1, bool p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,bool)", p0, p1, p2)); } - function log( - bool p0, - uint256 p1, - address p2 - ) internal view { + function log(bool p0, uint256 p1, address p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,address)", p0, p1, p2)); } - function log( - bool p0, - string memory p1, - uint256 p2 - ) internal view { + function log(bool p0, string memory p1, uint256 p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,uint)", p0, p1, p2)); } - function log( - bool p0, - string memory p1, - string memory p2 - ) internal view { + function log(bool p0, string memory p1, string memory p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,string)", p0, p1, p2)); } - function log( - bool p0, - string memory p1, - bool p2 - ) internal view { + function log(bool p0, string memory p1, bool p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,bool)", p0, p1, p2)); } - function log( - bool p0, - string memory p1, - address p2 - ) internal view { + function log(bool p0, string memory p1, address p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,address)", p0, p1, p2)); } - function log( - bool p0, - bool p1, - uint256 p2 - ) internal view { + function log(bool p0, bool p1, uint256 p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,uint)", p0, p1, p2)); } - function log( - bool p0, - bool p1, - string memory p2 - ) internal view { + function log(bool p0, bool p1, string memory p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,string)", p0, p1, p2)); } - function log( - bool p0, - bool p1, - bool p2 - ) internal view { + function log(bool p0, bool p1, bool p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,bool)", p0, p1, p2)); } - function log( - bool p0, - bool p1, - address p2 - ) internal view { + function log(bool p0, bool p1, address p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,address)", p0, p1, p2)); } - function log( - bool p0, - address p1, - uint256 p2 - ) internal view { + function log(bool p0, address p1, uint256 p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,uint)", p0, p1, p2)); } - function log( - bool p0, - address p1, - string memory p2 - ) internal view { + function log(bool p0, address p1, string memory p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,string)", p0, p1, p2)); } - function log( - bool p0, - address p1, - bool p2 - ) internal view { + function log(bool p0, address p1, bool p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,bool)", p0, p1, p2)); } - function log( - bool p0, - address p1, - address p2 - ) internal view { + function log(bool p0, address p1, address p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,address)", p0, p1, p2)); } - function log( - address p0, - uint256 p1, - uint256 p2 - ) internal view { + function log(address p0, uint256 p1, uint256 p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,uint)", p0, p1, p2)); } - function log( - address p0, - uint256 p1, - string memory p2 - ) internal view { + function log(address p0, uint256 p1, string memory p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,string)", p0, p1, p2)); } - function log( - address p0, - uint256 p1, - bool p2 - ) internal view { + function log(address p0, uint256 p1, bool p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,bool)", p0, p1, p2)); } - function log( - address p0, - uint256 p1, - address p2 - ) internal view { + function log(address p0, uint256 p1, address p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,address)", p0, p1, p2)); } - function log( - address p0, - string memory p1, - uint256 p2 - ) internal view { + function log(address p0, string memory p1, uint256 p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,uint)", p0, p1, p2)); } - function log( - address p0, - string memory p1, - string memory p2 - ) internal view { + function log(address p0, string memory p1, string memory p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,string)", p0, p1, p2)); } - function log( - address p0, - string memory p1, - bool p2 - ) internal view { + function log(address p0, string memory p1, bool p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,bool)", p0, p1, p2)); } - function log( - address p0, - string memory p1, - address p2 - ) internal view { + function log(address p0, string memory p1, address p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,address)", p0, p1, p2)); } - function log( - address p0, - bool p1, - uint256 p2 - ) internal view { + function log(address p0, bool p1, uint256 p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,uint)", p0, p1, p2)); } - function log( - address p0, - bool p1, - string memory p2 - ) internal view { + function log(address p0, bool p1, string memory p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,string)", p0, p1, p2)); } - function log( - address p0, - bool p1, - bool p2 - ) internal view { + function log(address p0, bool p1, bool p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,bool)", p0, p1, p2)); } - function log( - address p0, - bool p1, - address p2 - ) internal view { + function log(address p0, bool p1, address p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,address)", p0, p1, p2)); } - function log( - address p0, - address p1, - uint256 p2 - ) internal view { + function log(address p0, address p1, uint256 p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,uint)", p0, p1, p2)); } - function log( - address p0, - address p1, - string memory p2 - ) internal view { + function log(address p0, address p1, string memory p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,string)", p0, p1, p2)); } - function log( - address p0, - address p1, - bool p2 - ) internal view { + function log(address p0, address p1, bool p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,bool)", p0, p1, p2)); } - function log( - address p0, - address p1, - address p2 - ) internal view { + function log(address p0, address p1, address p2) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,address)", p0, p1, p2)); } - function log( - uint256 p0, - uint256 p1, - uint256 p2, - uint256 p3 - ) internal view { + function log(uint256 p0, uint256 p1, uint256 p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,uint,uint)", p0, p1, p2, p3)); } - function log( - uint256 p0, - uint256 p1, - uint256 p2, - string memory p3 - ) internal view { + function log(uint256 p0, uint256 p1, uint256 p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,uint,string)", p0, p1, p2, p3)); } - function log( - uint256 p0, - uint256 p1, - uint256 p2, - bool p3 - ) internal view { + function log(uint256 p0, uint256 p1, uint256 p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,uint,bool)", p0, p1, p2, p3)); } - function log( - uint256 p0, - uint256 p1, - uint256 p2, - address p3 - ) internal view { + function log(uint256 p0, uint256 p1, uint256 p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,uint,address)", p0, p1, p2, p3)); } - function log( - uint256 p0, - uint256 p1, - string memory p2, - uint256 p3 - ) internal view { + function log(uint256 p0, uint256 p1, string memory p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,string,uint)", p0, p1, p2, p3)); } - function log( - uint256 p0, - uint256 p1, - string memory p2, - string memory p3 - ) internal view { + function log(uint256 p0, uint256 p1, string memory p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,string,string)", p0, p1, p2, p3)); } - function log( - uint256 p0, - uint256 p1, - string memory p2, - bool p3 - ) internal view { + function log(uint256 p0, uint256 p1, string memory p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,string,bool)", p0, p1, p2, p3)); } - function log( - uint256 p0, - uint256 p1, - string memory p2, - address p3 - ) internal view { + function log(uint256 p0, uint256 p1, string memory p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,string,address)", p0, p1, p2, p3)); } - function log( - uint256 p0, - uint256 p1, - bool p2, - uint256 p3 - ) internal view { + function log(uint256 p0, uint256 p1, bool p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,bool,uint)", p0, p1, p2, p3)); } - function log( - uint256 p0, - uint256 p1, - bool p2, - string memory p3 - ) internal view { + function log(uint256 p0, uint256 p1, bool p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,bool,string)", p0, p1, p2, p3)); } - function log( - uint256 p0, - uint256 p1, - bool p2, - bool p3 - ) internal view { + function log(uint256 p0, uint256 p1, bool p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,bool,bool)", p0, p1, p2, p3)); } - function log( - uint256 p0, - uint256 p1, - bool p2, - address p3 - ) internal view { + function log(uint256 p0, uint256 p1, bool p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,bool,address)", p0, p1, p2, p3)); } - function log( - uint256 p0, - uint256 p1, - address p2, - uint256 p3 - ) internal view { + function log(uint256 p0, uint256 p1, address p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,address,uint)", p0, p1, p2, p3)); } - function log( - uint256 p0, - uint256 p1, - address p2, - string memory p3 - ) internal view { + function log(uint256 p0, uint256 p1, address p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,address,string)", p0, p1, p2, p3)); } - function log( - uint256 p0, - uint256 p1, - address p2, - bool p3 - ) internal view { + function log(uint256 p0, uint256 p1, address p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,address,bool)", p0, p1, p2, p3)); } - function log( - uint256 p0, - uint256 p1, - address p2, - address p3 - ) internal view { + function log(uint256 p0, uint256 p1, address p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,uint,address,address)", p0, p1, p2, p3)); } - function log( - uint256 p0, - string memory p1, - uint256 p2, - uint256 p3 - ) internal view { + function log(uint256 p0, string memory p1, uint256 p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,uint,uint)", p0, p1, p2, p3)); } - function log( - uint256 p0, - string memory p1, - uint256 p2, - string memory p3 - ) internal view { + function log(uint256 p0, string memory p1, uint256 p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,uint,string)", p0, p1, p2, p3)); } - function log( - uint256 p0, - string memory p1, - uint256 p2, - bool p3 - ) internal view { + function log(uint256 p0, string memory p1, uint256 p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,uint,bool)", p0, p1, p2, p3)); } - function log( - uint256 p0, - string memory p1, - uint256 p2, - address p3 - ) internal view { + function log(uint256 p0, string memory p1, uint256 p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,uint,address)", p0, p1, p2, p3)); } - function log( - uint256 p0, - string memory p1, - string memory p2, - uint256 p3 - ) internal view { + function log(uint256 p0, string memory p1, string memory p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,string,uint)", p0, p1, p2, p3)); } - function log( - uint256 p0, - string memory p1, - string memory p2, - string memory p3 - ) internal view { + function log(uint256 p0, string memory p1, string memory p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,string,string)", p0, p1, p2, p3)); } - function log( - uint256 p0, - string memory p1, - string memory p2, - bool p3 - ) internal view { + function log(uint256 p0, string memory p1, string memory p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,string,bool)", p0, p1, p2, p3)); } - function log( - uint256 p0, - string memory p1, - string memory p2, - address p3 - ) internal view { + function log(uint256 p0, string memory p1, string memory p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,string,address)", p0, p1, p2, p3)); } - function log( - uint256 p0, - string memory p1, - bool p2, - uint256 p3 - ) internal view { + function log(uint256 p0, string memory p1, bool p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,bool,uint)", p0, p1, p2, p3)); } - function log( - uint256 p0, - string memory p1, - bool p2, - string memory p3 - ) internal view { + function log(uint256 p0, string memory p1, bool p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,bool,string)", p0, p1, p2, p3)); } - function log( - uint256 p0, - string memory p1, - bool p2, - bool p3 - ) internal view { + function log(uint256 p0, string memory p1, bool p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,bool,bool)", p0, p1, p2, p3)); } - function log( - uint256 p0, - string memory p1, - bool p2, - address p3 - ) internal view { + function log(uint256 p0, string memory p1, bool p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,bool,address)", p0, p1, p2, p3)); } - function log( - uint256 p0, - string memory p1, - address p2, - uint256 p3 - ) internal view { + function log(uint256 p0, string memory p1, address p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,address,uint)", p0, p1, p2, p3)); } - function log( - uint256 p0, - string memory p1, - address p2, - string memory p3 - ) internal view { + function log(uint256 p0, string memory p1, address p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,address,string)", p0, p1, p2, p3)); } - function log( - uint256 p0, - string memory p1, - address p2, - bool p3 - ) internal view { + function log(uint256 p0, string memory p1, address p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,address,bool)", p0, p1, p2, p3)); } - function log( - uint256 p0, - string memory p1, - address p2, - address p3 - ) internal view { + function log(uint256 p0, string memory p1, address p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,string,address,address)", p0, p1, p2, p3)); } - function log( - uint256 p0, - bool p1, - uint256 p2, - uint256 p3 - ) internal view { + function log(uint256 p0, bool p1, uint256 p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,uint,uint)", p0, p1, p2, p3)); } - function log( - uint256 p0, - bool p1, - uint256 p2, - string memory p3 - ) internal view { + function log(uint256 p0, bool p1, uint256 p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,uint,string)", p0, p1, p2, p3)); } - function log( - uint256 p0, - bool p1, - uint256 p2, - bool p3 - ) internal view { + function log(uint256 p0, bool p1, uint256 p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,uint,bool)", p0, p1, p2, p3)); } - function log( - uint256 p0, - bool p1, - uint256 p2, - address p3 - ) internal view { + function log(uint256 p0, bool p1, uint256 p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,uint,address)", p0, p1, p2, p3)); } - function log( - uint256 p0, - bool p1, - string memory p2, - uint256 p3 - ) internal view { + function log(uint256 p0, bool p1, string memory p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,string,uint)", p0, p1, p2, p3)); } - function log( - uint256 p0, - bool p1, - string memory p2, - string memory p3 - ) internal view { + function log(uint256 p0, bool p1, string memory p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,string,string)", p0, p1, p2, p3)); } - function log( - uint256 p0, - bool p1, - string memory p2, - bool p3 - ) internal view { + function log(uint256 p0, bool p1, string memory p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,string,bool)", p0, p1, p2, p3)); } - function log( - uint256 p0, - bool p1, - string memory p2, - address p3 - ) internal view { + function log(uint256 p0, bool p1, string memory p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,string,address)", p0, p1, p2, p3)); } - function log( - uint256 p0, - bool p1, - bool p2, - uint256 p3 - ) internal view { + function log(uint256 p0, bool p1, bool p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,bool,uint)", p0, p1, p2, p3)); } - function log( - uint256 p0, - bool p1, - bool p2, - string memory p3 - ) internal view { + function log(uint256 p0, bool p1, bool p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,bool,string)", p0, p1, p2, p3)); } - function log( - uint256 p0, - bool p1, - bool p2, - bool p3 - ) internal view { + function log(uint256 p0, bool p1, bool p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,bool,bool)", p0, p1, p2, p3)); } - function log( - uint256 p0, - bool p1, - bool p2, - address p3 - ) internal view { + function log(uint256 p0, bool p1, bool p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,bool,address)", p0, p1, p2, p3)); } - function log( - uint256 p0, - bool p1, - address p2, - uint256 p3 - ) internal view { + function log(uint256 p0, bool p1, address p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,address,uint)", p0, p1, p2, p3)); } - function log( - uint256 p0, - bool p1, - address p2, - string memory p3 - ) internal view { + function log(uint256 p0, bool p1, address p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,address,string)", p0, p1, p2, p3)); } - function log( - uint256 p0, - bool p1, - address p2, - bool p3 - ) internal view { + function log(uint256 p0, bool p1, address p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,address,bool)", p0, p1, p2, p3)); } - function log( - uint256 p0, - bool p1, - address p2, - address p3 - ) internal view { + function log(uint256 p0, bool p1, address p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,bool,address,address)", p0, p1, p2, p3)); } - function log( - uint256 p0, - address p1, - uint256 p2, - uint256 p3 - ) internal view { + function log(uint256 p0, address p1, uint256 p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,uint,uint)", p0, p1, p2, p3)); } - function log( - uint256 p0, - address p1, - uint256 p2, - string memory p3 - ) internal view { + function log(uint256 p0, address p1, uint256 p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,uint,string)", p0, p1, p2, p3)); } - function log( - uint256 p0, - address p1, - uint256 p2, - bool p3 - ) internal view { + function log(uint256 p0, address p1, uint256 p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,uint,bool)", p0, p1, p2, p3)); } - function log( - uint256 p0, - address p1, - uint256 p2, - address p3 - ) internal view { + function log(uint256 p0, address p1, uint256 p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,uint,address)", p0, p1, p2, p3)); } - function log( - uint256 p0, - address p1, - string memory p2, - uint256 p3 - ) internal view { + function log(uint256 p0, address p1, string memory p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,string,uint)", p0, p1, p2, p3)); } - function log( - uint256 p0, - address p1, - string memory p2, - string memory p3 - ) internal view { + function log(uint256 p0, address p1, string memory p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,string,string)", p0, p1, p2, p3)); } - function log( - uint256 p0, - address p1, - string memory p2, - bool p3 - ) internal view { + function log(uint256 p0, address p1, string memory p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,string,bool)", p0, p1, p2, p3)); } - function log( - uint256 p0, - address p1, - string memory p2, - address p3 - ) internal view { + function log(uint256 p0, address p1, string memory p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,string,address)", p0, p1, p2, p3)); } - function log( - uint256 p0, - address p1, - bool p2, - uint256 p3 - ) internal view { + function log(uint256 p0, address p1, bool p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,bool,uint)", p0, p1, p2, p3)); } - function log( - uint256 p0, - address p1, - bool p2, - string memory p3 - ) internal view { + function log(uint256 p0, address p1, bool p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,bool,string)", p0, p1, p2, p3)); } - function log( - uint256 p0, - address p1, - bool p2, - bool p3 - ) internal view { + function log(uint256 p0, address p1, bool p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,bool,bool)", p0, p1, p2, p3)); } - function log( - uint256 p0, - address p1, - bool p2, - address p3 - ) internal view { + function log(uint256 p0, address p1, bool p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,bool,address)", p0, p1, p2, p3)); } - function log( - uint256 p0, - address p1, - address p2, - uint256 p3 - ) internal view { + function log(uint256 p0, address p1, address p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,address,uint)", p0, p1, p2, p3)); } - function log( - uint256 p0, - address p1, - address p2, - string memory p3 - ) internal view { + function log(uint256 p0, address p1, address p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,address,string)", p0, p1, p2, p3)); } - function log( - uint256 p0, - address p1, - address p2, - bool p3 - ) internal view { + function log(uint256 p0, address p1, address p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,address,bool)", p0, p1, p2, p3)); } - function log( - uint256 p0, - address p1, - address p2, - address p3 - ) internal view { + function log(uint256 p0, address p1, address p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(uint,address,address,address)", p0, p1, p2, p3)); } - function log( - string memory p0, - uint256 p1, - uint256 p2, - uint256 p3 - ) internal view { + function log(string memory p0, uint256 p1, uint256 p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,uint,uint)", p0, p1, p2, p3)); } - function log( - string memory p0, - uint256 p1, - uint256 p2, - string memory p3 - ) internal view { + function log(string memory p0, uint256 p1, uint256 p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,uint,string)", p0, p1, p2, p3)); } - function log( - string memory p0, - uint256 p1, - uint256 p2, - bool p3 - ) internal view { + function log(string memory p0, uint256 p1, uint256 p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,uint,bool)", p0, p1, p2, p3)); } - function log( - string memory p0, - uint256 p1, - uint256 p2, - address p3 - ) internal view { + function log(string memory p0, uint256 p1, uint256 p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,uint,address)", p0, p1, p2, p3)); } - function log( - string memory p0, - uint256 p1, - string memory p2, - uint256 p3 - ) internal view { + function log(string memory p0, uint256 p1, string memory p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,string,uint)", p0, p1, p2, p3)); } - function log( - string memory p0, - uint256 p1, - string memory p2, - string memory p3 - ) internal view { + function log(string memory p0, uint256 p1, string memory p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,string,string)", p0, p1, p2, p3)); } - function log( - string memory p0, - uint256 p1, - string memory p2, - bool p3 - ) internal view { + function log(string memory p0, uint256 p1, string memory p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,string,bool)", p0, p1, p2, p3)); } - function log( - string memory p0, - uint256 p1, - string memory p2, - address p3 - ) internal view { + function log(string memory p0, uint256 p1, string memory p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,string,address)", p0, p1, p2, p3)); } - function log( - string memory p0, - uint256 p1, - bool p2, - uint256 p3 - ) internal view { + function log(string memory p0, uint256 p1, bool p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,bool,uint)", p0, p1, p2, p3)); } - function log( - string memory p0, - uint256 p1, - bool p2, - string memory p3 - ) internal view { + function log(string memory p0, uint256 p1, bool p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,bool,string)", p0, p1, p2, p3)); } - function log( - string memory p0, - uint256 p1, - bool p2, - bool p3 - ) internal view { + function log(string memory p0, uint256 p1, bool p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,bool,bool)", p0, p1, p2, p3)); } - function log( - string memory p0, - uint256 p1, - bool p2, - address p3 - ) internal view { + function log(string memory p0, uint256 p1, bool p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,bool,address)", p0, p1, p2, p3)); } - function log( - string memory p0, - uint256 p1, - address p2, - uint256 p3 - ) internal view { + function log(string memory p0, uint256 p1, address p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,address,uint)", p0, p1, p2, p3)); } - function log( - string memory p0, - uint256 p1, - address p2, - string memory p3 - ) internal view { + function log(string memory p0, uint256 p1, address p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,address,string)", p0, p1, p2, p3)); } - function log( - string memory p0, - uint256 p1, - address p2, - bool p3 - ) internal view { + function log(string memory p0, uint256 p1, address p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,address,bool)", p0, p1, p2, p3)); } - function log( - string memory p0, - uint256 p1, - address p2, - address p3 - ) internal view { + function log(string memory p0, uint256 p1, address p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,uint,address,address)", p0, p1, p2, p3)); } - function log( - string memory p0, - string memory p1, - uint256 p2, - uint256 p3 - ) internal view { + function log(string memory p0, string memory p1, uint256 p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,uint,uint)", p0, p1, p2, p3)); } - function log( - string memory p0, - string memory p1, - uint256 p2, - string memory p3 - ) internal view { + function log(string memory p0, string memory p1, uint256 p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,uint,string)", p0, p1, p2, p3)); } - function log( - string memory p0, - string memory p1, - uint256 p2, - bool p3 - ) internal view { + function log(string memory p0, string memory p1, uint256 p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,uint,bool)", p0, p1, p2, p3)); } - function log( - string memory p0, - string memory p1, - uint256 p2, - address p3 - ) internal view { + function log(string memory p0, string memory p1, uint256 p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,uint,address)", p0, p1, p2, p3)); } - function log( - string memory p0, - string memory p1, - string memory p2, - uint256 p3 - ) internal view { + function log(string memory p0, string memory p1, string memory p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,string,uint)", p0, p1, p2, p3)); } - function log( - string memory p0, - string memory p1, - string memory p2, - string memory p3 - ) internal view { + function log(string memory p0, string memory p1, string memory p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,string,string)", p0, p1, p2, p3)); } - function log( - string memory p0, - string memory p1, - string memory p2, - bool p3 - ) internal view { + function log(string memory p0, string memory p1, string memory p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,string,bool)", p0, p1, p2, p3)); } - function log( - string memory p0, - string memory p1, - string memory p2, - address p3 - ) internal view { + function log(string memory p0, string memory p1, string memory p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,string,address)", p0, p1, p2, p3)); } - function log( - string memory p0, - string memory p1, - bool p2, - uint256 p3 - ) internal view { + function log(string memory p0, string memory p1, bool p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,bool,uint)", p0, p1, p2, p3)); } - function log( - string memory p0, - string memory p1, - bool p2, - string memory p3 - ) internal view { + function log(string memory p0, string memory p1, bool p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,bool,string)", p0, p1, p2, p3)); } - function log( - string memory p0, - string memory p1, - bool p2, - bool p3 - ) internal view { + function log(string memory p0, string memory p1, bool p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,bool,bool)", p0, p1, p2, p3)); } - function log( - string memory p0, - string memory p1, - bool p2, - address p3 - ) internal view { + function log(string memory p0, string memory p1, bool p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,bool,address)", p0, p1, p2, p3)); } - function log( - string memory p0, - string memory p1, - address p2, - uint256 p3 - ) internal view { + function log(string memory p0, string memory p1, address p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,address,uint)", p0, p1, p2, p3)); } - function log( - string memory p0, - string memory p1, - address p2, - string memory p3 - ) internal view { + function log(string memory p0, string memory p1, address p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,address,string)", p0, p1, p2, p3)); } - function log( - string memory p0, - string memory p1, - address p2, - bool p3 - ) internal view { + function log(string memory p0, string memory p1, address p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,address,bool)", p0, p1, p2, p3)); } - function log( - string memory p0, - string memory p1, - address p2, - address p3 - ) internal view { + function log(string memory p0, string memory p1, address p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,string,address,address)", p0, p1, p2, p3)); } - function log( - string memory p0, - bool p1, - uint256 p2, - uint256 p3 - ) internal view { + function log(string memory p0, bool p1, uint256 p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,uint,uint)", p0, p1, p2, p3)); } - function log( - string memory p0, - bool p1, - uint256 p2, - string memory p3 - ) internal view { + function log(string memory p0, bool p1, uint256 p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,uint,string)", p0, p1, p2, p3)); } - function log( - string memory p0, - bool p1, - uint256 p2, - bool p3 - ) internal view { + function log(string memory p0, bool p1, uint256 p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,uint,bool)", p0, p1, p2, p3)); } - function log( - string memory p0, - bool p1, - uint256 p2, - address p3 - ) internal view { + function log(string memory p0, bool p1, uint256 p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,uint,address)", p0, p1, p2, p3)); } - function log( - string memory p0, - bool p1, - string memory p2, - uint256 p3 - ) internal view { + function log(string memory p0, bool p1, string memory p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,string,uint)", p0, p1, p2, p3)); } - function log( - string memory p0, - bool p1, - string memory p2, - string memory p3 - ) internal view { + function log(string memory p0, bool p1, string memory p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,string,string)", p0, p1, p2, p3)); } - function log( - string memory p0, - bool p1, - string memory p2, - bool p3 - ) internal view { + function log(string memory p0, bool p1, string memory p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,string,bool)", p0, p1, p2, p3)); } - function log( - string memory p0, - bool p1, - string memory p2, - address p3 - ) internal view { + function log(string memory p0, bool p1, string memory p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,string,address)", p0, p1, p2, p3)); } - function log( - string memory p0, - bool p1, - bool p2, - uint256 p3 - ) internal view { + function log(string memory p0, bool p1, bool p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,bool,uint)", p0, p1, p2, p3)); } - function log( - string memory p0, - bool p1, - bool p2, - string memory p3 - ) internal view { + function log(string memory p0, bool p1, bool p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,bool,string)", p0, p1, p2, p3)); } - function log( - string memory p0, - bool p1, - bool p2, - bool p3 - ) internal view { + function log(string memory p0, bool p1, bool p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,bool,bool)", p0, p1, p2, p3)); } - function log( - string memory p0, - bool p1, - bool p2, - address p3 - ) internal view { + function log(string memory p0, bool p1, bool p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,bool,address)", p0, p1, p2, p3)); } - function log( - string memory p0, - bool p1, - address p2, - uint256 p3 - ) internal view { + function log(string memory p0, bool p1, address p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,address,uint)", p0, p1, p2, p3)); } - function log( - string memory p0, - bool p1, - address p2, - string memory p3 - ) internal view { + function log(string memory p0, bool p1, address p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,address,string)", p0, p1, p2, p3)); } - function log( - string memory p0, - bool p1, - address p2, - bool p3 - ) internal view { + function log(string memory p0, bool p1, address p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,address,bool)", p0, p1, p2, p3)); } - function log( - string memory p0, - bool p1, - address p2, - address p3 - ) internal view { + function log(string memory p0, bool p1, address p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,bool,address,address)", p0, p1, p2, p3)); } - function log( - string memory p0, - address p1, - uint256 p2, - uint256 p3 - ) internal view { + function log(string memory p0, address p1, uint256 p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,uint,uint)", p0, p1, p2, p3)); } - function log( - string memory p0, - address p1, - uint256 p2, - string memory p3 - ) internal view { + function log(string memory p0, address p1, uint256 p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,uint,string)", p0, p1, p2, p3)); } - function log( - string memory p0, - address p1, - uint256 p2, - bool p3 - ) internal view { + function log(string memory p0, address p1, uint256 p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,uint,bool)", p0, p1, p2, p3)); } - function log( - string memory p0, - address p1, - uint256 p2, - address p3 - ) internal view { + function log(string memory p0, address p1, uint256 p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,uint,address)", p0, p1, p2, p3)); } - function log( - string memory p0, - address p1, - string memory p2, - uint256 p3 - ) internal view { + function log(string memory p0, address p1, string memory p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,string,uint)", p0, p1, p2, p3)); } - function log( - string memory p0, - address p1, - string memory p2, - string memory p3 - ) internal view { + function log(string memory p0, address p1, string memory p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,string,string)", p0, p1, p2, p3)); } - function log( - string memory p0, - address p1, - string memory p2, - bool p3 - ) internal view { + function log(string memory p0, address p1, string memory p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,string,bool)", p0, p1, p2, p3)); } - function log( - string memory p0, - address p1, - string memory p2, - address p3 - ) internal view { + function log(string memory p0, address p1, string memory p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,string,address)", p0, p1, p2, p3)); } - function log( - string memory p0, - address p1, - bool p2, - uint256 p3 - ) internal view { + function log(string memory p0, address p1, bool p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,bool,uint)", p0, p1, p2, p3)); } - function log( - string memory p0, - address p1, - bool p2, - string memory p3 - ) internal view { + function log(string memory p0, address p1, bool p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,bool,string)", p0, p1, p2, p3)); } - function log( - string memory p0, - address p1, - bool p2, - bool p3 - ) internal view { + function log(string memory p0, address p1, bool p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,bool,bool)", p0, p1, p2, p3)); } - function log( - string memory p0, - address p1, - bool p2, - address p3 - ) internal view { + function log(string memory p0, address p1, bool p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,bool,address)", p0, p1, p2, p3)); } - function log( - string memory p0, - address p1, - address p2, - uint256 p3 - ) internal view { + function log(string memory p0, address p1, address p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,address,uint)", p0, p1, p2, p3)); } - function log( - string memory p0, - address p1, - address p2, - string memory p3 - ) internal view { + function log(string memory p0, address p1, address p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,address,string)", p0, p1, p2, p3)); } - function log( - string memory p0, - address p1, - address p2, - bool p3 - ) internal view { + function log(string memory p0, address p1, address p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,address,bool)", p0, p1, p2, p3)); } - function log( - string memory p0, - address p1, - address p2, - address p3 - ) internal view { + function log(string memory p0, address p1, address p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(string,address,address,address)", p0, p1, p2, p3)); } - function log( - bool p0, - uint256 p1, - uint256 p2, - uint256 p3 - ) internal view { + function log(bool p0, uint256 p1, uint256 p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,uint,uint)", p0, p1, p2, p3)); } - function log( - bool p0, - uint256 p1, - uint256 p2, - string memory p3 - ) internal view { + function log(bool p0, uint256 p1, uint256 p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,uint,string)", p0, p1, p2, p3)); } - function log( - bool p0, - uint256 p1, - uint256 p2, - bool p3 - ) internal view { + function log(bool p0, uint256 p1, uint256 p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,uint,bool)", p0, p1, p2, p3)); } - function log( - bool p0, - uint256 p1, - uint256 p2, - address p3 - ) internal view { + function log(bool p0, uint256 p1, uint256 p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,uint,address)", p0, p1, p2, p3)); } - function log( - bool p0, - uint256 p1, - string memory p2, - uint256 p3 - ) internal view { + function log(bool p0, uint256 p1, string memory p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,string,uint)", p0, p1, p2, p3)); } - function log( - bool p0, - uint256 p1, - string memory p2, - string memory p3 - ) internal view { + function log(bool p0, uint256 p1, string memory p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,string,string)", p0, p1, p2, p3)); } - function log( - bool p0, - uint256 p1, - string memory p2, - bool p3 - ) internal view { + function log(bool p0, uint256 p1, string memory p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,string,bool)", p0, p1, p2, p3)); } - function log( - bool p0, - uint256 p1, - string memory p2, - address p3 - ) internal view { + function log(bool p0, uint256 p1, string memory p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,string,address)", p0, p1, p2, p3)); } - function log( - bool p0, - uint256 p1, - bool p2, - uint256 p3 - ) internal view { + function log(bool p0, uint256 p1, bool p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,bool,uint)", p0, p1, p2, p3)); } - function log( - bool p0, - uint256 p1, - bool p2, - string memory p3 - ) internal view { + function log(bool p0, uint256 p1, bool p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,bool,string)", p0, p1, p2, p3)); } - function log( - bool p0, - uint256 p1, - bool p2, - bool p3 - ) internal view { + function log(bool p0, uint256 p1, bool p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,bool,bool)", p0, p1, p2, p3)); } - function log( - bool p0, - uint256 p1, - bool p2, - address p3 - ) internal view { + function log(bool p0, uint256 p1, bool p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,bool,address)", p0, p1, p2, p3)); } - function log( - bool p0, - uint256 p1, - address p2, - uint256 p3 - ) internal view { + function log(bool p0, uint256 p1, address p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,address,uint)", p0, p1, p2, p3)); } - function log( - bool p0, - uint256 p1, - address p2, - string memory p3 - ) internal view { + function log(bool p0, uint256 p1, address p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,address,string)", p0, p1, p2, p3)); } - function log( - bool p0, - uint256 p1, - address p2, - bool p3 - ) internal view { + function log(bool p0, uint256 p1, address p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,address,bool)", p0, p1, p2, p3)); } - function log( - bool p0, - uint256 p1, - address p2, - address p3 - ) internal view { + function log(bool p0, uint256 p1, address p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,uint,address,address)", p0, p1, p2, p3)); } - function log( - bool p0, - string memory p1, - uint256 p2, - uint256 p3 - ) internal view { + function log(bool p0, string memory p1, uint256 p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,uint,uint)", p0, p1, p2, p3)); } - function log( - bool p0, - string memory p1, - uint256 p2, - string memory p3 - ) internal view { + function log(bool p0, string memory p1, uint256 p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,uint,string)", p0, p1, p2, p3)); } - function log( - bool p0, - string memory p1, - uint256 p2, - bool p3 - ) internal view { + function log(bool p0, string memory p1, uint256 p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,uint,bool)", p0, p1, p2, p3)); } - function log( - bool p0, - string memory p1, - uint256 p2, - address p3 - ) internal view { + function log(bool p0, string memory p1, uint256 p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,uint,address)", p0, p1, p2, p3)); } - function log( - bool p0, - string memory p1, - string memory p2, - uint256 p3 - ) internal view { + function log(bool p0, string memory p1, string memory p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,string,uint)", p0, p1, p2, p3)); } - function log( - bool p0, - string memory p1, - string memory p2, - string memory p3 - ) internal view { + function log(bool p0, string memory p1, string memory p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,string,string)", p0, p1, p2, p3)); } - function log( - bool p0, - string memory p1, - string memory p2, - bool p3 - ) internal view { + function log(bool p0, string memory p1, string memory p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,string,bool)", p0, p1, p2, p3)); } - function log( - bool p0, - string memory p1, - string memory p2, - address p3 - ) internal view { + function log(bool p0, string memory p1, string memory p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,string,address)", p0, p1, p2, p3)); } - function log( - bool p0, - string memory p1, - bool p2, - uint256 p3 - ) internal view { + function log(bool p0, string memory p1, bool p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,bool,uint)", p0, p1, p2, p3)); } - function log( - bool p0, - string memory p1, - bool p2, - string memory p3 - ) internal view { + function log(bool p0, string memory p1, bool p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,bool,string)", p0, p1, p2, p3)); } - function log( - bool p0, - string memory p1, - bool p2, - bool p3 - ) internal view { + function log(bool p0, string memory p1, bool p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,bool,bool)", p0, p1, p2, p3)); } - function log( - bool p0, - string memory p1, - bool p2, - address p3 - ) internal view { + function log(bool p0, string memory p1, bool p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,bool,address)", p0, p1, p2, p3)); } - function log( - bool p0, - string memory p1, - address p2, - uint256 p3 - ) internal view { + function log(bool p0, string memory p1, address p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,address,uint)", p0, p1, p2, p3)); } - function log( - bool p0, - string memory p1, - address p2, - string memory p3 - ) internal view { + function log(bool p0, string memory p1, address p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,address,string)", p0, p1, p2, p3)); } - function log( - bool p0, - string memory p1, - address p2, - bool p3 - ) internal view { + function log(bool p0, string memory p1, address p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,address,bool)", p0, p1, p2, p3)); } - function log( - bool p0, - string memory p1, - address p2, - address p3 - ) internal view { + function log(bool p0, string memory p1, address p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,string,address,address)", p0, p1, p2, p3)); } - function log( - bool p0, - bool p1, - uint256 p2, - uint256 p3 - ) internal view { + function log(bool p0, bool p1, uint256 p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,uint,uint)", p0, p1, p2, p3)); } - function log( - bool p0, - bool p1, - uint256 p2, - string memory p3 - ) internal view { + function log(bool p0, bool p1, uint256 p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,uint,string)", p0, p1, p2, p3)); } - function log( - bool p0, - bool p1, - uint256 p2, - bool p3 - ) internal view { + function log(bool p0, bool p1, uint256 p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,uint,bool)", p0, p1, p2, p3)); } - function log( - bool p0, - bool p1, - uint256 p2, - address p3 - ) internal view { + function log(bool p0, bool p1, uint256 p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,uint,address)", p0, p1, p2, p3)); } - function log( - bool p0, - bool p1, - string memory p2, - uint256 p3 - ) internal view { + function log(bool p0, bool p1, string memory p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,string,uint)", p0, p1, p2, p3)); } - function log( - bool p0, - bool p1, - string memory p2, - string memory p3 - ) internal view { + function log(bool p0, bool p1, string memory p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,string,string)", p0, p1, p2, p3)); } - function log( - bool p0, - bool p1, - string memory p2, - bool p3 - ) internal view { + function log(bool p0, bool p1, string memory p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,string,bool)", p0, p1, p2, p3)); } - function log( - bool p0, - bool p1, - string memory p2, - address p3 - ) internal view { + function log(bool p0, bool p1, string memory p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,string,address)", p0, p1, p2, p3)); } - function log( - bool p0, - bool p1, - bool p2, - uint256 p3 - ) internal view { + function log(bool p0, bool p1, bool p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,bool,uint)", p0, p1, p2, p3)); } - function log( - bool p0, - bool p1, - bool p2, - string memory p3 - ) internal view { + function log(bool p0, bool p1, bool p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,bool,string)", p0, p1, p2, p3)); } - function log( - bool p0, - bool p1, - bool p2, - bool p3 - ) internal view { + function log(bool p0, bool p1, bool p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,bool,bool)", p0, p1, p2, p3)); } - function log( - bool p0, - bool p1, - bool p2, - address p3 - ) internal view { + function log(bool p0, bool p1, bool p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,bool,address)", p0, p1, p2, p3)); } - function log( - bool p0, - bool p1, - address p2, - uint256 p3 - ) internal view { + function log(bool p0, bool p1, address p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,address,uint)", p0, p1, p2, p3)); } - function log( - bool p0, - bool p1, - address p2, - string memory p3 - ) internal view { + function log(bool p0, bool p1, address p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,address,string)", p0, p1, p2, p3)); } - function log( - bool p0, - bool p1, - address p2, - bool p3 - ) internal view { + function log(bool p0, bool p1, address p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,address,bool)", p0, p1, p2, p3)); } - function log( - bool p0, - bool p1, - address p2, - address p3 - ) internal view { + function log(bool p0, bool p1, address p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,bool,address,address)", p0, p1, p2, p3)); } - function log( - bool p0, - address p1, - uint256 p2, - uint256 p3 - ) internal view { + function log(bool p0, address p1, uint256 p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,uint,uint)", p0, p1, p2, p3)); } - function log( - bool p0, - address p1, - uint256 p2, - string memory p3 - ) internal view { + function log(bool p0, address p1, uint256 p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,uint,string)", p0, p1, p2, p3)); } - function log( - bool p0, - address p1, - uint256 p2, - bool p3 - ) internal view { + function log(bool p0, address p1, uint256 p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,uint,bool)", p0, p1, p2, p3)); } - function log( - bool p0, - address p1, - uint256 p2, - address p3 - ) internal view { + function log(bool p0, address p1, uint256 p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,uint,address)", p0, p1, p2, p3)); } - function log( - bool p0, - address p1, - string memory p2, - uint256 p3 - ) internal view { + function log(bool p0, address p1, string memory p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,string,uint)", p0, p1, p2, p3)); } - function log( - bool p0, - address p1, - string memory p2, - string memory p3 - ) internal view { + function log(bool p0, address p1, string memory p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,string,string)", p0, p1, p2, p3)); } - function log( - bool p0, - address p1, - string memory p2, - bool p3 - ) internal view { + function log(bool p0, address p1, string memory p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,string,bool)", p0, p1, p2, p3)); } - function log( - bool p0, - address p1, - string memory p2, - address p3 - ) internal view { + function log(bool p0, address p1, string memory p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,string,address)", p0, p1, p2, p3)); } - function log( - bool p0, - address p1, - bool p2, - uint256 p3 - ) internal view { + function log(bool p0, address p1, bool p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,bool,uint)", p0, p1, p2, p3)); } - function log( - bool p0, - address p1, - bool p2, - string memory p3 - ) internal view { + function log(bool p0, address p1, bool p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,bool,string)", p0, p1, p2, p3)); } - function log( - bool p0, - address p1, - bool p2, - bool p3 - ) internal view { + function log(bool p0, address p1, bool p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,bool,bool)", p0, p1, p2, p3)); } - function log( - bool p0, - address p1, - bool p2, - address p3 - ) internal view { + function log(bool p0, address p1, bool p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,bool,address)", p0, p1, p2, p3)); } - function log( - bool p0, - address p1, - address p2, - uint256 p3 - ) internal view { + function log(bool p0, address p1, address p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,address,uint)", p0, p1, p2, p3)); } - function log( - bool p0, - address p1, - address p2, - string memory p3 - ) internal view { + function log(bool p0, address p1, address p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,address,string)", p0, p1, p2, p3)); } - function log( - bool p0, - address p1, - address p2, - bool p3 - ) internal view { + function log(bool p0, address p1, address p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,address,bool)", p0, p1, p2, p3)); } - function log( - bool p0, - address p1, - address p2, - address p3 - ) internal view { + function log(bool p0, address p1, address p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(bool,address,address,address)", p0, p1, p2, p3)); } - function log( - address p0, - uint256 p1, - uint256 p2, - uint256 p3 - ) internal view { + function log(address p0, uint256 p1, uint256 p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,uint,uint)", p0, p1, p2, p3)); } - function log( - address p0, - uint256 p1, - uint256 p2, - string memory p3 - ) internal view { + function log(address p0, uint256 p1, uint256 p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,uint,string)", p0, p1, p2, p3)); } - function log( - address p0, - uint256 p1, - uint256 p2, - bool p3 - ) internal view { + function log(address p0, uint256 p1, uint256 p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,uint,bool)", p0, p1, p2, p3)); } - function log( - address p0, - uint256 p1, - uint256 p2, - address p3 - ) internal view { + function log(address p0, uint256 p1, uint256 p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,uint,address)", p0, p1, p2, p3)); } - function log( - address p0, - uint256 p1, - string memory p2, - uint256 p3 - ) internal view { + function log(address p0, uint256 p1, string memory p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,string,uint)", p0, p1, p2, p3)); } - function log( - address p0, - uint256 p1, - string memory p2, - string memory p3 - ) internal view { + function log(address p0, uint256 p1, string memory p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,string,string)", p0, p1, p2, p3)); } - function log( - address p0, - uint256 p1, - string memory p2, - bool p3 - ) internal view { + function log(address p0, uint256 p1, string memory p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,string,bool)", p0, p1, p2, p3)); } - function log( - address p0, - uint256 p1, - string memory p2, - address p3 - ) internal view { + function log(address p0, uint256 p1, string memory p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,string,address)", p0, p1, p2, p3)); } - function log( - address p0, - uint256 p1, - bool p2, - uint256 p3 - ) internal view { + function log(address p0, uint256 p1, bool p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,bool,uint)", p0, p1, p2, p3)); } - function log( - address p0, - uint256 p1, - bool p2, - string memory p3 - ) internal view { + function log(address p0, uint256 p1, bool p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,bool,string)", p0, p1, p2, p3)); } - function log( - address p0, - uint256 p1, - bool p2, - bool p3 - ) internal view { + function log(address p0, uint256 p1, bool p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,bool,bool)", p0, p1, p2, p3)); } - function log( - address p0, - uint256 p1, - bool p2, - address p3 - ) internal view { + function log(address p0, uint256 p1, bool p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,bool,address)", p0, p1, p2, p3)); } - function log( - address p0, - uint256 p1, - address p2, - uint256 p3 - ) internal view { + function log(address p0, uint256 p1, address p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,address,uint)", p0, p1, p2, p3)); } - function log( - address p0, - uint256 p1, - address p2, - string memory p3 - ) internal view { + function log(address p0, uint256 p1, address p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,address,string)", p0, p1, p2, p3)); } - function log( - address p0, - uint256 p1, - address p2, - bool p3 - ) internal view { + function log(address p0, uint256 p1, address p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,address,bool)", p0, p1, p2, p3)); } - function log( - address p0, - uint256 p1, - address p2, - address p3 - ) internal view { + function log(address p0, uint256 p1, address p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,uint,address,address)", p0, p1, p2, p3)); } - function log( - address p0, - string memory p1, - uint256 p2, - uint256 p3 - ) internal view { + function log(address p0, string memory p1, uint256 p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,uint,uint)", p0, p1, p2, p3)); } - function log( - address p0, - string memory p1, - uint256 p2, - string memory p3 - ) internal view { + function log(address p0, string memory p1, uint256 p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,uint,string)", p0, p1, p2, p3)); } - function log( - address p0, - string memory p1, - uint256 p2, - bool p3 - ) internal view { + function log(address p0, string memory p1, uint256 p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,uint,bool)", p0, p1, p2, p3)); } - function log( - address p0, - string memory p1, - uint256 p2, - address p3 - ) internal view { + function log(address p0, string memory p1, uint256 p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,uint,address)", p0, p1, p2, p3)); } - function log( - address p0, - string memory p1, - string memory p2, - uint256 p3 - ) internal view { + function log(address p0, string memory p1, string memory p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,string,uint)", p0, p1, p2, p3)); } - function log( - address p0, - string memory p1, - string memory p2, - string memory p3 - ) internal view { + function log(address p0, string memory p1, string memory p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,string,string)", p0, p1, p2, p3)); } - function log( - address p0, - string memory p1, - string memory p2, - bool p3 - ) internal view { + function log(address p0, string memory p1, string memory p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,string,bool)", p0, p1, p2, p3)); } - function log( - address p0, - string memory p1, - string memory p2, - address p3 - ) internal view { + function log(address p0, string memory p1, string memory p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,string,address)", p0, p1, p2, p3)); } - function log( - address p0, - string memory p1, - bool p2, - uint256 p3 - ) internal view { + function log(address p0, string memory p1, bool p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,bool,uint)", p0, p1, p2, p3)); } - function log( - address p0, - string memory p1, - bool p2, - string memory p3 - ) internal view { + function log(address p0, string memory p1, bool p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,bool,string)", p0, p1, p2, p3)); } - function log( - address p0, - string memory p1, - bool p2, - bool p3 - ) internal view { + function log(address p0, string memory p1, bool p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,bool,bool)", p0, p1, p2, p3)); } - function log( - address p0, - string memory p1, - bool p2, - address p3 - ) internal view { + function log(address p0, string memory p1, bool p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,bool,address)", p0, p1, p2, p3)); } - function log( - address p0, - string memory p1, - address p2, - uint256 p3 - ) internal view { + function log(address p0, string memory p1, address p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,address,uint)", p0, p1, p2, p3)); } - function log( - address p0, - string memory p1, - address p2, - string memory p3 - ) internal view { + function log(address p0, string memory p1, address p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,address,string)", p0, p1, p2, p3)); } - function log( - address p0, - string memory p1, - address p2, - bool p3 - ) internal view { + function log(address p0, string memory p1, address p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,address,bool)", p0, p1, p2, p3)); } - function log( - address p0, - string memory p1, - address p2, - address p3 - ) internal view { + function log(address p0, string memory p1, address p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,string,address,address)", p0, p1, p2, p3)); } - function log( - address p0, - bool p1, - uint256 p2, - uint256 p3 - ) internal view { + function log(address p0, bool p1, uint256 p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,uint,uint)", p0, p1, p2, p3)); } - function log( - address p0, - bool p1, - uint256 p2, - string memory p3 - ) internal view { + function log(address p0, bool p1, uint256 p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,uint,string)", p0, p1, p2, p3)); } - function log( - address p0, - bool p1, - uint256 p2, - bool p3 - ) internal view { + function log(address p0, bool p1, uint256 p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,uint,bool)", p0, p1, p2, p3)); } - function log( - address p0, - bool p1, - uint256 p2, - address p3 - ) internal view { + function log(address p0, bool p1, uint256 p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,uint,address)", p0, p1, p2, p3)); } - function log( - address p0, - bool p1, - string memory p2, - uint256 p3 - ) internal view { + function log(address p0, bool p1, string memory p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,string,uint)", p0, p1, p2, p3)); } - function log( - address p0, - bool p1, - string memory p2, - string memory p3 - ) internal view { + function log(address p0, bool p1, string memory p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,string,string)", p0, p1, p2, p3)); } - function log( - address p0, - bool p1, - string memory p2, - bool p3 - ) internal view { + function log(address p0, bool p1, string memory p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,string,bool)", p0, p1, p2, p3)); } - function log( - address p0, - bool p1, - string memory p2, - address p3 - ) internal view { + function log(address p0, bool p1, string memory p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,string,address)", p0, p1, p2, p3)); } - function log( - address p0, - bool p1, - bool p2, - uint256 p3 - ) internal view { + function log(address p0, bool p1, bool p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,bool,uint)", p0, p1, p2, p3)); } - function log( - address p0, - bool p1, - bool p2, - string memory p3 - ) internal view { + function log(address p0, bool p1, bool p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,bool,string)", p0, p1, p2, p3)); } - function log( - address p0, - bool p1, - bool p2, - bool p3 - ) internal view { + function log(address p0, bool p1, bool p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,bool,bool)", p0, p1, p2, p3)); } - function log( - address p0, - bool p1, - bool p2, - address p3 - ) internal view { + function log(address p0, bool p1, bool p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,bool,address)", p0, p1, p2, p3)); } - function log( - address p0, - bool p1, - address p2, - uint256 p3 - ) internal view { + function log(address p0, bool p1, address p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,address,uint)", p0, p1, p2, p3)); } - function log( - address p0, - bool p1, - address p2, - string memory p3 - ) internal view { + function log(address p0, bool p1, address p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,address,string)", p0, p1, p2, p3)); } - function log( - address p0, - bool p1, - address p2, - bool p3 - ) internal view { + function log(address p0, bool p1, address p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,address,bool)", p0, p1, p2, p3)); } - function log( - address p0, - bool p1, - address p2, - address p3 - ) internal view { + function log(address p0, bool p1, address p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,bool,address,address)", p0, p1, p2, p3)); } - function log( - address p0, - address p1, - uint256 p2, - uint256 p3 - ) internal view { + function log(address p0, address p1, uint256 p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,uint,uint)", p0, p1, p2, p3)); } - function log( - address p0, - address p1, - uint256 p2, - string memory p3 - ) internal view { + function log(address p0, address p1, uint256 p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,uint,string)", p0, p1, p2, p3)); } - function log( - address p0, - address p1, - uint256 p2, - bool p3 - ) internal view { + function log(address p0, address p1, uint256 p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,uint,bool)", p0, p1, p2, p3)); } - function log( - address p0, - address p1, - uint256 p2, - address p3 - ) internal view { + function log(address p0, address p1, uint256 p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,uint,address)", p0, p1, p2, p3)); } - function log( - address p0, - address p1, - string memory p2, - uint256 p3 - ) internal view { + function log(address p0, address p1, string memory p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,string,uint)", p0, p1, p2, p3)); } - function log( - address p0, - address p1, - string memory p2, - string memory p3 - ) internal view { + function log(address p0, address p1, string memory p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,string,string)", p0, p1, p2, p3)); } - function log( - address p0, - address p1, - string memory p2, - bool p3 - ) internal view { + function log(address p0, address p1, string memory p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,string,bool)", p0, p1, p2, p3)); } - function log( - address p0, - address p1, - string memory p2, - address p3 - ) internal view { + function log(address p0, address p1, string memory p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,string,address)", p0, p1, p2, p3)); } - function log( - address p0, - address p1, - bool p2, - uint256 p3 - ) internal view { + function log(address p0, address p1, bool p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,bool,uint)", p0, p1, p2, p3)); } - function log( - address p0, - address p1, - bool p2, - string memory p3 - ) internal view { + function log(address p0, address p1, bool p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,bool,string)", p0, p1, p2, p3)); } - function log( - address p0, - address p1, - bool p2, - bool p3 - ) internal view { + function log(address p0, address p1, bool p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,bool,bool)", p0, p1, p2, p3)); } - function log( - address p0, - address p1, - bool p2, - address p3 - ) internal view { + function log(address p0, address p1, bool p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,bool,address)", p0, p1, p2, p3)); } - function log( - address p0, - address p1, - address p2, - uint256 p3 - ) internal view { + function log(address p0, address p1, address p2, uint256 p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,address,uint)", p0, p1, p2, p3)); } - function log( - address p0, - address p1, - address p2, - string memory p3 - ) internal view { + function log(address p0, address p1, address p2, string memory p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,address,string)", p0, p1, p2, p3)); } - function log( - address p0, - address p1, - address p2, - bool p3 - ) internal view { + function log(address p0, address p1, address p2, bool p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,address,bool)", p0, p1, p2, p3)); } - function log( - address p0, - address p1, - address p2, - address p3 - ) internal view { + function log(address p0, address p1, address p2, address p3) internal view { _sendLogPayload(abi.encodeWithSignature("log(address,address,address,address)", p0, p1, p2, p3)); } }