Skip to content

chore: updated fmt settings foundry.toml #16155

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

Merged
LHerskind merged 1 commit into from
Aug 3, 2025
Merged

chore: updated fmt settings foundry.toml #16155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion l1-contracts/foundry.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,12 @@ fs_permissions = [
no_match_contract="(ScreamAndShoutTest|UniswapPortalTest|MerkleCheck)"

[fmt]
line_length = 100
line_length = 120
tab_width = 2
variable_override_spacing=false
wrap_comments = true
number_underscore = "thousands"
override_spacing = false

[rpc_endpoints]
mainnet_fork="https://mainnet.infura.io/v3/9928b52099854248b3a096be07a6b23c"
Expand Down
48 changes: 14 additions & 34 deletions l1-contracts/script/InternalGov.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,14 @@ pragma solidity >=0.8.27;
import {Test} from "forge-std/Test.sol";

import {Governance} from "@aztec/governance/Governance.sol";
import {
Proposal, Configuration, ProposalState
} from "@aztec/governance/interfaces/IGovernance.sol";
import {Proposal, Configuration, ProposalState} from "@aztec/governance/interfaces/IGovernance.sol";
import {TestERC20} from "@aztec/mock/TestERC20.sol";
import {GovernanceProposer} from "@aztec/governance/proposer/GovernanceProposer.sol";
import {IRollup} from "@aztec/core/interfaces/IRollup.sol";
import {IRegistry} from "@aztec/governance/interfaces/IRegistry.sol";
import {IValidatorSelection} from "@aztec/core/interfaces/IValidatorSelection.sol";
import {IPayload} from "@aztec/governance/interfaces/IPayload.sol";
import {RegisterNewRollupVersionPayload} from
"../test/governance/scenario/RegisterNewRollupVersionPayload.sol";
import {RegisterNewRollupVersionPayload} from "../test/governance/scenario/RegisterNewRollupVersionPayload.sol";
import {ProposalLib} from "@aztec/governance/libraries/ProposalLib.sol";
import {Ownable} from "@oz/access/Ownable.sol";
import {Fakerollup} from "../test/governance/governance-proposer/mocks/Fakerollup.sol";
Expand All @@ -33,12 +30,10 @@ contract GovScript is Test {
address internal constant ME = address(0xf8d7d601759CBcfB78044bA7cA9B0c0D6301A54f);

Governance public constant governance = Governance(0xEE63E102E35F24c34b9eA09B597ACFb491c94e78);
GovernanceProposer public constant governanceProposer =
GovernanceProposer(0xF4bf5dF1c3B2dd67A0525Fc600E98ca51143a67D);
GovernanceProposer public constant governanceProposer = GovernanceProposer(0xF4bf5dF1c3B2dd67A0525Fc600E98ca51143a67D);
TestERC20 public constant stakingAsset = TestERC20(0x5C30c66847866A184ccb5197cBE31Fce7A92eB26);
TestERC20 public constant feeAsset = TestERC20(0x487Ff89A8bDAEFeA2Ad10D3e23727ccdA8F845B9);
FeeAssetHandler public constant feeAssetHandler =
FeeAssetHandler(0x80d848Dc9F52DF56789e2d62Ce66F19555FF1019);
FeeAssetHandler public constant feeAssetHandler = FeeAssetHandler(0x80d848Dc9F52DF56789e2d62Ce66F19555FF1019);
StakingAssetHandler public constant stakingAssetHandler =
StakingAssetHandler(0xF739D03e98e23A7B65940848aBA8921fF3bAc4b2);
IRegistry public constant registry = IRegistry(0x4d2cC1d5fb6BE65240e0bFC8154243e69c0Fb19E);
Expand Down Expand Up @@ -81,12 +76,8 @@ contract GovScript is Test {
emit log_named_address("\tOwner", Ownable(address(rollup)).owner());
emit log_named_uint("\tPending block number", rollup.getPendingBlockNumber());
emit log_named_uint("\tProven block number ", rollup.getProvenBlockNumber());
emit log_named_uint(
"\tNumber of attestors ", IStaking(address(rollup)).getActiveAttesterCount()
);
emit log_named_decimal_uint(
"\tMinimum stake", IStaking(address(rollup)).getActivationThreshold(), 18
);
emit log_named_uint("\tNumber of attestors ", IStaking(address(rollup)).getActiveAttesterCount());
emit log_named_decimal_uint("\tMinimum stake", IStaking(address(rollup)).getActivationThreshold(), 18);

emit log_named_address("# Governance", address(governance));
Configuration memory config = governance.getConfiguration();
Expand Down Expand Up @@ -126,8 +117,7 @@ contract GovScript is Test {

for (uint256 i = lowerLimit; i <= currentRound; i++) {
RoundAccounting memory r = governanceProposer.getRoundData(address(rollup), i);
uint256 signalCount =
governanceProposer.signalCount(address(rollup), i, r.payloadWithMostSignals);
uint256 signalCount = governanceProposer.signalCount(address(rollup), i, r.payloadWithMostSignals);

emit log_named_uint("Proposal at round", i);
emit log_named_uint("\tsignalCount", signalCount);
Expand Down Expand Up @@ -160,9 +150,7 @@ contract GovScript is Test {
emit log_named_decimal_uint("yeaCount ", proposal.summedBallot.yea, 18);
emit log_named_decimal_uint("nayCount ", proposal.summedBallot.nay, 18);

Timestamp ts = Timestamp.wrap(block.timestamp) < pendingThrough
? Timestamp.wrap(block.timestamp)
: pendingThrough;
Timestamp ts = Timestamp.wrap(block.timestamp) < pendingThrough ? Timestamp.wrap(block.timestamp) : pendingThrough;

emit log_named_decimal_uint("power ", governance.powerAt(ME, ts), 18);
}
Expand All @@ -182,24 +170,19 @@ contract GovScript is Test {
/* -------------------------------------------------------------------------- */

function fundRewardDistributor() public {
RewardDistributor rewardDistributor =
RewardDistributor(address(registry.getRewardDistributor()));
RewardDistributor rewardDistributor = RewardDistributor(address(registry.getRewardDistributor()));

TestERC20 asset = TestERC20(address(rewardDistributor.ASSET()));
IRollup canonicalRollup = IRollup(address(registry.getCanonicalRollup()));
uint256 blockReward = canonicalRollup.getBlockReward();

emit log_named_decimal_uint(
"Reward distributor balance", asset.balanceOf(address(rewardDistributor)), 18
);
emit log_named_decimal_uint("Reward distributor balance", asset.balanceOf(address(rewardDistributor)), 18);

vm.startBroadcast(ME);
asset.mint(address(rewardDistributor), 200000 * blockReward);
asset.mint(address(rewardDistributor), 200_000 * blockReward);
vm.stopBroadcast();

emit log_named_decimal_uint(
"Reward distributor balance", asset.balanceOf(address(rewardDistributor)), 18
);
emit log_named_decimal_uint("Reward distributor balance", asset.balanceOf(address(rewardDistributor)), 18);
}

// This should only be called if we figure that we are minting too little fee asset
Expand Down Expand Up @@ -266,9 +249,7 @@ contract GovScript is Test {
Ownable(address(registry)).transferOwnership(address(governance));
vm.stopBroadcast();
assertEq(Ownable(address(registry)).owner(), address(governance));
emit log_named_address(
"Passed ownership of registry to governance", Ownable(address(registry)).owner()
);
emit log_named_address("Passed ownership of registry to governance", Ownable(address(registry)).owner());
}

// Deposit enough funds to be able to pass a vote
Expand Down Expand Up @@ -307,8 +288,7 @@ contract GovScript is Test {
emit log_named_address("deploying payload to add instance", _instance);

vm.startBroadcast(ME);
RegisterNewRollupVersionPayload payload =
new RegisterNewRollupVersionPayload(registry, IInstance(_instance));
RegisterNewRollupVersionPayload payload = new RegisterNewRollupVersionPayload(registry, IInstance(_instance));
vm.stopBroadcast();

lookAtPayload(address(payload));
Expand Down
3 changes: 1 addition & 2 deletions l1-contracts/script/StakingAssetHandler.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import {IRollup} from "@aztec/core/interfaces/IRollup.sol";
import {IRegistry} from "@aztec/governance/interfaces/IRegistry.sol";
import {IValidatorSelection} from "@aztec/core/interfaces/IValidatorSelection.sol";
import {IPayload} from "@aztec/governance/interfaces/IPayload.sol";
import {RegisterNewRollupVersionPayload} from
"../test/governance/scenario/RegisterNewRollupVersionPayload.sol";
import {RegisterNewRollupVersionPayload} from "../test/governance/scenario/RegisterNewRollupVersionPayload.sol";
import {ProposalLib} from "@aztec/governance/libraries/ProposalLib.sol";
import {Ownable} from "@oz/access/Ownable.sol";
import {Fakerollup} from "../test/governance/governance-proposer/mocks/Fakerollup.sol";
Expand Down
Loading
Loading