allow to choose which api to use for traces and statediffs

Author: tmcgroul

evm/evm-data-service/src/data-source/setup.ts

@@ -10,18 +10,19 @@ const log = createLogger('sqd:evm-data-service/data-source')
 
 export interface DataSourceOptions {
     httpRpc: string,
-    ratelimit: number | undefined,
-    traces: boolean | undefined,
-    diffs: boolean | undefined,
-    receipts: boolean | undefined,
+    ratelimit?: number,
+    traces?: boolean,
+    diffs?: boolean,
+    receipts?: boolean,
+    useTraceApi?: boolean,
+    useDebugApiForStateDiffs?: boolean
 }
 
 
 export function createDataSource(options: DataSourceOptions): DataSource<Block> {
     let httpRpcClient = new RpcClient({
         url: options.httpRpc,
         capacity: 50,
-        fixUnsafeIntegers: true,
         requestTimeout: 16000,
         // retryAttempts: 5,
         // retrySchedule: [500, 1000, 2000, 5000, 10000, 20000],
@@ -36,6 +37,8 @@ export function createDataSource(options: DataSourceOptions): DataSource<Block>
             receipts: options.receipts,
             traces: options.traces,
             stateDiffs: options.diffs,
+            useTraceApi: options.useTraceApi,
+            useDebugApiForStateDiffs: options.useDebugApiForStateDiffs,
         }
     })
     return new Mapping(rpcSource)

evm/evm-data-service/src/main.ts

@@ -20,30 +20,33 @@ runProgram(async () => {
     program.option('-p, --port <number>', 'Port to listen on', positiveInt, 3000)
     program.option('-r, --ratelimit <number>', 'Ratelimit', positiveInt)
     program.option('--traces', 'Force enable traces')
-    program.option('--no-traces', "Force disable traces")
     program.option('--diffs', 'Force enable diffs')
-    program.option('--no-diffs', "Force disable diffs")
     program.option('--receipts', 'Force enable receipts')
-    program.option('--no-receipts', "Force disable receipts")
+    program.option('--use-trace-api', 'Use trace_* API for statediffs and call traces')
+    program.option('--use-debug-api-for-statediffs', 'Use debug prestateTracer to fetch statediffs (by default will use trace_* api)')
     program.parse()
 
     let args = program.opts() as {
         httpRpc: string
         wsRpc?: string
         blockCacheSize: number
-        port: number,
-        traces?: boolean,
-        diffs?: boolean,
+        port: number
+        traces?: boolean
+        diffs?: boolean
         receipts?: boolean
         ratelimit?: number
+        useTraceApi?: boolean
+        useDebugApiForStatediffs?: boolean
     }
 
     let dataSourceOptions: DataSourceOptions = {
         httpRpc: args.httpRpc,
+        ratelimit: args.ratelimit,
         traces: args.traces,
         diffs: args.diffs,
         receipts: args.receipts,
-        ratelimit: args.ratelimit
+        useTraceApi: args.useTraceApi,
+        useDebugApiForStateDiffs: args.useDebugApiForStatediffs
     }
 
     let mainWorker = new WorkerClient(dataSourceOptions)

evm/evm-dump/src/dumper.ts

@@ -48,6 +48,8 @@ export class EvmDumper extends Dumper<Block, Options> {
                 receipts: this.options().withReceipts,
                 traces: this.options().withTraces,
                 stateDiffs: this.options().withStatediffs,
+                useDebugApiForStateDiffs: this.options().useDebugApiForStatediffs,
+                useTraceApi: this.options().useTraceApi,
             },
         })
     }