Skip to content

Commit 8841958

Browse files
committed
lint fix for contract formatting
1 parent 51dc0b7 commit 8841958

File tree

5 files changed

+35
-31
lines changed

5 files changed

+35
-31
lines changed

packages/contracts/foundry.lock

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"lib/account-abstraction": {
3+
"rev": "7af70c8993a6f42973f520ae0752386a5032abe7"
4+
},
5+
"lib/forge-std": {
6+
"rev": "ae570fec082bfe1c1f45b0acca4a2b4f84d345ce"
7+
},
8+
"lib/openzeppelin-contracts": {
9+
"rev": "01ef448981be9d20ca85f2faf6ebdf591ce409f3"
10+
},
11+
"lib/openzeppelin-contracts-upgradeable": {
12+
"rev": "fbdb824a735891908d5588b28e0da5852d7ed7ba"
13+
},
14+
"lib/p256-verifier": {
15+
"rev": "5f96fa28cbf725cb4195ec5798589f23cc129d68"
16+
}
17+
}

packages/contracts/src/SendAccountFactory.sol

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,11 @@ contract SendAccountFactory {
5151
}
5252

5353
ret = SendAccount(
54-
payable(new ERC1967Proxy{salt: bytes32(salt)}(
54+
payable(
55+
new ERC1967Proxy{salt: bytes32(salt)}(
5556
address(accountImplementation), abi.encodeCall(SendAccount.initialize, (keySlot, key, initCalls))
56-
))
57+
)
58+
)
5759
);
5860

5961
emit AccountCreated(address(ret));

