Skip to content

Commit

Permalink
⬆️ dependencies: upgrade libraries and tools
Browse files Browse the repository at this point in the history
  • Loading branch information
@cruzdanilo
cruzdanilo committed May 16, 2024
1 parent 4961851 commit e7c93d0
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 12 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@
[submodule "lib/solady"]
path = lib/solady
url = https://github.com/vectorized/solady
[submodule "lib/modular-account-libs"]
path = lib/modular-account-libs
url = https://github.com/erc6900/modular-account-libs
2 changes: 1 addition & 1 deletion lib/forge-std
Submodule forge-std updated 6 files
+1 −1 package.json
+2 −0 src/StdChains.sol
+9 −3 src/StdInvariant.sol
+13 −10 src/Vm.sol
+2 −0 test/StdChains.t.sol
+1 −1 test/Vm.t.sol
2 changes: 1 addition & 1 deletion lib/modular-account
Submodule modular-account updated 83 files
+16 −0 .github/workflows/test.yml
+3 −0 package.json
+327 −250 pnpm-lock.yaml
+1 −0 remappings.txt
+0 −1 script/Deploy.s.sol
+2 −3 src/account/AccountExecutor.sol
+5 −4 src/account/AccountLoupe.sol
+3 −3 src/account/AccountStorageV1.sol
+16 −15 src/account/PluginManagerInternals.sol
+14 −12 src/account/UpgradeableModularAccount.sol
+2 −2 src/helpers/CastLib.sol
+3 −27 src/helpers/FunctionReferenceHelpers.sol
+7 −7 src/helpers/KnownSelectors.sol
+1 −1 src/helpers/ValidationDataHelpers.sol
+0 −53 src/interfaces/IAccountLoupe.sol
+0 −189 src/interfaces/IPlugin.sol
+0 −29 src/interfaces/IPluginExecutor.sol
+0 −39 src/interfaces/IPluginManager.sol
+0 −34 src/interfaces/IStandardExecutor.sol
+0 −30 src/interfaces/erc4337/IAccount.sol
+1 −1 src/interfaces/erc4337/IAggregator.sol
+1 −1 src/interfaces/erc4337/IEntryPoint.sol
+1 −1 src/interfaces/erc4337/IPaymaster.sol
+0 −22 src/interfaces/erc4337/UserOperation.sol
+0 −513 src/libraries/AssociatedLinkedListSetLib.sol
+0 −22 src/libraries/Constants.sol
+0 −80 src/libraries/CountableLinkedListSetLib.sol
+0 −325 src/libraries/LinkedListSetLib.sol
+0 −67 src/libraries/PluginStorageLib.sol
+2 −3 src/plugins/BasePlugin.sol
+1 −1 src/plugins/owner/IMultiOwnerPlugin.sol
+15 −12 src/plugins/owner/MultiOwnerPlugin.sol
+2 −2 src/plugins/session/ISessionKeyPlugin.sol
+17 −13 src/plugins/session/SessionKeyPlugin.sol
+4 −4 src/plugins/session/permissions/SessionKeyPermissions.sol
+2 −1 src/plugins/session/permissions/SessionKeyPermissionsBase.sol
+9 −10 test/account/AccountExecHooks.t.sol
+15 −16 test/account/AccountLoupe.t.sol
+10 −11 test/account/AccountPreValidationHooks.t.sol
+2 −3 test/account/AccountReturnData.t.sol
+2 −3 test/account/ExecuteFromPluginPermissions.t.sol
+1 −2 test/account/ManifestValidity.t.sol
+9 −10 test/account/TokenReceiver.t.sol
+5 −5 test/account/UpgradeableModularAccount.t.sol
+7 −7 test/account/UpgradeableModularAccountPluginManager.t.sol
+3 −4 test/account/ValidationIntersection.t.sol
+10 −11 test/account/phases/AccountStatePhases.t.sol
+4 −3 test/account/phases/AccountStatePhasesExec.t.sol
+4 −3 test/account/phases/AccountStatePhasesRTValidation.t.sol
+4 −5 test/account/phases/AccountStatePhasesUOValidation.t.sol
+1 −1 test/comparison/CompareSimpleAccount.t.sol
+0 −1 test/factory/MultiOwnerMAFactoryTest.t.sol
+0 −56 test/helpers/FunctionReferenceLib.t.sol
+5 −6 test/helpers/KnownSelectors.t.sol
+0 −122 test/invariant/AssociatedLinkedListSetLibInvariants.t.sol
+0 −53 test/invariant/LLSLRepro.t.sol
+0 −94 test/invariant/LinkedListSetLibInvariants.t.sol
+0 −431 test/invariant/handlers/AssociatedLinkedListSetHandler.sol
+0 −352 test/invariant/handlers/LinkedListSetHandler.sol
+0 −240 test/libraries/AssociatedLinkedListSetLib.t.sol
+0 −84 test/libraries/CountableLinkedListSetLib.t.sol
+0 −318 test/libraries/LinkedListSetLib.t.sol
+0 −107 test/libraries/PluginStorageLib.t.sol
+1 −2 test/mocks/MockPlugin.sol
+3 −2 test/mocks/plugins/AccountStateMutatingPlugin.sol
+4 −3 test/mocks/plugins/BadTransferOwnershipPlugin.sol
+2 −1 test/mocks/plugins/BaseTestPlugin.sol
+1 −1 test/mocks/plugins/ChangingManifestPlugin.sol
+4 −3 test/mocks/plugins/ComprehensivePlugin.sol
+6 −5 test/mocks/plugins/ExecFromPluginPermissionsMocks.sol
+6 −5 test/mocks/plugins/ManifestValidityMocks.sol
+6 −5 test/mocks/plugins/ReturnDataPluginMocks.sol
+3 −3 test/mocks/plugins/UninstallErrorsPlugin.sol
+3 −2 test/mocks/plugins/ValidationPluginMocks.sol
+2 −3 test/plugin/owner/MultiOwnerPlugin.t.sol
+3 −4 test/plugin/owner/MultiOwnerPluginIntegration.t.sol
+4 −5 test/plugin/session/SessionKeyPluginWithMultiOwner.t.sol
+4 −5 test/plugin/session/permissions/SessionKeyERC20SpendLimits.t.sol
+4 −5 test/plugin/session/permissions/SessionKeyGasLimits.t.sol
+4 −5 test/plugin/session/permissions/SessionKeyNativeTokenSpendLimits.t.sol
+4 −5 test/plugin/session/permissions/SessionKeyPermissions.t.sol
+0 −1 test/upgrade/LightAccountToModularAccount.t.sol
+1 −2 test/upgrade/MAToMA.t.sol
1 change: 1 addition & 0 deletions lib/modular-account-libs
Submodule modular-account-libs added at 5d9d0e
2 changes: 1 addition & 1 deletion lib/solady
Submodule solady updated 20 files
+616 −591 .gas-snapshot
+2 −0 README.md
+1 −1 package.json
+11 −6 src/Milady.sol
+33 −14 src/accounts/ERC1271.sol
+754 −3 src/utils/DynamicBufferLib.sol
+111 −65 src/utils/FixedPointMathLib.sol
+259 −1 src/utils/LibClone.sol
+1 −1 src/utils/LibSort.sol
+160 −66 src/utils/SafeCastLib.sol
+1 −1 src/utils/UUPSUpgradeable.sol
+190 −0 src/utils/UpgradeableBeacon.sol
+136 −0 test/DynamicBufferLib.t.sol
+315 −0 test/ERC1271.t.sol
+5 −1 test/ERC20.t.sol
+16 −174 test/ERC6551.t.sol
+182 −12 test/FixedPointMathLib.t.sol
+123 −0 test/LibClone.t.sol
+63 −2 test/SafeCastLib.t.sol
+197 −0 test/UpgradeableBeacon.t.sol
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
},
"devDependencies": {
"concurrently": "^8.2.2",
"solhint": "^4.5.4"
"solhint": "^5.0.1"
}
}
11 changes: 6 additions & 5 deletions src/WebauthnOwnerPlugin.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@
pragma solidity ^0.8.0;

