diff --git a/script/DeployBase.sol b/script/DeployBase.sol index 14a6c3e..0266131 100644 --- a/script/DeployBase.sol +++ b/script/DeployBase.sol @@ -19,10 +19,7 @@ contract DeployBase is ProtocolDeployBase, TTGDeployBase { { address[] memory allowedCashTokens_ = new address[](2); allowedCashTokens_[0] = weth_; - - uint256 deployerNonceAfterTTGDeployment_ = getDeployerNonceAfterTTGDeployment(deployerNonce_); - - allowedCashTokens_[1] = getExpectedMToken(deployer_, deployerNonceAfterTTGDeployment_); + allowedCashTokens_[1] = getExpectedMToken(deployer_, deployerNonce_); ttgRegistrar_ = deploy( deployer_, @@ -33,6 +30,8 @@ contract DeployBase is ProtocolDeployBase, TTGDeployBase { allowedCashTokens_ ); + uint256 deployerNonceAfterTTGDeployment_ = getDeployerNonceAfterTTGDeployment(deployerNonce_); + (minterGateway_, minterRateModel_, earnerRateModel_) = deploy( deployer_, deployerNonceAfterTTGDeployment_,