Skip to content

Commit 1312eab

Browse files
0xernesto0xernesto
committed
forge fmt
1 parent ddcb257 commit 1312eab

27 files changed

+252
-206
lines changed

‎contracts/foundry.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ optimizer_runs = 100
2020
[profile.fuzz]
2121
optimizer = true
2222
optimizer_runs = 100
23+
24+
[fuzz]
2325
runs = 10000
2426
seed = "0x1234"
2527

‎contracts/script/deploy/All.s.sol‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ import {IntermediateSuccinct} from "../../src/tokens/IntermediateSuccinct.sol";
88
import {SuccinctGovernor} from "../../src/SuccinctGovernor.sol";
99
import {Succinct} from "../../src/tokens/Succinct.sol";
1010
import {FixtureLoader} from "../../test/utils/FixtureLoader.sol";
11-
import {ERC1967Proxy} from
12-
"../../lib/openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
11+
import {
12+
ERC1967Proxy
13+
} from "../../lib/openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
1314
import {SP1VerifierGateway} from "../../lib/sp1-contracts/contracts/src/SP1VerifierGateway.sol";
1415
import {SP1Verifier} from "../../lib/sp1-contracts/contracts/src/v5.0.0/SP1VerifierGroth16.sol";
1516

@@ -117,17 +118,18 @@ contract AllScript is BaseScript, FixtureLoader {
117118
uint256 UNSTAKE_PERIOD = readUint256("UNSTAKE_PERIOD");
118119
uint256 SLASH_CANCELLATION_PERIOD = readUint256("SLASH_CANCELLATION_PERIOD");
119120

120-
SuccinctStaking(STAKING).initialize(
121-
OWNER,
122-
GOVERNOR,
123-
VAPP,
124-
PROVE,
125-
I_PROVE,
126-
DISPENSER,
127-
MIN_STAKE_AMOUNT,
128-
MAX_UNSTAKE_REQUESTS,
129-
UNSTAKE_PERIOD,
130-
SLASH_CANCELLATION_PERIOD
131-
);
121+
SuccinctStaking(STAKING)
122+
.initialize(
123+
OWNER,
124+
GOVERNOR,
125+
VAPP,
126+
PROVE,
127+
I_PROVE,
128+
DISPENSER,
129+
MIN_STAKE_AMOUNT,
130+
MAX_UNSTAKE_REQUESTS,
131+
UNSTAKE_PERIOD,
132+
SLASH_CANCELLATION_PERIOD
133+
);
132134
}
133135
}

‎contracts/script/deploy/AllAtomic.s.sol‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import {SuccinctVApp} from "../../src/SuccinctVApp.sol";
77
import {IntermediateSuccinct} from "../../src/tokens/IntermediateSuccinct.sol";
88
import {SuccinctGovernor} from "../../src/SuccinctGovernor.sol";
99
import {AtomicDeployer} from "../utils/AtomicDeployer.sol";
10-
import {ERC1967Proxy} from
11-
"../../lib/openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
10+
import {
11+
ERC1967Proxy
12+
} from "../../lib/openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
1213

