Merge #262

262: Use believable rates r=luckysori a=tcharding

Swap semi-believable rates for Ether <-> Bitcoin.  50 Ether is approx 1 bitcoin.  In order to do this we need to fund more Ether, fund 1000.

Co-authored-by: tcharding <me@tobin.cc>

Author: bors[bot]

new_project/examples/btc_eth/src/index.ts

@@ -104,11 +104,11 @@ function createSwap(maker: Actor, taker: Actor): SwapRequest {
         },
         alpha_asset: {
             name: "bitcoin",
-            quantity: toSatoshi(1).toString(),
+            quantity: toSatoshi(0.1).toString(),
         },
         beta_asset: {
             name: "ether",
-            quantity: "1000000000000000000",
+            quantity: "5000000000000000000",
         },
         beta_ledger_redeem_identity: redeemAddress,
         alpha_expiry: moment().unix() + 7200,

new_project/examples/separate_apps/src/maker.ts

@@ -68,7 +68,7 @@ import { createActor, sleep } from "./lib";
         tradingPair: "ETH-BTC",
         validUntil: moment().unix() + 300,
         ask: {
-            nominalAmount: "9",
+            nominalAmount: "50",
             asset: "ether",
             ledger: "ethereum",
         },

new_project/examples/separate_apps/src/taker.ts

@@ -44,7 +44,7 @@ import { createActor, sleep } from "./lib";
     const isOrderAcceptable = (order: Order) => {
         // Check if the returned order matches the requested asset-pair
         if (order.ask.asset !== "ether" || order.bid.asset !== "bitcoin") {
-            // These are'nt the droids you're looking for
+            // These aren't the droids you're looking for
             return false;
         }
 
@@ -56,7 +56,7 @@ import { createActor, sleep } from "./lib";
             return false;
         }
         // Only accept orders that are at least 1 bitcoin for 10 Ether
-        const minRate = 0.1;
+        const minRate = 0.001;
         const orderRate = bitcoin / ether;
         console.log("Rate offered: ", orderRate);
         return orderRate > minRate;

src/docker/ethereum.rs

@@ -90,7 +90,7 @@ async fn fund_new_account(endpoint: ParityHttpEndpoint) -> anyhow::Result<Accoun
         client.clone(),
         Some(derive_address(account.private_key)),
         30_000,
-        U256::from(100u128 * 10u128.pow(18)),
+        U256::from(1000u128 * 10u128.pow(18)),
         Vec::new(),
     )
     .await?;