Merge pull request #906 from starknet-io/feat/request-counter

Feat/request counter

Author: tabaktoni

__tests__/config/jest.setup.ts

@@ -38,8 +38,9 @@ if (process.env.DEBUG === 'true') {
 
     response(response) {
       const cloned = response.clone();
-      cloned.json().then(({ result }) => {
-        const match: any = combiner.find((it: any) => typeof it.result === 'undefined');
+      cloned.json().then((res) => {
+        const { result } = res;
+        const match: any = combiner.find((it: any) => it.request.body.id === res.id);
         if (match && 'request' in match) {
           match.result = result;
           console.log(util.inspect(match, false, null, true /* enable colors */));

src/channel/rpc_0_6.ts

@@ -42,6 +42,8 @@ export class RpcChannel {
 
   readonly retries: number;
 
+  public requestId: number;
+
   readonly blockIdentifier: BlockIdentifier;
 
   private chainId?: StarknetChainId;
@@ -65,6 +67,7 @@ export class RpcChannel {
     this.blockIdentifier = blockIdentifier || defaultOptions.blockIdentifier;
     this.chainId = chainId;
     this.waitMode = waitMode || false;
+    this.requestId = 0;
   }
 
   public fetch(method: string, params?: object, id: string | number = 0) {
@@ -102,7 +105,7 @@ export class RpcChannel {
     params?: RPC.Methods[T]['params']
   ): Promise<RPC.Methods[T]['result']> {
     try {
-      const rawResult = await this.fetch(method, params);
+      const rawResult = await this.fetch(method, params, (this.requestId += 1));
       const { error, result } = await rawResult.json();
       this.errorHandler(method, params, error);
       return result as RPC.Methods[T]['result'];