Release, final clean-up

forta-network · Dec 12, 2023 · b19669a · b19669a
1 parent 91c501e
commit b19669a
Show file tree

Hide file tree

Showing 8 changed files with 682 additions and 209 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
diff --git a/contracts/components/staking/slashing/SlashingController.sol b/contracts/components/staking/slashing/SlashingController.sol
@@ -50,6 +50,7 @@ contract SlashingController is BaseComponentUpgradeable, StateMachineController,
     mapping(uint256 => uint256) public deposits; // proposalId --> tokenAmount
     mapping(bytes32 => SlashPenalty) public penalties; // penaltyId --> SlashPenalty
     ISlashingExecutor public slashingExecutor;
+    /// @custom:oz-renamed-from stakingParameters
     StakeSubjectGateway public subjectGateway; // Should be immutable, but it's already deployed.
     uint256 public depositAmount;
     uint256 public slashPercentToProposer;

diff --git a/releases/1.2.10/index.yml b/releases/1.2.10/index.yml
@@ -4,4 +4,15 @@ deploy: prepare-upgrade 1.2.10
 verify: verify-deployed
 finish: propose-admin
 description: |
-  release/1.2.10
+  ## Deployed new implementations:
+  - AccessManager
+  - AgentRegistry
+  - ScannerPoolRegistry
+  - Dispatch
+  - StakeAllocator
+  - RewardsDistributor
+  - StakeSubjectGateway
+  - SlashingController
+  - FortaStaking
+  - ScannerNodeVersion
+  - ScannerToScannerPoolMigration
diff --git a/releases/1.2.10/mumbai/config/propose-admin.json b/releases/1.2.10/mumbai/config/propose-admin.json
@@ -0,0 +1,10 @@
+{
+    "AccessManager": [
+        {
+            "methodName": "grantRole",
+            "params": [
+                ["roles.SLASHER_ROLE", "deployment.slashing-controller"]
+            ]
+        }
+    ]
+}
diff --git a/releases/1.2.10/mumbai/config/upgrade.json b/releases/1.2.10/mumbai/config/upgrade.json
@@ -1,4 +1,115 @@
 {
+    "AccessManager": {
+        "impl": {
+            "opts": {
+                "unsafe-allow": [
+                    "delegatecall"
+                ],
+                "constructor-args": [
+                    "deployment.forwarder"
+                ]
+            }
+        }
+    },
+    "AgentRegistry": {
+        "impl": {
+            "opts": {
+                "unsafe-allow": [
+                    "delegatecall"
+                ],
+                "constructor-args": [
+                    "deployment.forwarder"
+                ]
+            }
+        }
+    },
+    "ScannerPoolRegistry": {
+        "impl": {
+            "opts": {
+                "unsafe-allow": [
+                    "delegatecall"
+                ],
+                "constructor-args": [
+                    "deployment.forwarder", "deployment.stake-allocator"
+                ]
+            }
+
+        }
+    },
+    "Dispatch": {
+        "impl": {
+            "opts": {
+                "unsafe-allow": [
+                    "delegatecall"
+                ],
+                "constructor-args": [
+                    "deployment.forwarder"
+                ]
+            }
+        }
+    },
+    "StakeAllocator": {
+        "impl": {
+            "opts": {
+                "unsafe-allow": [
+                    "delegatecall"
+                ],
+                "constructor-args": [
+                    "deployment.forwarder", "deployment.stake-subject-gateway", "deployment.rewards-distributor"
+                ]
+            }
+
+        }
+    },
+    "RewardsDistributor": {
+        "impl": {
+            "opts": {
+                "unsafe-allow": [
+                    "delegatecall"
+                ],
+                "constructor-args": [
+                    "deployment.forwarder", "deployment.forta", "deployment.stake-subject-gateway"
+                ]
+            }
+
+        }
+    },
+    "StakeSubjectGateway": {
+        "impl": {
+            "opts": {
+                "unsafe-allow": [
+                    "delegatecall"
+                ],
+                "constructor-args": [
+                    "deployment.forwarder"
+                ]
+            }
+        }
+    },
+    "FortaStaking": {
+        "impl": {
+            "opts": {
+                "unsafe-allow": [
+                    "delegatecall"
+                ],
+                "constructor-args": [
+                    "deployment.forwarder"
+                ]
+            }
+        }
+    },
+    "SlashingController": {
+        "impl": {
+            "opts": {
+                "unsafe-allow": [
+                    "delegatecall"
+                ],
+                "constructor-args": [
+                    "deployment.forwarder", "deployment.forta"
+                ]
+            }
+        }
+    },
     "ScannerNodeVersion": {
         "impl": {
             "opts": {

diff --git a/releases/1.2.10/mumbai/output/prepared-upgrades.json b/releases/1.2.10/mumbai/output/prepared-upgrades.json
@@ -1,4 +1,118 @@
 {
+	"access-manager": {
+		"impl": {
+			"address": "0x5Da21607E9e2bCA241E0EA46e27cea3bB8404505",
+			"constructor-args": [
+				"0x4E29Cea6D64be860f5eAba110686DcB585f393D6"
+			],
+			"init-args": [],
+			"name": "AccessManager",
+			"timeout": 1200000,
+			"version": "0.1.0"
+		}
+	},
+	"agent-registry": {
+		"impl": {
+			"address": "0xD25Fd5B722606d08A5DdCD00e969513d06d98d89",
+			"constructor-args": [
+				"0x4E29Cea6D64be860f5eAba110686DcB585f393D6"
+			],
+			"init-args": [],
+			"name": "AgentRegistry",
+			"timeout": 1200000,
+			"version": "0.1.6"
+		}
+	},
+	"scanner-pool-registry": {
+		"impl": {
+			"address": "0x72eaaBB3f5908D5Ac4Fce00285B5af120BA3EcAC",
+			"constructor-args": [
+				"0x4E29Cea6D64be860f5eAba110686DcB585f393D6",
+				"0x698A6400dE3865fC9E8A6dB22302AAb3372Cebd9"
+			],
+			"init-args": [],
+			"name": "ScannerPoolRegistry",
+			"timeout": 1200000,
+			"version": "0.1.0"
+		}
+	},
+	"dispatch": {
+		"impl": {
+			"address": "0x0ed550214869C3c3D5C05b97A8Bb9388125C4919",
+			"constructor-args": [
+				"0x4E29Cea6D64be860f5eAba110686DcB585f393D6"
+			],
+			"init-args": [],
+			"name": "Dispatch",
+			"timeout": 1200000,
+			"version": "0.1.5"
+		}
+	},
+	"stake-allocator": {
+		"impl": {
+			"address": "0x70FBC65e20DFe5ACDA5665f98A6CdA98800cC637",
+			"constructor-args": [
+				"0x4E29Cea6D64be860f5eAba110686DcB585f393D6",
+				"0x02304eC24ba2996a83F595D7cf80e5571a406EFA",
+				"0x404afc59Cacd74A28d0D5651460Cc950b42FAf08"
+			],
+			"init-args": [],
+			"name": "StakeAllocator",
+			"timeout": 1200000,
+			"version": "0.1.0"
+		}
+	},
+	"rewards-distributor": {
+		"impl": {
+			"address": "0x09803F257AB3D8a390837640ED9D9F4Eb22c1453",
+			"constructor-args": [
+				"0x4E29Cea6D64be860f5eAba110686DcB585f393D6",
+				"0x107Ac13567b1b5D84691f890A5bA07EdaE1a11c3",
+				"0x02304eC24ba2996a83F595D7cf80e5571a406EFA"
+			],
+			"init-args": [],
+			"name": "RewardsDistributor",
+			"timeout": 1200000,
+			"version": "0.1.0"
+		}
+	},
+	"stake-subject-gateway": {
+		"impl": {
+			"address": "0x40998890c1ad5B22CBe2deB9671E9df91b79dd16",
+			"constructor-args": [
+				"0x4E29Cea6D64be860f5eAba110686DcB585f393D6"
+			],
+			"init-args": [],
+			"name": "StakeSubjectGateway",
+			"timeout": 1200000,
+			"version": "0.1.1"
+		}
+	},
+	"forta-staking": {
+		"impl": {
+			"address": "0x8fd9d47e80f1d711aA97C4926e5E7CB3462455E8",
+			"constructor-args": [
+				"0x4E29Cea6D64be860f5eAba110686DcB585f393D6"
+			],
+			"init-args": [],
+			"name": "FortaStaking",
+			"timeout": 1200000,
+			"version": "0.1.2"
+		}
+	},
+	"slashing-controller": {
+		"impl": {
+			"address": "0xC43E5C075e4081209F337f0431D8c488Cd61B522",
+			"constructor-args": [
+				"0x4E29Cea6D64be860f5eAba110686DcB585f393D6",
+				"0x107Ac13567b1b5D84691f890A5bA07EdaE1a11c3"
+			],
+			"init-args": [],
+			"name": "SlashingController",
+			"timeout": 1200000,
+			"version": "0.1.1"
+		}
+	},
 	"scanner-node-version": {
 		"impl": {
 			"address": "0xAA42d92242eA0a6195452C6B64B4Dc5D4282e0a5",
@@ -26,4 +140,5 @@
 			"version": "0.1.0"
 		}
 	}
-}
+}
+
diff --git a/releases/1.2.10/polygon/config/upgrade.json b/releases/1.2.10/polygon/config/upgrade.json
@@ -1,4 +1,115 @@
 {
+    "AccessManager": {
+        "impl": {
+            "opts": {
+                "unsafe-allow": [
+                    "delegatecall"
+                ],
+                "constructor-args": [
+                    "deployment.forwarder"
+                ]
+            }
+        }
+    },
+    "AgentRegistry": {
+        "impl": {
+            "opts": {
+                "unsafe-allow": [
+                    "delegatecall"
+                ],
+                "constructor-args": [
+                    "deployment.forwarder"
+                ]
+            }
+        }
+    },
+    "ScannerPoolRegistry": {
+        "impl": {
+            "opts": {
+                "unsafe-allow": [
+                    "delegatecall"
+                ],
+                "constructor-args": [
+                    "deployment.forwarder", "deployment.stake-allocator"
+                ]
+            }
+
+        }
+    },
+    "Dispatch": {
+        "impl": {
+            "opts": {
+                "unsafe-allow": [
+                    "delegatecall"
+                ],
+                "constructor-args": [
+                    "deployment.forwarder"
+                ]
+            }
+        }
+    },
+    "StakeAllocator": {
+        "impl": {
+            "opts": {
+                "unsafe-allow": [
+                    "delegatecall"
+                ],
+                "constructor-args": [
+                    "deployment.forwarder", "deployment.stake-subject-gateway", "deployment.rewards-distributor"
+                ]
+            }
+
+        }
+    },
+    "RewardsDistributor": {
+        "impl": {
+            "opts": {
+                "unsafe-allow": [
+                    "delegatecall"
+                ],
+                "constructor-args": [
+                    "deployment.forwarder", "deployment.forta", "deployment.stake-subject-gateway"
+                ]
+            }
+
+        }
+    },
+    "StakeSubjectGateway": {
+        "impl": {
+            "opts": {
+                "unsafe-allow": [
+                    "delegatecall"
+                ],
+                "constructor-args": [
+                    "deployment.forwarder"
+                ]
+            }
+        }
+    },
+    "FortaStaking": {
+        "impl": {
+            "opts": {
+                "unsafe-allow": [
+                    "delegatecall"
+                ],
+                "constructor-args": [
+                    "deployment.forwarder"
+                ]
+            }
+        }
+    },
+    "SlashingController": {
+        "impl": {
+            "opts": {
+                "unsafe-allow": [
+                    "delegatecall"
+                ],
+                "constructor-args": [
+                    "deployment.forwarder", "deployment.forta"
+                ]
+            }
+        }
+    },
     "ScannerNodeVersion": {
         "impl": {
             "opts": {