Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Validium mode #14

Closed
wants to merge 9 commits into from
Closed

feat: Validium mode #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
583cb67
fix: outdated link to foundry config docs (#172)
krauspt Jan 17, 2024
417393f
Skip pubdata related logic in Validium mode
ilitteri Jan 31, 2024
48ff565
Add VALIDIUM_MODE to SystemConfigs
ilitteri Jan 31, 2024
bbb06ca
Initialize pubdataPricingMode correctly
ilitteri Jan 31, 2024
5723284
Fix
ilitteri Jan 31, 2024
8e020fa
Merge branch 'main' of github.com:lambdaclass/era-contracts into upda…
ilitteri Feb 5, 2024
df9ef59
Revert "Merge branch 'main' of github.com:lambdaclass/era-contracts i…
ilitteri Feb 5, 2024
6efcd0a
sync submodule
mationorato Feb 9, 2024
ceb214b
run zk fmt
mationorato Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions l1-contracts/contracts/zksync/facets/Executor.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ contract ExecutorFacet is Base, IExecutor {
/// @inheritdoc IBase
string public constant override getName = "ExecutorFacet";

bool constant VALIDIUM_MODE = $(VALIDIUM_MODE);

/// @dev Process one batch commit using the previous batch StoredBatchInfo
/// @dev returns new batch StoredBatchInfo
/// @notice Does not change storage
Expand Down Expand Up @@ -123,7 +125,9 @@ contract ExecutorFacet is Base, IExecutor {
// See SystemLogKey enum in Constants.sol for ordering.
uint256 processedLogs;

// #if VALIDIUM_MODE == false
bytes32 providedL2ToL1PubdataHash = keccak256(_newBatch.totalL2ToL1Pubdata);
// #endif

// linear traversal of the logs
for (uint256 i = 0; i < emittedL2Logs.length; i = i.uncheckedAdd(L2_TO_L1_LOG_SERIALIZE_SIZE)) {
Expand All @@ -141,8 +145,10 @@ contract ExecutorFacet is Base, IExecutor {
require(logSender == L2_TO_L1_MESSENGER_SYSTEM_CONTRACT_ADDR, "lm");
l2LogsTreeRoot = logValue;
} else if (logKey == uint256(SystemLogKey.TOTAL_L2_TO_L1_PUBDATA_KEY)) {
// #if VALIDIUM_MODE == false
require(logSender == L2_TO_L1_MESSENGER_SYSTEM_CONTRACT_ADDR, "ln");
require(providedL2ToL1PubdataHash == logValue, "wp");
// #endif
} else if (logKey == uint256(SystemLogKey.STATE_DIFF_HASH_KEY)) {
require(logSender == L2_TO_L1_MESSENGER_SYSTEM_CONTRACT_ADDR, "lb");
stateDiffHash = logValue;
Expand Down
1 change: 1 addition & 0 deletions l1-contracts/hardhat.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ export default {
return {
...systemParams,
...defs,
VALIDIUM_MODE: process.env.VALIDIUM_MODE == "true",
};
})(),
},
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/lib/forge-std
Open in desktop
Submodule forge-std updated 17 files
+1 −0 .gitattributes
+1 −1 package.json
+635 −0 scripts/vm.py
+16 −4 src/StdChains.sol
+2 −2 src/StdCheats.sol
+1 −1 src/StdJson.sol
+61 −33 src/StdUtils.sol
+957 −418 src/Vm.sol
+216 −0 src/mocks/MockERC20.sol
+221 −0 src/mocks/MockERC721.sol
+2 −6 test/StdChains.t.sol
+1 −1 test/StdCheats.t.sol
+3 −1 test/StdError.t.sol
+2 −2 test/StdUtils.t.sol
+15 −0 test/Vm.t.sol
+441 −0 test/mocks/MockERC20.t.sol
+721 −0 test/mocks/MockERC721.t.sol
5 changes: 4 additions & 1 deletion l1-contracts/src.ts/deploy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,11 @@ export class Deployer {
const initialProtocolVersion = getNumberFromEnv("CONTRACTS_INITIAL_PROTOCOL_VERSION");
const DiamondInit = new Interface(hardhat.artifacts.readArtifactSync("DiamondInit").abi);

const validiumMode = process.env["VALIDIUM_MODE"] == "true";
const pubdataPricingMode = validiumMode ? PubdataPricingMode.Validium : PubdataPricingMode.Rollup;

const feeParams = {
pubdataPricingMode: PubdataPricingMode.Rollup,
pubdataPricingMode,
batchOverheadL1Gas: SYSTEM_CONFIG.priorityTxBatchOverheadL1Gas,
maxPubdataPerBatch: SYSTEM_CONFIG.priorityTxPubdataPerBatch,
priorityTxMaxPubdata: SYSTEM_CONFIG.priorityTxMaxPubdata,
Expand Down
Loading