Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle all transaction statuses #273

Merged
merged 1 commit into from
Jun 28, 2024
Merged

Handle all transaction statuses #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@logion/client",
"version": "0.46.0",
"version": "0.46.1-1",
"description": "logion SDK for client applications",
"main": "dist/index.js",
"packageManager": "yarn@3.2.0",
Expand Down
29 changes: 26 additions & 3 deletions packages/client/src/Signer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { TypesEvent, Adapters, ValidAccountId } from '@logion/node-api';
import { Keyring } from '@polkadot/api';
import type { SubmittableExtrinsic } from '@polkadot/api/promise/types';
import { ISubmittableResult } from '@polkadot/types/types';
import { ExtrinsicStatus } from '@polkadot/types/interfaces/author';
import { Registry } from '@polkadot/types-codec/types';
import { base64Encode } from '@polkadot/util-crypto';
import { stringToHex } from '@polkadot/util';
Expand Down Expand Up @@ -169,14 +170,27 @@ export abstract class BaseSigner implements FullSigner {
signAndSendStrategy: SignAndSendStrategy;
}) {
if(params.next !== undefined) {
params.next(params.result);
try {
params.next(params.result);
} catch(e) {
console.error("Skipped callback failure: " + e);
}
}
if (params.result.status.isInBlock) {
params.submissionState.block = params.result.status.asInBlock.toString();
}
if (params.result.dispatchError || params.signAndSendStrategy.canUnsub(params.result)) {
if (this.isFinished(params.result.status) || params.signAndSendStrategy.canUnsub(params.result)) {
params.unsub();
if(params.result.dispatchError) {

if(params.result.status.isFinalityTimeout) {
params.reject(new Error("Finality timed out"));
} else if(params.result.status.isUsurped) {
params.reject(new Error("Transaction has been replaced in the pool, by another transaction"));
} else if(params.result.status.isInvalid) {
params.reject(new Error("Transaction is no longer valid in the current state"));
} else if(params.result.status.isDropped) {
params.reject(new Error("Transaction has been dropped from the pool because of the limit"));
} else if(params.result.dispatchError) {
params.reject(new Error(Adapters.getErrorMessage(params.result.dispatchError)));
} else {
params.resolve({
Expand All @@ -188,6 +202,15 @@ export abstract class BaseSigner implements FullSigner {
}
}

private isFinished(status: ExtrinsicStatus) {
// See https://github.com/paritytech/polkadot-sdk/blob/polkadot-v1.13.0/substrate/client/transaction-pool/api/src/lib.rs#L161
return status.isFinalized
|| status.isFinalityTimeout
|| status.isUsurped
|| status.isInvalid
|| status.isDropped
;
}
}

export class KeyringSigner extends BaseSigner {
Expand Down
Loading