Update deployments and tests for validator based activation

stakewise · Mar 19, 2021 · e062f27 · e062f27
1 parent 4c04f80
commit e062f27
Show file tree

Hide file tree

Showing 17 changed files with 442 additions and 866 deletions.
diff --git a/abi/IOracles.json b/abi/IOracles.json
@@ -1,23 +1,4 @@
 [
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "bool",
-        "name": "enabled",
-        "type": "bool"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      }
-    ],
-    "name": "DepositsActivationToggled",
-    "type": "event"
-  },
   {
     "anonymous": false,
     "inputs": [
@@ -61,13 +42,7 @@
       {
         "indexed": false,
         "internalType": "uint256",
-        "name": "activationDuration",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "totalStakingAmount",
+        "name": "activatedValidators",
         "type": "uint256"
       }
     ],
@@ -119,19 +94,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "depositsActivationEnabled",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -146,12 +108,7 @@
       },
       {
         "internalType": "uint256",
-        "name": "_activationDuration",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_totalStakingAmount",
+        "name": "_activatedValidators",
         "type": "uint256"
       }
     ],
@@ -224,30 +181,12 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "bool",
-        "name": "_depositsActivationEnabled",
-        "type": "bool"
-      }
-    ],
-    "name": "toggleDepositsActivation",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [
       {
         "internalType": "address",
         "name": "_pool",
         "type": "address"
-      },
-      {
-        "internalType": "bool",
-        "name": "_depositsActivationEnabled",
-        "type": "bool"
       }
     ],
     "name": "upgrade",
@@ -264,12 +203,7 @@
       },
       {
         "internalType": "uint256",
-        "name": "_activationDuration",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_totalStakingAmount",
+        "name": "_activatedValidators",
         "type": "uint256"
       }
     ],

diff --git a/abi/IPool.json b/abi/IPool.json
@@ -11,7 +11,7 @@
       {
         "indexed": false,
         "internalType": "uint256",
-        "name": "activationTime",
+        "name": "validatorIndex",
         "type": "uint256"
       },
       {
@@ -36,7 +36,7 @@
       {
         "indexed": false,
         "internalType": "uint256",
-        "name": "activationDuration",
+        "name": "activatedValidators",
         "type": "uint256"
       },
       {
@@ -46,7 +46,7 @@
         "type": "address"
       }
     ],
-    "name": "ActivationDurationUpdated",
+    "name": "ActivatedValidatorsUpdated",
     "type": "event"
   },
   {
@@ -61,7 +61,7 @@
       {
         "indexed": false,
         "internalType": "uint256",
-        "name": "activationTime",
+        "name": "validatorIndex",
         "type": "uint256"
       },
       {
@@ -99,7 +99,7 @@
       {
         "indexed": false,
         "internalType": "uint256",
-        "name": "minActivatingShare",
+        "name": "pendingValidatorsLimit",
         "type": "uint256"
       },
       {
@@ -109,26 +109,7 @@
         "type": "address"
       }
     ],
-    "name": "MinActivatingShareUpdated",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "totalStakingAmount",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      }
-    ],
-    "name": "TotalStakingAmountUpdated",
+    "name": "PendingValidatorsLimitUpdated",
     "type": "event"
   },
   {
@@ -172,7 +153,7 @@
       },
       {
         "internalType": "uint256",
-        "name": "_activationTime",
+        "name": "_validatorIndex",
         "type": "uint256"
       }
     ],
@@ -190,7 +171,7 @@
       },
       {
         "internalType": "uint256[]",
-        "name": "_activationTimes",
+        "name": "_validatorIndexes",
         "type": "uint256[]"
       }
     ],
@@ -201,7 +182,7 @@
   },
   {
     "inputs": [],
-    "name": "activationDuration",
+    "name": "activatedValidators",
     "outputs": [
       {
         "internalType": "uint256",
@@ -221,7 +202,7 @@
       },
       {
         "internalType": "uint256",
-        "name": "activationTime",
+        "name": "validatorIndex",
         "type": "uint256"
       }
     ],
@@ -258,7 +239,20 @@
   },
   {
     "inputs": [],
-    "name": "minActivatingShare",
+    "name": "pendingValidators",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "pendingValidatorsLimit",
     "outputs": [
       {
         "internalType": "uint256",
@@ -303,11 +297,11 @@
     "inputs": [
       {
         "internalType": "uint256",
-        "name": "_activationDuration",
+        "name": "_activatedValidators",
         "type": "uint256"
       }
     ],
-    "name": "setActivationDuration",
+    "name": "setActivatedValidators",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
@@ -329,24 +323,11 @@
     "inputs": [
       {
         "internalType": "uint256",
-        "name": "_minActivatingShare",
-        "type": "uint256"
-      }
-    ],
-    "name": "setMinActivatingShare",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_totalStakingAmount",
+        "name": "_pendingValidatorsLimit",
         "type": "uint256"
       }
     ],
-    "name": "setTotalStakingAmount",
+    "name": "setPendingValidatorsLimit",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
@@ -364,32 +345,6 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "totalCollectedAmount",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "totalStakingAmount",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -399,12 +354,12 @@
       },
       {
         "internalType": "uint256",
-        "name": "_activationDuration",
+        "name": "_activatedValidators",
         "type": "uint256"
       },
       {
         "internalType": "uint256",
-        "name": "_totalStakingAmount",
+        "name": "_pendingValidators",
         "type": "uint256"
       },
       {
@@ -414,7 +369,7 @@
       },
       {
         "internalType": "uint256",
-        "name": "_minActivatingShare",
+        "name": "_pendingValidatorsLimit",
         "type": "uint256"
       }
     ],