Use comit-sdk.createActor in separate_apps

Author: luckysori

new_project/examples/separate_apps/package.json

@@ -23,7 +23,7 @@
     "dependencies": {
         "@types/express": "^4.17.2",
         "axios": "^0.19.0",
-        "comit-sdk": "^0.7.1",
+        "comit-sdk": "^0.7.2",
         "dotenv": "^8.1.0",
         "express": "^4.17.1",
         "moment": "^2.24.0",

new_project/examples/separate_apps/src/lib.ts

@@ -1,7 +1,12 @@
-import { BitcoinWallet, Cnd, ComitClient, EthereumWallet } from "comit-sdk";
+import {
+    Actor,
+    BitcoinWallet,
+    createActor as createActorSdk,
+    EthereumWallet,
+} from "comit-sdk";
 import fs from "fs";
 
-export async function startClient(index: number): Promise<Actor> {
+export async function createActor(index: number): Promise<Actor> {
     checkEnvFile(process.env.DOTENV_CONFIG_PATH!);
 
     const bitcoinWallet = await BitcoinWallet.newInstance(
@@ -17,29 +22,11 @@ export async function startClient(index: number): 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 {
-        comitClient,
-        peerId,
-        addressHint,
+    return await createActorSdk(
         bitcoinWallet,
         ethereumWallet,
-    };
-}
-
-export interface Actor {
-    comitClient: ComitClient;
-    peerId: string;
-    addressHint: string;
-    bitcoinWallet: BitcoinWallet;
-    ethereumWallet: EthereumWallet;
+        process.env[`HTTP_URL_CND_${index}`]!
+    );
 }
 
 export function checkEnvFile(path: string) {

new_project/examples/separate_apps/src/maker.ts

@@ -1,14 +1,9 @@
-import {
-    MakerHttpApi,
-    MakerNegotiator,
-} from "comit-sdk/dist/src/negotiation/maker_negotiator";
-import { Order } from "comit-sdk/dist/src/negotiation/order";
-import { TryParams } from "comit-sdk/dist/src/timeout_promise";
+import { MakerHttpApi, MakerNegotiator, Order, TryParams } from "comit-sdk";
 import { formatEther } from "ethers/utils";
 import moment from "moment";
 import readLineSync from "readline-sync";
 import { toBitcoin } from "satoshi-bitcoin-ts";
-import { startClient } from "./lib";
+import { createActor } from "./lib";
 
 /**
  * This executable function represents the maker side during a trade.
@@ -24,7 +19,7 @@ import { startClient } from "./lib";
  */
 (async function main() {
     // Initialize the maker Actor
-    const maker = await startClient(0);
+    const maker = await createActor(0);
 
     // print balances before swapping
     console.log(

new_project/examples/separate_apps/src/taker.ts

@@ -1,13 +1,8 @@
-import { Order } from "comit-sdk/dist/src/negotiation/order";
-import {
-    MakerClient,
-    TakerNegotiator,
-} from "comit-sdk/dist/src/negotiation/taker_negotiator";
-import { TryParams } from "comit-sdk/dist/src/timeout_promise";
+import { MakerClient, Order, TakerNegotiator, TryParams } from "comit-sdk";
 import { formatEther } from "ethers/utils";
 import readLineSync from "readline-sync";
 import { toBitcoin } from "satoshi-bitcoin-ts";
-import { startClient } from "./lib";
+import { createActor } from "./lib";
 
 /**
  * This executable function represents the taker side during a trade.
@@ -24,7 +19,7 @@ import { startClient } from "./lib";
  */
 (async function main() {
     // Initialize the taker Actor
-    const taker = await startClient(1);
+    const taker = await createActor(1);
 
     // print balances before swapping
     console.log(
@@ -101,7 +96,7 @@ import { startClient } from "./lib";
     readLineSync.question("2. Continue funding the Ethereum HTLC?");
 
     // Define how often and how long the comit-js-sdk should try to execute the fund and redeem action.
-    const tryParams: TryParams = {  maxTimeoutSecs: 100, tryIntervalSecs: 1 };
+    const tryParams: TryParams = { maxTimeoutSecs: 100, tryIntervalSecs: 1 };
 
     console.log(
         "Ethereum HTLC funded! TXID: ",

new_project/examples/separate_apps/yarn.lock

@@ -538,10 +538,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"