From c0ee11298ab74f584914801322469dd885de106f Mon Sep 17 00:00:00 2001
From: Sabnock01 <24715302+Sabnock01@users.noreply.github.com>
Date: Wed, 4 Oct 2023 21:26:40 -0500
Subject: [PATCH 1/2] feat: add contracts feature flag to arbiter-core

---
 arbiter-core/Cargo.toml                            |  3 +++
 .../contracts}/ArbiterMath.sol                     |  0
 .../contracts}/ArbiterToken.sol                    |  0
 .../contracts}/LiquidExchange.sol                  |  0
 foundry.toml                                       | 14 --------------
 5 files changed, 3 insertions(+), 14 deletions(-)
 rename {contracts => arbiter-core/contracts}/ArbiterMath.sol (100%)
 rename {contracts => arbiter-core/contracts}/ArbiterToken.sol (100%)
 rename {contracts => arbiter-core/contracts}/LiquidExchange.sol (100%)
 delete mode 100644 foundry.toml

diff --git a/arbiter-core/Cargo.toml b/arbiter-core/Cargo.toml
index 305fd10d..48ed2a9c 100644
--- a/arbiter-core/Cargo.toml
+++ b/arbiter-core/Cargo.toml
@@ -8,6 +8,9 @@ license = "Apache-2.0"
 keywords = ["ethereum", "evm", "emulator", "testing", "smart-contracts"]
 readme = "../README.md"
 
+[features]
+contracts = []
+
 # Dependencies for the release build
 [dependencies]
 
diff --git a/contracts/ArbiterMath.sol b/arbiter-core/contracts/ArbiterMath.sol
similarity index 100%
rename from contracts/ArbiterMath.sol
rename to arbiter-core/contracts/ArbiterMath.sol
diff --git a/contracts/ArbiterToken.sol b/arbiter-core/contracts/ArbiterToken.sol
similarity index 100%
rename from contracts/ArbiterToken.sol
rename to arbiter-core/contracts/ArbiterToken.sol
diff --git a/contracts/LiquidExchange.sol b/arbiter-core/contracts/LiquidExchange.sol
similarity index 100%
rename from contracts/LiquidExchange.sol
rename to arbiter-core/contracts/LiquidExchange.sol
diff --git a/foundry.toml b/foundry.toml
deleted file mode 100644
index def4472d..00000000
--- a/foundry.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[profile.default] # all profiles inherit from this
-src = ''
-out = 'out/' # default
-test = 'test' # default
-libs = ['contracts']
-cache = false # !important! breaks echidna if cache = true.
-remappings = [
-    '@forge-std/=contracts/forge-std/src/',
-    '@solmate/=contracts/portfolio/lib/solmate/src/',
-    '@solstat/=contracts/solstat/src/',
-    '@uniswap/lib/=contracts/solidity-lib/',
-    '@uniswap/v2-core/=contracts/v2-core/',
-    '@uniswap/v2-periphery/=contracts/v2-periphery/',
-]

From d3e6ba1cebf263fa82675b75b3b21b8d060955ce Mon Sep 17 00:00:00 2001
From: Sabnock01 <24715302+Sabnock01@users.noreply.github.com>
Date: Thu, 5 Oct 2023 23:36:44 -0500
Subject: [PATCH 2/2] add bindings as part of feature flag

---
 arbiter-core/src/lib.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arbiter-core/src/lib.rs b/arbiter-core/src/lib.rs
index 3678d235..4ab31037 100644
--- a/arbiter-core/src/lib.rs
+++ b/arbiter-core/src/lib.rs
@@ -31,6 +31,7 @@
 
 #![warn(missing_docs)]
 
+#[cfg(feature = "contracts")]
 pub mod bindings; // TODO: Add better documentation here and some kind of overwrite protection.
 pub mod environment;
 pub mod manager;