Use comit-sdk.createActor in btc_eth

Author: luckysori

new_project/examples/btc_eth/package.json

@@ -21,7 +21,7 @@
         "typescript": "^3.7.2"
     },
     "dependencies": {
-        "comit-sdk": "^0.7.1",
+        "comit-sdk": "^0.7.2",
         "dotenv": "^8.2.0",
         "moment": "^2.24.0",
         "satoshi-bitcoin-ts": "^0.2.4"

new_project/examples/btc_eth/src/index.ts

@@ -1,8 +1,8 @@
 import {
+    Actor,
     BigNumber,
     BitcoinWallet,
-    Cnd,
-    ComitClient,
+    createActor as createActorSdk,
     EthereumWallet,
     SwapRequest,
 } from "comit-sdk";
@@ -13,18 +13,12 @@ import { toBitcoin, toSatoshi } from "satoshi-bitcoin-ts";
 (async function main() {
     checkEnvFile(process.env.DOTENV_CONFIG_PATH!);
 
-    const maker = await startClient(0, "Maker");
-    const taker = await startClient(1, "Taker");
+    const maker = await createActor(0, "Maker");
+    const taker = await createActor(1, "Taker");
 
-    console.log(
-        "Maker Ethereum address: ",
-        await maker.ethereumWallet.getAccount()
-    );
+    console.log("Maker Ethereum address: ", maker.ethereumWallet.getAccount());
 
-    console.log(
-        "Taker Ethereum address: ",
-        await taker.ethereumWallet.getAccount()
-    );
+    console.log("Taker Ethereum address: ", taker.ethereumWallet.getAccount());
 
     await printBalances(maker);
     await printBalances(taker);
@@ -74,16 +68,7 @@ import { toBitcoin, toSatoshi } from "satoshi-bitcoin-ts";
     process.exit();
 })();
 
-interface Actor {
-    name: string;
-    comitClient: ComitClient;
-    peerId: string;
-    addressHint: string;
-    bitcoinWallet: BitcoinWallet;
-    ethereumWallet: EthereumWallet;
-}
-
-async function startClient(index: number, name: string): Promise<Actor> {
+async function createActor(index: number, name: string): Promise<Actor> {
     const bitcoinWallet = await BitcoinWallet.newInstance(
         "regtest",
         process.env.BITCOIN_P2P_URI!,
@@ -96,22 +81,12 @@ async function startClient(index: number, name: string): Promise<Actor> {
         process.env[`ETHEREUM_KEY_${index}`]!
     );
 
-    const cnd = new Cnd(process.env[`HTTP_URL_CND_${index}`]!);
-    const peerId = await cnd.getPeerId();
-    const addressHint = await cnd
-        .getPeerListenAddresses()
-        .then(addresses => addresses[0]);
-
-    const comitClient = new ComitClient(bitcoinWallet, ethereumWallet, cnd);
-
-    return {
-        name,
-        comitClient,
-        peerId,
-        addressHint,
+    return createActorSdk(
         bitcoinWallet,
         ethereumWallet,
-    };
+        process.env[`HTTP_URL_CND_${index}`]!,
+        name
+    );
 }
 
 function createSwap(maker: Actor, taker: Actor): SwapRequest {

new_project/examples/btc_eth/yarn.lock

@@ -1105,10 +1105,10 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-comit-sdk@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/comit-sdk/-/comit-sdk-0.7.1.tgz#1853baef36067214868b289d51af2be7aaaa6994"
-  integrity sha512-M8j6iUf8G9zf7we0aBXSZQz7dvYuUkSUtEPMxlAWinpW+Ll5vAGsAVGlVC7rDFW+k//wk1XmcnQYGQx7omNPdw==
+comit-sdk@^0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/comit-sdk/-/comit-sdk-0.7.2.tgz#121f3fb7409fea4b695259f9c522fd4828b579a6"
+  integrity sha512-9lUkYLvt9wP/B9gmfVbPS+71lUMLCqoWEh5AVe1KfDYRC3rv+Bt5V+/tso90zgeyD4LecbVoab0g737uycOB1Q==
   dependencies:
     axios "^0.19.0"
     bcoin "https://github.com/bcoin-org/bcoin#2496acc7a98a43f00a7b5728eb256877c1bbf001"