Merge branch 'feat/symbolic-testing' into feat/convert-kontrol-tests

defi-wonderland · Sep 19, 2024 · e0dc0d3 · e0dc0d3
2 parents 28d1e71 + 37d86e7
commit e0dc0d3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/packages/contracts-bedrock/kontrol.toml b/packages/contracts-bedrock/kontrol.toml
@@ -42,6 +42,7 @@ use-hex-encoding = false
 [view-kcfg.default]
 foundry-project-root = '.'
 use-hex-encoding = false
+<<<<<<< HEAD
 
 ## Convert profile
 
@@ -66,4 +67,6 @@ break-on-basic-blocks = false
 break-on-cheatcodes = false
 run-constructor = true
 symbolic-immutables = false
-schedule = 'CANCUN'
+schedule = 'CANCUN'
+=======
+>>>>>>> feat/symbolic-testing
diff --git a/packages/contracts-bedrock/test/properties/PROPERTIES.md b/packages/contracts-bedrock/test/properties/PROPERTIES.md
@@ -97,8 +97,13 @@ legend:
 
 | id  | milestone           | description                                                                                                                                                           | kontrol | medusa |
 | --- | ------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- | ------ |
+<<<<<<< HEAD
 | 17  | Liquidity Migration | only calls to convert(legacy, super) can increase a supertoken’s total supply and decrease legacy's one across chains                                                 | [ ]     | [ ]    |
 | 18  | Liquidity Migration | only calls to convert(super, legacy) can decrease a supertoken’s total supply and increase the legacy's one across chains                                             | [ ]     | [ ]    |
+=======
+| 17  | Liquidity Migration | only calls to convert(legacy, super) can increase a supertoken’s total supply across chains                                                                           | [ ]     | [ ]    |
+| 18  | Liquidity Migration | only calls to convert(super, legacy) can decrease a supertoken’s total supply across chains                                                                           | [ ]     | [ ]    |
+>>>>>>> feat/symbolic-testing
 | 19  | Liquidity Migration | sum of supertoken total supply across all chains is always <= to convert(legacy, super)- convert(super, legacy)                                                       | [ ]     | [ ]    |
 | 20  | SupERC20            | tokens sendERC20-ed on a source chain to a destination chain can be relayERC20-ed on it as long as the source chain is in the dependency set of the destination chain | [ ]     | [ ]    |
 | 21  | Liquidity Migration | sum of supertoken total supply across all chains is = to convert(legacy, super)- convert(super, legacy) when all cross-chain messages are processed                   | [ ]     | [ ]    |