fix: [sc-1413] GNO/USD config (#39)

Author: teghnet

foundry/cast

@@ -1,13 +1,14 @@
 { pkgs }: let
-  rev = "b65d58d8f634137c61d8334ecfa81711e77496c6";
+  rev = "cb925b100b400b27875ad0667c2bec7e8d55d89c";
 in with pkgs; stdenv.mkDerivation rec {
   pname = "foundry";
-  version = "0.0.0-${lib.substring 0 7 rev}-0";
-  src = fetchzip {
-    url = "https://github.com/foundry-rs/foundry/releases/download/nightly-${rev}/foundry_nightly_linux_amd64.tar.gz";
-    sha256 = "sha256-2isjF7yINVrhD+aW80c37ldD0q/Obf6YhqS/JB/kRJk=";
-    stripRoot = false;
-  };
+  version = "0.0.0-${lib.substring 0 6 rev}";
+#  src = fetchzip {
+#    url = "https://github.com/foundry-rs/foundry/releases/download/nightly-${rev}/foundry_nightly_linux_amd64.tar.gz";
+#    sha256 = "sha256-TnlcU2wt1ml5lH25jYg1ZI0BXgO9FB08Lzf5i32609c=";
+#    stripRoot = false;
+#  };
+  src = ./.;
 
   nativeBuildInputs = with pkgs; [
     makeWrapper
@@ -16,8 +17,9 @@ in with pkgs; stdenv.mkDerivation rec {
   installPhase = let
     path = lib.makeBinPath [ git ];
   in ''
+    set -e
     mkdir -p $out/bin
-    mv cast $out/bin/
+    cp $src/cast $out/bin/
     chmod +x $out/bin/*
     find $out/bin -type f | while read -r x; do
       wrapProgram "$x" --prefix PATH : "${path}"

foundry/default.nix

@@ -26,7 +26,7 @@
             "ETH": "WETH"
           },
           "contracts": {
-            "GNO/WETH": "0xF4C0DD9B82DA36C07605df83c8a416F11724d88b",
+            "WETH/GNO": "0xF4C0DD9B82DA36C07605df83c8a416F11724d88b",
             "Ref:RETH/WETH": "0xae78736Cd615f374D3085123A210448E74Fc6393",
             "RETH/WETH": "0x1E19CF2D73a72Ef1332C882F20534B6519Be0276",
             "STETH/WETH": "0x32296969ef14eb0c6d29669c550d4a0449130230",
@@ -128,18 +128,19 @@
         "name": "uniswapV3",
         "params": {
           "symbolAliases": {
-            "ETH": "WETH",
             "BTC": "WBTC",
+            "ETH": "WETH",
             "USD": "USDC"
           },
           "contracts": {
             "COMP/WETH": "0xea4ba4ce14fdd287f380b55419b1c5b6c3f22ab6",
-            "WETH/CRV": "0x4c83a7f819a5c37d64b4c5a2f8238ea082fa1f4e",
-            "USDC/WETH": "0x88e6a0c2ddd26feeb64f039a2c41296fcb3f5640",
+            "GNO/WETH": "0xf56d08221b5942c428acc5de8f78489a97fc5599",
+            "LINK/WETH": "0xa6cc3c2531fdaa6ae1a3ca84c2855806728693e8",
             "UNI/WETH": "0x1d42064fc4beb5f8aaf85f4617ae8b3b5b8bd801",
+            "USDC/WETH": "0x88e6a0c2ddd26feeb64f039a2c41296fcb3f5640",
+            "WETH/CRV": "0x4c83a7f819a5c37d64b4c5a2f8238ea082fa1f4e",
             "WNXM/WETH": "0x058d79a4c6eb5b11d0248993ffa1faa168ddd3c0",
-            "YFI/WETH": "0x04916039b1f59d9745bf6e0a21f191d1e0a84287",
-            "LINK/WETH": "0xa6cc3c2531fdaa6ae1a3ca84c2855806728693e8"
+            "YFI/WETH": "0x04916039b1f59d9745bf6e0a21f191d1e0a84287"
           }
         }
       },
@@ -195,30 +196,12 @@
           "minimumSuccessfulSources": 4
         }
       },
-      "GNO/BTC": {
-        "method": "median",
-        "sources": [
-          [{ "origin": "kraken", "pair": "GNO/BTC" }]
-        ],
-        "params": {
-          "minimumSuccessfulSources": 1
-        }
-      },
-      "GNO/ETH": {
-        "method": "median",
-        "sources": [
-          [{ "origin": "balancerV2", "pair": "GNO/ETH" }],
-          [{ "origin": "uniswapV3", "pair": "GNO/ETH" }]
-        ],
-        "params": {
-          "minimumSuccessfulSources": 1
-        }
-      },
       "GNO/USD": {
         "method": "median",
         "sources": [
-          [{ "origin": ".", "pair": "GNO/ETH" }, { "origin": ".", "pair": "ETH/USD" }],
-          [{ "origin": ".", "pair": "GNO/BTC" }, { "origin": ".", "pair": "BTC/USD" }],
+          [{ "origin": "balancerV2", "pair": "ETH/GNO" }, { "origin": ".", "pair": "ETH/USD" }],
+          [{ "origin": "uniswapV3", "pair": "GNO/ETH" }, { "origin": ".", "pair": "ETH/USD" }],
+          [{ "origin": "kraken", "pair": "GNO/BTC" }, { "origin": ".", "pair": "BTC/USD" }],
           [{ "origin": "binance", "pair": "GNO/USDT" }, { "origin": ".", "pair": "USDT/USD" }]
         ],
         "params": {

systemd/gofer.json

@@ -1 +1 @@
-1.14.0
+1.14.1