adjustments

forta-network · Nov 1, 2023 · 149bc7d · 149bc7d
1 parent 70669a4
commit 149bc7d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/cli/commands/run/server/agent.proto b/cli/commands/run/server/agent.proto
@@ -296,16 +296,16 @@ message AlertEvent {
 
     message SourceAlertEvent {
       string botId = 1;
-      string alertHash = 2;
+      string hash = 2;
       string timestamp = 3;
-      string chainId = 4;
+      uint64 chainId = 4;
     }
 
     message Source {
       string transactionHash = 1;
       Bot bot = 2;
       Block block = 3;
-      SourceAlertEvent sourceEvent = 4;
+      SourceAlertEvent sourceAlert = 4;
     }
 
     message Label {
@@ -315,6 +315,7 @@ message AlertEvent {
       string entityType = 4;
       bool remove = 5;
       repeated string metadata = 6;
+      string uniqueKey = 7;
     }
 
     // Unique string to identify this class of finding,

diff --git a/python-sdk/src/forta_agent/alerts_api.py b/python-sdk/src/forta_agent/alerts_api.py
@@ -182,6 +182,7 @@ def get_query(self):
                         entityType
                         remove
                         metadata
+                        uniqueKey
                     }
                     addressBloomFilter {
                         bitset

diff --git a/python-sdk/src/forta_agent/label.py b/python-sdk/src/forta_agent/label.py
@@ -21,7 +21,7 @@ def __init__(self, dict):
         self.confidence = dict['confidence']
         self.label = dict['label']
         self.remove = dict.get('remove', False)
-        self.unique_key = dict.get('uniqueKey', False)
+        self.unique_key = dict.get('unique_key', dict.get('uniqueKey'))
         self.metadata = dict.get('metadata') if dict.get(
             'metadata') is not None else {}
         # if metadata is array, convert to map
@@ -35,6 +35,7 @@ def __init__(self, dict):
     def toDict(self):
         d = dict(self.__dict__, **{
             'entityType': self.entity_type,
+            'uniqueKey': self.unique_key,
         })
         return {k: v for k, v in d.items() if v is not None}
 

diff --git a/sdk/alerts.api.ts b/sdk/alerts.api.ts
@@ -233,6 +233,7 @@ const getQueryFromAlertOptions = (options: AlertQueryOptions) => {
                                 entityType
                                 remove
                                 metadata
+                                uniqueKey
                             }
                             addressBloomFilter {
                                 bitset

diff --git a/sdk/labels.api.ts b/sdk/labels.api.ts
@@ -131,6 +131,7 @@ export const getQueryFromLabelOptions = (options: LabelQueryOptions) => {
                                 label
                                 metadata
                                 remove
+                                uniqueKey
                             }
                             source {
                               alertHash