[fix]: fix merge conflicts

.github/ISSUE_TEMPLATE/common-issues.md

@@ -0,0 +1,27 @@
+---
+name: Common Issues
+about: common issues
+title: "[Module]: purpose / problem"
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/pull_request_template.md

@@ -0,0 +1,13 @@
+# Goals of PR
+
+Core changes:
+
+- Describe changes here
+
+Notes:
+
+- Write notes here
+
+Related Issues:
+
+- Link issues here

.github/workflows/gh-pages.yaml

@@ -0,0 +1,41 @@
+name: gh-pages
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'packages/sdk/**'
+
+jobs:
+  cd:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        node: [18]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+        with:
+          ref: main
+
+      - name: Setup node env
+        uses: actions/[email protected]
+        with:
+          node-version: ${{ matrix.node }}
+
+      - name: Install dependencies
+        run: yarn install && yarn build
+
+      - name: Build
+        run:  cd packages/sdk/ && yarn autogen:docs
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./packages/sdk/docs
+          cname: sdk.mantle.xyz

.gitignore

@@ -57,4 +57,9 @@ mantle.iml
 
 ops/data/**
 dist/
+<<<<<<< HEAD
 packages/contracts/test/data/
+=======
+
+packages/contracts/abi/
+>>>>>>> origin/release/v0.3.1

CHANGELOG.md

@@ -1,20 +1,75 @@
 # Changelog
 
-## 0.1.1 (Dec 1, 2022)
+## [0.3.0] - 2023-02-20
 
-### IMPROVEMENTS
-- [deployer]  [#343](https://github.com/mantlenetworkio/mantle/pull/343) Optimize code submission for deployed contracts
+### Features
+- Verifier syncs data from the DA network, verifies and generates new blocks([#638](https://github.com/mantlenetworkio/mantle/pull/638))
+- Make a verification mechanism for the data stored in the DA layer, and rollup again if the storage fails([#670](https://github.com/mantlenetworkio/mantle/pull/670))
+
+### Improvements
+- Improve rollback logic to account for Layer-1 reorgs([#635](https://github.com/mantlenetworkio/mantle/pull/635))
+- dockerfile upgrade go1.19 ([#656](https://github.com/mantlenetworkio/mantle/pull/656))
+
+### Bug Fixes
+- Fix the array out-of-bounds bug of batchsubmitter([#622](https://github.com/mantlenetworkio/mantle/pull/622))
+- Optimized performance when tss processes large batch of stateroots verification([#627](https://github.com/mantlenetworkio/mantle/pull/627))
+- Solve the problem of inconsistent blockhash generated by the sequencer and verifier nodes due to the gas limit([#630](https://github.com/mantlenetworkio/mantle/pull/630))
+- Verify stateroot when verifier syncs data from Layer1 and DA([#648](https://github.com/mantlenetworkio/mantle/pull/648))
+- Fixed the state root bug for verifier nodes([#658](https://github.com/mantlenetworkio/mantle/pull/658))
+
+## [0.2.0](https://github.com/mantlenetworkio/mantle/commits/v0.2.0) - 2023-01-09
+
+### Features
+- add white list for da fraud proof([#496](https://github.com/mantlenetworkio/mantle/issues/496))
+- support mt-batcher and mt-challenger send transaction by EIP1559([#524](https://github.com/mantlenetworkio/mantle/issues/524))
+- da challenger integrate to mantle([#527](https://github.com/mantlenetworkio/mantle/issues/527))
+- add da rollup min and max size config([#528](https://github.com/mantlenetworkio/mantle/issues/528))
+- Add WBIT Token on mantle network([#540](https://github.com/mantlenetworkio/mantle/issues/540))
+
+### Improvements
+- Make challenge period time for fraud proofs configurable([#461](https://github.com/mantlenetworkio/mantle/pull/461))
+- Updates to main README.md([#543](https://github.com/mantlenetworkio/mantle/pull/543))
+- sdk bump to v0.1.4([#546](https://github.com/mantlenetworkio/mantle/pull/546))
+
+### Bug Fixes
+- fix bug when tss manager get signature from store ([#538](https://github.com/mantlenetworkio/mantle/pull/538))
+
+## [0.2.0-alpha](https://github.com/mantlenetworkio/mantle/commits/v0.2.0-alpha) - 2022-12-23
+
+### Features
+- Implement the mechanism of triggering the Rollback instruction when the MPC signature fails ([#377](https://github.com/mantlenetworkio/mantle/pull/377)).
+- Add data availability layer [eigenlayer](https://www.eigenlayer.com/) ([#395](https://github.com/mantlenetworkio/mantle/pull/395)) .
+- Add the rollback mechanism ([#430](https://github.com/mantlenetworkio/mantle/pull/430)).
+
+### Improvements
+- Update hardhat version ([#382](https://github.com/mantlenetworkio/mantle/pull/382)).
+- Update datalayer to support l1 hardhat and bit token ([#410](https://github.com/mantlenetworkio/mantle/pull/410)).
+- Update golang version to 1.19 ([#424](https://github.com/mantlenetworkio/mantle/pull/424)).
 
 ### Bug Fixes
-- [l2geth]    [#323](https://github.com/mantlenetworkio/mantle/pull/323) Delete automatic withdraw
-- [tssResard] [#324](https://github.com/mantlenetworkio/mantle/pull/324) fix TssRewardContract,batchTime update exception
-- [l2geth]    [#320](https://github.com/mantlenetworkio/mantle/pull/320) fix gasPriceOracle contract modifier checkValue
+- Optimized tss roll back codes ([#454](https://github.com/mantlenetworkio/mantle/pull/454)).
+- Complete data verification logic for eigenlayer ([#433](https://github.com/mantlenetworkio/mantle/pull/433)) .
+
+## [0.1.1](https://github.com/mantlenetworkio/mantle/commits/v0.1.1) - 2022-12-01
+
+
+### Improvements
+- Optimize code submission for deployed contracts ([#343](https://github.com/mantlenetworkio/mantle/pull/343)).
+- Adjust l2 charging logic([#317](https://github.com/mantlenetworkio/mantle/pull/317)).
+
+### Bug Fixes
+- Delete automatic withdraw ([#323](https://github.com/mantlenetworkio/mantle/pull/323)).
+- Fix tssReward contract.batchTime update exception ([#299](https://github.com/mantlenetworkio/mantle/pull/299)) .
+- Fix gasPriceOracle contract modifier checkValue ([#320](https://github.com/mantlenetworkio/mantle/pull/320)).
+
+### Deprecated
+- Delete automatic burning ([#328](https://github.com/mantlenetworkio/mantle/pull/328)) .
+
+## [0.1.0](https://github.com/mantlenetworkio/mantle/commits/v0.1.0) - 2022-11-11
 
-## 0.1.0 (Nov 18, 2022)
 
 ### Features
 - MPC validators module in Layer 2 network, to minimize the trust risk of L2 execution results by threshold signature scheme(TSS).
 - Native Token replacement in Layer 2 Network, to empower BitDAO's ecosystem by replacing the native token with BIT.
 - Token Reward, to inspire community, organization and individual to run a l2geth-node and TSS-node.
 - Gas fee adjustment, the Bit destruction mechanism will be triggered after collecting enough GasFee in the special contract.
-