Merge branch 'master' into vishal/metrika_node_monitoring

onflow · May 4, 2023 · 89593c9 · 89593c9
2 parents 4f8d750 + 91ad8ba
commit 89593c9
Show file tree

Hide file tree

Showing 20 changed files with 849 additions and 199 deletions.
diff --git a/docs/content/node-operation/upcoming-sporks.mdx b/docs/content/node-operation/upcoming-sporks.mdx
@@ -9,6 +9,10 @@ The following are the upcoming Spork dates. These dates indicate the intention t
 
 | Mainnet Spork Date | Spork Info                                          | Testnet Spork Date                             | Spork Info |
 | :----------------- | :---------------------------------------------------| ---------------------------------------------- | ---------- |
+| June, 2023         | Mainnet 23                                          | Apr 12, 2023 —> June, 2023                     | Devnet43   |
+|                    |                                                     | Apr 12, 2023                                   | Devnet42   |
+| Feb 22, 2023       | Mainnet 22                                          | Jan 30, 2023 —> Feb 22, 2023                   | Devnet41   |
+|                    |                                                     | Jan 23, 2023                                   | Devnet40   |
 | Jan 18, 2023       | Mainnet 21                                          | Jan 4, 2023 —> Jan 18, 2023                    | Devnet39   |
 | Nov 2, 2022        | Mainnet 20                                          | Oct 19, 2022 —> Nov 2, 2022                    | Devnet38   |
 | Aug 24, 2022       | Mainnet 19                                          | Aug 10, 2022 —> Aug 24, 2022                   | Devnet37   |

diff --git a/docs/content/staking/staking-rewards.mdx b/docs/content/staking/staking-rewards.mdx
@@ -131,73 +131,51 @@ Instead of a separate reward payout transaction, the reward payout events will b
 
 The rewards payout can be queried by querying the block which contains the system chunk that contains the reward payout events.
 ```
-flow events get A.9eca2b38b18b5dfe.FlowIDTableStaking.RewardsPaid --start <block Height> --end <block height> -n mainnet
+flow events get A.8624b52f9ddcd04a.FlowIDTableStaking.RewardsPaid A.8624b52f9ddcd04a.FlowIDTableStaking.DelegatorRewardsPaid --start <block Height> --end <block height> -n mainnet
 
 where block height is the height of the block containing the rewards payout events
 ```
 
