Skip to content

Commit 7309489

Browse files
zimphaThegaram
andauthored
remove unused contracts and functions (#110)
Co-authored-by: Péter Garamvölgyi <[email protected]>
1 parent 0f922b9 commit 7309489

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+120
-3646
lines changed

hardhat-test/GasSwap.spec.ts

Lines changed: 0 additions & 329 deletions
This file was deleted.

hardhat-test/ZkEvmVerifierV2.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ describe("ZkEvmVerifierV2", async () => {
122122
await expect(zkEvmVerifier.verify(proof, publicInputs.reverse())).to.reverted;
123123
});
124124

125-
it("should succeed when call through ScrollChain", async () => {
125+
it.skip("should succeed when call through ScrollChain", async () => {
126126
const proof = hexlify(fs.readFileSync(`./hardhat-test/testdata/plonk-verifier/${version}_proof.data`));
127127

128128
const lastFinalizedBatchIndex = 1;

scripts/foundry/InitializeL1ScrollOwner.s.sol

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,6 @@ contract InitializeL1ScrollOwner is Script {
180180
_selectors[0] = ScrollChain.addSequencer.selector;
181181
_selectors[1] = ScrollChain.addProver.selector;
182182
owner.updateAccess(L1_SCROLL_CHAIN_PROXY_ADDR, _selectors, TIMELOCK_1DAY_DELAY_ROLE, true);
183-
184-
// delay 7 day, scroll multisig
185-
_selectors = new bytes4[](1);
186-
_selectors[0] = ScrollChain.updateMaxNumTxInChunk.selector;
187-
owner.updateAccess(L1_SCROLL_CHAIN_PROXY_ADDR, _selectors, TIMELOCK_7DAY_DELAY_ROLE, true);
188183
}
189184

190185
function configL1MessageQueue() internal {
@@ -207,11 +202,6 @@ contract InitializeL1ScrollOwner is Script {
207202
_selectors[0] = ScrollMessengerBase.setPause.selector;
208203
owner.updateAccess(L1_SCROLL_MESSENGER_PROXY_ADDR, _selectors, SCROLL_MULTISIG_NO_DELAY_ROLE, true);
209204
owner.updateAccess(L1_SCROLL_MESSENGER_PROXY_ADDR, _selectors, EMERGENCY_MULTISIG_NO_DELAY_ROLE, true);
210-
211-
// delay 1 day, scroll multisig
212-
_selectors = new bytes4[](1);
213-
_selectors[0] = L1ScrollMessenger.updateMaxReplayTimes.selector;
214-
owner.updateAccess(L1_SCROLL_MESSENGER_PROXY_ADDR, _selectors, TIMELOCK_1DAY_DELAY_ROLE, true);
215205
}
216206

217207
function configL2GasPriceOracle() internal {

src/L1/IL1ScrollMessenger.sol

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@ pragma solidity ^0.8.24;
55
import {IScrollMessenger} from "../libraries/IScrollMessenger.sol";
66

77
interface IL1ScrollMessenger is IScrollMessenger {
8-
/**********
9-
* Events *
10-
**********/
11-
12-
/// @notice Emitted when the maximum number of times each message can be replayed is updated.
13-
/// @param oldMaxReplayTimes The old maximum number of times each message can be replayed.
14-
/// @param newMaxReplayTimes The new maximum number of times each message can be replayed.
15-
event UpdateMaxReplayTimes(uint256 oldMaxReplayTimes, uint256 newMaxReplayTimes);
16-
178
/***********
189
* Structs *
1910
***********/
@@ -62,18 +53,4 @@ interface IL1ScrollMessenger is IScrollMessenger {
6253
uint32 newGasLimit,
6354
address refundAddress
6455
) external payable;
65-
66-
/// @notice Drop a skipped message.
67-
/// @param from The address of the sender of the message.
68-
/// @param to The address of the recipient of the message.
69-
/// @param value The msg.value passed to the message call.
70-
/// @param messageNonce The nonce for the message to drop.
71-
/// @param message The content of the message.
72-
function dropMessage(
73-
address from,
74-
address to,
75-
uint256 value,
76-
uint256 messageNonce,
77-
bytes memory message
78-
) external;
7956
}

0 commit comments

Comments
 (0)