Skip to content

Commit cc8ff7f

Browse files
Merge branch 'master' into development
2 parents 6af5b3f + c72be6e commit cc8ff7f

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

docs/selector-access-control.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ If you prefer to deploy the components individually:
8787

8888
This contract is a specialized risk management contract that combines `SelectorAccessControl` with controlled parameter adjustment capabilities for EVK vaults. It is compatible with the `GovernorAccessControl` and `GovernorAccessControlEmergency` contracts and enables authorized users to modify vault parameters (caps and interest rate models) while enforcing safety limits.
8989

90-
`CapRiskSteward` allows autorized users to increase/decrease supply and borrow caps by up to 50% over 3 days. The maximum readjustment factor recharges over time.
90+
`CapRiskSteward` allows authorized users to increase/decrease supply and borrow caps by up to 50% over 3 days. The maximum readjustment factor recharges over time.
9191

92-
`CapRiskSteward` allows autorized users to substitute the interest rate model for an interest model deployed by the recognized factory.
92+
`CapRiskSteward` allows authorized users to substitute the interest rate model for an interest model deployed by the recognized factory.
9393

9494
### Usage
9595

@@ -108,4 +108,4 @@ This contract can be associated with one or more vaults deployed by the specifie
108108
1. Deploy an instance of `HookTargetAccessControl`, specifying the EVC address, default admin, and associated EVault factory address
109109
2. Grant roles to addresses for specific function selectors or the `WILD_CARD`
110110
3. Install the `HookTargetAccessControl` instance as a hook target for the desired vault(s) and configure hooked operations
111-
4. The vault will now enforce access control checks for hooked operations
111+
4. The vault will now enforce access control checks for hooked operations

docs/swaps.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
The `Swapper` and `SwapVerifier` contracts are helpers for executing swaps and swaps-to-repay operations on EVK vaults, using EVC batches.
44

5-
## Security and trust boundries
5+
## Security and trust boundaries
66

77
The `Swapper` contract is not trusted. From the protocol's perspective, it is a black box. Provided with a token to sell, it is supposed to execute the swap and return the bought token either as a balance available for deposit or as repaid debt. No assumptions are made about how the swap is performed or about the security of the `Swapper` code. In fact, the `Swapper` has no access control and allows anyone to remove any token balance it holds at any time. The provided implementation is just a reference; users are generally free to use any swapper they choose.
88

@@ -34,7 +34,7 @@ The general steps to use the `Swapper` contract are following:
3434

3535
The `Swapper` contract should implement the `ISwapper` interface. This ensures, that users could potentially provide their own implementations of the swapper contract in the UI, without needing to modify the FE code.
3636

37-
The main function is `swap()`, which takes a swap definition in a `SwapParams` struct. The params define a handler to use, swapping mode, bought and sold tokens, the amounts etc. See [ISwapper natspec](../src/Swaps/ISwapper.sol) for details. Note, that some parameters might be ignored in certain modes or by certain handlers, while others (`amountOut`) might have differrent semantics in certain modes.
37+
The main function is `swap()`, which takes a swap definition in a `SwapParams` struct. The params define a handler to use, swapping mode, bought and sold tokens, the amounts etc. See [ISwapper natspec](../src/Swaps/ISwapper.sol) for details. Note, that some parameters might be ignored in certain modes or by certain handlers, while others (`amountOut`) might have different semantics in certain modes.
3838

3939
The interface also defines helper functions like `sweep`, `deposit`, `repay` and `repayAndDeposit` which allow consuming the contract's balance.
4040

