Skip to content

Commit c02c674

Browse files
kaihiroikaihiroi
authored
Chore/setting up formatter (#61)
* update vscode setting files * remove unused files (7201 calc script, DecodeErrorString) * fmt all sol files * fix pr template file name
1 parent 4c86ec2 commit c02c674

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+2214
-1587
lines changed

‎.github/pul_request_template.md renamed to ‎.github/pull_request_template.md

File renamed without changes.

‎.vscode/extensions.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"recommendations": ["NomicFoundation.hardhat-solidity"]
3+
}

‎.vscode/settings.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
2-
"solidity.packageDefaultDependenciesContractsDirectory": "src",
3-
"solidity.packageDefaultDependenciesDirectory": "lib",
4-
"solidity.compileUsingRemoteVersion": "true",
5-
"solidity.compileUsingLocalVersion": "false"
2+
"solidity-language-server.trace.server.verbosity": "verbose",
3+
"solidity.formatter": "forge",
4+
"solidity.telemetry": false,
5+
"editor.formatOnSave": true,
6+
"[solidity]": {
7+
"editor.defaultFormatter": "NomicFoundation.hardhat-solidity"
8+
}
69
}

‎foundry.toml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
2+
13
[profile.default]
2-
src = "src"
3-
out = "out"
4-
libs = ["lib"]
5-
optimizer = false
6-
fs_permissions = [{ access = "read", path = "./mc.toml" }, { access = "read", path = "./lib/mc/mc.toml" }]
4+
src = "src"
5+
out = "out"
6+
libs = ["lib"]
7+
optimizer = false
8+
fs_permissions = [
9+
{ access = "read", path = "./mc.toml" },
10+
{ access = "read", path = "./lib/mc/mc.toml" },
11+
]
712

8-
# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
13+
[fmt]
14+
ignore = ["**/Flattened.sol"]

‎mc.toml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
[setup]
2-
STD_FUNCS = true
2+
STD_FUNCS = true
33

44
[system]
5-
LOG_LEVEL = "Warn"
6-
SCAN_RANGE = 5
5+
LOG_LEVEL = "Warn"
6+
SCAN_RANGE = 5
77

88
[naming]
9-
DEFAULT_DICTIONARY = 'Dictionary'
10-
DEFAULT_DICTIONARY_DUPLICATED = 'DuplicatedDictionary'
11-
DEFAULT_DICTIONARY_MOCK = 'MockDictionary'
12-
DEFAULT_PROXY = 'Proxy'
13-
DEFAULT_PROXY_MOCK = 'MockProxy'
14-
DEFAULT_BUNDLE = 'Bundle'
15-
DEFAULT_FUNCTION = 'Function'
16-
17-
# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
9+
DEFAULT_DICTIONARY = 'Dictionary'
10+
DEFAULT_DICTIONARY_DUPLICATED = 'DuplicatedDictionary'
11+
DEFAULT_DICTIONARY_MOCK = 'MockDictionary'
12+
DEFAULT_PROXY = 'Proxy'
13+
DEFAULT_PROXY_MOCK = 'MockProxy'
14+
DEFAULT_BUNDLE = 'Bundle'
15+
DEFAULT_FUNCTION = 'Function'

‎remappings.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1+
@mc/=src/
12
@mc-std/=src/std/
23
@mc-devkit/=src/devkit/
34
@ucs.mc/=lib/ucs-contracts/src/
45
@oz.mc/=lib/ucs-contracts/lib/openzeppelin-contracts/contracts/
5-
@openzeppelin/contracts/=lib/ucs-contracts/lib/openzeppelin-contracts/contracts/
6-
@oz.ucs/=lib/ucs-contracts/lib/openzeppelin-contracts/contracts/
7-
ds-test/=lib/ucs-contracts/lib/openzeppelin-contracts/lib/forge-std/lib/ds-test/src/
8-
erc4626-tests/=lib/ucs-contracts/lib/openzeppelin-contracts/lib/erc4626-tests/
9-
forge-std/=lib/forge-std/src/
10-
openzeppelin-contracts/=lib/ucs-contracts/lib/openzeppelin-contracts/
11-
ucs-contracts/=lib/ucs-contracts/

