Remove RiskManagerChangeModule

Author: 0xdomrom

.gas-snapshot

@@ -1,62 +1,68 @@
 BadModule:test() (gas: 120)
 DepositModuleTest:test() (gas: 186)
-DepositModuleTest:testCannotCallDepositWithWrongActionLength() (gas: 127010)
-DepositModuleTest:testCannotDepositWithExpiredSigningKey() (gas: 141766)
-DepositModuleTest:testCannotDepositWithRandomAddress() (gas: 117334)
-DepositModuleTest:testDeposit() (gas: 252604)
-DepositModuleTest:testDepositToNewAccount() (gas: 349274)
-DepositModuleTest:testDepositWithSigningKey() (gas: 275243)
+DepositModuleTest:testCanSendERC20Out() (gas: 54504)
+DepositModuleTest:testCannotCallDepositWithWrongActionLength() (gas: 124606)
+DepositModuleTest:testCannotDepositWithExpiredSigningKey() (gas: 140791)
+DepositModuleTest:testCannotDepositWithRandomAddress() (gas: 116360)
+DepositModuleTest:testDeposit() (gas: 262087)
+DepositModuleTest:testDepositToNewAccount() (gas: 372475)
+DepositModuleTest:testDepositWithSigningKey() (gas: 284688)
 MatchingBase:test() (gas: 186)
 MatchingBasicTest:test() (gas: 186)
-MatchingBasicTest:testCannotExecuteActionsForDifferentModules() (gas: 297711)
-MatchingBasicTest:testCannotUseModuleThatDoesNotReturnAccounts() (gas: 363035)
-MatchingBasicTest:testGetDomainSeparator() (gas: 5608)
-MatchingBasicTest:testSetExecutor() (gas: 14697)
+MatchingBasicTest:testCanSendERC20Out() (gas: 54620)
+MatchingBasicTest:testCannotExecuteActionsForDifferentModules() (gas: 295365)
+MatchingBasicTest:testCannotExecuteActionsWithNoSignature() (gas: 34714)
+MatchingBasicTest:testCannotUseModuleThatDoesNotReturnAccounts() (gas: 362878)
+MatchingBasicTest:testGetDomainSeparator() (gas: 5631)
+MatchingBasicTest:testSetExecutor() (gas: 14799)
 MatchingSignatureTest:test() (gas: 186)
-MatchingSignatureTest:testCanUseInvalidKey() (gas: 187344)
-MatchingSignatureTest:testCanUseSessionKeyToSign() (gas: 661714)
-MatchingSignatureTest:testCannotDeregisterInvalidKey() (gas: 12781)
+MatchingSignatureTest:testCanUseInvalidKey() (gas: 184281)
+MatchingSignatureTest:testCanUseSessionKeyToSign() (gas: 699654)
+MatchingSignatureTest:testCannotDeregisterInvalidKey() (gas: 12826)
 MatchingSignatureTest:testCannotDeregisterWithRegisterSessionKeyFunc() (gas: 38478)
-MatchingSignatureTest:testCannotSpecifyWrongOwnerInAction() (gas: 44553)
-MatchingSignatureTest:testCannotSubmitExpiredAction() (gas: 40520)
-MatchingSignatureTest:testCannotUseUnDepositedAccount() (gas: 325711)
-MatchingSignatureTest:testDeregisterSessionKey() (gas: 211915)
-RiskManagerChangeModuleTest:test() (gas: 186)
-RiskManagerChangeModuleTest:testCanChangeManager() (gas: 681971)
-RiskManagerChangeModuleTest:testCannotPassInInvalidActionLength() (gas: 127755)
+MatchingSignatureTest:testCannotSpecifyWrongOwnerInAction() (gas: 43639)
+MatchingSignatureTest:testCannotSubmitExpiredAction() (gas: 39606)
+MatchingSignatureTest:testCannotUseUnDepositedAccount() (gas: 349777)
+MatchingSignatureTest:testDeregisterSessionKey() (gas: 209634)
+SubAccountCreatorTest:test() (gas: 186)
+SubAccountCreatorTest:testCanCreateWithInitDeposit() (gas: 318276)
+SubAccountCreatorTest:testCanCreateWithNoUSDC() (gas: 116792)
 SubAccountManagementTest:test() (gas: 186)
