Merge pull request #1 from h20liquidity/2023-02-21-h20-strat

Twap Mirror

.github/workflows/forge-test.yaml

@@ -7,7 +7,7 @@ jobs:
       fail-fast: true
     runs-on: ubuntu-latest
     env:
-      RPC_URL_POLYGON: ${{ secrets. RPC_URL_POLYGON }}
+      RPC_URL_POLYGON: ${{ secrets. RPC_URL_POLYGON}}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -18,7 +18,9 @@ jobs:
         uses: DeterminateSystems/nix-installer-action@v4
       - uses: DeterminateSystems/magic-nix-cache-action@v2
 
+      - run: nix run .#uniswap-prelude
       - run: nix run .#rainix-sol-prelude
       - run: nix run .#i9r-prelude
-        working-directory: lib/rain.interpreter
-      - run: nix run .#rainix-sol-test
+        working-directory: lib/rain.orderbook/lib/rain.interpreter
+      - run: mkdir -p test/csvs
+      - run: nix run .#rainix-sol-test

.gitignore

@@ -2,3 +2,4 @@ out
 cache
 broadcast
 .env
+test/csvs/*

.gitmodules

@@ -4,6 +4,15 @@
 [submodule "lib/rain.intorastring"]
 	path = lib/rain.intorastring
 	url = https://github.com/rainlanguage/rain.intorastring
-[submodule "lib/rain.interpreter"]
-	path = lib/rain.interpreter
-	url = https://github.com/rainlanguage/rain.interpreter
+[submodule "lib/rain.orderbook"]
+	path = lib/rain.orderbook
+	url = https://github.com/rainlanguage/rain.orderbook.git
+[submodule "lib/rain.uniswap"]
+	path = lib/rain.uniswap
+	url = https://github.com/rainlanguage/rain.uniswap.git
+[submodule "lib/h20.pubstrats"]
+	path = lib/h20.pubstrats
+	url = https://github.com/h20liquidity/h20.pubstrats.git
+[submodule "lib/view-quoter-v3"]
+	path = lib/view-quoter-v3
+	url = https://github.com/Uniswap/view-quoter-v3

flake.nix

@@ -11,7 +11,18 @@
       let
         pkgs = rainix.pkgs.${system};
       in {
-        packages = rainix.packages.${system};
+        packages = rec {
+          uniswap-prelude = rainix.mkTask.${system} {
+            name = "uniswap-prelude";
+            body = ''
+              set -euxo pipefail
+
+              FOUNDRY_PROFILE=reference forge build --force
+              FOUNDRY_PROFILE=quoter forge build --force
+            '';
+            additionalBuildInputs = rainix.sol-build-inputs.${system};
+          };
+        } // rainix.packages.${system};
         devShells = rainix.devShells.${system};
       }
     );

foundry.toml

@@ -5,6 +5,9 @@ libs = ['lib']
 
 # See more config options https://github.com/foundry-rs/foundry/tree/master/config
 
+# Needed for dotrain compose
+ffi = true
+
 solc = "0.8.19"
 optimizer = true
 optimizer_runs = 100000
@@ -14,7 +17,45 @@ cbor_metadata = false
 
 # Build metadata used for testing rain meta aware contracts in this folder rather
 # than expose ffi to forge.
-fs_permissions = [{ access = "read", path = "./meta"}]
+fs_permissions = [
+  { access = "read", path = "out/reference/UniswapV2LibraryConcrete.sol/UniswapV2LibraryConcrete.json" },
+  { access = "read", path = "out/quoter/Quoter.sol/Quoter.json" },
+  { access = "read", path = "./lib/rain.orderbook/lib/rain.interpreter/meta/RainterpreterExpressionDeployerNPE2.rain.meta"},
+  { access = "read-write", path = "test/csvs"}
+]
+
+remappings = [
+  "rain.interpreter/=lib/rain.orderbook/lib/rain.interpreter/src",
+  "rain.metadata/=lib/rain.orderbook/lib/rain.metadata/src"
+]
+
 
 [fuzz]
 runs = 1024
+
+[profile.reference]
+
+solc = "0.6.6"
+src = "reference/src"
+test = 'reference/test'
+script = 'reference/script'
+out = "out/reference/"
+libs = ["reference/lib"]
+remappings = [
+    "v2-core/=reference/lib/v2-core/",
+    "v2-periphery/=reference/lib/v2-periphery/",
+    "@uniswap/v2-core/=reference/lib/v2-core/",
+    "@uniswap/v2-periphery/=reference/lib/v2-periphery/"
+]
+
+[profile.quoter]
+
+solc = "0.7.6"
+src = "lib/view-quoter-v3/contracts"
+test = "lib/view-quoter-v3/test"
+script = "lib/view-quoter-v3/script"
+out = "out/quoter/"
+libs = ["lib/view-quoter-v3/lib"]
+remappings = [
+    "v3-periphery/=lib/view-quoter-v3/lib/v3-periphery/",
+]