1314
// Deploy all contracts.
1415
contract AllAtomicScript is BaseScript {

‎contracts/script/deploy/SuccinctStaking.s.sol‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ pragma solidity ^0.8.28;
33

44
import {BaseScript} from "../utils/Base.s.sol";
55
import {SuccinctStaking} from "../../src/SuccinctStaking.sol";
6-
import {ERC1967Proxy} from
7-
"../../lib/openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
6+
import {
7+
ERC1967Proxy
8+
} from "../../lib/openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
89

910
contract SuccinctStakingScript is BaseScript {
1011
string internal constant KEY = "STAKING";

‎contracts/script/deploy/SuccinctVApp.s.sol‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ pragma solidity ^0.8.28;
33

44
import {BaseScript} from "../utils/Base.s.sol";
55
import {SuccinctVApp} from "../../src/SuccinctVApp.sol";
6-
import {ERC1967Proxy} from
7-
"../../lib/openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
6+
import {
7+
ERC1967Proxy
8+
} from "../../lib/openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
89

910
contract SuccinctVAppScript is BaseScript {
1011
string internal constant KEY = "VAPP";

‎contracts/script/utils/AtomicDeployer.sol‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ pragma solidity ^0.8.28;
44
import {SuccinctStaking} from "../../src/SuccinctStaking.sol";
55
import {SuccinctVApp} from "../../src/SuccinctVApp.sol";
66
import {IntermediateSuccinct} from "../../src/tokens/IntermediateSuccinct.sol";
7-
import {ERC1967Proxy} from
8-
"../../lib/openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
7+
import {
8+
ERC1967Proxy
9+
} from "../../lib/openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
910

1011
contract AtomicDeployer {
1112
// Staking proxy param
@@ -152,18 +153,19 @@ contract AtomicDeployer {
152153
VAPP = address(new ERC1967Proxy{salt: salt}(vappImpl, vappInitData));
153154
}
154155

155-
SuccinctStaking(STAKING).initialize(
156-
owner,
157-
GOVERNOR,
158-
VAPP,
159-
prove,
160-
I_PROVE,
161-
dispenser,
162-
minStakeAmount,
163-
maxUnstakeRequests,
164-
unstakePeriod,
165-
slashCancellationPeriod
166-
);
156+
SuccinctStaking(STAKING)
157+
.initialize(
158+
owner,
159+
GOVERNOR,
160+
VAPP,
161+
prove,
162+
I_PROVE,
163+
dispenser,
164+
minStakeAmount,
165+
maxUnstakeRequests,
166+
unstakePeriod,
167+
slashCancellationPeriod
168+
);
167169

168170
return (STAKING, VAPP, I_PROVE, GOVERNOR);
169171
}

‎contracts/src/SuccinctGovernor.sol‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@
22
pragma solidity ^0.8.28;
33

44
import {Governor} from "../lib/openzeppelin-contracts/contracts/governance/Governor.sol";
5-
import {GovernorCountingSimple} from
6-
"../lib/openzeppelin-contracts/contracts/governance/extensions/GovernorCountingSimple.sol";
7-
import {GovernorSettings} from
8-
"../lib/openzeppelin-contracts/contracts/governance/extensions/GovernorSettings.sol";
9-
import {GovernorVotes} from
10-
"../lib/openzeppelin-contracts/contracts/governance/extensions/GovernorVotes.sol";
11-
import {GovernorVotesQuorumFraction} from
12-
"../lib/openzeppelin-contracts/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";
5+
import {
6+
GovernorCountingSimple
7+
} from "../lib/openzeppelin-contracts/contracts/governance/extensions/GovernorCountingSimple.sol";
8+
import {
9+
GovernorSettings
10+
} from "../lib/openzeppelin-contracts/contracts/governance/extensions/GovernorSettings.sol";
11+
import {
12+
GovernorVotes
13+
} from "../lib/openzeppelin-contracts/contracts/governance/extensions/GovernorVotes.sol";
14+
import {
15+
GovernorVotesQuorumFraction
16+
} from "../lib/openzeppelin-contracts/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";
1317
import {IVotes} from "../lib/openzeppelin-contracts/contracts/governance/utils/IVotes.sol";
1418

1519
string constant NAME = "SuccinctGovernor";

‎contracts/src/SuccinctStaking.sol‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,22 @@ import {ISuccinctStaking} from "./interfaces/ISuccinctStaking.sol";
77
import {IIntermediateSuccinct} from "./interfaces/IIntermediateSuccinct.sol";
88
import {IProver} from "./interfaces/IProver.sol";
99
import {SuccinctGovernor} from "./SuccinctGovernor.sol";
10-
import {Initializable} from
11-
"../lib/openzeppelin-contracts-upgradeable/contracts/proxy/utils/Initializable.sol";
12-
import {OwnableUpgradeable} from
13-
"../lib/openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol";
10+
import {
11+
Initializable
12+
} from "../lib/openzeppelin-contracts-upgradeable/contracts/proxy/utils/Initializable.sol";
13+
import {
14+
OwnableUpgradeable
15+
} from "../lib/openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol";
1416
import {IERC20} from "../lib/openzeppelin-contracts/contracts/interfaces/IERC20.sol";
15-
import {IERC20Permit} from
16-
"../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Permit.sol";
17+
import {
18+
IERC20Permit
19+
} from "../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Permit.sol";
1720
import {IERC4626} from "../lib/openzeppelin-contracts/contracts/interfaces/IERC4626.sol";
1821
import {SafeERC20} from "../lib/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
1922
import {Math} from "../lib/openzeppelin-contracts/contracts/utils/math/Math.sol";
20-
import {UUPSUpgradeable} from
21-
"../lib/openzeppelin-contracts-upgradeable/contracts/proxy/utils/UUPSUpgradeable.sol";
23+
import {
24+
UUPSUpgradeable
25+
} from "../lib/openzeppelin-contracts-upgradeable/contracts/proxy/utils/UUPSUpgradeable.sol";
2226

2327
/// @title SuccinctStaking
2428
/// @author Succinct Labs
@@ -286,7 +290,9 @@ contract SuccinctStaking is
286290
if (prover == address(0)) revert NotStaked();
287291

288292
// Check that this staker has not already requested too many unstake requests.
289-
if (unstakeClaims[msg.sender].length >= maxUnstakeRequests) revert TooManyUnstakeRequests();
293+
if (unstakeClaims[msg.sender].length >= maxUnstakeRequests) {
294+
revert TooManyUnstakeRequests();
295+
}
290296

291297
// Check that this prover is not in the process of being slashed.
292298
_requireProverWithoutSlashRequests(prover);
@@ -384,11 +390,7 @@ contract SuccinctStaking is
384390
}
385391

386392
/// @inheritdoc ISuccinctStaking
387-
function cancelSlash(address _prover, uint256 _index)
388-
external
389-
override
390-
onlyForProver(_prover)
391-
{
393+
function cancelSlash(address _prover, uint256 _index) external override onlyForProver(_prover) {
392394
// Get the slash claim.
393395
SlashClaim storage claim = slashClaims[_prover][_index];
394396

‎contracts/src/SuccinctVApp.sol‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,24 @@ import {IProver} from "./interfaces/IProver.sol";
1616
import {ISuccinctVApp} from "./interfaces/ISuccinctVApp.sol";
1717
import {ISuccinctStaking} from "./interfaces/ISuccinctStaking.sol";
1818
import {ISP1Verifier} from "../lib/sp1-contracts/contracts/src/ISP1Verifier.sol";
19-
import {Initializable} from
20-
"../lib/openzeppelin-contracts-upgradeable/contracts/proxy/utils/Initializable.sol";
21-
import {OwnableUpgradeable} from
22-
"../lib/openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol";
19+
import {
20+
Initializable
21+
} from "../lib/openzeppelin-contracts-upgradeable/contracts/proxy/utils/Initializable.sol";
22+
import {
23+
OwnableUpgradeable
24+
} from "../lib/openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol";
2325
import {SafeERC20} from "../lib/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
24-
import {UUPSUpgradeable} from
25-
"../lib/openzeppelin-contracts-upgradeable/contracts/proxy/utils/UUPSUpgradeable.sol";
26-
import {IERC20Permit} from
27-
"../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Permit.sol";
26+
import {
27+
UUPSUpgradeable
28+
} from "../lib/openzeppelin-contracts-upgradeable/contracts/proxy/utils/UUPSUpgradeable.sol";
29+
import {
30+
IERC20Permit
31+
} from "../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Permit.sol";
2832
import {IERC20} from "../lib/openzeppelin-contracts/contracts/interfaces/IERC20.sol";
2933
import {IERC4626} from "../lib/openzeppelin-contracts/contracts/interfaces/IERC4626.sol";
30-
import {PausableUpgradeable} from
31-
"../lib/openzeppelin-contracts-upgradeable/contracts/utils/PausableUpgradeable.sol";
34+
import {
35+
PausableUpgradeable
36+
} from "../lib/openzeppelin-contracts-upgradeable/contracts/utils/PausableUpgradeable.sol";
3237

3338
/// @title SuccinctVApp
3439
/// @author Succinct Labs

‎contracts/src/mocks/MockStaking.sol‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ pragma solidity ^0.8.28;
44
import {ISuccinctStaking} from "../interfaces/ISuccinctStaking.sol";
55
import {ProverRegistry} from "../libraries/ProverRegistry.sol";
66
import {IERC20} from "../../lib/openzeppelin-contracts/contracts/interfaces/IERC20.sol";
7-
import {SafeERC20} from "../../lib/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
7+
import {
8+
SafeERC20
9+
} from "../../lib/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
810

911
contract MockStaking is ProverRegistry, ISuccinctStaking {
1012
using SafeERC20 for IERC20;
@@ -112,9 +114,7 @@ contract MockStaking is ProverRegistry, ISuccinctStaking {
112114

113115
unstakeClaims[msg.sender].push(
114116
UnstakeClaim({
115-
iPROVEEscrow: _stPROVE,
116-
slashFactor: pool.slashFactor,
117-
timestamp: block.timestamp
117+
iPROVEEscrow: _stPROVE, slashFactor: pool.slashFactor, timestamp: block.timestamp
118118
})
119119
);
120120

0 commit comments

Comments
 (0)