fixed stack too deep issue

Kotsin · Kotsin · commit 69226dcec579 · 2022-10-24T20:03:36.000+07:00
diff --git a/.solcover.js b/.solcover.js
@@ -1,6 +1,5 @@
 module.exports = {
   norpc: true,
-  compileCommand: '../node_modules/.bin/truffle compile',
-  testCommand: 'node --max-old-space-size=4096 ../node_modules/.bin/truffle test --network coverage',
-  skipFiles: ['interfaces','libs']
+  skipFiles: ['interfaces', 'libs'],
+  configureYulOptimizer: true
 }
diff --git a/contracts/InitializerHbbft.sol b/contracts/InitializerHbbft.sol
@@ -1,5 +1,4 @@
 pragma solidity =0.8.17;
-pragma experimental ABIEncoderV2;
 
 import "./interfaces/IBlockRewardHbbft.sol";
 import "./interfaces/ICertifier.sol";
@@ -57,14 +56,16 @@ contract InitializerHbbft {
             _stakingAddresses
         );
         IStakingHbbft(_contracts[3]).initialize(
-            _contracts[0], // _validatorSetContract
-            _stakingAddresses,
-            _stakingParams[0], // _delegatorMinStake
-            _stakingParams[1], // _candidateMinStake
-            _stakingParams[2], // _maxStake
-            _stakingParams[3], // _stakingEpochDuration
-            _stakingParams[4], // _stakingTransitionTimeframeLength
-            _stakingParams[5], // _stakingWithdrawDisallowPeriod
+            IStakingHbbft.StakingParams({
+                _validatorSetContract: _contracts[0], // _validatorSetContract
+                _initialStakingAddresses: _stakingAddresses,
+                _delegatorMinStake: _stakingParams[0], // _delegatorMinStake
+                _candidateMinStake: _stakingParams[1], // _candidateMinStake
+                _maxStake: _stakingParams[2], // _maxStake
+                _stakingFixedEpochDuration: _stakingParams[3], // _stakingEpochDuration
+                _stakingTransitionTimeframeLength: _stakingParams[4], // _stakingTransitionTimeframeLength
+                _stakingWithdrawDisallowPeriod: _stakingParams[5] // _stakingWithdrawDisallowPeriod
+            }),
             _publicKeys,
             _internetAddresses
         );
diff --git a/contracts/KeyGenHistory.sol b/contracts/KeyGenHistory.sol
@@ -1,5 +1,4 @@
 pragma solidity =0.8.17;
-pragma experimental ABIEncoderV2;
 
 import "./interfaces/IKeyGenHistory.sol";
 import "./interfaces/IValidatorSetHbbft.sol";
