Merge branch 'main' into unified-lxly-bridge

Author: hsutaiyu

docs/cdk/version-matrix.md

@@ -22,13 +22,22 @@ The table below shows the version compatibility for CDK releases and related com
 </thead>
 <tbody>
   <tr>
-    <td>Ares release</td>
+    <td>CDK Elderberry 2 Release </td>
+    <td>9</td>
+    <td><a href="https://github.com/0xPolygonHermez/zkevm-node/releases/tag/v0.6.4">v0.6.4 Elderberry 2</a></td>
+    <td><a href="https://hub.docker.com/layers/0xpolygon/cdk-validium-node/0.6.4-cdk/images/sha256-6393eebf06fae415549070001d118aeb886777e532858777ab52096b3c25e5f2?context=explore">0.6.4-cdk</a> </td>
+    <td><a href="https://hub.docker.com/layers/0xpolygon/cdk-data-availability/0.0.7/images/sha256-17590789a831259d7a07d8a042ea87e381c5708dec3a7daef6f3f782f50b2c00?context=explore">v0.0.7</a></td>
+    <td><a href="https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v6.0.0">v6.0.0</a></td>
+    <td> <a href="https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v5.0.1-rc.2-fork.8">v5.0.1</a></td>
+    <td><a href="https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.4.2">v0.4.2</a></td>
+  </tr>
+    <td>CDK Elderberry 1 Release </td>
     <td>8</td>
     <td><a href="https://github.com/0xPolygonHermez/zkevm-node/releases/tag/v0.6.2">v0.6.2 Elderberry</a></td>
     <td><a href="https://hub.docker.com/layers/0xpolygon/cdk-validium-node/0.6.2-cdk/images/sha256-6393eebf06fae415549070001d118aeb886777e532858777ab52096b3c25e5f2?context=explore">0.6.2-cdk</a> </td>
     <td><a href="https://hub.docker.com/layers/0xpolygon/cdk-data-availability/0.0.6/images/sha256-17590789a831259d7a07d8a042ea87e381c5708dec3a7daef6f3f782f50b2c00?context=explore">v0.0.6</a></td>
     <td><a href="https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v5.0.7">v5.0.7</a></td>
-    <td> <a href="https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v5.0.1-rc.2-fork.8">v5.0.1-rc.2-fork.8</a></td>
+    <td> <a href="https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v5.0.1-rc.2-fork.8">v5.0.1</a></td>
     <td><a href="https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.4.2">v0.4.2</a></td>
   </tr>
   <tr>
@@ -56,7 +65,7 @@ The table below shows the version compatibility for CDK releases and related com
 
 ### Migrating
 
-- Anyone on earlier versions, we recommend going straight to fork ID 8.
+- Anyone on earlier versions, we recommend going straight to fork ID 9.
 
 ## zkEVM
 
@@ -73,15 +82,21 @@ The table below shows the version compatibility for Polygon zkEVM releases.
 </thead>
 <tbody>
   <tr>
-    <td><a href="https://github.com/0xPolygonHermez/zkevm-node/releases/tag/v0.5.10">v0.6.2 </a></td>
-    <td>v0.4.2</td>
-    <td>v5.0.7</td>
+    <td><a href="https://github.com/0xPolygonHermez/zkevm-node/releases/tag/v0.6.4">v0.6.4 </a></td>
+    <td><a href="https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.4.2">v0.4.2</a></td>
+    <td><a href="https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v6.0.0">v6.0.0</a></td>
+    <td>Mainnet &amp; Cardona: 4-9 <br>Testnet (Goerli): 1-6</td>
+  </tr>
+  <tr>
+    <td><a href="https://github.com/0xPolygonHermez/zkevm-node/releases/tag/v0.6.2">v0.6.2 </a></td>
+    <td><a href="https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.4.2">v0.4.2</a></td>
+    <td><a href="https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v5.0.7">v5.0.7</a></td>
     <td>Mainnet &amp; Cardona: 4-8. <br>Testnet (Goerli): 1-6</td>
   </tr>
   <tr>
-    <td><a href="https://github.com/0xPolygonHermez/zkevm-node/releases/tag/v0.5.10">v0.5.10</a></td>
-    <td>v0.4.0</td>
-    <td>v4.0.4</td>
+    <td><a href="https://github.com/0xPolygonHermez/zkevm-node/releases/tag/v0.5.13">v0.5.13</a></td>
+    <td><a href="https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.4.2">v0.4.2</a></td>
+    <td><a href="https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v4.0.19">v4.0.19</a></td>
     <td>Mainnet &amp; Cardona: 4-7. <br>Testnet (Goerli): 1-6</td>
   </tr>
   <tr>

