Skip to content

Commit

Permalink
Merge pull request #10 from MZero-Labs/feat/line-reduced-claimable
Browse files Browse the repository at this point in the history
feat: simplified claimable
  • Loading branch information
deluca-mike authored Jun 20, 2024
2 parents 939ca6e + f6eaa6d commit 05230c0
Show file tree
Hide file tree
Showing 18 changed files with 955 additions and 87 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@
path = lib/forge-std
url = https://github.com/foundry-rs/forge-std
branch = v1
[submodule "lib/common"]
path = lib/common
url = git@github.com:MZero-Labs/common.git
7 changes: 4 additions & 3 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
{
"plugins": ["prettier-plugin-solidity"],
"plugins": [
"prettier-plugin-solidity"
],
"overrides": [
{
"files": "*.sol",
"options": {
"bracketSpacing": true,
"compiler": "0.8.25",
"compiler": "0.8.23",
"parser": "solidity-parse",
"printWidth": 120,
"tabWidth": 4,
}
}
]
}

28 changes: 22 additions & 6 deletions .solhint.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
{
"extends": ["solhint:recommended"],
"plugins": ["prettier"],
"extends": [
"solhint:recommended"
],
"plugins": [
"prettier"
],
"rules": {
"prettier/prettier": "error",
"code-complexity": ["warn", 10],
"compiler-version": ["error", "0.8.25"],
"code-complexity": [
"warn",
10
],
"compiler-version": [
"error",
"0.8.23"
],
"comprehensive-interface": "off",
"const-name-snakecase": "off",
"func-name-mixedcase": "off",
Expand All @@ -14,10 +24,16 @@
"ignoreConstructors": true
}
],
"function-max-lines": ["warn", 100],
"function-max-lines": [
"warn",
100
],
"immutable-vars-naming": "off",
"imports-on-top": "error",
"max-line-length": ["warn", 120],
"max-line-length": [
"warn",
120
],
"no-empty-blocks": "off",
"no-inline-assembly": "off",
"not-rely-on-time": "off",
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ profile ?=default
build:
@./build.sh -p production

test:
tests:
@./test.sh -p $(profile)

fuzz:
Expand All @@ -41,4 +41,3 @@ sizes:

clean:
forge clean && rm -rf ./abi && rm -rf ./bytecode && rm -rf ./types

2 changes: 1 addition & 1 deletion foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ gas_reports = ["*"]
gas_reports_ignore = []
ignored_error_codes = []
optimizer = false
solc_version = "0.8.25"
solc_version = "0.8.23"
verbosity = 3

[profile.production]
Expand Down
1 change: 1 addition & 0 deletions lib/common
Submodule common added at e80940
9 changes: 4 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"devDependencies": {
"husky": "^9.0.11",
"lint-staged": "^15.2.2",
"prettier": "^3.2.5",
"prettier": "^3.3.2",
"prettier-plugin-solidity": "^1.3.1",
"solhint": "^4.5.2",
"solhint-plugin-prettier": "^0.1.0"
Expand Down
17 changes: 0 additions & 17 deletions script/Foo.s.sol

This file was deleted.

9 changes: 0 additions & 9 deletions src/Foo.sol

This file was deleted.

Loading

0 comments on commit 05230c0

Please sign in to comment.