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.

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

CCIP-4130 CCIP-Compatible Generic BurnMintERC20 #15123

Merged
merged 56 commits into from
Nov 21, 2024
Merged
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
8ce0c12
make generic BurnMintERC20 that's ccip-compatible
jhweintraub Nov 5, 2024
e84c420
formatting
jhweintraub Nov 5, 2024
53a3d37
changeset, compiler version set to 8.19 for conformity, and new gethw…
jhweintraub Nov 5, 2024
4082a05
[Bot] Update changeset file with jira issues
app-token-issuer-infra-releng[bot] Nov 5, 2024
fb77e5b
adjust compiler version
jhweintraub Nov 5, 2024
0744916
replace ERC677 with ERC20 in tests that don't need it.
jhweintraub Nov 6, 2024
2b03e2f
move burnMintERC20 to access control not ownership
jhweintraub Nov 7, 2024
eee9d79
forge fmt
jhweintraub Nov 7, 2024
6160bf1
Merge branch 'develop' into feat/genericERC20
jhweintraub Nov 7, 2024
568a536
undo accidental changes to go file in merge
jhweintraub Nov 7, 2024
70a41ae
fix compiler errors
jhweintraub Nov 7, 2024
63ab7c6
Merge 70a41aeae9eb040c81fa1fdc8b6716e23d9eae1c into 3b6aacef0c21beca9…
jhweintraub Nov 7, 2024
decd644
Update gethwrappers
app-token-issuer-infra-releng[bot] Nov 7, 2024
d0d68f7
formatting
jhweintraub Nov 7, 2024
2258a0b
remove more references to ERC677
jhweintraub Nov 7, 2024
6f2bd9f
Merge branch 'develop' into feat/genericERC20
jhweintraub Nov 11, 2024
2be4438
fix snapshot broken in merge
jhweintraub Nov 11, 2024
11c5898
Merge branch 'develop' into feat/genericERC20
jhweintraub Nov 11, 2024
9aee6d0
remove automatic mint and burn role granting in BurnMintERC20 constru…
jhweintraub Nov 11, 2024
c40c669
Merge 9aee6d04a6119b0621078f9270e383b66b54e6ce into 00d966176b8212c27…
jhweintraub Nov 11, 2024
794adba
Update gethwrappers
app-token-issuer-infra-releng[bot] Nov 11, 2024
bea7c55
optimize contract and change function names for new naming convention
jhweintraub Nov 11, 2024
d502b02
Merge bea7c554f84d47668bc78dd8d79be81d7ac0ff6e into a455950e53f8ef7f5…
jhweintraub Nov 11, 2024
5351c79
snapshot fix
jhweintraub Nov 11, 2024
25a1196
pnpm prettier formatting
jhweintraub Nov 11, 2024
147f69a
Merge 25a1196a053ce19e4f1322a5495a9c4aa54be7f0 into a455950e53f8ef7f5…
jhweintraub Nov 11, 2024
3ed0a97
Update gethwrappers
app-token-issuer-infra-releng[bot] Nov 11, 2024
dce25c7
optimize transfer and approve function by removing unnec. error check…
jhweintraub Nov 11, 2024
dd7bb2b
Merge dce25c7fd803b23ae0821c041c27943acef85eb6 into a455950e53f8ef7f5…
jhweintraub Nov 11, 2024
d813844
Merge dd7bb2ba3f18d1da8f3a97e950e6e476086c6023 into a455950e53f8ef7f5…
jhweintraub Nov 11, 2024
2ee121d
Update gethwrappers
app-token-issuer-infra-releng[bot] Nov 11, 2024
f07b0af
remove unused import and better interface imports
jhweintraub Nov 11, 2024
dcc5172
snapshot fix
jhweintraub Nov 11, 2024
1902174
Merge branch 'develop' into feat/genericERC20
jhweintraub Nov 12, 2024
658c9e4
remove failing coverage test
jhweintraub Nov 12, 2024
a9813a0
Merge branch 'develop' into feat/genericERC20
jhweintraub Nov 12, 2024
8e2661c
add missing single quote in github action
jhweintraub Nov 12, 2024
419e69c
lets try this one more time
jhweintraub Nov 12, 2024
e3ce8f3
remove IR minimum compilation detail
jhweintraub Nov 12, 2024
18ef340
gas snapshot fix attempt
jhweintraub Nov 12, 2024
58e2a6a
Revert "optimize transfer and approve function by removing unnec. err…
RensR Nov 13, 2024
609e9ef
Merge branch 'develop' into feat/genericERC20
RensR Nov 13, 2024
1202ea8
fix naming of tests
RensR Nov 13, 2024
c7005c6
Merge 1202ea8ab5a0a186a14bccc4bbf628bca4860baf into 61aa9afd6b25ae50d…
jhweintraub Nov 13, 2024
802f71b
Update gethwrappers
app-token-issuer-infra-releng[bot] Nov 13, 2024
322b74c
fix min pragma
RensR Nov 13, 2024
f1d9f7f
Merge branch 'develop' into feat/genericERC20
jhweintraub Nov 14, 2024
b99d088
add important natspec comment
jhweintraub Nov 15, 2024
5802a9e
Merge branch 'develop' into feat/genericERC20
jhweintraub Nov 15, 2024
ca8d02c
Merge branch 'develop' into feat/genericERC20
jhweintraub Nov 19, 2024
5ddd909
Merge branch 'develop' into feat/genericERC20
jhweintraub Nov 19, 2024
f18d1e3
snapshot fix
jhweintraub Nov 19, 2024
9a4b443
another snapshot fix attempt
jhweintraub Nov 19, 2024
e333214
Merge branch 'develop' into feat/genericERC20
jhweintraub Nov 19, 2024
15b29bf
Merge branch 'develop' into feat/genericERC20
jhweintraub Nov 20, 2024
da791c9
Merge branch 'develop' into feat/genericERC20
jhweintraub Nov 21, 2024
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
Prev Previous commit
Next Next commit
adjust compiler version
  • Loading branch information