-SubAccountManagementTest:testCanCompleteWithNotOwner() (gas: 66585)
-SubAccountManagementTest:testCanCreateAccount() (gas: 103353)
-SubAccountManagementTest:testCanDepositAccount() (gas: 123007)
-SubAccountManagementTest:testCanWithdrawAccount() (gas: 68368)
-SubAccountManagementTest:testCannotRequestWithdrawFromNonOwner() (gas: 15084)
-SubAccountManagementTest:testCannotWithdrawDuringCooldown() (gas: 40201)
+SubAccountManagementTest:testCanCompleteWithNotOwner() (gas: 66568)
+SubAccountManagementTest:testCanCreateAccount() (gas: 103785)
+SubAccountManagementTest:testCanDepositAccount() (gas: 123267)
+SubAccountManagementTest:testCanDepositAccountForOthers() (gas: 125056)
+SubAccountManagementTest:testCanWithdrawAccount() (gas: 68333)
+SubAccountManagementTest:testCannotRequestWithdrawFromNonOwner() (gas: 15107)
+SubAccountManagementTest:testCannotWithdrawDuringCooldown() (gas: 40244)
 TradeModuleTest:test() (gas: 208)
-TradeModuleTest:testCanUpdateSpotAndThenTrade() (gas: 1663213)
-TradeModuleTest:testCannotReuseNonceWithDiffParams() (gas: 2450146)
-TradeModuleTest:testMultipleFills() (gas: 1983466)
-TradeModuleTest:testPerpTrade() (gas: 1045463)
-TradeModuleTest:testSetFeeRecipient() (gas: 99359)
-TradeModuleTest:testSetIsPerp() (gas: 31148)
-TradeModuleTest:testTrade() (gas: 1448513)
-TradeModuleTest:testTradeBidAskReversed() (gas: 1448977)
-TradeModuleTest:testTradeCannotExceedLimit() (gas: 1825024)
-TradeModuleTest:testTradeFeesAreSent() (gas: 3221910)
-TradeModuleTest:testTradeLimitIsPreserved() (gas: 2446419)
-TradeModuleTest:testTradeRevertsIfActionExpired() (gas: 64954)
-TradeModuleTest:testTradeRevertsWithMismatchedSignedAccounts() (gas: 191667)
-TradeModuleTest:testTradeWithinPriceBounds() (gas: 3462660)
+TradeModuleTest:testCanUpdateSpotAndThenTrade() (gas: 1582151)
+TradeModuleTest:testCannotMatchOrderForDifferentSubIds() (gas: 187749)
+TradeModuleTest:testCannotMatchOrdersForDifferentAssets() (gas: 189681)
+TradeModuleTest:testCannotReuseNonceWithDiffParams() (gas: 2253767)
+TradeModuleTest:testMultipleFills() (gas: 1930062)
+TradeModuleTest:testPerpTrade() (gas: 1110362)
+TradeModuleTest:testSetFeeRecipient() (gas: 99381)
+TradeModuleTest:testSetIsPerp() (gas: 31081)
+TradeModuleTest:testTrade() (gas: 1367475)
+TradeModuleTest:testTradeBidAskReversed() (gas: 1368185)
+TradeModuleTest:testTradeCannotExceedLimit() (gas: 1743290)
+TradeModuleTest:testTradeFeesAreSent() (gas: 3002996)
+TradeModuleTest:testTradeLimitIsPreserved() (gas: 2260227)
+TradeModuleTest:testTradeRevertsIfActionExpired() (gas: 61852)
+TradeModuleTest:testTradeRevertsWithMismatchedSignedAccounts() (gas: 187257)
+TradeModuleTest:testTradeWithinPriceBounds() (gas: 3165164)
 TransferModuleTest:test() (gas: 186)
-TransferModuleTest:testCanTransferDebtWithSecondAction() (gas: 805017)
-TransferModuleTest:testCannotAttachInvalidSecondAction() (gas: 257104)
-TransferModuleTest:testCannotCallModuleWithThreeActions() (gas: 146362)
-TransferModuleTest:testCannotTransferDebtWithoutAttachingSecondOwner() (gas: 359646)
-TransferModuleTest:testCannotTransferFrom0() (gas: 122427)
-TransferModuleTest:testCannotTransferToAccountMismatch() (gas: 278894)
-TransferModuleTest:testTransferSingleAsset() (gas: 635033)
-TransferModuleTest:testTransferToNewAccount() (gas: 596113)
+TransferModuleTest:testCanTransferDebtWithSecondAction() (gas: 844970)
+TransferModuleTest:testCannotAttachInvalidSecondAction() (gas: 253894)
+TransferModuleTest:testCannotCallModuleWithThreeActions() (gas: 142448)
+TransferModuleTest:testCannotTransferDebtWithoutAttachingSecondOwner() (gas: 385563)
+TransferModuleTest:testCannotTransferFrom0() (gas: 117763)
+TransferModuleTest:testCannotTransferToAccountMismatch() (gas: 274220)
+TransferModuleTest:testTransferSingleAsset() (gas: 672925)
+TransferModuleTest:testTransferToNewAccount() (gas: 633748)
 WithdrawalModuleTest:test() (gas: 186)
