From 2081b24b148983de23ea44bdf682197ad9f1cdad Mon Sep 17 00:00:00 2001 From: Aaron Cook Date: Mon, 2 Dec 2024 13:17:32 +0100 Subject: [PATCH] Update EIP-5792 support, fixing pending status (#615) * Update EIP-5792 support, fixing pending status * Handle receipts of transactions being executed * Add build --- .changeset/great-mails-warn.md | 5 ++++ packages/safe-apps-provider/dist/provider.js | 25 ++++++++++------- .../safe-apps-provider/dist/provider.js.map | 2 +- packages/safe-apps-provider/src/provider.ts | 27 ++++++++++++------- 4 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 .changeset/great-mails-warn.md diff --git a/.changeset/great-mails-warn.md b/.changeset/great-mails-warn.md new file mode 100644 index 00000000..69daf173 --- /dev/null +++ b/.changeset/great-mails-warn.md @@ -0,0 +1,5 @@ +--- +'@safe-global/safe-apps-provider': patch +--- + +Update EIP-5792 implementation according to spec. and fix pending status diff --git a/packages/safe-apps-provider/dist/provider.js b/packages/safe-apps-provider/dist/provider.js index 198eacfd..0eabb45b 100644 --- a/packages/safe-apps-provider/dist/provider.js +++ b/packages/safe-apps-provider/dist/provider.js @@ -184,13 +184,20 @@ class SafeAppProvider extends events_1.EventEmitter { [safe_apps_sdk_1.TransactionStatus.FAILED]: 'CONFIRMED', [safe_apps_sdk_1.TransactionStatus.SUCCESS]: 'CONFIRMED', }; - const tx = await this.sdk.txs.getBySafeTxHash(params[0]).catch(() => null); - if (!tx?.txHash) { - throw new Error('Transaction not found'); + const tx = await this.sdk.txs.getBySafeTxHash(params[0]); + const status = CallStatus[tx.txStatus]; + // Transaction is queued + if (!tx.txHash) { + return { + status, + }; } - const receipt = await this.sdk.eth.getTransactionReceipt([tx.txHash]).catch(() => null); + // If transaction is executing, receipt is null + const receipt = await this.sdk.eth.getTransactionReceipt([tx.txHash]); if (!receipt) { - throw new Error('Transaction receipt not found'); + return { + status, + }; } const calls = tx.txData?.dataDecoded?.method !== 'multiSend' ? 1 @@ -200,16 +207,16 @@ class SafeAppProvider extends events_1.EventEmitter { const blockNumber = Number(receipt.blockNumber); const gasUsed = Number(receipt.gasUsed); const receipts = Array(calls).fill({ - success: (0, utils_1.numberToHex)(tx.txStatus === safe_apps_sdk_1.TransactionStatus.SUCCESS ? 1 : 0), + logs: receipt.logs, + status: (0, utils_1.numberToHex)(tx.txStatus === safe_apps_sdk_1.TransactionStatus.SUCCESS ? 1 : 0), + chainId: (0, utils_1.numberToHex)(this.chainId), blockHash: receipt.blockHash, blockNumber: (0, utils_1.numberToHex)(blockNumber), - blockTimestamp: (0, utils_1.numberToHex)(tx.executedAt ?? 0), gasUsed: (0, utils_1.numberToHex)(gasUsed), transactionHash: tx.txHash, - logs: receipt.logs, }); return { - status: CallStatus[tx.txStatus], + status, receipts, }; } diff --git a/packages/safe-apps-provider/dist/provider.js.map b/packages/safe-apps-provider/dist/provider.js.map index 7388760a..6d7985f5 100644 --- a/packages/safe-apps-provider/dist/provider.js.map +++ b/packages/safe-apps-provider/dist/provider.js.map @@ -1 +1 @@ -{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":";;;AAAA,8DAA6G;AAC7G,mCAAsC;AAEtC,mCAAoD;AAEpD,+GAA+G;AAC/G,MAAa,eAAgB,SAAQ,qBAAY;IAK/C,YAAY,IAAc,EAAE,GAAgB;QAC1C,KAAK,EAAE,CAAC;QAHF,iBAAY,GAAG,IAAI,GAAG,EAAiC,CAAC;QAI9D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAChD,OAAO;IACT,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO;IACT,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;IAC3B,CAAC;IAED,8DAA8D;IAC9D,KAAK,CAAC,OAAO,CAAC,OAA2C;QACvD,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;QAExC,QAAQ,MAAM,EAAE;YACd,KAAK,cAAc;gBACjB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAEjC,KAAK,aAAa,CAAC;YACnB,KAAK,aAAa;gBAChB,OAAO,IAAA,mBAAW,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAEnC,KAAK,eAAe,CAAC,CAAC;gBACpB,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;gBAElC,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,EAAE;oBACjE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;iBAC3D;gBAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;gBACzD,MAAM,SAAS,GAAG,WAAW,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;gBAE3E,OAAO,SAAS,IAAI,IAAI,CAAC;aAC1B;YAED,KAAK,UAAU,CAAC,CAAC;gBACf,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,MAAM,CAAC;gBAEtC,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;oBAClG,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;iBAC3D;gBAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;gBAC7D,MAAM,SAAS,GAAG,WAAW,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;gBAE3E,OAAO,SAAS,IAAI,IAAI,CAAC;aAC1B;YAED,KAAK,mBAAmB,CAAC;YACzB,KAAK,sBAAsB,CAAC,CAAC;gBAC3B,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG,MAAM,CAAC;gBACpC,MAAM,eAAe,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAE1F,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,EAAE;oBACjE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;iBAC3C;gBAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;gBACtE,MAAM,SAAS,GAAG,WAAW,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC3E,OAAO,SAAS,IAAI,IAAI,CAAC;aAC1B;YAED,KAAK,qBAAqB;gBACxB,4HAA4H;gBAC5H,MAAM,EAAE,GAAG;oBACT,GAAG,MAAM,CAAC,CAAC,CAAC;oBACZ,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG;oBAC7B,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI;iBAC7B,CAAC;gBAEF,qEAAqE;gBACrE,mGAAmG;gBACnG,kBAAkB;gBAClB,IAAI,OAAO,EAAE,CAAC,GAAG,KAAK,QAAQ,IAAI,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;oBACzD,EAAE,CAAC,GAAG,GAAG,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;iBAC/B;gBAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;oBACnC,GAAG,EAAE,CAAC,EAAE,CAAC;oBACT,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,GAAG,EAAE;iBAC9B,CAAC,CAAC;gBAEH,yBAAyB;gBACzB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE;oBACrC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;oBAC3B,IAAI,EAAE,IAAI,CAAC,UAAU;oBACrB,GAAG,EAAE,CAAC;oBACN,QAAQ,EAAE,MAAM;oBAChB,KAAK,EAAE,CAAC;oBACR,KAAK,EAAE,EAAE,CAAC,IAAI;oBACd,KAAK,EAAE,EAAE,CAAC,KAAK;oBACf,EAAE,EAAE,EAAE,CAAC,EAAE;oBACT,SAAS,EAAE,IAAI;oBACf,WAAW,EAAE,IAAI;oBACjB,gBAAgB,EAAE,IAAI;iBACvB,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC,UAAU,CAAC;YAEzB,KAAK,iBAAiB;gBACpB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAE9D,OAAO,KAAK,CAAC,MAAM,CAAC;YAEtB,KAAK,gBAAgB;gBACnB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAA,oBAAY,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEvE,KAAK,aAAa;gBAChB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAA,oBAAY,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEpE,KAAK,yBAAyB;gBAC5B,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,IAAA,oBAAY,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEhF,KAAK,kBAAkB;gBACrB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAA,oBAAY,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEpF,KAAK,sBAAsB;gBACzB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAE/D,KAAK,oBAAoB;gBACvB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAE7D,KAAK,0BAA0B;gBAC7B,IAAI,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACvB,IAAI;oBACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;oBACxD,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC;iBAChC;gBAAC,OAAO,CAAC,EAAE,GAAE;gBACd,uDAAuD;gBACvD,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;oBACjC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;iBACtC;gBACD,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;oBAC7D,wEAAwE;oBACxE,IAAI,EAAE,EAAE;wBACN,EAAE,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;qBACrB;oBACD,OAAO,EAAE,CAAC;gBACZ,CAAC,CAAC,CAAC;YAEL,KAAK,2BAA2B,CAAC,CAAC;gBAChC,IAAI,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACvB,IAAI;oBACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;oBACxD,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC;iBAChC;gBAAC,OAAO,CAAC,EAAE,GAAE;gBACd,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;oBAC9D,wEAAwE;oBACxE,IAAI,EAAE,EAAE;wBACN,EAAE,CAAC,eAAe,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;qBAChC;oBACD,OAAO,EAAE,CAAC;gBACZ,CAAC,CAAC,CAAC;aACJ;YAED,KAAK,iBAAiB,CAAC,CAAC;gBACtB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;aAC/C;YAED,KAAK,UAAU,CAAC,CAAC;gBACf,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAClD;YAED,KAAK,aAAa;gBAChB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAE/C,KAAK,cAAc;gBACjB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;YAEpC,KAAK,uBAAuB;gBAC1B,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YAE1C,KAAK,2BAA2B;gBAC9B,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAEvD,KAAK,kBAAkB;gBACrB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEnD,KAAK,kBAAkB,CAAC,CAAC;gBACvB,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;oBAC5C,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAC;iBACrC;gBAED,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAC7B,CACE,IAAkG,EAClG,CAAS,EACT,EAAE;oBACF,IAAI,IAAI,CAAC,OAAO,KAAK,IAAA,mBAAW,EAAC,IAAI,CAAC,OAAO,CAAC,EAAE;wBAC9C,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,0BAA0B,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;qBAC7E;oBACD,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;wBACZ,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,CAAC;qBAC3D;oBACD,OAAO;wBACL,EAAE,EAAE,IAAI,CAAC,EAAE;wBACX,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI;wBACvB,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,IAAA,mBAAW,EAAC,CAAC,CAAC;qBACpC,CAAC;gBACJ,CAAC,CACF,CAAC;gBAEF,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;gBACxD,OAAO,UAAU,CAAC;aACnB;YAED,KAAK,uBAAuB,CAAC,CAAC;gBAC5B,MAAM,UAAU,GAEZ;oBACF,CAAC,iCAAiB,CAAC,sBAAsB,CAAC,EAAE,SAAS;oBACrD,CAAC,iCAAiB,CAAC,kBAAkB,CAAC,EAAE,SAAS;oBACjD,CAAC,iCAAiB,CAAC,SAAS,CAAC,EAAE,WAAW;oBAC1C,CAAC,iCAAiB,CAAC,MAAM,CAAC,EAAE,WAAW;oBACvC,CAAC,iCAAiB,CAAC,OAAO,CAAC,EAAE,WAAW;iBACzC,CAAC;gBAEF,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;gBAC3E,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE;oBACf,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;iBAC1C;gBAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;gBACxF,IAAI,CAAC,OAAO,EAAE;oBACZ,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;iBAClD;gBAED,MAAM,KAAK,GACT,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,WAAW;oBAC5C,CAAC,CAAC,CAAC;oBACH,CAAC,CAAC,iCAAiC;wBACjC,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,MAAM,IAAI,CAAC,CAAC;gBAEtE,0BAA0B;gBAC1B,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;gBAChD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAExC,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC;oBACjC,OAAO,EAAE,IAAA,mBAAW,EAAC,EAAE,CAAC,QAAQ,KAAK,iCAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACvE,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,WAAW,EAAE,IAAA,mBAAW,EAAC,WAAW,CAAC;oBACrC,cAAc,EAAE,IAAA,mBAAW,EAAC,EAAE,CAAC,UAAU,IAAI,CAAC,CAAC;oBAC/C,OAAO,EAAE,IAAA,mBAAW,EAAC,OAAO,CAAC;oBAC7B,eAAe,EAAE,EAAE,CAAC,MAAM;oBAC1B,IAAI,EAAE,OAAO,CAAC,IAAI;iBACnB,CAAC,CAAC;gBAEH,OAAO;oBACL,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC,QAAQ,CAAC;oBAC/B,QAAQ;iBACT,CAAC;aACH;YAED,KAAK,wBAAwB,CAAC,CAAC;gBAC7B,+CAA+C;gBAC/C,MAAM,IAAI,KAAK,CAAC,IAAI,OAAO,CAAC,MAAM,iBAAiB,CAAC,CAAC;aACtD;YAED,KAAK,wBAAwB,CAAC,CAAC;gBAC7B,OAAO;oBACL,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE;wBAC3B,WAAW,EAAE;4BACX,SAAS,EAAE,IAAI;yBAChB;qBACF;iBACF,CAAC;aACH;YAED;gBACE,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,MAAM,mBAAmB,CAAC,CAAC;SACtD;IACH,CAAC;IAED,sCAAsC;IACtC,iIAAiI;IACjI,IAAI,CAAC,OAAY,EAAE,QAA8C;QAC/D,IAAI,CAAC,OAAO;YAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QAC5C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;aAClB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;aAC5E,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7C,CAAC;CACF;AAtSD,0CAsSC"} \ No newline at end of file +{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/safe-apps-provider/src/provider.ts b/packages/safe-apps-provider/src/provider.ts index 4cb3baf4..7bdcb33b 100644 --- a/packages/safe-apps-provider/src/provider.ts +++ b/packages/safe-apps-provider/src/provider.ts @@ -234,14 +234,23 @@ export class SafeAppProvider extends EventEmitter implements EIP1193Provider { [TransactionStatus.SUCCESS]: 'CONFIRMED', }; - const tx = await this.sdk.txs.getBySafeTxHash(params[0]).catch(() => null); - if (!tx?.txHash) { - throw new Error('Transaction not found'); + const tx = await this.sdk.txs.getBySafeTxHash(params[0]); + + const status = CallStatus[tx.txStatus]; + + // Transaction is queued + if (!tx.txHash) { + return { + status, + }; } - const receipt = await this.sdk.eth.getTransactionReceipt([tx.txHash]).catch(() => null); + // If transaction is executing, receipt is null + const receipt = await this.sdk.eth.getTransactionReceipt([tx.txHash]); if (!receipt) { - throw new Error('Transaction receipt not found'); + return { + status, + }; } const calls = @@ -255,17 +264,17 @@ export class SafeAppProvider extends EventEmitter implements EIP1193Provider { const gasUsed = Number(receipt.gasUsed); const receipts = Array(calls).fill({ - success: numberToHex(tx.txStatus === TransactionStatus.SUCCESS ? 1 : 0), + logs: receipt.logs, + status: numberToHex(tx.txStatus === TransactionStatus.SUCCESS ? 1 : 0), + chainId: numberToHex(this.chainId), blockHash: receipt.blockHash, blockNumber: numberToHex(blockNumber), - blockTimestamp: numberToHex(tx.executedAt ?? 0), gasUsed: numberToHex(gasUsed), transactionHash: tx.txHash, - logs: receipt.logs, }); return { - status: CallStatus[tx.txStatus], + status, receipts, }; }