Skip to content

Commit

Permalink
Merge pull request #696 from morpho-org/certora/quick-refactor
Browse files Browse the repository at this point in the history
[Certora] Quick refactor
  • Loading branch information
colin-morpho authored Oct 10, 2024
2 parents fcb190b + 4446011 commit d60e123
Show file tree
Hide file tree
Showing 13 changed files with 131 additions and 136 deletions.
26 changes: 13 additions & 13 deletions certora/confs/AccrueInterest.conf
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"files": [
"certora/harness/MorphoHarness.sol",
],
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/AccrueInterest.spec",
"prover_args": [
"-depth 3",
"-mediumTimeout 30",
"-smt_hashingScheme plaininjectivity",
],
"rule_sanity": "basic",
"server": "production",
"msg": "Morpho Blue Accrue Interest"
"files": [
"certora/harness/MorphoHarness.sol"
],
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/AccrueInterest.spec",
"prover_args": [
"-depth 3",
"-mediumTimeout 30",
"-smt_hashingScheme plaininjectivity"
],
"rule_sanity": "basic",
"server": "production",
"msg": "Morpho Blue Accrue Interest"
}
16 changes: 8 additions & 8 deletions certora/confs/AssetsAccounting.conf
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"files": [
"certora/harness/MorphoHarness.sol",
],
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/AssetsAccounting.spec",
"rule_sanity": "basic",
"server": "production",
"msg": "Morpho Blue Assets Accounting"
"files": [
"certora/harness/MorphoHarness.sol"
],
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/AssetsAccounting.spec",
"rule_sanity": "basic",
"server": "production",
"msg": "Morpho Blue Assets Accounting"
}
16 changes: 8 additions & 8 deletions certora/confs/ConsistentState.conf
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"files": [
"certora/harness/MorphoHarness.sol",
],
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/ConsistentState.spec",
"rule_sanity": "basic",
"server": "production",
"msg": "Morpho Blue Consistent State"
"files": [
"certora/harness/MorphoHarness.sol"
],
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/ConsistentState.spec",
"rule_sanity": "basic",
"server": "production",
"msg": "Morpho Blue Consistent State"
}
33 changes: 16 additions & 17 deletions certora/confs/ExactMath.conf
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
{
"files": [
"certora/harness/MorphoHarness.sol",
],
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/ExactMath.spec",
"rule_sanity": "basic",
"prover_args": [
"-depth 5",
"-mediumTimeout 5",
"-timeout 3600",
"-adaptiveSolverConfig false",
"-smt_nonLinearArithmetic true",
"-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]",
],
"cache": "none",
"server": "production",
"msg": "Morpho Blue Exact Math"
"files": [
"certora/harness/MorphoHarness.sol"
],
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/ExactMath.spec",
"prover_args": [
"-depth 5",
"-mediumTimeout 5",
"-timeout 3600",
"-adaptiveSolverConfig false",
"-smt_nonLinearArithmetic true",
"-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]"
],
"rule_sanity": "basic",
"server": "production",
"msg": "Morpho Blue Exact Math"
}
24 changes: 12 additions & 12 deletions certora/confs/ExchangeRate.conf
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"files": [
"certora/harness/MorphoHarness.sol",
],
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/ExchangeRate.spec",
"rule_sanity": "basic",
"prover_args": [
"-smt_hashingScheme plaininjectivity",
"-smt_easy_LIA true",
],
"server": "production",
"msg": "Morpho Blue Exchange Rate"
"files": [
"certora/harness/MorphoHarness.sol"
],
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/ExchangeRate.spec",
"prover_args": [
"-smt_hashingScheme plaininjectivity",
"-smt_easy_LIA true"
],
"rule_sanity": "basic",
"server": "production",
"msg": "Morpho Blue Exchange Rate"
}
24 changes: 12 additions & 12 deletions certora/confs/Health.conf
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"files": [
"certora/harness/MorphoHarness.sol",
"src/mocks/OracleMock.sol"
],
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/Health.spec",
"rule_sanity": "basic",
"prover_args": [
"-smt_hashingScheme plaininjectivity",
],
"server": "production",
"msg": "Morpho Blue Health"
"files": [
"certora/harness/MorphoHarness.sol",
"src/mocks/OracleMock.sol"
],
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/Health.spec",
"prover_args": [
"-smt_hashingScheme plaininjectivity"
],
"rule_sanity": "basic",
"server": "production",
"msg": "Morpho Blue Health"
}
22 changes: 11 additions & 11 deletions certora/confs/LibSummary.conf
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"files": [
"certora/harness/MorphoHarness.sol",
],
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/LibSummary.spec",
"rule_sanity": "basic",
"prover_args": [
"-smt_bitVectorTheory true"
],
"server": "production",
"msg": "Morpho Blue Lib Summary"
"files": [
"certora/harness/MorphoHarness.sol"
],
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/LibSummary.spec",
"prover_args": [
"-smt_bitVectorTheory true"
],
"rule_sanity": "basic",
"server": "production",
"msg": "Morpho Blue Lib Summary"
}
16 changes: 8 additions & 8 deletions certora/confs/Liveness.conf
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"files": [
"certora/harness/MorphoInternalAccess.sol",
],
"solc": "solc-0.8.19",
"verify": "MorphoInternalAccess:certora/specs/Liveness.spec",
"rule_sanity": "basic",
"server": "production",
"msg": "Morpho Blue Liveness"
"files": [
"certora/harness/MorphoInternalAccess.sol"
],
"solc": "solc-0.8.19",
"verify": "MorphoInternalAccess:certora/specs/Liveness.spec",
"rule_sanity": "basic",
"server": "production",
"msg": "Morpho Blue Liveness"
}
22 changes: 11 additions & 11 deletions certora/confs/Reentrancy.conf
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"files": [
"certora/harness/MorphoHarness.sol",
],
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/Reentrancy.spec",
"rule_sanity": "basic",
"prover_args": [
"-enableStorageSplitting false",
],
"server": "production",
"msg": "Morpho Blue Reentrancy"
"files": [
"certora/harness/MorphoHarness.sol"
],
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/Reentrancy.spec",
"prover_args": [
"-enableStorageSplitting false"
],
"rule_sanity": "basic",
"server": "production",
"msg": "Morpho Blue Reentrancy"
}
16 changes: 8 additions & 8 deletions certora/confs/Reverts.conf
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"files": [
"certora/harness/MorphoHarness.sol",
],
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/Reverts.spec",
"rule_sanity": "basic",
"server": "production",
"msg": "Morpho Blue Reverts"
"files": [
"certora/harness/MorphoHarness.sol"
],
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/Reverts.spec",
"rule_sanity": "basic",
"server": "production",
"msg": "Morpho Blue Reverts"
}
29 changes: 13 additions & 16 deletions certora/confs/StayHealthy.conf
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
{
"files": [
"certora/harness/MorphoHarness.sol",
"src/mocks/OracleMock.sol",
],
"msg": "Morpho Blue Stay Healthy",
"process": "emv",
"prover_args": [
"-depth 5",
"-mediumTimeout 5",
"-timeout 3600",
"-smt_hashingScheme plaininjectivity"
],
"rule_sanity": "basic",
"server": "production",
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/StayHealthy.spec"
"files": [
"certora/harness/MorphoHarness.sol",
"src/mocks/OracleMock.sol"
],
"solc": "solc-0.8.19",
"verify": "MorphoHarness:certora/specs/StayHealthy.spec",
"prover_args": [
"-smt_hashingScheme plaininjectivity",
"-solvers [yices,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": "Morpho Blue Stay Healthy"
}
22 changes: 11 additions & 11 deletions certora/confs/Transfer.conf
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"files": [
"certora/harness/TransferHarness.sol",
"certora/dispatch/ERC20Standard.sol",
"certora/dispatch/ERC20USDT.sol",
"certora/dispatch/ERC20NoRevert.sol",
],
"solc": "solc-0.8.19",
"verify": "TransferHarness:certora/specs/Transfer.spec",
"rule_sanity": "basic",
"server": "production",
"msg": "Morpho Blue Transfer"
"files": [
"certora/harness/TransferHarness.sol",
"certora/dispatch/ERC20Standard.sol",
"certora/dispatch/ERC20USDT.sol",
"certora/dispatch/ERC20NoRevert.sol"
],
"solc": "solc-0.8.19",
"verify": "TransferHarness:certora/specs/Transfer.spec",
"rule_sanity": "basic",
"server": "production",
"msg": "Morpho Blue Transfer"
}
1 change: 0 additions & 1 deletion certora/specs/Health.spec
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ filtered { f -> !f.isView }

mathint collateralBefore = collateral(id, user);

priceChanged = false;
f(e, data);

mathint collateralAfter = collateral(id, user);
Expand Down

0 comments on commit d60e123

Please sign in to comment.