Skip to content

Commit 89b4030

Browse files
committed
feat: use EAS library
1 parent 95b8fc7 commit 89b4030

File tree

9 files changed

+12
-41
lines changed

9 files changed

+12
-41
lines changed

remappings.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
solmate/=lib/solmate/
22
@eth-optimism-bedrock/=lib/optimism/packages/contracts-bedrock
3+
eas-contracts/=lib/dao-signer/lib/eas-contracts/contracts/

script/02_DeployUnichain.s.sol

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
pragma solidity ^0.8.20;
33

44
import {console2} from "forge-std/console2.sol";
5-
import "forge-std/Script.sol";
5+
import {Script} from "forge-std/Script.sol";
66
import {UnichainDeployer} from "./deployers/UnichainDeployer.sol";
7-
import {ITokenJar} from "../src/interfaces/ITokenJar.sol";
8-
import {TokenJar} from "../src/TokenJar.sol";
97
import {OptimismBridgedResourceFirepit} from "../src/releasers/OptimismBridgedResourceFirepit.sol";
108

119
contract DeployUnichain is Script {

script/04_UnificationProposal.s.sol

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

44
import {console2} from "forge-std/console2.sol";
5-
import "forge-std/Script.sol";
6-
import "forge-std/StdAssertions.sol";
5+
import {AttestationRequestData, AttestationRequest, IEAS} from "eas-contracts/IEAS.sol";
6+
import {Script} from "forge-std/Script.sol";
7+
import {StdAssertions} from "forge-std/StdAssertions.sol";
78
import {MainnetDeployer} from "./deployers/MainnetDeployer.sol";
89
import {IUniswapV2Factory} from "briefcase/protocols/v2-core/interfaces/IUniswapV2Factory.sol";
910
import {IUniswapV3Factory} from "briefcase/protocols/v3-core/interfaces/IUniswapV3Factory.sol";
@@ -209,24 +210,6 @@ interface IFeeToSetter {
209210
function setFeeToSetter(address) external;
210211
}
211212

212-
struct AttestationRequestData {
213-
address recipient;
214-
uint64 expirationTime;
215-
bool revocable;
216-
bytes32 refUID;
217-
bytes data;
218-
uint256 value;
219-
}
220-
221-
struct AttestationRequest {
222-
bytes32 schema;
223-
AttestationRequestData data;
224-
}
225-
226-
interface IEAS {
227-
function attest(AttestationRequest calldata request) external payable returns (bytes32);
228-
}
229-
230213
interface IGovernorBravo {
231214
function propose(
232215
address[] memory targets,

script/deployers/UnichainDeployer.sol

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
// SPDX-License-Identifier: AGPL-3.0-only
22
pragma solidity ^0.8.29;
33

4-
import {V3FeeAdapter} from "../../src/feeAdapters/V3FeeAdapter.sol";
54
import {ITokenJar} from "../../src/interfaces/ITokenJar.sol";
65
import {TokenJar} from "../../src/TokenJar.sol";
76
import {IReleaser} from "../../src/interfaces/IReleaser.sol";
8-
import {IV3FeeAdapter} from "../../src/interfaces/IV3FeeAdapter.sol";
97
import {IOwned} from "../../src/interfaces/base/IOwned.sol";
108
import {
119
OptimismBridgedResourceFirepit

snapshots/V3FeeAdapterTest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"batchTriggerFeeUpdate_allLeaves": "186391457",
3-
"triggerFeeUpdate_0": "15048",
4-
"triggerFeeUpdate_4500": "13000",
5-
"triggerFeeUpdate_8999": "13192"
2+
"batchTriggerFeeUpdate_allLeaves": "277996773",
3+
"triggerFeeUpdate_0": "57728",
4+
"triggerFeeUpdate_4500": "57704",
5+
"triggerFeeUpdate_8999": "55136"
66
}

test/CreateAgreementAnchorsMainnet.fork.t.sol

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.20;
33

4-
import "forge-std/Test.sol";
5-
import {
6-
CreateAgreementAnchors,
7-
IAgreementAnchorFactory
8-
} from "script/03_CreateAgreementAnchorsMainnet.s.sol";
4+
import {Test} from "forge-std/Test.sol";
5+
import {CreateAgreementAnchors} from "script/03_CreateAgreementAnchorsMainnet.s.sol";
96

107
contract CreateAgreementAnchorsMainnetForkTest is Test {
118
CreateAgreementAnchors public script;

test/Firepit.t.sol

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import {INonce} from "../src/interfaces/base/INonce.sol";
88
import {IOwned} from "../src/interfaces/base/IOwned.sol";
99
import {IResourceManager} from "../src/interfaces/base/IResourceManager.sol";
1010
import {IReleaser} from "../src/interfaces/IReleaser.sol";
11-
import {Firepit} from "../src/releasers/Firepit.sol";
12-
import {ExchangeReleaser} from "../src/releasers/ExchangeReleaser.sol";
1311

1412
contract FirepitTest is ProtocolFeesTestBase {
1513
function setUp() public override {

test/ProtocolFees.fork.t.sol

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ pragma solidity ^0.8.29;
33

44
import {Test} from "forge-std/Test.sol";
55
import {IERC20} from "forge-std/interfaces/IERC20.sol";
6-
import {
7-
UniswapV3FactoryDeployer,
8-
IUniswapV3Factory
9-
} from "briefcase/deployers/v3-core/UniswapV3FactoryDeployer.sol";
6+
import {IUniswapV3Factory} from "briefcase/deployers/v3-core/UniswapV3FactoryDeployer.sol";
107
import {IUniswapV3Pool} from "v3-core/contracts/interfaces/IUniswapV3Pool.sol";
118
import {MainnetDeployer} from "../script/deployers/MainnetDeployer.sol";
129
import {ITokenJar} from "../src/interfaces/ITokenJar.sol";

test/mocks/ExchangeReleaserMock.sol

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// SPDX-License-Identifier: AGPL-3.0-only
22
pragma solidity ^0.8.29;
33

4-
import {Currency} from "v4-core/types/Currency.sol";
54
import {ExchangeReleaser} from "../../src/releasers/ExchangeReleaser.sol";
65

76
contract ExchangeReleaserMock is ExchangeReleaser {

0 commit comments

Comments
 (0)