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

Allow using signDirect/signAmino directly and add SignData

Browse Source
This commit is contained in:
Simon Warta 2021-03-23 23:43:07 +01:00
parent bc0e7f5331
commit c3470dc90a
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
packages/stargate/src/signingstargateclient.ts
View File

@ -98,6 +98,12 @@ function createDefaultRegistry(): Registry {
return new Registry(defaultRegistryTypes);
}
export interface SignData {
readonly accountNumber: number;
readonly sequence: number;
readonly chainId: string;
}
/** Use for testing only */
export interface PrivateSigningStargateClient {
readonly fees: CosmosFeeTable;
@ -186,16 +192,25 @@ export class SigningStargateClient extends StargateClient {
fee: StdFee,
memo: string,
): Promise<TxRaw> {
const accountFromChain = await this.getAccountUnverified(signerAddress);
if (!accountFromChain) {
throw new Error("Account not found");
}
const { accountNumber, sequence } = accountFromChain;
const chainId = await this.getChainId();
const signData: SignData = { accountNumber, sequence, chainId };
return isOfflineDirectSigner(this.signer)
? this.signDirect(signerAddress, messages, fee, memo)
: this.signAmino(signerAddress, messages, fee, memo);
? this.signDirect(signerAddress, messages, fee, memo, signData)
: this.signAmino(signerAddress, messages, fee, memo, signData);
}
private async signAmino(
public async signAmino(
signerAddress: string,
messages: readonly EncodeObject[],
fee: StdFee,
memo: string,
{ accountNumber, sequence, chainId }: SignData,
): Promise<TxRaw> {
assert(!isOfflineDirectSigner(this.signer));
const accountFromSigner = (await this.signer.getAccounts()).find(
@ -205,12 +220,6 @@ export class SigningStargateClient extends StargateClient {
throw new Error("Failed to retrieve account from signer");
}
const pubkey = encodePubkey(encodeSecp256k1Pubkey(accountFromSigner.pubkey));
const accountFromChain = await this.getAccountUnverified(signerAddress);
if (!accountFromChain) {
throw new Error("Account not found");
}
const { accountNumber, sequence } = accountFromChain;
const chainId = await this.getChainId();
const signMode = SignMode.SIGN_MODE_LEGACY_AMINO_JSON;
const msgs = messages.map((msg) => this.aminoTypes.toAmino(msg));
const signDoc = makeSignDocAmino(msgs, fee, chainId, memo, accountNumber, sequence);
@ -239,11 +248,12 @@ export class SigningStargateClient extends StargateClient {
});
}
private async signDirect(
public async signDirect(
signerAddress: string,
messages: readonly EncodeObject[],
fee: StdFee,
memo: string,
{ accountNumber, sequence, chainId }: SignData,
): Promise<TxRaw> {
assert(isOfflineDirectSigner(this.signer));
const accountFromSigner = (await this.signer.getAccounts()).find(
@ -253,12 +263,6 @@ export class SigningStargateClient extends StargateClient {
throw new Error("Failed to retrieve account from signer");
}
const pubkey = encodePubkey(encodeSecp256k1Pubkey(accountFromSigner.pubkey));
const accountFromChain = await this.getAccountUnverified(signerAddress);
if (!accountFromChain) {
throw new Error("Account not found");
}
const { accountNumber, sequence } = accountFromChain;
const chainId = await this.getChainId();
const txBody = {
messages: messages,
memo: memo,