Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@howydev
howydev committed Oct 16, 2024
1 parent 8ed5d43 commit 1148b11
Show file tree
Hide file tree
Showing 27 changed files with 1,995 additions and 2,439 deletions.
2 changes: 1 addition & 1 deletion .forge-snapshots/ModularAccount_Runtime_AccountCreation.snap
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
176030
176008
2 changes: 1 addition & 1 deletion .forge-snapshots/ModularAccount_Runtime_BatchTransfers.snap
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
93118
93096
2 changes: 1 addition & 1 deletion .forge-snapshots/ModularAccount_Runtime_Erc20Transfer.snap
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
78543
78521
2 changes: 1 addition & 1 deletion .forge-snapshots/ModularAccount_Runtime_InstallSessionKey_Case1.snap
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
423957
423913
2 changes: 1 addition & 1 deletion .forge-snapshots/ModularAccount_Runtime_NativeTransfer.snap
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
54692
54670
2 changes: 1 addition & 1 deletion .forge-snapshots/ModularAccount_Runtime_UseSessionKey_Case1_Counter.snap
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
79531
79509
2 changes: 1 addition & 1 deletion .forge-snapshots/ModularAccount_Runtime_UseSessionKey_Case1_Token.snap
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
113089
113067
2 changes: 1 addition & 1 deletion .forge-snapshots/ModularAccount_UserOp_InstallSessionKey_Case1.snap
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
532162
532140
2 changes: 1 addition & 1 deletion .forge-snapshots/ModularAccount_UserOp_deferredValidation.snap
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
257385
261242
2 changes: 1 addition & 1 deletion .forge-snapshots/SemiModularAccount_Runtime_BatchTransfers.snap
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
89189
89167
2 changes: 1 addition & 1 deletion .forge-snapshots/SemiModularAccount_Runtime_Erc20Transfer.snap
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
74706
74684
2 changes: 1 addition & 1 deletion .forge-snapshots/SemiModularAccount_Runtime_InstallSessionKey_Case1.snap
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
422610
422566
2 changes: 1 addition & 1 deletion .forge-snapshots/SemiModularAccount_Runtime_NativeTransfer.snap
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
50865
50843
2 changes: 1 addition & 1 deletion .forge-snapshots/SemiModularAccount_Runtime_UseSessionKey_Case1_Counter.snap
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
79969
79925
2 changes: 1 addition & 1 deletion .forge-snapshots/SemiModularAccount_Runtime_UseSessionKey_Case1_Token.snap
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
113527
113483
2 changes: 1 addition & 1 deletion .forge-snapshots/SemiModularAccount_UserOp_InstallSessionKey_Case1.snap
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
529742
529720
2 changes: 1 addition & 1 deletion .forge-snapshots/SemiModularAccount_UserOp_deferredValidation.snap
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
254003
257938
21 changes: 9 additions & 12 deletions gas/modular-account/ModularAccount.gas.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,28 +276,25 @@ contract ModularAccountGasTest is ModularAccountBenchmarkBase("ModularAccount")
uint48 deferredInstallDeadline = 0;

(bytes32 structHash, bytes32 digest, bytes32 domainSeparator) = _getDeferredInstallStructAndHash(
account1, deferredInstallNonce, deferredInstallDeadline, deferredValidationInstallCall
account1, deferredInstallNonce, deferredInstallDeadline, newUOValidation, deferredValidationInstallCall
);

bytes memory deferredValidationSig = _packFinal1271Signature(
_signRawHash(
vm,
owner1Key,
_getECDSAReplaySafeHash(
account1,
singleSignerValidationModule,
_getDeferredInstallHash(
account1,
deferredInstallNonce,
deferredInstallDeadline,
newUOValidation,
deferredValidationInstallCall
)
_getModuleReplaySafeHash(
address(account1),
address(singleSignerValidationModule),
domainSeparator,
structHash,
digest,
_DEFERRED_ACTION_CONTENTS_TYPE
)
),
domainSeparator,
structHash,
_DEFERRED_INSTALL_CONTENTS_TYPE
_DEFERRED_ACTION_CONTENTS_TYPE
);

userOp.signature = _encodeDeferredInstallUOSignature(
Expand Down
13 changes: 3 additions & 10 deletions gas/modular-account/SemiModularAccount.gas.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,27 +270,20 @@ contract ModularAccountGasTest is ModularAccountBenchmarkBase("SemiModularAccoun
uint48 deferredInstallDeadline = 0;

(bytes32 structHash, bytes32 digest, bytes32 domainSeparator) = _getDeferredInstallStructAndHash(
account1, deferredInstallNonce, deferredInstallDeadline, deferredValidationInstallCall
account1, deferredInstallNonce, deferredInstallDeadline, newUOValidation, deferredValidationInstallCall
);

bytes memory deferredValidationSig = _packFinal1271Signature(
_signRawHash(
vm,
owner1Key,
_getSMAReplaySafeHash(
account1,
_getDeferredInstallHash(
account1,
deferredInstallNonce,
deferredInstallDeadline,
newUOValidation,
deferredValidationInstallCall
)
address(account1), domainSeparator, structHash, digest, _DEFERRED_ACTION_CONTENTS_TYPE
)
),
domainSeparator,
structHash,
_DEFERRED_INSTALL_CONTENTS_TYPE
_DEFERRED_ACTION_CONTENTS_TYPE
);

userOp.signature = _encodeDeferredInstallUOSignature(
Expand Down
Loading

0 comments on commit 1148b11

Please sign in to comment.