fix the SC commit

matter-labs · Jan 16, 2025 · 54a36da · 54a36da
1 parent 606a587
commit 54a36da
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/compiler_tester/src/vm/eravm/system_contracts.rs b/compiler_tester/src/vm/eravm/system_contracts.rs
@@ -133,8 +133,8 @@ impl SystemContracts {
 
     /// The base token system contract implementation path.
     const PATH_BASE_TOKEN: (&'static str, &'static str) = (
-        "era-contracts/system-contracts/contracts/BaseToken.sol",
-        "BaseToken",
+        "era-contracts/system-contracts/contracts/L2BaseToken.sol",
+        "L2BaseToken",
     );
 
     /// The EVM gas manager system contract implementation path.

diff --git a/era-contracts b/era-contracts
diff --git a/solidity b/solidity
+4 −26		.github/workflows/build-release.yaml
+20 −38		.github/workflows/l1-contracts-ci.yaml
+11 −23		.github/workflows/l2-contracts-ci.yaml
+4 −9		.github/workflows/slither.yaml
+8 −30		.github/workflows/system-contracts-ci.yaml
+0 −1		.solhintignore
+6 −16		l1-contracts/contracts/bridge/L1SharedBridge.sol
+0 −4		l1-contracts/contracts/common/L1ContractErrors.sol
+72 −0		l1-contracts/contracts/governance/AccessControlRestriction.sol
+78 −36		l1-contracts/contracts/governance/ChainAdmin.sol
+14 −0		l1-contracts/contracts/governance/IAccessControlRestriction.sol
+20 −19		l1-contracts/contracts/governance/IChainAdmin.sol
+17 −0		l1-contracts/contracts/governance/IPermanentRestriction.sol
+15 −0		l1-contracts/contracts/governance/IRestriction.sol
+186 −0		l1-contracts/contracts/governance/PermanentRestriction.sol
+10 −24		l1-contracts/contracts/state-transition/StateTransitionManager.sol
+0 −11		l1-contracts/contracts/state-transition/l2-deps/AllowedBytecodeTypes.sol
+1 −4		l1-contracts/contracts/state-transition/l2-deps/ISystemContext.sol
+5 −6		l1-contracts/contracts/upgrades/BaseZkSyncUpgrade.sol
+0 −2		l1-contracts/contracts/upgrades/ZkSyncUpgradeErrors.sol
+0 −63		l1-contracts/deploy-scripts/ChainConfigurationReader.s.sol
+1 −1		l1-contracts/deploy-scripts/DeployErc20.s.sol
+9 −7		l1-contracts/deploy-scripts/DeployL1.s.sol
+20 −79		l1-contracts/deploy-scripts/DeployL2Contracts.sol
+0 −30		l1-contracts/deploy-scripts/EIP712Utils.sol
+20 −27		l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol
+28 −19		l1-contracts/deploy-scripts/RegisterHyperchain.s.sol
+8 −144		l1-contracts/deploy-scripts/Utils.sol
+8 −12		l1-contracts/deploy-scripts/dev/SetupLegacyBridge.s.sol
+0 −23		l1-contracts/deploy-scripts/interfaces/IEmergencyUpgrageBoard.sol
+0 −9		l1-contracts/deploy-scripts/interfaces/IMultisig.sol
+0 −33		l1-contracts/deploy-scripts/interfaces/IProtocolUpgradeHandler.sol
+0 −9		l1-contracts/deploy-scripts/interfaces/ISafe.sol
+0 −0		l1-contracts/script-config/.gitkeep
+81 −0		l1-contracts/script-config/artifacts/BeaconProxy.json
+262 −0		l1-contracts/script-config/artifacts/L2SharedBridge.json
+86 −0		l1-contracts/script-config/artifacts/TransparentUpgradeableProxy.json
+1 −16		l1-contracts/scripts/register-hyperchain.ts
+2 −4		l1-contracts/src.ts/deploy-process.ts
+15 −12		l1-contracts/src.ts/deploy.ts
+8 −13		l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol
+186 −0		l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol
+105 −21		l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol
+209 −0		l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol
+1 −12		l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/CreateNewChain.t.sol
+1 −22		...cts/test/foundry/unit/concrete/state-transition/StateTransitionManager/_StateTransitionManager_Shared.t.sol
+16 −16		l1-contracts/test/test_config/constant/hardhat.json
+1 −1		l2-contracts/contracts/dev-contracts/DevL2SharedBridge.sol
+0 −6		l2-contracts/contracts/dev-contracts/ITimestampAsserter.sol
+0 −237		l2-contracts/contracts/dev-contracts/Multicall3.sol
+0 −20		l2-contracts/contracts/dev-contracts/TimestampAsserter.sol
+1 −1		l2-contracts/foundry.toml
+1 −1		l2-contracts/hardhat.config.ts
+79 −93		system-contracts/SystemContractsHashes.json
+4 −4		system-contracts/bootloader/bootloader.yul
+9 −13		system-contracts/contracts/BootloaderUtilities.sol
+0 −5		system-contracts/contracts/Constants.sol
+59 −160		system-contracts/contracts/ContractDeployer.sol
+5 −14		system-contracts/contracts/DefaultAccount.sol
+2,444 −2,540		system-contracts/contracts/EvmEmulator.yul
+14 −57		system-contracts/contracts/EvmGasManager.yul
+7 −3		system-contracts/contracts/KnownCodesStorage.sol
+18 −0		system-contracts/contracts/L2BaseToken.sol
+1 −13		system-contracts/contracts/SystemContext.sol
+1 −6		system-contracts/contracts/SystemContractErrors.sol
+1 −10		system-contracts/contracts/abstract/SystemContractBase.sol
+6 −0		system-contracts/contracts/interfaces/IBaseToken.sol
+3 −22		system-contracts/contracts/interfaces/IContractDeployer.sol
+3 −9		system-contracts/contracts/libraries/SystemContractHelper.sol
+9 −14		system-contracts/contracts/libraries/TransactionHelper.sol
+20 −49		system-contracts/contracts/libraries/Utils.sol
+17 −45		system-contracts/evm-emulator/EvmEmulator.template.yul
+777 −743		system-contracts/evm-emulator/EvmEmulatorFunctions.template.yul
+325 −394		system-contracts/evm-emulator/EvmEmulatorLoop.template.yul
+111 −111		system-contracts/evm-emulator/EvmEmulatorLoopUnusedOpcodes.template.yul
+0 −85		system-contracts/evm-emulator/drafted/EvmEmulatorModexpGas.template.yul
+2 −5		system-contracts/foundry.toml
+17 −1		system-contracts/hardhat.config.ts
+2 −2		system-contracts/package.json
+7 −13		system-contracts/scripts/calculate-hashes.ts
+2 −2		system-contracts/scripts/compile-yul.ts
+2 −2		system-contracts/scripts/compile-zasm.ts
+8 −26		system-contracts/scripts/preprocess-bootloader.ts
+0 −30		system-contracts/test/AccountCodeStorage.spec.ts
+1 −20		system-contracts/test/ContractDeployer.spec.ts
+0 −32		system-contracts/test/KnownCodesStorage.spec.ts
+21 −0		system-contracts/test/L2BaseToken.spec.ts
+1 −1		system-contracts/test/precompiles/Identity.spec.ts
+4 −10		system-contracts/test/shared/utils.ts
+0 −7		yarn.lock