Updating ipynb in root and demo area

bancorprotocol · Dec 14, 2022 · e39dfd6 · e39dfd6
1 parent d267f2f
commit e39dfd6
Show file tree

Hide file tree

Showing 14 changed files with 564 additions and 728 deletions.
diff --git a/CarbonSim-Example.ipynb b/CarbonSim-Example.ipynb
@@ -30,7 +30,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Carbon Version v1.3 (30/Nov/2022)\n"
+      "Carbon Version v1.5-beta0 (6/Dec/2022)\n"
      ]
     }
    ],
@@ -54,7 +54,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "Sim = CarbonSimulatorUI(pair=\"ETHUSDC\")"
+    "Sim = CarbonSimulatorUI(pair=\"ETH/USDC\")"
    ]
   },
   {
@@ -85,8 +85,8 @@
        "          p_unit  lid  \n",
        " 0  USDC per ETH    1  \n",
        " 1  USDC per ETH    0  ,\n",
-       " 'orderuis': {0: CarbonOrderUI(pair=CarbonPair(tknb='ETH', tknq='USDC'), tkn='ETH', B=0.02, S=0.0023606797749978967, yint=10.0, y=10.0),\n",
-       "  1: CarbonOrderUI(pair=CarbonPair(tknb='ETH', tknq='USDC'), tkn='USDC', B=27.386127875258307, S=4.236648726425486, yint=10000.0, y=10000.0)}}"
+       " 'orderuis': {0: CarbonOrderUI(pair=CarbonPair(slashpair='ETH/USDC', tknb='ETH', tknq='USDC'), tkn='ETH', B=0.02, S=0.0023606797749978967, yint=10.0, y=10.0),\n",
+       "  1: CarbonOrderUI(pair=CarbonPair(slashpair='ETH/USDC', tknb='ETH', tknq='USDC'), tkn='USDC', B=27.386127875258307, S=4.236648726425486, yint=10000.0, y=10000.0)}}"
       ]
      },
      "execution_count": 3,
@@ -221,13 +221,9 @@
        " 0  0.0   0     0                      route #0  False  True      None   1.0   \n",
        " 0    0   0     A  AMM sells 1ETH buys 2021USDC   True  True      None   1.0   \n",
        " \n",
-       "   tkn1         amt2  tkn2     pair routeix  nroutes        price  \\\n",
-       " 0  ETH  2021.339853  USDC  ETHUSDC       0        1  2021.339853   \n",
-       " 0  ETH  2021.339853  USDC  ETHUSDC     [0]        1  2021.339853   \n",
-       " \n",
-       "          p_unit threshold_orders  \n",
-       " 0  USDC per ETH             None  \n",
-       " 0  USDC per ETH             None  }"
+       "   tkn1         amt2  tkn2     pair routeix  nroutes        price        p_unit  \n",
+       " 0  ETH  2021.339853  USDC  ETHUSDC       0        1  2021.339853  USDC per ETH  \n",
+       " 0  ETH  2021.339853  USDC  ETHUSDC     [0]        1  2021.339853  USDC per ETH  }"
       ]
      },
      "execution_count": 5,
@@ -367,9 +363,9 @@
        " 0  988.978105  USDC   1.0  ETH  ETHUSDC       1        1  988.978105   \n",
        " 0  988.978105  USDC   1.0  ETH  ETHUSDC     [1]        1  988.978105   \n",
        " \n",
-       "          p_unit threshold_orders  \n",
-       " 0  USDC per ETH             None  \n",
-       " 0  USDC per ETH             None  }"
+       "          p_unit  \n",
+       " 0  USDC per ETH  \n",
+       " 0  USDC per ETH  }"
       ]
      },
      "execution_count": 7,

diff --git a/CarbonSim-ExampleTwitter.ipynb b/CarbonSim-ExampleTwitter.ipynb
@@ -30,7 +30,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Carbon Version v1.4-alpha2 (30/Nov/2022)\n"
+      "Carbon Version v1.5-beta0 (6/Dec/2022)\n"
      ]
     }
    ],