feat: upgrade rss3 staking contract

RSS3-Network · Jan 11, 2024 · 97262e7 · 97262e7
1 parent 36f7f6b
commit 97262e7
Show file tree

Hide file tree

Showing 4 changed files with 200 additions and 92 deletions.
diff --git a/common/ethereum/contract/staking/abi/Staking.abi b/common/ethereum/contract/staking/abi/Staking.abi
@@ -1085,19 +1085,9 @@
     {
         "inputs": [
             {
-                "internalType": "uint256",
-                "name": "epoch",
-                "type": "uint256"
-            },
-            {
-                "internalType": "uint256",
-                "name": "startTimestamp",
-                "type": "uint256"
-            },
-            {
-                "internalType": "uint256",
-                "name": "endTimestamp",
-                "type": "uint256"
+                "internalType": "uint256[3]",
+                "name": "epochInfo",
+                "type": "uint256[3]"
             },
             {
                 "internalType": "address[]",
@@ -1206,12 +1196,12 @@
                     },
                     {
                         "internalType": "uint256",
-                        "name": "operatingPool",
+                        "name": "operatingPoolTokens",
                         "type": "uint256"
                     },
                     {
                         "internalType": "uint256",
-                        "name": "stakingPool",
+                        "name": "stakingPoolTokens",
                         "type": "uint256"
                     },
                     {
@@ -1221,7 +1211,7 @@
                     },
                     {
                         "internalType": "uint256",
-                        "name": "slashedAmount",
+                        "name": "slashedTokens",
                         "type": "uint256"
                     }
                 ],
@@ -1246,6 +1236,72 @@
         "stateMutability": "view",
         "type": "function"
     },
+    {
+        "inputs": [
+            {
+                "internalType": "address[]",
+                "name": "nodeAddrs",
+                "type": "address[]"
+            }
+        ],
+        "name": "getNodes",
+        "outputs": [
+            {
+                "components": [
+                    {
+                        "internalType": "address",
+                        "name": "account",
+                        "type": "address"
+                    },
+                    {
+                        "internalType": "uint64",
+                        "name": "taxFraction",
+                        "type": "uint64"
+                    },
+                    {
+                        "internalType": "bool",
+                        "name": "publicGood",
+                        "type": "bool"
+                    },
+                    {
+                        "internalType": "string",
+                        "name": "name",
+                        "type": "string"
+                    },
+                    {
+                        "internalType": "string",
+                        "name": "description",
+                        "type": "string"
+                    },
+                    {
+                        "internalType": "uint256",
+                        "name": "operatingPoolTokens",
+                        "type": "uint256"
+                    },
+                    {
+                        "internalType": "uint256",
+                        "name": "stakingPoolTokens",
+                        "type": "uint256"
+                    },
+                    {
+                        "internalType": "uint256",
+                        "name": "totalShares",
+                        "type": "uint256"
+                    },
+                    {
+                        "internalType": "uint256",
+                        "name": "slashedTokens",
+                        "type": "uint256"
+                    }
+                ],
+                "internalType": "struct DataTypes.Node[]",
+                "name": "nodes",
+                "type": "tuple[]"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
     {
         "inputs": [
             {
@@ -1259,7 +1315,7 @@
                 "type": "uint256"
             }
         ],
-        "name": "getNodes",
+        "name": "getNodesWithPagination",
         "outputs": [
             {
                 "components": [
@@ -1290,12 +1346,12 @@
                     },
                     {
                         "internalType": "uint256",
-                        "name": "operatingPool",
+                        "name": "operatingPoolTokens",
                         "type": "uint256"
                     },
                     {
                         "internalType": "uint256",
-                        "name": "stakingPool",
+                        "name": "stakingPoolTokens",
                         "type": "uint256"
                     },
                     {
@@ -1305,7 +1361,7 @@
                     },
                     {
                         "internalType": "uint256",
-                        "name": "slashedAmount",
+                        "name": "slashedTokens",
                         "type": "uint256"
                     }
                 ],
@@ -1400,12 +1456,12 @@
         "outputs": [
             {
                 "internalType": "uint256",
-                "name": "totalOperatingPool",
+                "name": "totalOperatingPoolTokens",
                 "type": "uint256"
             },
             {
                 "internalType": "uint256",
-                "name": "totalStakingPool",
+                "name": "totalStakingPoolTokens",
                 "type": "uint256"
             },
             {
@@ -1450,12 +1506,12 @@
                     },
                     {
                         "internalType": "uint256",
-                        "name": "operatingPool",
+                        "name": "operatingPoolTokens",
                         "type": "uint256"
                     },
                     {
                         "internalType": "uint256",
-                        "name": "stakingPool",
+                        "name": "stakingPoolTokens",
                         "type": "uint256"
                     },
                     {
@@ -1465,7 +1521,7 @@
                     },
                     {
                         "internalType": "uint256",
-                        "name": "slashedAmount",
+                        "name": "slashedTokens",
                         "type": "uint256"
                     }
                 ],