@@ -111,7 +111,7 @@ F2. Swap deposits from one EVault (A) to exact amount of another (B)
111111
- `A.withdraw` to the swapper contract. The amount must cover all of the estimated swap costs with some extra, to account for slippage
112112
- `swapper.multicall` with the following items:
113113
- `Swapper.swap` - `exact input` on the generic handler with the off-chain payload
114-
- `Swapper.swap` - `exact output` on one of the supportin handlers (Uni V2/V3) with the user specified `amountOut`. The receiver can be either the swapper contract or B vault.
114+
- `Swapper.swap` - `exact output` on one of the supporting handlers (Uni V2/V3) with the user specified `amountOut`. The receiver can be either the swapper contract or B vault.
115115
- `Swapper.sweep` the output token, into the B vault
116116
- `SwapVerifier.verifyAmountMinAndSkim` check a minimum required amount was bought and claim the funds for the user. Because exact output swaps are not guaranteed to be exact always, a small slippage could be allowed.
117117

script/22_EulerSwapFactory.s.sol

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ contract EulerSwapFactoryDeployer is ScriptUtils {
1313
address eVaultFactory = vm.parseJsonAddress(json, ".eVaultFactory");
1414
address eulerSwapImplementation = vm.parseJsonAddress(json, ".eulerSwapImplementation");
1515
address feeOwner = vm.parseJsonAddress(json, ".feeOwner");
16-
address feeReceipientSetter = vm.parseJsonAddress(json, ".feeReceipientSetter");
16+
address feeRecipientSetter = vm.parseJsonAddress(json, ".feeRecipientSetter");
1717

18-
eulerSwapFactory = execute(evc, eVaultFactory, eulerSwapImplementation, feeOwner, feeReceipientSetter);
18+
eulerSwapFactory = execute(evc, eVaultFactory, eulerSwapImplementation, feeOwner, feeRecipientSetter);
1919

2020
string memory object;
2121
object = vm.serializeAddress("factory", "eulerSwapFactory", eulerSwapFactory);
@@ -28,21 +28,21 @@ contract EulerSwapFactoryDeployer is ScriptUtils {
2828
address eVaultFactory,
2929
address eulerSwapImplementation,
3030
address feeOwner,
31-
address feeReceipientSetter
31+
address feeRecipientSetter
3232
) public broadcast returns (address eulerSwapFactory) {
33-
eulerSwapFactory = execute(evc, eVaultFactory, eulerSwapImplementation, feeOwner, feeReceipientSetter);
33+
eulerSwapFactory = execute(evc, eVaultFactory, eulerSwapImplementation, feeOwner, feeRecipientSetter);
3434
}
3535

3636
function execute(
3737
address evc,
3838
address eVaultFactory,
3939
address eulerSwapImplementation,
4040
address feeOwner,
41-
address feeReceipientSetter
41+
address feeRecipientSetter
4242
) public returns (address eulerSwapFactory) {
4343
bytes memory bytecode = abi.encodePacked(
4444
vm.getCode("out-euler-swap/EulerSwapFactory.sol/EulerSwapFactory.json"),
45-
abi.encode(evc, eVaultFactory, eulerSwapImplementation, feeOwner, feeReceipientSetter)
45+
abi.encode(evc, eVaultFactory, eulerSwapImplementation, feeOwner, feeRecipientSetter)
4646
);
4747
assembly {
4848
eulerSwapFactory := create(0, add(bytecode, 0x20), mload(bytecode))

test/Governor/FactoryGovernor.t.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ contract FactoryGovernorTests is EVaultTestBase {
9191
assertEq(eTST.balanceOf(depositor), 102e18);
9292
}
9393

94-
function test_FactoryGovernor_unathorizedCantTriggePause() external {
94+
function test_FactoryGovernor_unauthorizedCantTriggePause() external {
9595
vm.prank(admin);
9696
vm.expectRevert();
9797
factoryGovernor.pause(address(factory));
@@ -132,7 +132,7 @@ contract FactoryGovernorTests is EVaultTestBase {
132132
assertEq(eTST.balanceOf(depositor), 101e18);
133133
}
134134

135-
function test_FactoryGovernor_unathorizedCantTriggeUnpause() external {
135+
function test_FactoryGovernor_unauthorizedCantTriggeUnpause() external {
136136
vm.prank(admin);
137137
vm.expectRevert();
138138
factoryGovernor.unpause(address(factory));

0 commit comments

Comments
 (0)