import { UpgradeableModularAccount, UUPSUpgradeable } from "modular-account/src/account/UpgradeableModularAccount.sol";
import { UserOperation } from "modular-account/src/interfaces/erc4337/UserOperation.sol";
import { BasePlugin } from "modular-account/src/plugins/BasePlugin.sol";

import {
ManifestAssociatedFunction,
ManifestAssociatedFunctionType,
ManifestFunction,
PluginManifest,
PluginMetadata,
SelectorPermission
} from "modular-account/src/interfaces/IPlugin.sol";
import { IStandardExecutor } from "modular-account/src/interfaces/IStandardExecutor.sol";
import { SIG_VALIDATION_PASSED, SIG_VALIDATION_FAILED } from "modular-account/src/libraries/Constants.sol";
import { BasePlugin } from "modular-account/src/plugins/BasePlugin.sol";
} from "modular-account-libs/interfaces/IPlugin.sol";
import { IStandardExecutor } from "modular-account-libs/interfaces/IStandardExecutor.sol";
import { UserOperation } from "modular-account-libs/interfaces/UserOperation.sol";
import { SIG_VALIDATION_PASSED, SIG_VALIDATION_FAILED } from "modular-account-libs/libraries/Constants.sol";

import { IERC1271 } from "openzeppelin-contracts/contracts/interfaces/IERC1271.sol";

Expand Down
5 changes: 3 additions & 2 deletions test/WebauthnOwnerPlugin.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ pragma solidity ^0.8.0;
import { Test } from "forge-std/Test.sol";

import { IEntryPoint } from "modular-account/src/interfaces/erc4337/IEntryPoint.sol";
import { UserOperation } from "modular-account/src/interfaces/erc4337/UserOperation.sol";
import { PluginManifest } from "modular-account/src/interfaces/IPlugin.sol";
import { BasePlugin } from "modular-account/src/plugins/BasePlugin.sol";
import { IMultiOwnerPlugin } from "modular-account/src/plugins/owner/IMultiOwnerPlugin.sol";
import { ContractOwner } from "modular-account/test/mocks/ContractOwner.sol";

import { PluginManifest } from "modular-account-libs/interfaces/IPlugin.sol";
import { UserOperation } from "modular-account-libs/interfaces/UserOperation.sol";

import { ECDSA } from "solady/utils/ECDSA.sol";

import { WebAuthn } from "webauthn-sol/WebAuthn.sol";
Expand Down
3 changes: 2 additions & 1 deletion test/WebauthnPluginIntegration.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import { Test } from "forge-std/Test.sol";

import { UpgradeableModularAccount } from "modular-account/src/account/UpgradeableModularAccount.sol";
import { IEntryPoint } from "modular-account/src/interfaces/erc4337/IEntryPoint.sol";
import { UserOperation } from "modular-account/src/interfaces/erc4337/UserOperation.sol";
import { IMultiOwnerPlugin } from "modular-account/src/plugins/owner/IMultiOwnerPlugin.sol";
import { Counter } from "modular-account/test/mocks/Counter.sol";

import { UserOperation } from "modular-account-libs/interfaces/UserOperation.sol";

import { IERC1271 } from "openzeppelin-contracts/contracts/interfaces/IERC1271.sol";

import { ECDSA } from "solady/utils/ECDSA.sol";
Expand Down

0 comments on commit e7c93d0

Please sign in to comment.