jhweintraub committed Nov 5, 2024
commit fb77e5b0f1617aae256f8ce4f249277e2afa48b7
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
pragma solidity 0.8.24;

import {BurnMintERC20Setup} from "./BurnMintERC20Setup.t.sol";

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
pragma solidity 0.8.24;

import {BurnMintERC20Setup} from "./BurnMintERC20Setup.t.sol";
import {BurnMintERC20} from "../../../../token/ERC20/BurnMintERC20.sol";
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
pragma solidity 0.8.24;

import {BurnMintERC20Setup} from "./BurnMintERC20Setup.t.sol";
import {BurnMintERC20} from "../../../../token/ERC20/BurnMintERC20.sol";
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
pragma solidity 0.8.24;

import {BurnMintERC20Setup} from "./BurnMintERC20Setup.t.sol";
import {BurnMintERC20} from "../../../../token/ERC20/BurnMintERC20.sol";
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
pragma solidity 0.8.24;

import {BurnMintERC20Setup} from "./BurnMintERC20Setup.t.sol";
import {BurnMintERC20} from "../../../../token/ERC20/BurnMintERC20.sol";
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
pragma solidity 0.8.24;

import {BurnMintERC20Setup} from "./BurnMintERC20Setup.t.sol";
import {BurnMintERC20} from "../../../../token/ERC20/BurnMintERC20.sol";
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
pragma solidity 0.8.24;

import {BurnMintERC20Setup} from "./BurnMintERC20Setup.t.sol";

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
pragma solidity 0.8.24;

import {BurnMintERC20Setup} from "./BurnMintERC20Setup.t.sol";
import {BurnMintERC20} from "../../../../token/ERC20/BurnMintERC20.sol";
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
pragma solidity 0.8.24;

import {BurnMintERC20Setup} from "./BurnMintERC20Setup.t.sol";
import {BurnMintERC20} from "../../../../token/ERC20/BurnMintERC20.sol";
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
pragma solidity 0.8.24;

import {BurnMintERC20Setup} from "./BurnMintERC20Setup.t.sol";

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
pragma solidity 0.8.24;

import {BurnMintERC20Setup} from "./BurnMintERC20Setup.t.sol";
import {BurnMintERC20} from "../../../../token/ERC20/BurnMintERC20.sol";
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
pragma solidity 0.8.24;

import {IBurnMintERC20} from "../../../../../shared/token/ERC20/IBurnMintERC20.sol";

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
pragma solidity 0.8.24;

import {BurnMintERC20Setup} from "./BurnMintERC20Setup.t.sol";

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
pragma solidity 0.8.24;

import {BurnMintERC20} from "../../../../token/ERC20/BurnMintERC20.sol";
import {BaseTest} from "../../../BaseTest.t.sol";
2 changes: 1 addition & 1 deletion contracts/src/v0.8/shared/token/ERC20/BurnMintERC20.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
pragma solidity ^0.8.0;

import {IGetCCIPAdmin} from "../../../ccip/interfaces/IGetCCIPAdmin.sol";
import {IOwnable} from "../../../shared/interfaces/IOwnable.sol";
Loading