‎script/DeployLib.sol

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
1-
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.23;
3-
4-
import {MCDevKit} from "@mc-devkit/Flattened.sol";
5-
import {StdFacade} from "@mc-std/interfaces/StdFacade.sol";
6-
import {InitSetAdmin} from "@mc-std/functions/protected/InitSetAdmin.sol";
7-
8-
library DeployLib {
9-
using DeployLib for MCDevKit;
10-
string internal constant BUNDLE_NAME = "Std";
11-
12-
function deployStd(MCDevKit storage mc, address admin) internal returns(address) {
13-
for (uint i; i < mc.std.all.functions.length; ++i) {
14-
mc.use(mc.std.all.functions[i]);
15-
}
16-
mc.useFacade(address(new StdFacade()));
17-
bytes memory initData = abi.encodeCall(InitSetAdmin.initSetAdmin, admin);
18-
return mc.deploy(initData).toProxyAddress();
19-
}
20-
21-
function deployStdFunctions(MCDevKit storage mc) internal returns(MCDevKit storage) {
22-
mc.std.functions.deployIfNotExists();
23-
return mc;
24-
}
25-
26-
function deployStdDictionary(MCDevKit storage mc) internal returns(MCDevKit storage) {
27-
mc.std.complete();
28-
mc.deployDictionary(mc.std.all);
29-
return mc;
30-
}
31-
}
1+
// SPDX-License-Identifier: MIT
2+
pragma solidity ^0.8.23;
3+
4+
import {MCDevKit} from "@mc-devkit/Flattened.sol";
5+
import {StdFacade} from "@mc-std/interfaces/StdFacade.sol";
6+
import {InitSetAdmin} from "@mc-std/functions/protected/InitSetAdmin.sol";
7+
8+
library DeployLib {
9+
using DeployLib for MCDevKit;
10+
11+
string internal constant BUNDLE_NAME = "Std";
12+
13+
function deployStd(MCDevKit storage mc, address admin) internal returns (address) {
14+
for (uint256 i; i < mc.std.all.functions.length; ++i) {
15+
mc.use(mc.std.all.functions[i]);
16+
}
17+
mc.useFacade(address(new StdFacade()));
18+
bytes memory initData = abi.encodeCall(InitSetAdmin.initSetAdmin, admin);
19+
return mc.deploy(initData).toProxyAddress();
20+
}
21+
22+
function deployStdFunctions(MCDevKit storage mc) internal returns (MCDevKit storage) {
23+
mc.std.functions.deployIfNotExists();
24+
return mc;
25+
}
26+
27+
function deployStdDictionary(MCDevKit storage mc) internal returns (MCDevKit storage) {
28+
mc.std.complete();
29+
mc.deployDictionary(mc.std.all);
30+
return mc;
31+
}
32+
}

‎script/ERC7201Calc.s.sol

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎src/devkit/MCBase.sol

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {Test as ForgeTest} from "forge-std/Test.sol";
99
import {MCDevKit} from "@mc-devkit/MCDevKit.sol";
1010
import {System} from "@mc-devkit/system/System.sol";
1111

12-
1312
abstract contract MCBase is CommonBase {
1413
MCDevKit internal mc;
1514
uint256 internal deployerKey;

‎src/devkit/MCDevKit.sol

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,19 @@ import {MCHelpers} from "@mc-devkit/utils/global/MCHelpers.sol";
1818
// System Methods
1919
import {Tracer} from "@mc-devkit/system/Tracer.sol";
2020

21-
22-
/********************************
23-
🌟 Meta Contract DevKit
24-
*********************************/
21+
/**
22+
*
23+
* 🌟 Meta Contract DevKit
24+
*
25+
*/
2526
struct MCDevKit {
2627
StdRegistry std;
2728
FunctionRegistry functions;
2829
BundleRegistry bundle;
2930
DictionaryRegistry dictionary;
3031
ProxyRegistry proxy;
3132
}
33+
3234
using MCInitLib for MCDevKit global;
3335
using MCDeployLib for MCDevKit global;
3436
using MCFinderLib for MCDevKit global;

0 commit comments

Comments
 (0)