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

spearbit 94 #389

Merged
merged 1 commit into from
Sep 3, 2024
Merged

spearbit 94 #389

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
13 changes: 0 additions & 13 deletions contracts/base/Callbacks.sol
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions contracts/base/Dispatcher.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {BytesLib} from '../modules/uniswap/v3/BytesLib.sol';
import {Payments} from '../modules/Payments.sol';
import {PaymentsImmutables} from '../modules/PaymentsImmutables.sol';
import {V3ToV4Migrator} from '../modules/V3ToV4Migrator.sol';
import {Callbacks} from '../base/Callbacks.sol';
import {Commands} from '../libraries/Commands.sol';
import {Lock} from './Lock.sol';
import {ERC20} from 'solmate/src/tokens/ERC20.sol';
Expand All @@ -18,7 +17,7 @@ import {ActionConstants} from '@uniswap/v4-periphery/src/libraries/ActionConstan

/// @title Decodes and Executes Commands
/// @notice Called by the UniversalRouter contract to efficiently decode and execute a singular command
abstract contract Dispatcher is Payments, V2SwapRouter, V3SwapRouter, V4SwapRouter, V3ToV4Migrator, Callbacks, Lock {
abstract contract Dispatcher is Payments, V2SwapRouter, V3SwapRouter, V4SwapRouter, V3ToV4Migrator, Lock {
using BytesLib for bytes;

error InvalidCommandType(uint256 commandType);
Expand Down
9 changes: 0 additions & 9 deletions test/foundry-tests/UniversalRouter.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {Payments} from '../../contracts/modules/Payments.sol';
import {Constants} from '../../contracts/libraries/Constants.sol';
import {Commands} from '../../contracts/libraries/Commands.sol';
import {MockERC20} from './mock/MockERC20.sol';
import {Callbacks} from '../../contracts/base/Callbacks.sol';
import {ExampleModule} from '../../contracts/test/ExampleModule.sol';
import {RouterParameters} from '../../contracts/base/RouterImmutables.sol';
import {ERC20} from 'solmate/src/tokens/ERC20.sol';
Expand All @@ -21,7 +20,6 @@ contract UniversalRouterTest is Test {
UniversalRouter router;
ExampleModule testModule;
MockERC20 erc20;
Callbacks callbacks;

function setUp() public {
RouterParameters memory params = RouterParameters({
Expand All @@ -38,7 +36,6 @@ contract UniversalRouterTest is Test {
router = new UniversalRouter(params);
testModule = new ExampleModule();
erc20 = new MockERC20();
callbacks = new Callbacks();
}

event ExampleModuleEvent(string message);
Expand Down Expand Up @@ -99,10 +96,4 @@ contract UniversalRouterTest is Test {
vm.expectRevert(Payments.InsufficientETH.selector);
router.execute(commands, inputs);
}

function testSupportsInterface() public {
bool supportsERC165 = callbacks.supportsInterface(type(IERC165).interfaceId);

assertEq(supportsERC165, true);
}
}
2 changes: 1 addition & 1 deletion test/integration-tests/gas-tests/__snapshots__/CheckOwnership.gas.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
exports[`Check Ownership Gas gas: balance check ERC20 1`] = `
Object {
"calldataByteLength": 356,
"gasUsed": 37731,
"gasUsed": 37701,
}
`;
14 changes: 7 additions & 7 deletions test/integration-tests/gas-tests/__snapshots__/Payments.gas.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,48 +3,48 @@
exports[`Payments Gas Tests Individual Command Tests gas: SWEEP with ERC20 1`] = `
Object {
"calldataByteLength": 356,
"gasUsed": 37042,
"gasUsed": 37012,
}
`;

exports[`Payments Gas Tests Individual Command Tests gas: SWEEP_WITH_FEE 1`] = `
Object {
"calldataByteLength": 516,
"gasUsed": 65756,
"gasUsed": 65726,
}
`;

exports[`Payments Gas Tests Individual Command Tests gas: TRANSFER with ERC20 1`] = `
Object {
"calldataByteLength": 356,
"gasUsed": 36070,
"gasUsed": 36040,
}
`;

exports[`Payments Gas Tests Individual Command Tests gas: TRANSFER with ETH 1`] = `
Object {
"calldataByteLength": 356,
"gasUsed": 31635,
"gasUsed": 31605,
}
`;

exports[`Payments Gas Tests Individual Command Tests gas: UNWRAP_WETH 1`] = `
Object {
"calldataByteLength": 324,
"gasUsed": 44614,
"gasUsed": 44579,
}
`;

exports[`Payments Gas Tests Individual Command Tests gas: UNWRAP_WETH_WITH_FEE 1`] = `
Object {
"calldataByteLength": 644,
"gasUsed": 51041,
"gasUsed": 51006,
}
`;

exports[`Payments Gas Tests Individual Command Tests gas: WRAP_ETH 1`] = `
Object {
"calldataByteLength": 324,
"gasUsed": 53413,
"gasUsed": 53389,
}
`;
Loading
Loading