cleanup

taikoxyz · May 3, 2023 · f8c1797 · f8c1797
1 parent bd203f3
commit f8c1797
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 23 deletions.
diff --git a/packages/protocol/contracts/L1/TaikoData.sol b/packages/protocol/contracts/L1/TaikoData.sol
@@ -103,7 +103,6 @@ library TaikoData {
         mapping(uint256 forkChoiceId => ForkChoice) forkChoices;
         uint64 blockId;
         uint64 proposedAt;
-        uint64 deposit;
         uint24 nextForkChoiceId;
         uint24 verifiedForkChoiceId;
         bytes32 metaHash;

diff --git a/packages/protocol/contracts/L1/TaikoL1.sol b/packages/protocol/contracts/L1/TaikoL1.sol
@@ -93,8 +93,7 @@ contract TaikoL1 is
     }
 
     /**
-     * Prove a block is valid with a zero-knowledge proof, a transaction
-     * merkel proof, and a receipt merkel proof.
+     * Prove a block with a zero-knowledge proof.
      *
      * @param blockId The index of the block to prove. This is also used
      *        to select the right implementation version.
@@ -176,20 +175,14 @@ contract TaikoL1 is
     )
         public
         view
-        returns (
-            bytes32 _metaHash,
-            uint256 _deposit,
-            address _proposer,
-            uint64 _proposedAt
-        )
+        returns (bytes32 _metaHash, address _proposer, uint64 _proposedAt)
     {
         TaikoData.Block storage blk = LibProposing.getBlock({
             state: state,
             config: getConfig(),
             blockId: blockId
         });
         _metaHash = blk.metaHash;
-        _deposit = blk.deposit;
         _proposer = blk.proposer;
         _proposedAt = blk.proposedAt;
     }

diff --git a/packages/protocol/contracts/L1/TaikoToken.sol b/packages/protocol/contracts/L1/TaikoToken.sol
@@ -59,7 +59,7 @@ contract TaikoToken is EssentialContract, ERC20Upgradeable, IMintableERC20 {
         ERC20Upgradeable.__ERC20_init({
             name_: _name,
             symbol_: _symbol,
-            decimals_: 8
+            decimals_: 18
         });
 
         for (uint256 i = 0; i < _premintRecipients.length; ++i) {

diff --git a/packages/protocol/contracts/L1/libs/LibProposing.sol b/packages/protocol/contracts/L1/libs/LibProposing.sol
@@ -84,7 +84,6 @@ library LibProposing {
 
         blk.blockId = state.numBlocks;
         blk.proposedAt = meta.timestamp;
-        blk.deposit = 0;
         blk.nextForkChoiceId = 1;
         blk.verifiedForkChoiceId = 0;
         blk.metaHash = LibUtils.hashMetadata(meta);

diff --git a/packages/website/pages/docs/reference/contract-documentation/L1/TaikoData.md b/packages/website/pages/docs/reference/contract-documentation/L1/TaikoData.md
@@ -119,7 +119,6 @@ struct Block {
   mapping(uint256 => struct TaikoData.ForkChoice) forkChoices;
   uint64 blockId;
   uint64 proposedAt;
-  uint64 deposit;
   uint24 nextForkChoiceId;
   uint24 verifiedForkChoiceId;
   bytes32 metaHash;

diff --git a/packages/website/pages/docs/reference/contract-documentation/L1/TaikoL1.md b/packages/website/pages/docs/reference/contract-documentation/L1/TaikoL1.md
@@ -26,12 +26,12 @@ Initialize the rollup.
 
 #### Parameters
 
-| Name                  | Type    | Description                                                  |
-| --------------------- | ------- | ------------------------------------------------------------ |
-| \_addressManager      | address | The AddressManager address.                                  |
-| \_genesisBlockHash    | bytes32 | The block hash of the genesis block.                         |
-| \_initBlockFee        | uint64  | Initial (reasonable) block fee value.                        |
-| \_initProofTimeIssued | uint64  | Initial proof time which keeps the inflow/outflow in balance |
+| Name                  | Type    | Description                                                         |
+| --------------------- | ------- | ------------------------------------------------------------------- |
+| \_addressManager      | address | The AddressManager address.                                         |
+| \_genesisBlockHash    | bytes32 | The block hash of the genesis block.                                |
+| \_initBlockFee        | uint64  | Initial (reasonable) block fee value.                               |
+| \_initProofTimeIssued | uint64  | Initial proof time issued corresponding with the initial block fee. |
 
 ### proposeBlock
 
@@ -54,15 +54,14 @@ Propose a Taiko L2 block.
 function proveBlock(uint256 blockId, bytes input) external
 ```
 
-Prove a block is valid with a zero-knowledge proof, a transaction
-merkel proof, and a receipt merkel proof.
+Prove a block with a zero-knowledge proof.
 
 #### Parameters
 
 | Name    | Type    | Description                                                                                    |
 | ------- | ------- | ---------------------------------------------------------------------------------------------- |
 | blockId | uint256 | The index of the block to prove. This is also used to select the right implementation version. |
-| input   | bytes   | An abi-encoded TaikoData.ValidBlockEvidence object.                                            |
+| input   | bytes   | An abi-encoded TaikoData.BlockEvidence object.                                                 |
 
 ### verifyBlocks
 
@@ -117,7 +116,7 @@ function getProofReward(uint64 provenAt, uint64 proposedAt) public view returns
 ### getBlock
 
 ```solidity
-function getBlock(uint256 blockId) public view returns (bytes32 _metaHash, uint256 _deposit, address _proposer, uint64 _proposedAt)
+function getBlock(uint256 blockId) public view returns (bytes32 _metaHash, address _proposer, uint64 _proposedAt)
 ```
 
 ### getForkChoice