-Example (using testnet instead of mainnet)
+Example
 
 ```
-$ flow --host=access.devnet.nodes.onflow.org:9000 events get A.9eca2b38b18b5dfe.FlowIDTableStaking.RewardsPaid --start 96961750 --end 96961750
+$ flow events get A.8624b52f9ddcd04a.FlowIDTableStaking.RewardsPaid --start 51753836 --end 51753836 -n mainnet
 
-Events Block #96961750:
-    Index	48
-    Type	A.9eca2b38b18b5dfe.FlowIDTableStaking.RewardsPaid
-    Tx ID	b302ae591011d2bca9679ee2d7271bc827f86f921f03c2696927d57480b315e3
+Events Block #51753836:
+    Index	6
+    Type	A.8624b52f9ddcd04a.FlowIDTableStaking.RewardsPaid
+    Tx ID	f31815934bff124e332b3c8be5e1c7a949532707251a9f2f81def8cc9f3d1458
     Values
-		- nodeID (String): "4261737469616e204d756c6c65720055a00e2aa117a9a908f57867833819b3c9"
-		- amount (UFix64): 7.43750000
+		- nodeID (String): "a3075cf9280cab4fa0b7b1e639b675bdae3e8874557d98ee78963f0799338a5f"
+		- amount (UFix64): 1660.21200000
 
-    Index	51
-    Type	A.9eca2b38b18b5dfe.FlowIDTableStaking.RewardsPaid
-    Tx ID	b302ae591011d2bca9679ee2d7271bc827f86f921f03c2696927d57480b315e3
+    Index	9
+    Type	A.8624b52f9ddcd04a.FlowIDTableStaking.RewardsPaid
+    Tx ID	f31815934bff124e332b3c8be5e1c7a949532707251a9f2f81def8cc9f3d1458
     Values
-		- nodeID (String): "546172616b2042656e20596f7573736566006237a53e71d7caca97655e05690b"
-		- amount (UFix64): 7.43751951
+		- nodeID (String): "cf0ff514b6aa659914b99ab1d17743edb2b69fbb338ab01945a08530a98c97d4"
+		- amount (UFix64): 3762.20370347
 
-    Index	60
-    Type	A.9eca2b38b18b5dfe.FlowIDTableStaking.RewardsPaid
-    Tx ID	b302ae591011d2bca9679ee2d7271bc827f86f921f03c2696927d57480b315e3
+    Index	12
+    Type	A.8624b52f9ddcd04a.FlowIDTableStaking.RewardsPaid
+    Tx ID	f31815934bff124e332b3c8be5e1c7a949532707251a9f2f81def8cc9f3d1458
     Values
-		- nodeID (String): "cbefb4fa84e843a45abb351c4d1041fda5fdc9517a37c0bed4881ee073681a4d"
-		- amount (UFix64): 0.80325094
+		- nodeID (String): "de988efc8cb79d02876b7beffd404fc24b61c287ebeede567f90056f0eece90f"
+		- amount (UFix64): 939.85630919
 
-    Index	69
-    Type	A.9eca2b38b18b5dfe.FlowIDTableStaking.RewardsPaid
-    Tx ID	b302ae591011d2bca9679ee2d7271bc827f86f921f03c2696927d57480b315e3
+    Index	27
+    Type	A.8624b52f9ddcd04a.FlowIDTableStaking.RewardsPaid
+    Tx ID	f31815934bff124e332b3c8be5e1c7a949532707251a9f2f81def8cc9f3d1458
     Values
-		- nodeID (String): "5f6c73a22445d7d958c6a37c1f3be99c72cacd39894a3e46d6647a9adb007b4d"
-		- amount (UFix64): 7.43750000
+		- nodeID (String): "fa5f24a66c2f177ebc09b8b51429e9f157037880290e7858f4336479e57dc26b"
+		- amount (UFix64): 1660.21200000
 
-    Index	72
-    Type	A.9eca2b38b18b5dfe.FlowIDTableStaking.RewardsPaid
-    Tx ID	b302ae591011d2bca9679ee2d7271bc827f86f921f03c2696927d57480b315e3
+    Index	30
+    Type	A.8624b52f9ddcd04a.FlowIDTableStaking.RewardsPaid
+    Tx ID	f31815934bff124e332b3c8be5e1c7a949532707251a9f2f81def8cc9f3d1458
     Values
-		- nodeID (String): "416e647265772042757269616e00a2c4cd7d1b78bb62d3f005bb968b52ff0d0e"
-		- amount (UFix64): 7.43750052
-
-    Index	78
-    Type	A.9eca2b38b18b5dfe.FlowIDTableStaking.RewardsPaid
-    Tx ID	b302ae591011d2bca9679ee2d7271bc827f86f921f03c2696927d57480b315e3
-    Values
-		- nodeID (String): "79f039c41539dd93e4ab82688ce7bd0ee37519a069a92e50d4a27f530ff213f6"
-		- amount (UFix64): 2.97500000
-
-    Index	81
-    Type	A.9eca2b38b18b5dfe.FlowIDTableStaking.RewardsPaid
-    Tx ID	b302ae591011d2bca9679ee2d7271bc827f86f921f03c2696927d57480b315e3
-    Values
-		- nodeID (String): "4a616d65732048756e746572000e00bbde823f31b3c9728bdacc767e469cd6cb"
-		- amount (UFix64): 7.43750000
-
-    Index	84
-    Type	A.9eca2b38b18b5dfe.FlowIDTableStaking.RewardsPaid
-    Tx ID	b302ae591011d2bca9679ee2d7271bc827f86f921f03c2696927d57480b315e3
-    Values
-		- nodeID (String): "f0d7e1f46f1a8bd04984bd4842133b44cb9b0c217f037d3ccc80a1596b3eadeb"
-		- amount (UFix64): 0.80325000
-
+		- nodeID (String): "581525fa93d8fe4b334c179698c6e72baccb802593e55e40da61d24e589d85be"
+		- amount (UFix64): 1937.24727662
     ...
     ...
    <clipped for brevity>
@@ -216,7 +194,7 @@ import (
 func main() {
 
 	// the Flow testnet community Access node API endpoint
-	accessNodeAddress := "access.testnet.nodes.onflow.org:9000"
+	accessNodeAddress := "access.mainnet.nodes.onflow.org:9000"
 
 	// create a gRPC client for the Access node
 	accessNodeClient, err := client.NewClient(accessNodeAddress)
@@ -228,9 +206,9 @@ func main() {
 	ctx := context.Background()
 
 	blockEvents, err := accessNodeClient.GetEventsForHeightRange(ctx,
-		"A.9eca2b38b18b5dfe.FlowIDTableStaking.RewardsPaid",
-		96961750,
-		96961750)
+		"A.8624b52f9ddcd04a.FlowIDTableStaking.RewardsPaid",
+		51753836,
+		51753836)
 	if err != nil {
 		panic(err)
 	}

diff --git a/nodeoperators/NodeOperatorList.md b/nodeoperators/NodeOperatorList.md
@@ -18,6 +18,7 @@
 | Accomplice | Verification | 79949f163dac6b72ab72c1d12b9677d71dd9367f7331d59425b485050c8712d9
 | Alxo | Verification | f7422f2d3296ede4d1efb36ec55e3fd93702c061f7ee627881f0b3007beff2ed
 | Artemis | Verification | a67ca1afd47c58358c656dffa2e5585d80b01371866e5634b68dcbab090b9b6f 
+| Binance Staking | Verification | 7c589e6cc38508b27545d052073ab3aa84a35425bd2881205d778cca95f10a7b
 | Bitcoin Louie | Verification | fffba108a52e4ca8f5d30658c3f03f47ad1cc13a0995435c0532336236813218
 | Blockchain at Berkeley | Verification | 8f8d77ba98d1606b19fce8f6d35908bfc29ea171c02879162f6755c05e0ca1ee
 | Blockchain Coalition/Block Venture | Verification | 16036263d71f64d65f84542e9f7678e578482a107b61e45b88759ebea2c7451d

diff --git a/openapi/access.yaml b/openapi/access.yaml
@@ -108,6 +108,8 @@ paths:
           schema:
             $ref: '#/components/schemas/Identifier'
           required: true
+        - $ref: '#/components/parameters/blockIdParam'
+        - $ref: '#/components/parameters/collectionIdParam'
         - $ref: '#/components/parameters/expandParam'
         - $ref: '#/components/parameters/selectParam'
       responses:
@@ -136,6 +138,8 @@ paths:
           schema:
             $ref: '#/components/schemas/Identifier'
           required: true
+        - $ref: '#/components/parameters/blockIdParam'
+        - $ref: '#/components/parameters/collectionIdParam'
         - $ref: '#/components/parameters/expandParam'
         - $ref: '#/components/parameters/selectParam'
       responses:
@@ -478,6 +482,25 @@ paths:
           $ref: '#/components/responses/404NotFound'
         '500':
           $ref: '#/components/responses/500InternalServerError'
+  /node_version_info:
+    get:
+      summary: Get Node Version Information
+      description: Get node version information, such as semver, commit, sporkID and protocol version.
+      tags:
+        - NodeVersionInfo
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/NodeVersionInfo'
+          description: OK
+        '400':
+          $ref: '#/components/responses/400BadRequest'
+        '404':
+          $ref: '#/components/responses/404NotFound'
+        '500':
+          $ref: '#/components/responses/500InternalServerError'
 components:
   parameters:
     expandParam:
@@ -506,6 +529,20 @@ components:
       explode: false
       style: form
       required: false
+    blockIdParam:
+      description: A block ID optional parameter
+      name: block_id
+      in: query
+      schema:
+        $ref: '#/components/schemas/Identifier'
+      required: false
+    collectionIdParam:
+      description: A collection ID optional parameter.
+      name: collection_id
+      in: query
+      schema:
+        $ref: '#/components/schemas/Identifier'
+      required: false
   schemas:
     Account:
       type: object
@@ -703,6 +740,7 @@ components:
       type: object
       required:
         - block_id
+        - collection_id
         - status
         - status_code
         - error_message
@@ -711,6 +749,8 @@ components:
       properties:
         block_id:
           $ref: '#/components/schemas/Identifier'
+        collection_id:
+          $ref: '#/components/schemas/Identifier'
         execution:
           $ref: '#/components/schemas/TransactionExecution'
         status:
@@ -1005,6 +1045,23 @@ components:
       properties:
         chain_id:
           type: string
+    NodeVersionInfo:
+      type: object
+      required:
+        - semver
+        - commit
+        - spork_id
+        - protocol_version
+      properties:
+        semver:
+          type: string
+        commit:
+          type: string
+        spork_id:
+          $ref: '#/components/schemas/Identifier'
+        protocol_version:
+          type: string
+          format: uint64
   responses:
     400BadRequest:
       description: Bad Request

diff --git a/openapi/go-client-generated/README.md b/openapi/go-client-generated/README.md
@@ -29,6 +29,7 @@ Class | Method | HTTP request | Description
 *ExecutionResultsApi* | [**ExecutionResultsGet**](docs/ExecutionResultsApi.md#executionresultsget) | **Get** /execution_results | Get Execution Results by Block ID
 *ExecutionResultsApi* | [**ExecutionResultsIdGet**](docs/ExecutionResultsApi.md#executionresultsidget) | **Get** /execution_results/{id} | Get Execution Result by ID
 *NetworkApi* | [**NetworkParametersGet**](docs/NetworkApi.md#networkparametersget) | **Get** /network/parameters | Get Network Parameters
+*NodeVersionInfoApi* | [**NodeVersionInfoGet**](docs/NodeVersionInfoApi.md#nodeversioninfoget) | **Get** /node_version_info | Get Node Version Information
 *ScriptsApi* | [**ScriptsPost**](docs/ScriptsApi.md#scriptspost) | **Post** /scripts | Execute a Cadence Script
 *TransactionsApi* | [**TransactionResultsTransactionIdGet**](docs/TransactionsApi.md#transactionresultstransactionidget) | **Get** /transaction_results/{transaction_id} | Get a Transaction Result by ID.
 *TransactionsApi* | [**TransactionsIdGet**](docs/TransactionsApi.md#transactionsidget) | **Get** /transactions/{id} | Get a Transaction by ID.
@@ -58,6 +59,7 @@ Class | Method | HTTP request | Description
  - [Links](docs/Links.md)
  - [ModelError](docs/ModelError.md)
  - [NetworkParameters](docs/NetworkParameters.md)
+ - [NodeVersionInfo](docs/NodeVersionInfo.md)
  - [ProposalKey](docs/ProposalKey.md)
  - [ScriptsBody](docs/ScriptsBody.md)
  - [SigningAlgorithm](docs/SigningAlgorithm.md)