diff --git a/contracts/base/StakingHbbftBase.sol b/contracts/base/StakingHbbftBase.sol
@@ -341,59 +341,60 @@ contract StakingHbbftBase is UpgradeableOwned, IStakingHbbft {
 
     /// @dev Initializes the network parameters.
     /// Can only be called by the constructor of the `InitializerHbbft` contract or owner.
-    /// @param _validatorSetContract The address of the `ValidatorSetHbbft` contract.
-    /// @param _initialStakingAddresses The array of initial validators' staking addresses.
-    /// @param _delegatorMinStake The minimum allowed amount of delegator stake in Wei.
-    /// @param _candidateMinStake The minimum allowed amount of candidate/validator stake in Wei.
-    /// @param _stakingFixedEpochDuration The fixed duration of each epoch before keyGen starts.
-    /// @param _stakingTransitionTimeframeLength Length of the timeframe in seconds for the transition
+    /// @param stakingParams stores other parameters due to stack too deep issue
+    ///  _validatorSetContract The address of the `ValidatorSetHbbft` contract.
+    ///  _initialStakingAddresses The array of initial validators' staking addresses.
+    ///  _delegatorMinStake The minimum allowed amount of delegator stake in Wei.
+    ///  _candidateMinStake The minimum allowed amount of candidate/validator stake in Wei.
+    ///  _stakingFixedEpochDuration The fixed duration of each epoch before keyGen starts.
+    ///  _stakingTransitionTimeframeLength Length of the timeframe in seconds for the transition
     /// to the new validator set.
-    /// @param _stakingWithdrawDisallowPeriod The duration period at the end of a staking epoch
+    ///  _stakingWithdrawDisallowPeriod The duration period at the end of a staking epoch
     /// during which participants cannot stake/withdraw/order/claim their staking coins
     function initialize(
-        address _validatorSetContract,
-        address[] calldata _initialStakingAddresses,
-        uint256 _delegatorMinStake,
-        uint256 _candidateMinStake,
-        uint256 _maxStake,
-        uint256 _stakingFixedEpochDuration,
-        uint256 _stakingTransitionTimeframeLength,
-        uint256 _stakingWithdrawDisallowPeriod,
+        StakingParams calldata stakingParams,
         bytes32[] calldata _publicKeys,
         bytes16[] calldata _internetAddresses
     ) external {
-        require(_stakingFixedEpochDuration != 0, "FixedEpochDuration is 0");
         require(
-            _stakingFixedEpochDuration > _stakingWithdrawDisallowPeriod,
+            stakingParams._stakingFixedEpochDuration != 0,
+            "FixedEpochDuration is 0"
+        );
+        require(
+            stakingParams._stakingFixedEpochDuration >
+                stakingParams._stakingWithdrawDisallowPeriod,
             "FixedEpochDuration must be longer than withdrawDisallowPeriod"
         );
         require(
-            _stakingWithdrawDisallowPeriod != 0,
+            stakingParams._stakingWithdrawDisallowPeriod != 0,
             "WithdrawDisallowPeriod is 0"
         );
         require(
-            _stakingTransitionTimeframeLength != 0,
+            stakingParams._stakingTransitionTimeframeLength != 0,
             "The transition timeframe must be longer than 0"
         );
         require(
-            _stakingTransitionTimeframeLength < _stakingFixedEpochDuration,
+            stakingParams._stakingTransitionTimeframeLength <
+                stakingParams._stakingFixedEpochDuration,
             "The transition timeframe must be shorter then the epoch duration"
         );
 
         _initialize(
-            _validatorSetContract,
-            _initialStakingAddresses,
-            _delegatorMinStake,
-            _candidateMinStake,
-            _maxStake,
+            stakingParams._validatorSetContract,
+            stakingParams._initialStakingAddresses,
+            stakingParams._delegatorMinStake,
+            stakingParams._candidateMinStake,
+            stakingParams._maxStake,
             _publicKeys,
             _internetAddresses
         );
-        stakingFixedEpochDuration = _stakingFixedEpochDuration;
-        stakingWithdrawDisallowPeriod = _stakingWithdrawDisallowPeriod;
+        stakingFixedEpochDuration = stakingParams._stakingFixedEpochDuration;
+        stakingWithdrawDisallowPeriod = stakingParams
+            ._stakingWithdrawDisallowPeriod;
         //note: this might be still 0 when created in the genesis block.
         stakingEpochStartTime = validatorSetContract.getCurrentTimestamp();
-        stakingTransitionTimeframeLength = _stakingTransitionTimeframeLength;
+        stakingTransitionTimeframeLength = stakingParams
+            ._stakingTransitionTimeframeLength;
     }
 
     /// @dev Removes a specified pool from the `pools` array (a list of active pools which can be retrieved by the
diff --git a/contracts/interfaces/IKeyGenHistory.sol b/contracts/interfaces/IKeyGenHistory.sol
@@ -1,5 +1,4 @@
 pragma solidity =0.8.17;
-pragma experimental ABIEncoderV2;
 
 interface IKeyGenHistory {
     function initialize(
diff --git a/contracts/interfaces/IStakingHbbft.sol b/contracts/interfaces/IStakingHbbft.sol
@@ -1,17 +1,21 @@
 pragma solidity =0.8.17;
 
 interface IStakingHbbft {
+    struct StakingParams {
+        address _validatorSetContract;
+        address[] _initialStakingAddresses;
+        uint256 _delegatorMinStake;
+        uint256 _candidateMinStake;
+        uint256 _maxStake;
+        uint256 _stakingFixedEpochDuration;
+        uint256 _stakingTransitionTimeframeLength;
+        uint256 _stakingWithdrawDisallowPeriod;
+    }
+
     function incrementStakingEpoch() external;
 
     function initialize(
-        address,
-        address[] calldata,
-        uint256,
-        uint256,
-        uint256,
-        uint256,
-        uint256,
-        uint256,
+        StakingParams calldata,
         bytes32[] calldata,
         bytes16[] calldata
     ) external;
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -127,7 +127,6 @@ const config: {} = {
     solidity: {
         version: "0.8.17",
         settings: {
-            viaIR: true,
             // metadata: {
             //     // Not including the metadata hash
             //     // https://github.com/paulrberg/hardhat-template/issues/31
@@ -138,7 +137,11 @@ const config: {} = {
             optimizer: {
                 enabled: true,
                 runs: 800,
+                details: {
+                    yul: true,
+                },
             },
+            evmVersion: "istanbul"
         },
     },
     typechain: {
diff --git a/test/BlockRewardHbbft.ts b/test/BlockRewardHbbft.ts
@@ -6,7 +6,8 @@ import {
     RandomHbbftMock,
     ValidatorSetHbbftMock,
     StakingHbbftCoinsMock,
-    KeyGenHistory
+    KeyGenHistory,
+    IStakingHbbft
 } from "../src/types";
 
 import fp from 'lodash/fp';
@@ -141,16 +142,20 @@ describe('BlockRewardHbbft', () => {
             initialStakingAddresses, // _initialStakingAddresses
         );
 
+        let structure: IStakingHbbft.InitializerStruct = {
+            _validatorSetContract: validatorSetHbbft.address,
+            _initialStakingAddresses: initialStakingAddresses,
+            _delegatorMinStake: MIN_STAKE,
+            _candidateMinStake: MIN_STAKE,
+            _maxStake: MAX_STAKE,
+            _stakingFixedEpochDuration: STAKING_FIXED_EPOCH_DURATION,
+            _stakingTransitionTimeframeLength: STAKING_TRANSITION_WINDOW_LENGTH,
+            _stakingWithdrawDisallowPeriod: STAKE_WITHDRAW_DISALLOW_PERIOD
+        };
+
         // Initialize StakingHbbft
         await stakingHbbft.initialize(
-            validatorSetHbbft.address, // _validatorSetContract
-            initialStakingAddresses, // _initialStakingAddresses
-            MIN_STAKE, // _delegatorMinStake
-            MIN_STAKE, // _candidateMinStake
-            MAX_STAKE, // _maxStake
-            STAKING_FIXED_EPOCH_DURATION, // _stakingFixedEpochDuration,
-            STAKING_TRANSITION_WINDOW_LENGTH, // _stakingTransitionTimeframeLength
-            STAKE_WITHDRAW_DISALLOW_PERIOD, // _stakeWithdrawDisallowPeriod
+            structure, // initializer structure
             initialValidatorsPubKeys, // _publicKeys
             initialValidatorsIpAddresses // _internetAddresses
         );
diff --git a/test/StakingHbbft.ts b/test/StakingHbbft.ts
diff --git a/test/ValidatorSetHbbft.ts b/test/ValidatorSetHbbft.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`module.exports = {`
`2`	`2`	`norpc: true,`
`3`		`- compileCommand: '../node_modules/.bin/truffle compile',`
`4`		`- testCommand: 'node --max-old-space-size=4096 ../node_modules/.bin/truffle test --network coverage',`
`5`		`- skipFiles: ['interfaces','libs']`
	`3`	`+ skipFiles: ['interfaces', 'libs'],`
	`4`	`+ configureYulOptimizer: true`
`6`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`pragma solidity =0.8.17;`
`2`		`-pragma experimental ABIEncoderV2;`
`3`	`2`
`4`	`3`	`import "./interfaces/IKeyGenHistory.sol";`
`5`	`4`	`import "./interfaces/IValidatorSetHbbft.sol";`