GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:nymtech/nym into develop

Browse Source
This commit is contained in:
Dave
2021-03-23 11:30:30 +00:00
parent 4ae8ae7231 5ef77185a1
commit b567ee55f3
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/validator/src/index.ts
+1 -1
View File
@@ -39,7 +39,7 @@ export default class ValidatorClient {
static async connect(contractAddress: string, mnemonic: string, url: string): Promise<ValidatorClient> {
const wallet = await ValidatorClient.buildWallet(mnemonic);
const [{ address }] = await wallet.getAccounts();
const netClient = await NetClient.connect(contractAddress, wallet, url);
const netClient = await NetClient.connect(wallet, url);
return new ValidatorClient(url, netClient, wallet, address, contractAddress);
}
clients/validator/src/net-client.ts
+9 -11
View File
@@ -1,10 +1,10 @@
import {SigningCosmWasmClient, SigningCosmWasmClientOptions} from "@cosmjs/cosmwasm-stargate";
import {GatewayBond, MixNodeBond} from "./types"
import {DirectSecp256k1HdWallet} from "@cosmjs/proto-signing";
import {Coin, GasPrice} from "@cosmjs/launchpad";
import {BroadcastTxResponse} from "@cosmjs/stargate/types"
import {defaultOptions, nymGasLimits, Options} from "./stargate-helper"
import {ExecuteResult, InstantiateOptions, InstantiateResult, UploadMeta, UploadResult} from "@cosmjs/cosmwasm";
import { SigningCosmWasmClient, SigningCosmWasmClientOptions } from "@cosmjs/cosmwasm-stargate";
import { GatewayBond, MixNodeBond } from "./types"
import { DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
import { Coin, GasPrice } from "@cosmjs/launchpad";
import { BroadcastTxResponse } from "@cosmjs/stargate/types"
import { defaultOptions, nymGasLimits, Options } from "./stargate-helper"
import { ExecuteResult, InstantiateOptions, InstantiateResult, UploadMeta, UploadResult } from "@cosmjs/cosmwasm";
export interface INetClient {
getBalance(address: string): Promise<Coin | null>;
@@ -33,15 +33,13 @@ export default class NetClient implements INetClient {
this.cosmClient = cosmClient;
}
public static async connect(contractAddress: string, wallet: DirectSecp256k1HdWallet, url?: string, opts?: Partial<Options>): Promise<INetClient> {
const options: Options = { ...defaultOptions, ...opts }
public static async connect(wallet: DirectSecp256k1HdWallet, url: string, opts?: Partial<Options>): Promise<INetClient> {
const [{ address }] = await wallet.getAccounts();
const signerOptions: SigningCosmWasmClientOptions = {
gasPrice: GasPrice.fromString("0.025unym"),
gasLimits: nymGasLimits,
};
const client = await SigningCosmWasmClient.connectWithSigner(options.httpUrl, wallet, signerOptions);
const client = await SigningCosmWasmClient.connectWithSigner(url, wallet, signerOptions);
return new NetClient(address, client);
}