extend addTrace with callFrom (#232)

subsquid · Feb 17, 2024 · 587d5f5 · 587d5f5
1 parent 0ea7ccf
commit 587d5f5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/common/changes/@subsquid/evm-processor/call-from_2024-02-15-13-39.json b/common/changes/@subsquid/evm-processor/call-from_2024-02-15-13-39.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@subsquid/evm-processor",
+      "comment": "extend `.addTrace()` with `callFrom` filter",
+      "type": "minor"
+    }
+  ],
+  "packageName": "@subsquid/evm-processor"
+}
diff --git a/evm/evm-processor/src/ds-rpc/filter.ts b/evm/evm-processor/src/ds-rpc/filter.ts
@@ -54,6 +54,7 @@ function buildTraceFilter(dataRequest: DataRequest): EntityFilter<Trace, {
             type,
             createFrom,
             callTo,
+            callFrom,
             callSighash,
             suicideRefundAddress,
             rewardAuthor,
@@ -63,6 +64,7 @@ function buildTraceFilter(dataRequest: DataRequest): EntityFilter<Trace, {
         filter.propIn('type', type as Trace['type'][])
         filter.getIn(trace => trace.type === 'create' && assertNotNull(trace.action?.from), createFrom)
         filter.getIn(trace => trace.type === 'call' && assertNotNull(trace.action?.to), callTo)
+        filter.getIn(trace => trace.type === 'call' && assertNotNull(trace.action?.from), callFrom)
         filter.getIn(trace => trace.type === 'call' && assertNotNull(trace.action?.sighash), callSighash)
         filter.getIn(trace => trace.type === 'suicide' && assertNotNull(trace.action?.refundAddress), suicideRefundAddress)
         filter.getIn(trace => trace.type === 'reward' && assertNotNull(trace.action?.author), rewardAuthor)

diff --git a/evm/evm-processor/src/interfaces/data-request.ts b/evm/evm-processor/src/interfaces/data-request.ts
@@ -39,6 +39,7 @@ export interface TraceRequest {
     type?: string[]
     createFrom?: Bytes20[]
     callTo?: Bytes20[]
+    callFrom?: Bytes20[]
     callSighash?: Bytes[]
     suicideRefundAddress?: Bytes[]
     rewardAuthor?: Bytes20[]

diff --git a/evm/evm-processor/src/mapping/schema.ts b/evm/evm-processor/src/mapping/schema.ts
@@ -137,7 +137,7 @@ export function getTraceFrameValidator(fields: FieldSelection['trace'], forArchi
 
     let traceCallAction = project({
         callType: fields?.callCallType,
-        from: fields?.callFrom,
+        from: forArchive ? fields?.callFrom : true,
         to: forArchive ? fields?.callTo : true,
         value: fields?.callValue,
         gas: fields?.callGas,