LaconicNetwork/cosmjs-util
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Remove remaining uses of MultiChainSigner

Browse Source
This commit is contained in:
Simon Warta 2020-01-30 10:51:16 +01:00
parent 36e86543cb
commit 6ea963c87d
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/faucet/src/actions/start/start.ts
View File

@ -1,6 +1,5 @@
// tslint:disable: no-object-mutation
import { UserProfile } from "@iov/keycontrol";
import { MultiChainSigner } from "@iov/multichain";
import cors = require("@koa/cors");
import Koa from "koa";
import bodyParser from "koa-bodyparser";
@ -44,9 +43,8 @@ export async function start(args: ReadonlyArray<string>): Promise<void> {
if (!constants.mnemonic) {
throw new Error("The FAUCET_MNEMONIC environment variable is not set");
}
const signer = new MultiChainSigner(profile);
console.info(`Connecting to blockchain ${blockchainBaseUrl} ...`);
const connection = (await signer.addChain(createChainConnector(blockchainBaseUrl))).connection;
const connection = await createChainConnector(blockchainBaseUrl).establishConnection();
const connectedChainId = connection.chainId();
console.info(`Connected to network: ${connectedChainId}`);
@ -70,8 +68,8 @@ export async function start(args: ReadonlyArray<string>): Promise<void> {
const distibutorIdentities = identitiesOfFirstWallet(profile).slice(1);
await refillFirstChain(profile, signer);
setInterval(async () => refillFirstChain(profile, signer), 60_000); // ever 60 seconds
await refillFirstChain(profile, connection);
setInterval(async () => refillFirstChain(profile, connection), 60_000); // ever 60 seconds
console.info("Creating webserver ...");
const api = new Koa();

11
packages/faucet/src/multichainhelpers.ts
View File

@ -8,7 +8,6 @@ import {
TokenTicker,
} from "@iov/bcp";
import { UserProfile } from "@iov/keycontrol";
import { MultiChainSigner } from "@iov/multichain";
import { needsRefill, refillAmount } from "./cashflow";
import { codecImplementation } from "./codec";
@ -91,11 +90,11 @@ export function availableTokensFromHolder(holderAccount: Account): ReadonlyArray
return holderAccount.balance.map(coin => coin.tokenTicker);
}
export async function refillFirstChain(profile: UserProfile, signer: MultiChainSigner): Promise<void> {
const chainId = signer.chainIds()[0];
const connection = signer.connection(chainId);
console.info(`Connected to network: ${chainId}`);
export async function refillFirstChain(
profile: UserProfile,
connection: BlockchainConnection,
): Promise<void> {
console.info(`Connected to network: ${connection.chainId()}`);
console.info(`Tokens on network: ${(await tokenTickersOfFirstChain(connection)).join(", ")}`);
const holderIdentity = identitiesOfFirstWallet(profile)[0];