Lending Liquidator V1

.github/workflows/test.yml

@@ -18,5 +18,5 @@ jobs:
           username: ${{ secrets.GITLAB_USERNAME }}
           password: ${{ secrets.GITLAB_TOKEN }}
       - name: Run and set up the parachain, oracle, staked relayer and vault
-        run: yarn install && yarn docker-parachain-start
+        run: docker-compose up -d
       - run: yarn install && yarn test

README.md

@@ -8,7 +8,7 @@ Repo with agents that perform actions in response to on-chain states. Includes a
 ## Testing
 ```bash
 yarn install
-yarn docker-parachain-start
+docker-compose up
 # open a new terminal...
 yarn test
 ```

bots/bridge-tester/.env.local

@@ -7,6 +7,4 @@ export BITCOIN_RPC_PORT="18443"
 export ISSUE_TOP_UP_AMOUNT="0.1"
 export REDEEM_ADDRESS="bcrt1qujs29q4gkyn2uj6y570xl460p4y43ruayxu8ry"
 export PARACHAIN_URL="ws://0.0.0.0:9944"
-export STATS_URL="http://0.0.0.0:3007"
-export FAUCET_URL="http://0.0.0.0:3036"
 export BITCOIN_RPC_WALLET="Alice"

bots/bridge-tester/package.json

@@ -4,7 +4,7 @@
     "description": "Bot for testing the Interlay and Kintsugi bridges.",
     "main": "build/index.js",
     "typings": "build/index.d.ts",