packages/contracts/src/SendVerifyingPaymaster.sol

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ import "account-abstraction/samples/VerifyingPaymaster.sol";
77
/// @author @0xBigBoss
88
/// @dev This is for deterministic deployments using CREATE2. The owner is passed in as a constructor argument.
99
contract SendVerifyingPaymaster is VerifyingPaymaster {
10-
constructor(IEntryPoint _entryPoint, address _verifier, address _owner) VerifyingPaymaster(_entryPoint, _verifier) {
10+
constructor(IEntryPoint _entryPoint, address _verifier, address _owner)
11+
VerifyingPaymaster(_entryPoint, _verifier)
12+
{
1113
transferOwnership(_owner);
1214
}
1315
}

packages/contracts/test/AccountVerify1271.t.sol

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ contract AccountVerify1271Test is BaseSepoliaForkTest {
4646
abi.encode( // signature
4747
Utils.rawSignatureToSignature({
4848
// solhint-disable-next-line
49-
challenge: abi.encodePacked(
50-
bytes32(0x15fa6f8c855db1dccbb8a42eef3a7b83f11d29758e84aed37312527165d5eec5)
51-
),
49+
challenge: abi.encodePacked(bytes32(0x15fa6f8c855db1dccbb8a42eef3a7b83f11d29758e84aed37312527165d5eec5)),
5250
r: 0x3f033e5c93d0310f33632295f64d526f7569c4cb30895f50d60de5fe9e0e6a9a,
5351
s: 0x2adcff2bd06fc3cdd03e21e5e4c197913e96e75cad0bc6e9c9c14607af4f3a37
5452
})
@@ -74,9 +72,7 @@ contract AccountVerify1271Test is BaseSepoliaForkTest {
7472
abi.encode( // signature
7573
Utils.rawSignatureToSignature({
7674
// solhint-disable-next-line
77-
challenge: abi.encodePacked(
78-
bytes32(0x15fa6f8c855db1dccbb8a42eef3a7b83f11d29758e84aed37312527165d5eec5)
79-
),
75+
challenge: abi.encodePacked(bytes32(0x15fa6f8c855db1dccbb8a42eef3a7b83f11d29758e84aed37312527165d5eec5)),
8076
r: 0x3f033e5c93d0310f33632295f64d526f7569c4cb30895f50d60de5fe9e0e6a9a,
8177
s: s
8278
})
@@ -96,9 +92,7 @@ contract AccountVerify1271Test is BaseSepoliaForkTest {
9692
abi.encode( // signature
9793
Utils.rawSignatureToSignature({
9894
// solhint-disable-next-line
99-
challenge: abi.encodePacked(
100-
bytes32(0x15fa6f8c855db1dccbb8a42eef3a7b83f11d29758e84aed37312527165d5eec5)
101-
),
95+
challenge: abi.encodePacked(bytes32(0x15fa6f8c855db1dccbb8a42eef3a7b83f11d29758e84aed37312527165d5eec5)),
10296
r: 0x3f033e5c93d0310f33632295f64d526f7569c4cb30895f50d60de5fe9e0e6a9a,
10397
s: s
10498
})

packages/contracts/test/TokenPaymaster6.t.sol

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -519,12 +519,8 @@ contract TokenPaymaster6Test is Test {
519519

520520
uint256 preChargeTokens = abi.decode(entries[0].data, (uint256));
521521
uint256 refundTokens = abi.decode(entries[2].data, (uint256));
522-
(
523-
uint256 actualTokenCharge,
524-
uint256 actualGasCostPaymaster,
525-
uint256 actualTokenPriceWithMarkup,
526-
uint256 baseFee
527-
) = abi.decode(entries[4].data, (uint256, uint256, uint256, uint256));
522+
(uint256 actualTokenCharge, uint256 actualGasCostPaymaster, uint256 actualTokenPriceWithMarkup, uint256 baseFee)
523+
= abi.decode(entries[4].data, (uint256, uint256, uint256, uint256));
528524
uint256 actualTokenChargeEvents = preChargeTokens - refundTokens;
529525
(, bool success, uint256 actualGasCostEntryPoint,) =
530526
abi.decode(entries[5].data, (uint256, bool, uint256, uint256));
@@ -814,9 +810,8 @@ contract TokenPaymaster6Test is Test {
814810
}
815811

816812
// should revert in the first postOp run if the pre-charge ended up lower than the final transaction cost but the client has no tokens to cover the overdraft
817-
function testShouldRevertInTheFirstPostOpRunIfThePreChargeEndedUpLowerThanTheFinalTransactionCostButTheClientHasNoTokensToCoverTheOverdraft()
818-
external
819-
{
813+
function testShouldRevertInTheFirstPostOpRunIfThePreChargeEndedUpLowerThanTheFinalTransactionCostButTheClientHasNoTokensToCoverTheOverdraft(
814+
) external {
820815
address alice = makeAddr("alice");
821816
token.sudoMint(address(account), 0.01 ether);
822817
token.sudoApprove(address(account), address(paymaster), type(uint256).max);
@@ -871,10 +866,8 @@ contract TokenPaymaster6Test is Test {
871866
);
872867
if (
873868
keccak256(
874-
abi.encodePacked(
875-
abi.encodeWithSelector(IEntryPoint.PostOpReverted.selector, expectedRevertReason)
876-
)
877-
) == keccak256(abi.encodePacked(revertReason))
869+
abi.encodePacked(abi.encodeWithSelector(IEntryPoint.PostOpReverted.selector, expectedRevertReason))
870+
) == keccak256(abi.encodePacked(revertReason))
878871
) {
879872
// test should pass
880873
return;
@@ -1013,12 +1006,8 @@ contract TokenPaymaster6Test is Test {
10131006

10141007
uint256 preChargeTokens = abi.decode(entries[0].data, (uint256));
10151008
uint256 refundTokens = abi.decode(entries[2].data, (uint256));
1016-
(
1017-
uint256 actualTokenCharge,
1018-
uint256 actualGasCostPaymaster,
1019-
uint256 actualTokenPriceWithMarkup,
1020-
uint256 baseFee
1021-
) = abi.decode(entries[4].data, (uint256, uint256, uint256, uint256));
1009+
(uint256 actualTokenCharge, uint256 actualGasCostPaymaster, uint256 actualTokenPriceWithMarkup, uint256 baseFee)
1010+
= abi.decode(entries[4].data, (uint256, uint256, uint256, uint256));
10221011
uint256 actualTokenChargeEvents = preChargeTokens - refundTokens;
10231012
(, bool success, uint256 actualGasCostEntryPoint,) =
10241013
abi.decode(entries[5].data, (uint256, bool, uint256, uint256));

0 commit comments

Comments
 (0)