Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Certora] Update morpho-blue #430

Merged
merged 7 commits into from
Nov 8, 2024
Merged

[Certora] Update morpho-blue #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
99685a8
chore: update morpho-blue
QGarchery Oct 29, 2024
0e4f7c9
chore: format .conf files
QGarchery Oct 29, 2024
f65c4f4
refactor: remove Morpho Util from Util
QGarchery Oct 29, 2024
d24bf5e
refactor: use Morpho Util, and rename Util to ERC20Helper
QGarchery Oct 29, 2024
c3b2c3a
fix: use Morpho Util in MarketInteractions
QGarchery Oct 29, 2024
fb02d69
refactor: remove withdrawnAssets from ERC20Helper
QGarchery Oct 29, 2024
ba0f491
fix: timeout in Liveness
QGarchery Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions certora/confs/ConsistentState.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
{
"files": [
"certora/helpers/MetaMorphoHarness.sol",
"certora/helpers/Util.sol",
],
"solc": "solc-0.8.21",
"parametric_contracts": [
"MetaMorphoHarness",
],
"verify": "MetaMorphoHarness:certora/specs/ConsistentState.spec",
"loop_iter": "2",
"optimistic_loop": true,
"smt_timeout": "600",
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Consistent State"
"files": [
"lib/morpho-blue/certora/harness/Util.sol",
"certora/helpers/MetaMorphoHarness.sol"
],
"solc_map": {
"Util": "solc-0.8.19",
MathisGD marked this conversation as resolved.
Show resolved Hide resolved
"MetaMorphoHarness": "solc-0.8.21"
},
"parametric_contracts": [
"MetaMorphoHarness"
],
"verify": "MetaMorphoHarness:certora/specs/ConsistentState.spec",
"loop_iter": "2",
"optimistic_loop": true,
"smt_timeout": "600",
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Consistent State"
}
32 changes: 16 additions & 16 deletions certora/confs/DistinctIdentifiers.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"files": [
"certora/helpers/MetaMorphoHarness.sol",
],
"solc": "solc-0.8.21",
"verify": "MetaMorphoHarness:certora/specs/DistinctIdentifiers.spec",
"loop_iter": "2",
"optimistic_loop": true,
"prover_args": [
"-solvers [z3:def{randomSeed=1},z3:def{randomSeed=2},z3:def{randomSeed=3},z3:def{randomSeed=4},z3:def{randomSeed=5},z3:def{randomSeed=6},z3:def{randomSeed=7},z3:lia2]",
"-depth 3",
"-mediumTimeout 20",
"-timeout 2000",
],
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Distinct Identifiers"
"files": [
"certora/helpers/MetaMorphoHarness.sol"
],
"solc": "solc-0.8.21",
"verify": "MetaMorphoHarness:certora/specs/DistinctIdentifiers.spec",
"loop_iter": "2",
"optimistic_loop": true,
"prover_args": [
"-solvers [z3:def{randomSeed=1},z3:def{randomSeed=2},z3:def{randomSeed=3},z3:def{randomSeed=4},z3:def{randomSeed=5},z3:def{randomSeed=6},z3:def{randomSeed=7},z3:lia2]",
"-depth 3",
"-mediumTimeout 20",
"-timeout 2000"
],
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Distinct Identifiers"
}
35 changes: 17 additions & 18 deletions certora/confs/Enabled.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
{
"files": [
"certora/helpers/MetaMorphoHarness.sol",
],
"solc": "solc-0.8.21",
"verify": "MetaMorphoHarness:certora/specs/Enabled.spec",
"loop_iter": "2",
"optimistic_loop": true,
"prover_args": [
"-solvers [z3:lia2,cvc5:nonlinNoDio,cvc4:nonlin,yices:def,z3:arith2]",
"-depth 3",
"-mediumTimeout 20",
"-timeout 1000",
"-smt_easy_LIA true",
],
"smt_timeout": "7000",
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Enabled"
"files": [
"certora/helpers/MetaMorphoHarness.sol"
],
"solc": "solc-0.8.21",
"verify": "MetaMorphoHarness:certora/specs/Enabled.spec",
"loop_iter": "2",
"optimistic_loop": true,
"prover_args": [
"-solvers [z3:lia2,cvc5:nonlinNoDio,cvc4:nonlin,yices:def,z3:arith2]",
"-depth 3",
"-mediumTimeout 20",
"-timeout 1000"
],
"smt_timeout": "7000",
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Enabled"
}
30 changes: 15 additions & 15 deletions certora/confs/Immutability.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"files": [
"certora/helpers/MetaMorphoHarness.sol",
],
"solc": "solc-0.8.21",
"verify": "MetaMorphoHarness:certora/specs/Immutability.spec",
"loop_iter": "2",
"optimistic_loop": true,
"prover_args": [
"-depth 3",
"-mediumTimeout 20",
"-timeout 120",
],
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Immutability",
"files": [
"certora/helpers/MetaMorphoHarness.sol"
],
"solc": "solc-0.8.21",
"verify": "MetaMorphoHarness:certora/specs/Immutability.spec",
"loop_iter": "2",
"optimistic_loop": true,
"prover_args": [
"-depth 3",
"-mediumTimeout 20",
"-timeout 120"
],
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Immutability"
}
44 changes: 23 additions & 21 deletions certora/confs/LastUpdated.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
{
"files": [
"lib/morpho-blue/certora/harness/MorphoHarness.sol",
"certora/helpers/MetaMorphoHarness.sol",
"certora/helpers/Util.sol",
],
"solc_map": {
"MorphoHarness": "solc-0.8.19",
"MetaMorphoHarness": "solc-0.8.21",
"Util": "solc-0.8.21",
},
"verify": "MetaMorphoHarness:certora/specs/LastUpdated.spec",
"loop_iter": "2",
"optimistic_loop": true,
"prover_args": [
"-depth 3",
"-mediumTimeout 20",
"-timeout 300",
],
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Last Updated"
"files": [
"lib/morpho-blue/certora/harness/MorphoHarness.sol",
"lib/morpho-blue/certora/harness/Util.sol",
"certora/helpers/MetaMorphoHarness.sol",
"certora/helpers/ERC20Helper.sol"
],
"solc_map": {
"MorphoHarness": "solc-0.8.19",
"Util": "solc-0.8.19",
"MetaMorphoHarness": "solc-0.8.21",
"ERC20Helper": "solc-0.8.21"
},
"verify": "MetaMorphoHarness:certora/specs/LastUpdated.spec",
"loop_iter": "2",
"optimistic_loop": true,
"prover_args": [
"-depth 3",
"-mediumTimeout 20",
"-timeout 300"
],
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Last Updated"
}
48 changes: 25 additions & 23 deletions certora/confs/Liveness.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
{
"files": [
"lib/morpho-blue/certora/harness/MorphoHarness.sol",
"certora/helpers/MetaMorphoHarness.sol",
"certora/helpers/Util.sol",
],
"link": [
"MetaMorphoHarness:MORPHO=MorphoHarness",
],
"solc_map": {
"MorphoHarness": "solc-0.8.19",
"MetaMorphoHarness": "solc-0.8.21",
"Util": "solc-0.8.21",
},
"verify": "MetaMorphoHarness:certora/specs/Liveness.spec",
"loop_iter": "2",
"optimistic_loop": true,
"prover_args": [
"-smt_easy_LIA true",
],
"smt_timeout": "7000",
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Liveness"
"files": [
"lib/morpho-blue/certora/harness/MorphoHarness.sol",
"lib/morpho-blue/certora/harness/Util.sol",
"certora/helpers/MetaMorphoHarness.sol",
"certora/helpers/ERC20Helper.sol"
],
"link": [
"MetaMorphoHarness:MORPHO=MorphoHarness"
],
"solc_map": {
"MorphoHarness": "solc-0.8.19",
"Util": "solc-0.8.19",
"MetaMorphoHarness": "solc-0.8.21",
"ERC20Helper": "solc-0.8.21"
},
"verify": "MetaMorphoHarness:certora/specs/Liveness.spec",
"loop_iter": "2",
"optimistic_loop": true,
"prover_args": [
"-depth 0"
],
"smt_timeout": "7000",
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Liveness"
}
43 changes: 23 additions & 20 deletions certora/confs/MarketInteractions.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
{
"files": [
"certora/helpers/MetaMorphoHarness.sol",
"certora/helpers/Util.sol",
],
"solc": "solc-0.8.21",
"parametric_contracts": [
"MetaMorphoHarness",
],
"verify": "MetaMorphoHarness:certora/specs/MarketInteractions.spec",
"loop_iter": "2",
"optimistic_loop": true,
"prover_args": [
"-depth 3",
"-mediumTimeout 20",
"-timeout 120",
"-smt_nonLinearArithmetic false",
],
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Market Interactions"
"files": [
"lib/morpho-blue/certora/harness/Util.sol",
"certora/helpers/MetaMorphoHarness.sol"
],
"solc_map": {
"Util": "solc-0.8.19",
"MetaMorphoHarness": "solc-0.8.21"
},
"parametric_contracts": [
"MetaMorphoHarness"
],
"verify": "MetaMorphoHarness:certora/specs/MarketInteractions.spec",
"loop_iter": "2",
"optimistic_loop": true,
"prover_args": [
"-depth 3",
"-mediumTimeout 20",
"-timeout 120",
"-smt_nonLinearArithmetic false"
],
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Market Interactions"
}
30 changes: 15 additions & 15 deletions certora/confs/PendingValues.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"files": [
"certora/helpers/MetaMorphoHarness.sol",
],
"solc": "solc-0.8.21",
"verify": "MetaMorphoHarness:certora/specs/PendingValues.spec",
"loop_iter": "2",
"optimistic_loop": true,
"prover_args": [
"-depth 3",
"-mediumTimeout 20",
"-timeout 3600",
],
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Pending Values"
"files": [
"certora/helpers/MetaMorphoHarness.sol"
],
"solc": "solc-0.8.21",
"verify": "MetaMorphoHarness:certora/specs/PendingValues.spec",
"loop_iter": "2",
"optimistic_loop": true,
"prover_args": [
"-depth 3",
"-mediumTimeout 20",
"-timeout 3600"
],
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Pending Values"
}
34 changes: 17 additions & 17 deletions certora/confs/Range.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"files": [
"certora/helpers/MetaMorphoHarness.sol",
],
"solc": "solc-0.8.21",
"verify": "MetaMorphoHarness:certora/specs/Range.spec",
"loop_iter": "2",
"optimistic_loop": true,
"prover_args": [
"-depth 0",
"-timeout 300",
"-smt_nonLinearArithmetic true",
"-adaptiveSolverConfig false",
"-solvers [z3:def{randomSeed=1},z3:def{randomSeed=2},z3:def{randomSeed=3},z3:def{randomSeed=4},z3:def{randomSeed=5},z3:def{randomSeed=6},z3:def{randomSeed=7},z3:def{randomSeed=8},z3:def{randomSeed=9},z3:def{randomSeed=10}]",
],
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Range"
"files": [
"certora/helpers/MetaMorphoHarness.sol"
],
"solc": "solc-0.8.21",
"verify": "MetaMorphoHarness:certora/specs/Range.spec",
"loop_iter": "2",
"optimistic_loop": true,
"prover_args": [
"-depth 0",
"-timeout 300",
"-smt_nonLinearArithmetic true",
"-adaptiveSolverConfig false",
"-solvers [z3:def{randomSeed=1},z3:def{randomSeed=2},z3:def{randomSeed=3},z3:def{randomSeed=4},z3:def{randomSeed=5},z3:def{randomSeed=6},z3:def{randomSeed=7},z3:def{randomSeed=8},z3:def{randomSeed=9},z3:def{randomSeed=10}]"
],
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Range"
}
32 changes: 16 additions & 16 deletions certora/confs/Reentrancy.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"files": [
"certora/helpers/MetaMorphoHarness.sol",
],
"solc": "solc-0.8.21",
"verify": "MetaMorphoHarness:certora/specs/Reentrancy.spec",
"loop_iter": "2",
"optimistic_loop": true,
"prover_args": [
"-depth 3",
"-mediumTimeout 20",
"-timeout 120",
"-enableStorageSplitting false",
],
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Reentrancy",
"files": [
"certora/helpers/MetaMorphoHarness.sol"
],
"solc": "solc-0.8.21",
"verify": "MetaMorphoHarness:certora/specs/Reentrancy.spec",
"loop_iter": "2",
"optimistic_loop": true,
"prover_args": [
"-depth 3",
"-mediumTimeout 20",
"-timeout 120",
"-enableStorageSplitting false"
],
"rule_sanity": "basic",
"server": "production",
"msg": "MetaMorpho Reentrancy"
}
Loading