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

Extend PaymentSplitter to support ERC20 tokens #2858

Merged
merged 15 commits into from
Oct 7, 2021
Merged

Extend PaymentSplitter to support ERC20 tokens #2858

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d2ed543
Add MultiPaymentSplitter
Amxx Sep 14, 2021
06068cf
consistency and linting
Amxx Sep 14, 2021
95d873c
Add MultiPaymentSplitter tests
Amxx Sep 14, 2021
f38ed9c
fix lint
Amxx Sep 14, 2021
399a544
add changelog entry
Amxx Sep 14, 2021
27ce366
add MultiPaymentSplitter to documentation
Amxx Sep 14, 2021
abfd13b
rework PaymentSplitter to include ERC20 support by default
Amxx Sep 14, 2021
7ed7a91
remove test file for MultiPaymentSplitter
Amxx Sep 14, 2021
ca9a2c3
fix lint
Amxx Sep 15, 2021
3745c03
completelly split erc20 and token tracking
Amxx Sep 15, 2021
574941a
address some PR comments
Amxx Sep 15, 2021
350c06d
add notice about rebasing tokens
Amxx Sep 15, 2021
099537b
fix minor error in tests
Amxx Sep 16, 2021
0f5e7ea
Merge branch 'master' into feature/erc20splitter
frangio Oct 6, 2021
2fc8f92
Merge branch 'master' into feature/erc20splitter
Amxx Oct 7, 2021
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
Merge branch 'master' into feature/erc20splitter
  • Loading branch information
@Amxx
Amxx authored Oct 7, 2021
commit 2fc8f9281dd2d734bd4d134c9ca8e51422fa6837
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* `AccessControl`: mark `_setupRole(bytes32,address)` as deprecated in favor of `_grantRole(bytes32,address)`. ([#2568](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/#2568))
* `EIP712`: cache `address(this)` to immutable storage to avoid potential issues if a vanilla contract is used in a delegatecall context. ([#2852](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/#2852))
* Add internal `_setApprovalForAll` to `ERC721` and `ERC1155`. ([#2834](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2834))
* `Governor`: shift vote start and end by one block to better match Compound's GovernorBravo and prevent voting at the Governor level if the voting snapshot is not ready. ([#2892](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/#2892))
* `PaymentSplitter`: now supports ERC20 assets in addition to Ether. ([#2858](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/#2858))

## 4.3.2 (2021-09-14)
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.