From a2acf9e061df98e82b8394c29608756b8725c827 Mon Sep 17 00:00:00 2001 From: willclarktech Date: Wed, 28 Oct 2020 10:46:33 +0100 Subject: [PATCH] Tidy proto-signing and stargate after review --- packages/proto-signing/src/directsecp256k1wallet.spec.ts | 4 ++-- packages/proto-signing/src/signer.ts | 2 +- packages/proto-signing/src/signing.spec.ts | 4 ++-- packages/stargate/src/signingstargateclient.ts | 4 ++-- packages/stargate/src/stargateclient.searchtx.spec.ts | 4 ++-- packages/stargate/src/stargateclient.spec.ts | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/proto-signing/src/directsecp256k1wallet.spec.ts b/packages/proto-signing/src/directsecp256k1wallet.spec.ts index 1e51c72a..fc44ec2c 100644 --- a/packages/proto-signing/src/directsecp256k1wallet.spec.ts +++ b/packages/proto-signing/src/directsecp256k1wallet.spec.ts @@ -76,9 +76,9 @@ describe("DirectSecp256k1Wallet", () => { accountNumber, ); const signDocBytes = makeSignBytes(signDoc); - const signResponse = await wallet.signDirect(faucet.address, signDoc); + const { signature } = await wallet.signDirect(faucet.address, signDoc); const valid = await Secp256k1.verifySignature( - Secp256k1Signature.fromFixedLength(fromBase64(signResponse.signature.signature)), + Secp256k1Signature.fromFixedLength(fromBase64(signature.signature)), sha256(signDocBytes), pubkey.value, ); diff --git a/packages/proto-signing/src/signer.ts b/packages/proto-signing/src/signer.ts index 424eeae8..f1c205e9 100644 --- a/packages/proto-signing/src/signer.ts +++ b/packages/proto-signing/src/signer.ts @@ -22,5 +22,5 @@ export interface OfflineDirectSigner { export type OfflineSigner = OfflineAminoSigner | OfflineDirectSigner; export function isOfflineDirectSigner(signer: OfflineSigner): signer is OfflineDirectSigner { - return (signer as any).signDirect !== undefined; + return (signer as OfflineDirectSigner).signDirect !== undefined; } diff --git a/packages/proto-signing/src/signing.spec.ts b/packages/proto-signing/src/signing.spec.ts index 2a1ad8fd..342f46af 100644 --- a/packages/proto-signing/src/signing.spec.ts +++ b/packages/proto-signing/src/signing.spec.ts @@ -100,11 +100,11 @@ describe("signing", () => { const signDocBytes = makeSignBytes(signDoc); expect(toHex(signDocBytes)).toEqual(signBytes); - const signResponse = await wallet.signDirect(address, signDoc); + const { signature } = await wallet.signDirect(address, signDoc); const txRaw = TxRaw.create({ bodyBytes: txBodyBytes, authInfoBytes: authInfoBytes, - signatures: [fromBase64(signResponse.signature.signature)], + signatures: [fromBase64(signature.signature)], }); const txRawBytes = Uint8Array.from(TxRaw.encode(txRaw).finish()); const txBytesHex = toHex(txRawBytes); diff --git a/packages/stargate/src/signingstargateclient.ts b/packages/stargate/src/signingstargateclient.ts index e2dc7d41..d4bd344a 100644 --- a/packages/stargate/src/signingstargateclient.ts +++ b/packages/stargate/src/signingstargateclient.ts @@ -123,11 +123,11 @@ export class SigningStargateClient extends StargateClient { if (isOfflineDirectSigner(this.signer)) { const authInfoBytes = makeAuthInfoBytes([pubkeyAny], fee.amount, gasLimit, sequence); const signDoc = makeSignDoc(txBodyBytes, authInfoBytes, chainId, accountNumber); - const signResponse = await this.signer.signDirect(address, signDoc); + const { signature } = await this.signer.signDirect(address, signDoc); const txRaw = TxRaw.create({ bodyBytes: txBodyBytes, authInfoBytes: authInfoBytes, - signatures: [fromBase64(signResponse.signature.signature)], + signatures: [fromBase64(signature.signature)], }); const signedTx = Uint8Array.from(TxRaw.encode(txRaw).finish()); return this.broadcastTx(signedTx); diff --git a/packages/stargate/src/stargateclient.searchtx.spec.ts b/packages/stargate/src/stargateclient.searchtx.spec.ts index ae771457..ede5bcda 100644 --- a/packages/stargate/src/stargateclient.searchtx.spec.ts +++ b/packages/stargate/src/stargateclient.searchtx.spec.ts @@ -74,11 +74,11 @@ async function sendTokens( const chainId = await client.getChainId(); const signDoc = makeSignDoc(txBodyBytes, authInfoBytes, chainId, accountNumber); - const signResponse = await wallet.signDirect(walletAddress, signDoc); + const { signature } = await wallet.signDirect(walletAddress, signDoc); const txRaw = TxRaw.create({ bodyBytes: txBodyBytes, authInfoBytes: authInfoBytes, - signatures: [fromBase64(signResponse.signature.signature)], + signatures: [fromBase64(signature.signature)], }); const txRawBytes = Uint8Array.from(TxRaw.encode(txRaw).finish()); const broadcastResponse = await client.broadcastTx(txRawBytes); diff --git a/packages/stargate/src/stargateclient.spec.ts b/packages/stargate/src/stargateclient.spec.ts index c8d7357d..813d4006 100644 --- a/packages/stargate/src/stargateclient.spec.ts +++ b/packages/stargate/src/stargateclient.spec.ts @@ -296,11 +296,11 @@ describe("StargateClient", () => { const chainId = await client.getChainId(); const signDoc = makeSignDoc(txBodyBytes, authInfoBytes, chainId, accountNumber); - const signResponse = await wallet.signDirect(address, signDoc); + const { signature } = await wallet.signDirect(address, signDoc); const txRaw = TxRaw.create({ bodyBytes: txBodyBytes, authInfoBytes: authInfoBytes, - signatures: [fromBase64(signResponse.signature.signature)], + signatures: [fromBase64(signature.signature)], }); const txRawBytes = Uint8Array.from(TxRaw.encode(txRaw).finish()); const txResult = await client.broadcastTx(txRawBytes);