Skip to content

Commit 7985840

Browse files
pcaversacciopcaversaccio
committed
🔁 Update prettier-plugin-solidity to 2.3.0
Signed-off-by: pcaversaccio <pascal.caversaccio@hotmail.ch>
1 parent 4f7a136 commit 7985840

11 files changed

Lines changed: 48 additions & 45 deletions

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -761,9 +761,8 @@ function _guard(bytes32 salt) internal view returns (bytes32 guardedSalt) {
761761
} else {
762762
// For the non-pseudo-random cases, the salt value `salt` is hashed to prevent the safeguard mechanisms
763763
// from being bypassed. Otherwise, the salt value `salt` is not modified.
764-
guardedSalt = (salt != _generateSalt())
765-
? keccak256(abi.encode(salt))
766-
: salt;
764+
guardedSalt =
765+
(salt != _generateSalt()) ? keccak256(abi.encode(salt)) : salt;
767766
}
768767
}
769768
```

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"author": "pcaversaccio (https://pcaversaccio.com), Matt Solomon (https://mattsolomon.dev)",
2323
"license": "AGPL-3.0-only",
24-
"packageManager": "pnpm@10.32.0",
24+
"packageManager": "pnpm@10.32.1",
2525
"scripts": {
2626
"clean": "hardhat clean && forge clean",
2727
"test": "forge test --out forge-artifacts",
@@ -275,7 +275,7 @@
275275
"hardhat-contract-sizer": "^2.10.1",
276276
"hardhat-gas-reporter": "^2.3.0",
277277
"prettier": "^3.8.1",
278-
"prettier-plugin-solidity": "^2.2.1",
278+
"prettier-plugin-solidity": "^2.3.0",
279279
"solhint": "^6.0.3",
280280
"ts-node": "^10.9.2",
281281
"typechain": "^8.3.2",

‎pnpm-lock.yaml‎

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/public/CREATE2/CreateX.deployCreate2Clone_2Args.t.sol‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@ contract CreateX_DeployCreate2Clone_2Args_Public_Test is BaseTest {
1212

1313
ImplementationContract internal implementationContract = new ImplementationContract();
1414
address internal implementation = address(implementationContract);
15-
bytes32 internal codeHash =
16-
keccak256(
17-
abi.encodePacked(
18-
hex"36_3d_3d_37_3d_3d_3d_36_3d_73",
19-
implementation,
20-
hex"5a_f4_3d_82_80_3e_90_3d_91_60_2b_57_fd_5b_f3"
21-
)
22-
);
15+
bytes32 internal codeHash = keccak256(
16+
abi.encodePacked(
17+
hex"36_3d_3d_37_3d_3d_3d_36_3d_73",
18+
implementation,
19+
hex"5a_f4_3d_82_80_3e_90_3d_91_60_2b_57_fd_5b_f3"
20+
)
21+
);
2322

2423
/*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
2524
/* TESTS */

‎test/public/CREATE2/CreateX.deployCreate2Clone_3Args.t.sol‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@ contract CreateX_DeployCreate2Clone_3Args_Public_Test is BaseTest {
1212

1313
ImplementationContract internal implementationContract = new ImplementationContract();
1414
address internal implementation = address(implementationContract);
15-
bytes32 internal codeHash =
16-
keccak256(
17-
abi.encodePacked(
18-
hex"36_3d_3d_37_3d_3d_3d_36_3d_73",
19-
implementation,
20-
hex"5a_f4_3d_82_80_3e_90_3d_91_60_2b_57_fd_5b_f3"
21-
)
22-
);
15+
bytes32 internal codeHash = keccak256(
16+
abi.encodePacked(
17+
hex"36_3d_3d_37_3d_3d_3d_36_3d_73",
18+
implementation,
19+
hex"5a_f4_3d_82_80_3e_90_3d_91_60_2b_57_fd_5b_f3"
20+
)
21+
);
2322

2423
// To avoid any stack-too-deep errors, we use an `internal` state variable for the snapshot ID.
2524
uint256 internal snapshotId;

‎test/public/CREATE3/CreateX.deployCreate3AndInit_3Args.t.sol‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ contract CreateX_DeployCreate3AndInit_3Args_Public_Test is BaseTest {
1313
/*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
1414

1515
// The `keccak256`-hashed `CREATE3` proxy contract creation bytecode.
16-
bytes32 internal proxyInitCodeHash =
17-
keccak256(abi.encodePacked(hex"67_36_3d_3d_37_36_3d_34_f0_3d_52_60_08_60_18_f3"));
16+
bytes32 internal proxyInitCodeHash = keccak256(
17+
abi.encodePacked(hex"67_36_3d_3d_37_36_3d_34_f0_3d_52_60_08_60_18_f3")
18+
);
1819

1920
// To avoid any stack-too-deep errors, we use `internal` state variables for the precomputed `CREATE3` address
2021
// and some further contract deployment addresses and variables.

‎test/public/CREATE3/CreateX.deployCreate3AndInit_4Args_CustomiseRefundAddress.t.sol‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ contract CreateX_DeployCreate3AndInit_4Args_CustomiseRefundAddress_Public_Test i
1313
/*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
1414

1515
// The `keccak256`-hashed `CREATE3` proxy contract creation bytecode.
16-
bytes32 internal proxyInitCodeHash =
17-
keccak256(abi.encodePacked(hex"67_36_3d_3d_37_36_3d_34_f0_3d_52_60_08_60_18_f3"));
16+
bytes32 internal proxyInitCodeHash = keccak256(
17+
abi.encodePacked(hex"67_36_3d_3d_37_36_3d_34_f0_3d_52_60_08_60_18_f3")
18+
);
1819

1920
// To avoid any stack-too-deep errors, we use `internal` state variables for the precomputed `CREATE3` address
2021
// and some further contract deployment addresses and variables.

‎test/public/CREATE3/CreateX.deployCreate3AndInit_4Args_CustomiseSalt.t.sol‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ contract CreateX_DeployCreate3AndInit_4Args_CustomiseSalt_Public_Test is BaseTes
1313
/*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
1414

1515
// The `keccak256`-hashed `CREATE3` proxy contract creation bytecode.
16-
bytes32 internal proxyInitCodeHash =
17-
keccak256(abi.encodePacked(hex"67_36_3d_3d_37_36_3d_34_f0_3d_52_60_08_60_18_f3"));
16+
bytes32 internal proxyInitCodeHash = keccak256(
17+
abi.encodePacked(hex"67_36_3d_3d_37_36_3d_34_f0_3d_52_60_08_60_18_f3")
18+
);
1819

1920
// To avoid any stack-too-deep errors, we use `internal` state variables for the precomputed `CREATE2` address
2021
// and some further contract deployment addresses and variables.

‎test/public/CREATE3/CreateX.deployCreate3AndInit_5Args.t.sol‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ contract CreateX_DeployCreate3AndInit_5Args_Public_Test is BaseTest {
1313
/*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
1414

1515
// The `keccak256`-hashed `CREATE3` proxy contract creation bytecode.
16-
bytes32 internal proxyInitCodeHash =
17-
keccak256(abi.encodePacked(hex"67_36_3d_3d_37_36_3d_34_f0_3d_52_60_08_60_18_f3"));
16+
bytes32 internal proxyInitCodeHash = keccak256(
17+
abi.encodePacked(hex"67_36_3d_3d_37_36_3d_34_f0_3d_52_60_08_60_18_f3")
18+
);
1819

1920
// To avoid any stack-too-deep errors, we use `internal` state variables for the precomputed `CREATE2` address
2021
// and some further contract deployment addresses and variables.

‎test/public/CREATE3/CreateX.deployCreate3_1Arg.t.sol‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ contract CreateX_DeployCreate3_1Arg_Public_Test is BaseTest {
1313
/*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
1414

1515
// The `keccak256`-hashed `CREATE3` proxy contract creation bytecode.
16-
bytes32 internal proxyInitCodeHash =
17-
keccak256(abi.encodePacked(hex"67_36_3d_3d_37_36_3d_34_f0_3d_52_60_08_60_18_f3"));
16+
bytes32 internal proxyInitCodeHash = keccak256(
17+
abi.encodePacked(hex"67_36_3d_3d_37_36_3d_34_f0_3d_52_60_08_60_18_f3")
18+
);
1819

1920
// To avoid any stack-too-deep errors, we use `internal` state variables for the precomputed `CREATE3` address
2021
// and some further contract deployment addresses and variables.

0 commit comments

Comments
 (0)