made it a flat fee.

ten-protocol · Dec 10, 2024 · 260ac24 · 260ac24
1 parent 4795668
commit 260ac24
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 47 deletions.
diff --git a/contracts/deployment_scripts/testnet/layer2/003_set_fee.ts b/contracts/deployment_scripts/testnet/layer2/003_set_fee.ts
@@ -28,7 +28,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     console.log(`Owner = ${owner}`);
     console.log(`Signer = ${l2Accounts.deployer}`);
 
-    const tx = await fees.setMessageFee(10000);
+    const tx = await fees.setMessageFee(32*10000);
     const receipt =await tx.wait();
 
     if (receipt.status != 1) {

diff --git a/contracts/generated/Fees/Fees.go b/contracts/generated/Fees/Fees.go
diff --git a/contracts/generated/ManagementContract/ManagementContract.go b/contracts/generated/ManagementContract/ManagementContract.go
diff --git a/contracts/generated/MerkleTreeMessageBus/MerkleTreeMessageBus.go b/contracts/generated/MerkleTreeMessageBus/MerkleTreeMessageBus.go
diff --git a/contracts/generated/MessageBus/MessageBus.go b/contracts/generated/MessageBus/MessageBus.go
diff --git a/contracts/generated/SystemDeployer/SystemDeployer.go b/contracts/generated/SystemDeployer/SystemDeployer.go
diff --git a/contracts/src/messaging/MessageBus.sol b/contracts/src/messaging/MessageBus.sol
@@ -76,7 +76,7 @@ contract MessageBus is IMessageBus, Initializable, OwnableUpgradeable {
     }
 
     function getPublishFee() public view returns (uint256) {
-        return fees.messageFee(32); //just a hash
+        return fees.messageFee();
     }
 
     // This method is called from contracts to publish messages to the other linked message bus.

diff --git a/contracts/src/system/Fees.sol b/contracts/src/system/Fees.sol
@@ -5,13 +5,13 @@ import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
 interface IFees {
-    function messageFee(uint256 messageSize) external view returns (uint256);
+    function messageFee() external view returns (uint256);
 }
 
 // Contract that will contain fees for contracts that need to apply them
-contract Fees is Initializable, OwnableUpgradeable {
+contract Fees is Initializable, OwnableUpgradeable, IFees {
 
-    uint256 private _messageFeePerByte;
+    uint256 private _messageFee;
 
     // Constructor disables initializer;
     // Only owner functions will not be callable on implementation
@@ -20,20 +20,20 @@ contract Fees is Initializable, OwnableUpgradeable {
     }
 
     // initialization function to be used by the proxy.
-    function initialize(uint256 initialMessageFeePerByte, address eoaOwner) public initializer {
+    function initialize(uint256 flatFee, address eoaOwner) public initializer {
         __Ownable_init(eoaOwner);
-        _messageFeePerByte = initialMessageFeePerByte;
+        _messageFee = flatFee;
     }
 
     // Helper function to calculate the fee for a message
-    function messageFee(uint256 messageSize) external view returns (uint256) {
-        return _messageFeePerByte * messageSize;
+    function messageFee() external view returns (uint256) {
+        return _messageFee;
     }
 
     // The EOA owner can set the message fee to ensure sequencer is not publishing
     // at a loss
-    function setMessageFee(uint256 newMessageFeePerByte) external onlyOwner{
-        _messageFeePerByte = newMessageFeePerByte;
+    function setMessageFee(uint256 newFeeForMessage) external onlyOwner{
+        _messageFee = newFeeForMessage;
     }
 
     // The EOA owner can collect the fees