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

Remove fees argument from makeReadOnly

Browse Source
This commit is contained in:
Simon Warta 2020-02-17 13:00:38 +01:00
parent 52d9e0b5c3
commit 0010c1bc77
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/sdk/src/cosmwasmclient.ts
View File

@ -27,7 +27,7 @@ function singleAmount(amount: number, denom: string): readonly Coin[] {
return [{ amount: amount.toString(), denom: denom }];
}
const defaultFeeTable: FeeTable = {
const defaultFees: FeeTable = {
upload: {
amount: singleAmount(25000, "ucosm"),
gas: "1000000", // one million
@ -98,8 +98,8 @@ export interface ExecuteResult {
}
export class CosmWasmClient {
public static makeReadOnly(url: string, feeTable?: Partial<FeeTable>): CosmWasmClient {
return new CosmWasmClient(url, undefined, feeTable);
public static makeReadOnly(url: string): CosmWasmClient {
return new CosmWasmClient(url, undefined, {});
}
public static makeWritable(
@ -114,13 +114,13 @@ export class CosmWasmClient {
senderAddress: senderAddress,
signCallback: signCallback,
},
feeTable,
feeTable || {},
);
}
private readonly restClient: RestClient;
private readonly signingData: SigningData | undefined;
private readonly feeTable: FeeTable;
private readonly fees: FeeTable;
private get senderAddress(): string {
if (!this.signingData) throw new Error("Signing data not set in this client");
@ -132,10 +132,10 @@ export class CosmWasmClient {
return this.signingData.signCallback;
}
private constructor(url: string, signingData?: SigningData, feeTable?: Partial<FeeTable>) {
private constructor(url: string, signingData: SigningData | undefined, customFees: Partial<FeeTable>) {
this.restClient = new RestClient(url);
this.signingData = signingData;
this.feeTable = { ...defaultFeeTable, ...(feeTable || {}) };
this.fees = { ...defaultFees, ...customFees };
}
public async chainId(): Promise<string> {
@ -242,7 +242,7 @@ export class CosmWasmClient {
builder: "",
},
};
const fee = this.feeTable.upload;
const fee = this.fees.upload;
const { accountNumber, sequence } = await this.getNonce();
const chainId = await this.chainId();
const signBytes = makeSignBytes([storeCodeMsg], fee, chainId, memo, accountNumber, sequence);
@ -278,7 +278,7 @@ export class CosmWasmClient {
init_funds: transferAmount || [],
},
};
const fee = this.feeTable.init;
const fee = this.fees.init;
const { accountNumber, sequence } = await this.getNonce();
const chainId = await this.chainId();
const signBytes = makeSignBytes([instantiateMsg], fee, chainId, memo, accountNumber, sequence);
@ -312,7 +312,7 @@ export class CosmWasmClient {
sent_funds: transferAmount || [],
},
};
const fee = this.feeTable.exec;
const fee = this.fees.exec;
const { accountNumber, sequence } = await this.getNonce();
const chainId = await this.chainId();
const signBytes = makeSignBytes([executeMsg], fee, chainId, memo, accountNumber, sequence);
@ -345,7 +345,7 @@ export class CosmWasmClient {
amount: transferAmount,
},
};
const fee = this.feeTable.send;
const fee = this.fees.send;
const { accountNumber, sequence } = await this.getNonce();
const chainId = await this.chainId();
const signBytes = makeSignBytes([sendMsg], fee, chainId, memo, accountNumber, sequence);

4
packages/sdk/types/cosmwasmclient.d.ts vendored
View File

@ -34,7 +34,7 @@ export interface ExecuteResult {
readonly logs: readonly Log[];
}
export declare class CosmWasmClient {
static makeReadOnly(url: string, feeTable?: Partial<FeeTable>): CosmWasmClient;
static makeReadOnly(url: string): CosmWasmClient;
static makeWritable(
url: string,
senderAddress: string,
@ -43,7 +43,7 @@ export declare class CosmWasmClient {
): CosmWasmClient;
private readonly restClient;
private readonly signingData;
private readonly feeTable;
private readonly fees;
private get senderAddress();
private get signCallback();
private constructor();