-    "repository": "https://github.com/interlay/bots/bridge-tester",
+    "repository": "https://github.com/interlay/bots/bots/bridge-tester",
     "author": "Interlay",
     "license": "Apache-2.0",
   "engines": {
@@ -20,8 +20,8 @@
     "test:integration": "mocha test/**/*.test.ts --timeout 10000000"
   },
   "dependencies": {
-    "@interlay/interbtc-api": "1.8.3",
-    "@interlay/monetary-js": "0.5.3",
+    "@interlay/interbtc-api": "1.21.0",
+    "@interlay/monetary-js": "0.7.0",
     "@types/big.js": "6.1.2",
     "@types/node": "^14.14.31",
     "@types/underscore": "^1.11.2",

bots/bridge-tester/src/index.ts

@@ -2,6 +2,7 @@ import {
   BitcoinNetwork,
   createInterBtcApi,
   InterBtcApi,
+  newMonetaryAmount,
   sleep,
 } from "@interlay/interbtc-api";
 import { KeyringPair } from "@polkadot/keyring/types";
@@ -11,8 +12,8 @@ import { cryptoWaitReady } from "@polkadot/util-crypto";
 import { MS_IN_AN_HOUR } from "./consts";
 import { Issue } from "./issue";
 import { Redeem } from "./redeem";
-import { BitcoinAmount } from "@interlay/monetary-js";
 import logger from "./logger";
+import { Bitcoin } from "@interlay/monetary-js";
 
 const yargs = require("yargs/yargs");
 const { hideBin } = require("yargs/helpers");
@@ -100,7 +101,7 @@ async function heartbeats(
       );
       const redeem = new Redeem(
         interBtcApi,
-        BitcoinAmount.from.BTC(process.env.ISSUE_TOP_UP_AMOUNT)
+        newMonetaryAmount(process.env.ISSUE_TOP_UP_AMOUNT, Bitcoin, true)
       );
       await redeem.performHeartbeatRedeems(
         account,
@@ -151,7 +152,7 @@ async function main(inputFlag: InputFlag, requestWaitingTime: number) {
     }
     case InputFlag.heartbeats: {
       heartbeats(account, process.env.REDEEM_ADDRESS as string);
-      setInterval(heartbeats, requestWaitingTime, account);
+      setInterval(heartbeats, requestWaitingTime, account, process.env.REDEEM_ADDRESS as string);
       break;
     }
   }

bots/bridge-tester/src/issue.ts

@@ -5,25 +5,22 @@ import {
   BitcoinNetwork,
   InterbtcPrimitivesVaultId,
   WrappedCurrency,
-  CurrencyUnit,
   newMonetaryAmount,
-  getCorrespondingCollateralCurrency,
-  CollateralUnit,
   encodeVaultId,
 } from "@interlay/interbtc-api";
-import { BitcoinUnit, Currency, MonetaryAmount } from "@interlay/monetary-js";
+import { Currency, MonetaryAmount } from "@interlay/monetary-js";
 import { KeyringPair } from "@polkadot/keyring/types";
 import Big from "big.js";
 import _ from "underscore";
 
 import { LOAD_TEST_ISSUE_AMOUNT } from "./consts";
 import logger from "./logger";
-import { sleep, waitForEmptyMempool } from "./utils";
+import { sleep } from "./utils";
 
 export class Issue {
   interBtcApi: InterBtcApi;
   private redeemDustValue:
-    | MonetaryAmount<WrappedCurrency, BitcoinUnit>
+    | MonetaryAmount<WrappedCurrency>
     | undefined;
 
   constructor(interBtc: InterBtcApi) {
@@ -37,9 +34,7 @@ export class Issue {
       "AccountId",
       requester.address
     );
-    const collateralCurrency = getCorrespondingCollateralCurrency(
-      this.interBtcApi.getGovernanceCurrency()
-    ) as Currency<CollateralUnit>;
+    const collateralCurrency = this.interBtcApi.api.consts.currency.getRelayChainCurrencyId;
     const balance = await this.interBtcApi.tokens.balance(
       collateralCurrency,
       requesterAccountId
@@ -69,7 +64,7 @@ export class Issue {
 
   async requestAndExecuteIssue(
     requester: KeyringPair,
-    amount: MonetaryAmount<WrappedCurrency, BitcoinUnit>,
+    amount: MonetaryAmount<WrappedCurrency>,
     bitcoinCoreClient: BitcoinCoreClient,
     vaultId?: InterbtcPrimitivesVaultId
   ): Promise<boolean> {
@@ -91,22 +86,22 @@ export class Issue {
   }
 
   async getCachedRedeemDustValue(): Promise<
-    MonetaryAmount<WrappedCurrency, BitcoinUnit>
+    MonetaryAmount<WrappedCurrency>
   > {
     if (!this.redeemDustValue) {
       this.redeemDustValue = await this.interBtcApi.redeem.getDustValue();
     }
     return this.redeemDustValue;
   }
 
-  increaseByFiftyPercent<U extends CurrencyUnit>(
-    x: MonetaryAmount<Currency<U>, U>
-  ): MonetaryAmount<Currency<U>, U> {
+  increaseByFiftyPercent(
+    x: MonetaryAmount<Currency>
+  ): MonetaryAmount<Currency> {
     return x.mul(new Big(15)).div(new Big(10));
   }
 
   async getAmountToIssue(): Promise<
-    MonetaryAmount<WrappedCurrency, BitcoinUnit>
+    MonetaryAmount<WrappedCurrency>
   > {
     const redeemDustValue = await this.getCachedRedeemDustValue();
     // We need to account for redeem fees to redeem later
@@ -161,9 +156,9 @@ export class Issue {
     for (const vault of vaults) {
       try {
         logger.info(
-          `Issuing ${amountToIssue.toString(amountToIssue.currency.base)} ${
+          `Issuing ${amountToIssue.toString(false)} ${
             amountToIssue.currency.ticker
-          } with vault ID ${encodeVaultId(vault.id)}`
+          } with vault ID ${encodeVaultId(this.interBtcApi.assetRegistry, this.interBtcApi.loans, vault.id)}`
         );
         this.requestAndExecuteIssue(
           account,

bots/bridge-tester/src/redeem.ts

@@ -8,7 +8,7 @@ import {
   newMonetaryAmount,
   encodeVaultId,
 } from "@interlay/interbtc-api";
-import { BitcoinUnit, MonetaryAmount } from "@interlay/monetary-js";
+import { MonetaryAmount } from "@interlay/monetary-js";
 import { KeyringPair } from "@polkadot/keyring/types";
 import { H256 } from "@polkadot/types/interfaces";
 import Big from "big.js";
@@ -22,20 +22,20 @@ export class Redeem {
   vaultHeartbeats = new Map<string, number>();
   issue: Issue;
   private redeemDustValue:
-    | MonetaryAmount<WrappedCurrency, BitcoinUnit>
+    | MonetaryAmount<WrappedCurrency>
     | undefined;
   interBtc: InterBtcApi;
   expiredRedeemRequests: H256[] = [];
   constructor(
     interBtc: InterBtcApi,
-    private issueTopUpAmount: MonetaryAmount<WrappedCurrency, BitcoinUnit>
+    private issueTopUpAmount: MonetaryAmount<WrappedCurrency>
   ) {
     this.issue = new Issue(interBtc);
     this.interBtc = interBtc;
   }
 
   async getCachedRedeemDustValue(): Promise<
-    MonetaryAmount<WrappedCurrency, BitcoinUnit>
+    MonetaryAmount<WrappedCurrency>
   > {
     if (!this.redeemDustValue) {
       this.redeemDustValue = await this.interBtc.redeem.getDustValue();
@@ -44,14 +44,14 @@ export class Redeem {
   }
 
   increaseByThirtyPercent(
-    x: MonetaryAmount<WrappedCurrency, BitcoinUnit>
-  ): MonetaryAmount<WrappedCurrency, BitcoinUnit> {
+    x: MonetaryAmount<WrappedCurrency>
+  ): MonetaryAmount<WrappedCurrency> {
     return x.mul(new Big(13)).div(new Big(10));
   }
 
   async getMinimumBalanceForHeartbeat(
     vaultCount?: number
-  ): Promise<MonetaryAmount<WrappedCurrency, BitcoinUnit>> {
+  ): Promise<MonetaryAmount<WrappedCurrency>> {
     if (!this.interBtc.vaults) {
       logger.error("Parachain not connected");
       return newMonetaryAmount(0, this.interBtc.getWrappedCurrency());
@@ -69,7 +69,7 @@ export class Redeem {
   }
 
   async getMinRedeemableAmount(): Promise<
-    MonetaryAmount<WrappedCurrency, BitcoinUnit>
+    MonetaryAmount<WrappedCurrency>
   > {
     const redeemDustValue = await this.getCachedRedeemDustValue();
     const bitcoinNetworkFees =
@@ -228,6 +228,8 @@ export class Redeem {
         if (issuedTokens.gte(amountToRedeem)) {
           logger.info(
             `Redeeming ${amountToRedeem.toHuman()} out of ${issuedTokens.toHuman()} from vault ID ${encodeVaultId(
+              this.interBtc.assetRegistry,
+              this.interBtc.loans,
               vault.id
             )}`
           );
@@ -239,7 +241,11 @@ export class Redeem {
           logger.info(
             `Requested redeem: ${
               requestResult.id
-            } from vault ID ${encodeVaultId(vault.id)}`
+            } from vault ID ${encodeVaultId(
+              this.interBtc.assetRegistry,
+              this.interBtc.loans,
+              vault.id
+            )}`
           );
           // TODO: Uncomment once redeems are executed quickly by vaults.
           // const redeemRequestId = requestResult.id.toString();

bots/bridge-tester/src/utils.ts

@@ -1,12 +1,3 @@
-import { BitcoinCoreClient } from "@interlay/interbtc-api";
-
-export async function waitForEmptyMempool(
-  bitcoinCoreClient: BitcoinCoreClient
-): Promise<void> {
-  while ((await bitcoinCoreClient.getMempoolInfo()).size === 0) {
-    await sleep(1000);
-  }
-}
 
 export async function sleep(ms: number): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, ms));