-WithdrawalModuleTest:testCannotWithdrawToZeroAccount() (gas: 51761)
-WithdrawalModuleTest:testCannotWithdrawWithMoreThanOneActions() (gas: 130743)
-WithdrawalModuleTest:testWithdraw() (gas: 375014)
-WithdrawalModuleTest:testWithdrawWithSigningKey() (gas: 403354)
+WithdrawalModuleTest:testCannotWithdrawToZeroAccount() (gas: 50568)
+WithdrawalModuleTest:testCannotWithdrawWithMoreThanOneActions() (gas: 127750)
+WithdrawalModuleTest:testWithdraw() (gas: 383949)
+WithdrawalModuleTest:testWithdrawWithSigningKey() (gas: 412286)

lib/v2-core

@@ -4,7 +4,6 @@ pragma solidity ^0.8.0;
 
 import {Matching} from "../src/Matching.sol";
 import {DepositModule} from "../src/modules/DepositModule.sol";
-import {RiskManagerChangeModule} from "../src/modules/RiskManagerChangeModule.sol";
 import {TradeModule} from "../src/modules/TradeModule.sol";
 import {TransferModule} from "../src/modules/TransferModule.sol";
 import {WithdrawalModule} from "../src/modules/WithdrawalModule.sol";
@@ -45,7 +44,6 @@ contract DeployAll is Utils {
     deployment.matching = new Matching(ISubAccounts(config.subAccounts));
 
     deployment.deposit = new DepositModule(deployment.matching);
-    deployment.rmChange = new RiskManagerChangeModule(deployment.matching);
     deployment.trade = new TradeModule(deployment.matching, IAsset(config.cash), defaultFeeRecipient);
     deployment.transfer = new TransferModule(deployment.matching);
     deployment.withdrawal = new WithdrawalModule(deployment.matching);

scripts/deploy-all.s.sol

@@ -3,13 +3,13 @@ pragma solidity ^0.8.0;
 
 import {Matching} from "../src/Matching.sol";
 import {DepositModule} from "../src/modules/DepositModule.sol";
-import {RiskManagerChangeModule} from "../src/modules/RiskManagerChangeModule.sol";
 import {TradeModule} from "../src/modules/TradeModule.sol";
 import {TransferModule} from "../src/modules/TransferModule.sol";
 import {WithdrawalModule} from "../src/modules/WithdrawalModule.sol";
+import {SubAccountCreator} from "../src/periphery/SubAccountCreator.sol";
 
 
-struct NetworkConfig { 
+  struct NetworkConfig {
   address subAccounts;
   address cash;
 }
@@ -19,7 +19,6 @@ struct Deployment {
   Matching matching;
   // modules
   DepositModule deposit;
-  RiskManagerChangeModule rmChange;
   TradeModule trade;
   TransferModule transfer;
   WithdrawalModule withdrawal;

scripts/types.sol

@@ -9,7 +9,6 @@ import {DepositModule, IDepositModule} from "src/modules/DepositModule.sol";
 import {WithdrawalModule, IWithdrawalModule} from "src/modules/WithdrawalModule.sol";
 import {TransferModule} from "src/modules/TransferModule.sol";
 import {TradeModule} from "src/modules/TradeModule.sol";
-import {RiskManagerChangeModule} from "src/modules/RiskManagerChangeModule.sol";
 import {PMRMTestBase} from "v2-core/test/risk-managers/unit-tests/PMRM/utils/PMRMTestBase.sol";
 import {IActionVerifier} from "src/interfaces/IActionVerifier.sol";
 import {PMRMTestBase} from "v2-core/test/risk-managers/unit-tests/PMRM/utils/PMRMTestBase.sol";
@@ -31,7 +30,6 @@ contract MatchingBase is PMRMTestBase {
   WithdrawalModule public withdrawalModule;
   TransferModule public transferModule;
   TradeModule public tradeModule;
-  RiskManagerChangeModule public changeModule;
 
   // signer
   uint internal camAcc;
@@ -70,13 +68,11 @@ contract MatchingBase is PMRMTestBase {
     transferModule = new TransferModule(matching);
     tradeModule = new TradeModule(matching, IAsset(address(cash)), aliceAcc);
     tradeModule.setPerpAsset(IPerpAsset(address(mockPerp)), true);
-    changeModule = new RiskManagerChangeModule(matching);
 
     matching.setAllowedModule(address(depositModule), true);
     matching.setAllowedModule(address(withdrawalModule), true);
     matching.setAllowedModule(address(transferModule), true);
     matching.setAllowedModule(address(tradeModule), true);
-    matching.setAllowedModule(address(changeModule), true);
 
     domainSeparator = matching.domainSeparator();
     matching.setTradeExecutor(tradeExecutor, true);