refactor(protocol): remove LibTokenomics from LibProposing (#13801)

taikoxyz · May 23, 2023 · b5f22e5 · b5f22e5
1 parent 34de89c
commit b5f22e5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/packages/protocol/contracts/L1/libs/LibProposing.sol b/packages/protocol/contracts/L1/libs/LibProposing.sol
@@ -9,7 +9,6 @@ pragma solidity ^0.8.18;
 import {AddressResolver} from "../../common/AddressResolver.sol";
 import {LibAddress} from "../../libs/LibAddress.sol";
 import {LibEthDepositing} from "./LibEthDepositing.sol";
-import {LibTokenomics} from "./LibTokenomics.sol";
 import {LibUtils} from "./LibUtils.sol";
 import {SafeCastUpgradeable} from
     "@openzeppelin/contracts-upgradeable/utils/math/SafeCastUpgradeable.sol";
@@ -61,8 +60,7 @@ library LibProposing {
         meta.gasLimit = input.gasLimit;
         meta.beneficiary = input.beneficiary;
         meta.treasury = resolver.resolve(config.chainId, "treasury", false);
-        meta.depositsProcessed =
-            LibEthDepositing.processDeposits(state, config, input.beneficiary);
+        meta.depositsProcessed = LibEthDepositing.processDeposits(state, config, input.beneficiary);
 
         unchecked {
             meta.timestamp = uint64(block.timestamp);

diff --git a/packages/protocol/contracts/L1/libs/LibProving.sol b/packages/protocol/contracts/L1/libs/LibProving.sol
@@ -8,7 +8,6 @@ pragma solidity ^0.8.18;
 
 import {AddressResolver} from "../../common/AddressResolver.sol";
 import {LibMath} from "../../libs/LibMath.sol";
-import {LibTokenomics} from "./LibTokenomics.sol";
 import {LibUtils} from "./LibUtils.sol";
 import {TaikoData} from "../../L1/TaikoData.sol";
 
@@ -164,7 +163,7 @@ library LibProving {
                 uint256(uint160(address(resolver.resolve(config.chainId, "signal_service", false))));
             inputs[2] = uint256(uint160(address(resolver.resolve(config.chainId, "taiko", false))));
 
-            inputs[3] = uint256(blk.metaHash);
+            inputs[3] = uint256(evidence.metaHash);
             inputs[4] = uint256(evidence.parentHash);
             inputs[5] = uint256(evidence.blockHash);
             inputs[6] = uint256(evidence.signalRoot);

diff --git a/packages/protocol/contracts/L1/libs/LibUtils.sol b/packages/protocol/contracts/L1/libs/LibUtils.sol
@@ -8,7 +8,6 @@ pragma solidity ^0.8.18;
 
 import {LibMath} from "../../libs/LibMath.sol";
 import {LibEthDepositing} from "./LibEthDepositing.sol";
-import {LibTokenomics} from "./LibTokenomics.sol";
 import {SafeCastUpgradeable} from
     "@openzeppelin/contracts-upgradeable/utils/math/SafeCastUpgradeable.sol";
 import {TaikoData} from "../TaikoData.sol";

diff --git a/packages/protocol/script/DetermineNewProofTimeIssued.s.sol b/packages/protocol/script/DetermineNewProofTimeIssued.s.sol
@@ -9,7 +9,7 @@ uint16 constant DESIRED_PROOF_TIME_TARGET = 500;
 uint8 constant ADJUSTMENT_QUOTIENT = 16;
 
 contract DetermineProofTimeIssued is Script {
-    function run() public {
+    function run() public view {
         uint16 proofTimeTarget = DESIRED_PROOF_TIME_TARGET; // Approx. value which close to what is in the simulation
         uint64 feeBase = 1e8; // 1 TKO
         uint64 initProofTimeIssued =

diff --git a/packages/protocol/test/TaikoL1.t.sol b/packages/protocol/test/TaikoL1.t.sol
@@ -289,7 +289,8 @@ contract TaikoL1Test is TaikoL1TestBase {
         // Expected: 0x8117066d69ff650d78f0d7383a10cc802c2b8c0eedd932d70994252e2438c636  (pre calculated with these values)
         //console2.logBytes32(meta.depositsRoot);
         assertEq(
-            LibEthDepositing.hashEthDeposits(meta.depositsProcessed), 0x8117066d69ff650d78f0d7383a10cc802c2b8c0eedd932d70994252e2438c636
+            LibEthDepositing.hashEthDeposits(meta.depositsProcessed),
+            0x8117066d69ff650d78f0d7383a10cc802c2b8c0eedd932d70994252e2438c636
         );
     }
 }