docs/img/cdk/stb-1.png

@@ -32,7 +32,7 @@ type CheckpointBlockHeader struct {
 
 #### Root hash calculation
 
-![Root Hash Image](../../../img/pos/checkpoint.svg)
+![Root Hash Image](../../../img/pos/checkpoint.png)
 
 The `RootHash` is calculated as a Merkle hash of Bor block hashes from `StartBlock` to `EndBlock`. The process involves hashing each block's number, time, transaction hash, and receipt hash, then creating a Merkle root of these hashes.
 
@@ -83,44 +83,41 @@ rootHash := tree.Root().Hash
 `AccountRootHash` is the hash of the validator account-related information that needs to pass to the Ethereum chain at each checkpoint.
 
 ```jsx
-eachAccountHash := keccak256([validator id, withdraw fee, slash amount])
+eachAccountHash := keccak256([validator id, withdraw fee])
 ```
 
 Pseudocode for the account root hash for `1` to `n` Bor blocks:
 
 ```go
-B(1) := keccak256([validator id, withdraw fee, slash amount])
-B(2) := keccak256([validator id, withdraw fee, slash amount])
+B(1) := keccak256([validator id, withdraw fee])
+B(2) := keccak256([validator id, withdraw fee])
 .
 .
 .
-B(n) := keccak256([validator id, withdraw fee, slash amount])
+B(n) := keccak256([validator id, withdraw fee])
 
 // account root hash is Merkle root of all block hash
 checkpoint's account root hash = Merkel[B(1), B(2), ....., B(n)]
 ```
 
-Golang code for the account hash can be found here: [https://github.com/maticnetwork/heimdall/blob/develop/types/dividend-account.go#L91-L101](https://github.com/maticnetwork/heimdall/blob/develop/types/dividend-account.go#L91-L101)
+Golang code for the account hash can be found here: [https://github.com/maticnetwork/heimdall/blob/develop/types/dividend-account.go](https://github.com/maticnetwork/heimdall/blob/develop/types/dividend-account.go)
 
 ```go
-// DividendAccount contains Fee, Slashed amount
+// DividendAccount contains burned Fee amount
 type DividendAccount struct {
- ID            DividendAccountID `json:"ID"`
- FeeAmount     string            `json:"feeAmount"`     // string representation of big.Int
- SlashedAmount string            `json:"slashedAmount"` // string representation of big.Int
+	User      HeimdallAddress `json:"user"`
+	FeeAmount string          `json:"feeAmount"` // string representation of big.Int
 }
 
-// calculate hash for particular account
+// CalculateHash hashes the values of a DividendAccount
 func (da DividendAccount) CalculateHash() ([]byte, error) {
- fee, _ := big.NewInt(0).SetString(da.FeeAmount, 10)
- slashAmount, _ := big.NewInt(0).SetString(da.SlashedAmount, 10)
- divAccountHash := crypto.Keccak256(appendBytes32(
-  new(big.Int).SetUint64(uint64(da.ID)).Bytes(),
-  fee.Bytes(),
-  slashAmount.Bytes(),
- ))
-
- return divAccountHash, nil
+	fee, _ := big.NewInt(0).SetString(da.FeeAmount, 10)
+	divAccountHash := crypto.Keccak256(appendBytes32(
+		da.User.Bytes(),
+		fee.Bytes(),
+	))
+
+	return divAccountHash, nil
 }
 ```
 

docs/img/pos/checkpoint.png

@@ -40,3 +40,4 @@ interface IAccount {
 - [ERC-4337 proposal](https://eips.ethereum.org/EIPS/eip-4337) is the link to the official proposal and technical specification.
 - [@account-abstraction SDK](https://www.npmjs.com/package/@account-abstraction/sdk) is an npm package for using ERC-4337 developed by the authors of the proposal.
 - [Stackup](https://docs.stackup.sh/) provides node services with ERC-4337 bundlers and other ERC-4337 infrastructure.
+- [WalletKit](https://walletkit.com) is an all-in-one platform for adding smart, gasless wallets to your app. It has integrated support for ERC-4337 and comes with a paymaster and bundler included, requiring no extra setup.

docs/img/pos/checkpoint.svg

@@ -25,20 +25,14 @@ PIP4 introduced the concept of showcasing validator performance for community vi
 
 ## Methods and variables
 
-!!!caution
-    Slashing Implementation
-
-    `jail`, `unJail`, and `slash` functions are not used currently as part of the slashing implementation.
-
-
 ### validatorThreshold
 
 It stores the maximum number of validators accepted by the system, also called slots.
 
 ### AccountStateRoot
 
 - For various accounting done on Heimdall for validators and delegator, account root is submitted while submitting the `checkpoint`.
-- accRoot is used while `claimRewards` and `unStakeClaim`.
+- `accRoot` is used while `claimRewards` and `unStakeClaim`.
 
 ### stake / stakeFor
 
@@ -76,9 +70,7 @@ function stakeFor(
 ```solidity
 function unstakeClaim(uint256 validatorId) public;
 ```
-
-- After `unstaking`, validators are put into withdrawal period so that they can be slashed, if any fraud found after `unstaking`, for past frauds.
-- Once `WITHDRAWAL_DELAY` period is served, validators can call this function and do settlement with `stakeManager` (get rewards if any, get staked tokens back, burn NFT, etc).
+Once `WITHDRAWAL_DELAY` period is served, validators can call this function and do settlement with `stakeManager` (get rewards if any, get staked tokens back, burn NFT, etc).
 
 ### restake
 
@@ -127,7 +119,7 @@ function claimFee(
 
 This method is used to withdraw fees from Heimdall. `accountStateRoot` is updated on each checkpoint, so that validators can provide proof of inclusion in this root for account on Heimdall and withdraw fee.
 
-Note that `accountStateRoot` is re-written to prevent exits on multiple checkpoints (for old root and save accounting on `stakeManager`). `accumSlashedAmount` is unused at the moment and will be used for slashing on Heimdall if needed.
+Note that `accountStateRoot` is re-written to prevent exits on multiple checkpoints (for old root and save accounting on `stakeManager`).
 
 ### StakingNFT
 

docs/img/tools/wallet/walletkit/walletkit-overview.png

@@ -0,0 +1,37 @@
+!!! note "Content disclaimer"
+
+    Please view the third-party content disclaimer [here](https://github.com/0xPolygon/polygon-docs/blob/main/CONTENT_DISCLAIMER.md).
+
+## Intro
+
+SubQuery is a leading blockchain data indexer that provides developers with fast, flexible, universal, open source and decentralised APIs for web3 projects. SubQuery SDK allows developers to get rich indexed data and build intuitive and immersive decentralised applications in a faster and more efficient way. SubQuery supports 100+ ecosystems including Polygon, Polygon zkEVM, Polygon Mumbai, Ethereum, Polkadot, Algorand, NEAR, and Avalanche.
+
+Another one of SubQuery's competitive advantages is the ability to aggregate data not only within a chain but across multiple blockchains all within a single project. This allows the creation of feature-rich dashboard analytics and multi-chain block scanners.
+
+Other advantages include superior performance with multiple RPC endpoint configurations, multi-worker capabilities and a configurable caching architecture. To find out more, visit our [documentation](https://academy.subquery/).
+
+**Useful resources**:
+
+- SubQuery docs: [SubQuery Academy (Documentation)](https://academy.subquery.network/)
+
+- Intro quick start guide: [1. Create a New Project](https://academy.subquery.network/quickstart/quickstart.html)
+
+- [Polygon Quick Start Guide](https://academy.subquery.network/quickstart/quickstart_chains/polygon.html)
+
+- [Polygon ZKEVM quick start guide](https://academy.subquery.network/quickstart/quickstart_chains/polygon-zkevm.html)
+
+- [Polygon Plasma bridge multi-chain quick start guide](https://academy.subquery.network/quickstart/quickstart_multichain/polygon-plasma-bridge.html)
+
+- [Polygon's starter projects directory](https://github.com/subquery/ethereum-subql-starter/tree/main/Polygon)
+
+For technical questions and support reach out to us start@subquery.network
+
+## Running and hosting your Polygon SubQuery APIs
+
+SubQuery is open-source, meaning you have the freedom to run it in the following three ways:
+
+- Locally on your own computer (or a cloud provider of your choosing), [view the instructions on how to run SubQuery Locally](https://academy.subquery.network/run_publish/run.html).
+
+- You can publish it to SubQuery's enterprise-level [Managed Service](https://managedservice.subquery.network/), where we'll host your SubQuery project in production ready services for mission critical data with zero-downtime blue/green deployments. There even is a generous free tier. [Find out how](https://academy.subquery.network/run_publish/publish.html).
+
+- You can publish it to the decentralised [SubQuery Network](https://subquery.network/network), the most open, performant, reliable, and scalable data service for dApp developers. The SubQuery Network indexes and services data to the global community in an incentivised and verifiable way and supports Polygon from launch.