@atomiqlabs/chain-starknet 6.0.0-beta.1 → 6.0.0-beta.2

package/dist/starknet/btcrelay/StarknetBtcRelay.d.ts

@@ -61,7 +61,7 @@ export declare class StarknetBtcRelay<B extends BtcBlock> extends StarknetContra
     }, requiredBlockheight?: number): Promise<{
         header: StarknetBtcStoredHeader;
         height: number;
-    } | null>;
+    }>;
     /**
      * Retrieves blockheader data by blockheader's commit hash,
      *

package/dist/starknet/events/StarknetChainEventsBrowser.js

@@ -49,7 +49,18 @@ class StarknetChainEventsBrowser {
      */
     getSwapDataGetter(event, claimHandler) {
         return async () => {
-            const trace = await this.provider.getTransactionTrace(event.txHash);
+            let trace;
+            try {
+                trace = await this.provider.getTransactionTrace(event.txHash);
+            }
+            catch (e) {
+                this.logger.warn("getSwapDataGetter(): getter: starknet_traceTransaction not supported by the RPC: ", e);
+                const blockTraces = await this.provider.getBlockTransactionsTraces(event.blockHash);
+                const foundTrace = blockTraces.find(val => (0, Utils_1.toHex)(val.transaction_hash) === (0, Utils_1.toHex)(event.txHash));
+                if (foundTrace == null)
+                    throw new Error(`Cannot find ${event.txHash} in the block traces, block: ${event.blockHash}`);
+                trace = foundTrace.trace_root;
+            }
             if (trace == null)
                 return null;
             if (trace.execute_invocation.revert_reason != null)

package/dist/starknet/swaps/StarknetSwapContract.d.ts

@@ -147,7 +147,7 @@ export declare class StarknetSwapContract extends StarknetContractBase<typeof Es
         txid: string;
         hex: string;
         height: number;
-    }, requiredConfirmations: number, vout: number, commitedHeader?: StarknetBtcStoredHeader, synchronizer?: RelaySynchronizer<StarknetBtcStoredHeader, StarknetTx, any>, initAta?: boolean, feeRate?: string): Promise<StarknetTx[] | null>;
+    }, requiredConfirmations: number, vout: number, commitedHeader?: StarknetBtcStoredHeader, synchronizer?: RelaySynchronizer<StarknetBtcStoredHeader, StarknetTx, any>, initAta?: boolean, feeRate?: string): Promise<StarknetTx[]>;
     txsRefund(signer: string, swapData: StarknetSwapData, check?: boolean, initAta?: boolean, feeRate?: string): Promise<StarknetTx[]>;
     txsRefundWithAuthorization(signer: string, swapData: StarknetSwapData, { timeout, prefix, signature }: {
         timeout: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-starknet",
-  "version": "6.0.0-beta.1",
+  "version": "6.0.0-beta.2",
   "description": "Starknet specific base implementation",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/starknet/btcrelay/StarknetBtcRelay.ts

@@ -222,7 +222,7 @@ export class StarknetBtcRelay<B extends BtcBlock>
     public async retrieveLogAndBlockheight(blockData: {blockhash: string}, requiredBlockheight?: number): Promise<{
         header: StarknetBtcStoredHeader,
         height: number
-    } | null> {
+    }> {
         //TODO: we can fetch the blockheight and events in parallel
         const blockHeight = await this.getBlockHeight();
         if(requiredBlockheight!=null && blockHeight < requiredBlockheight) {

package/src/starknet/events/StarknetChainEventsBrowser.ts

@@ -100,7 +100,16 @@ export class StarknetChainEventsBrowser implements ChainEvents<StarknetSwapData>
         claimHandler: IClaimHandler<any, any>
     ): () => Promise<StarknetSwapData> {
         return async () => {
-            const trace: any = await this.provider.getTransactionTrace(event.txHash);
+            let trace: any;
+            try {
+                trace = await this.provider.getTransactionTrace(event.txHash);
+            } catch (e) {
+                this.logger.warn("getSwapDataGetter(): getter: starknet_traceTransaction not supported by the RPC: ", e);
+                const blockTraces: any[] = await this.provider.getBlockTransactionsTraces(event.blockHash);
+                const foundTrace = blockTraces.find(val => toHex(val.transaction_hash)===toHex(event.txHash));
+                if(foundTrace==null) throw new Error(`Cannot find ${event.txHash} in the block traces, block: ${event.blockHash}`);
+                trace = foundTrace.trace_root;
+            }
             if(trace==null) return null;
             if(trace.execute_invocation.revert_reason!=null) return null;
             return this.findInitSwapData(trace.execute_invocation as any, event.params.escrow_hash, claimHandler);

package/src/starknet/swaps/StarknetSwapContract.ts

@@ -464,7 +464,7 @@ export class StarknetSwapContract
         synchronizer?: RelaySynchronizer<StarknetBtcStoredHeader, StarknetTx, any>,
         initAta?: boolean,
         feeRate?: string
-    ): Promise<StarknetTx[] | null> {
+    ): Promise<StarknetTx[]> {
         return this.Claim.txsClaimWithTxData(
             typeof(signer)==="string" ? signer : signer.getAddress(),
             swapData,