Merge pull request #88 from OpenZeppelin/feature/plat-6599-remove-forta-related-integrations-from-dac

feat: plat-6599 remove forta related integrations from dac

Author: pasevin

examples/defender-test-project/serverless.yml

@@ -185,37 +185,6 @@ resources:
           - signature: 'renounceOwnership()'
             expression: null # optional
         transaction: 'gasPrice > 0' # optional expression
-    forta-example:
-      name: 'Forta Example'
-      type: 'FORTA'
-      # optional
-      alert-threshold:
-        amount: 2
-        window-seconds: 3600
-      # optional
-      paused: false
-      # optional
-      action-condition: ${self:resources.actions.action-example-1}
-      # optional
-      action-trigger: null
-      notify-config:
-        timeout: 0 # optional
-        message: null # optional
-        channels: [] # optional
-      # optional
-      conditions:
-        min-scanner-count: 1
-        severity: 2 # optional (unknown=0, info=1, low=2, medium=3, high=4, critical=5)
-        # optional
-        alert-ids:
-          - '0x1ef2600454e8ed808cc0411a4d653679cc7a1b73d320388cee1e0fc0412490a3'
-      # optional
-      forta-node-id: '123'
-      # optional if addresses is defined
-      agent-ids:
-        - '0x8fe07f1a4d33b30be2387293f052c273660c829e9a6965cf7e8d485bcb871083'
-      # optional
-      forta-last-processed-time: null
 
   forked-networks:
     mainnet-fork:

package.json

@@ -59,7 +59,7 @@
     "@types/serverless": "^3.12.8",
     "@typescript-eslint/eslint-plugin": "^5.36.2",
     "@typescript-eslint/parser": "^5.36.2",
-    "code-style": "https://github.com/OpenZeppelin/code-style.git",
+    "code-style": "github:OpenZeppelin/code-style",
     "eslint": "^8.23.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-prettier": "^4.2.1",
@@ -70,7 +70,7 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "@openzeppelin/defender-sdk": "^2.2.0",
+    "@openzeppelin/defender-sdk": "^2.6.0",
     "keccak256": "^1.0.6",
     "lodash": "^4.17.21",
     "prompt": "^1.3.0"

src/cmd/deploy.ts

@@ -50,7 +50,6 @@ import {
   DefenderMonitorTrigger,
   DefenderMonitorFilterTrigger,
   DefenderBlockExplorerApiKey,
-  DefenderFortaMonitorResponse,
   DefenderBlockMonitorResponse,
   Resources,
   DefenderTenantNetwork,
@@ -944,7 +943,6 @@ export default class DefenderDeploy {
         retrieveExisting,
         // on update
         async (monitor: Monitor, match: DefenderMonitor) => {
-          const isForta = (o: DefenderMonitor): o is DefenderFortaMonitorResponse => o.type === 'FORTA';
           const isBlock = (o: DefenderMonitor): o is DefenderBlockMonitorResponse => o.type === 'BLOCK';
 
           // Warn users when they try to change the monitor network
@@ -1018,14 +1016,8 @@ export default class DefenderDeploy {
               blockConditions &&
               blockConditions[0]!.txConditions.length > 0 &&
               blockConditions[0]!.txConditions[0]!.expression,
-            privateFortaNodeId: (isForta(match) && match.privateFortaNodeId) || undefined,
-            addresses: isBlock(match) ? addressRule && addressRule.addresses : match.fortaRule?.addresses,
-            actionCondition: isBlock(match)
-              ? addressRule && addressRule.actionCondition?.actionId
-              : match.fortaRule?.actionCondition?.actionId,
-            fortaLastProcessedTime: (isForta(match) && match.fortaLastProcessedTime) || undefined,
-            agentIDs: (isForta(match) && match.fortaRule?.agentIDs) || undefined,
-            fortaConditions: (isForta(match) && match.fortaRule.conditions) || undefined,
+            addresses: addressRule && addressRule.addresses,
+            actionCondition: addressRule && addressRule.actionCondition?.actionId,
             riskCategory: match.riskCategory,
           };