Commits · c90ff2cb1315d3a7e6d452977188c9a022f64216 · 俞永鹏 / openzeppelin-contracts-upgradeable

03 Feb, 2022 2 commits
- Merge upstream master into patched/master · c90ff2cb
  github-actions authored Feb 03, 2022
  
  c90ff2cb Browse Files
- Start tokenId at zero in docs (#3162) · 28986d2f
```
- Fixes #3123
```
  Tim Daubenschütz authored Feb 03, 2022
  28986d2f Browse Files
02 Feb, 2022 2 commits
- Merge upstream master into patched/master · a8e431c3
  github-actions authored Feb 02, 2022
  
  a8e431c3 Browse Files
- Improve documentation of various governance aspects (#3161) · 85566fae
```
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
```
  Francisco Giordano authored Feb 02, 2022
  85566fae Browse Files
01 Feb, 2022 8 commits
- Merge upstream master into patched/master · 48be8fb8
  github-actions authored Feb 01, 2022
  
  48be8fb8 Browse Files
- Add "available since" on Base64.sol · bfd05d96
  Francisco Giordano authored Feb 01, 2022
  
  bfd05d96 Browse Files
- Merge upstream master into patched/master · 070d42d9
  github-actions authored Feb 01, 2022
  
  070d42d9 Browse Files
- Add proper revert message on overflow of totalSupply during burn (#3144) · 574f3b89
  Hadrien Croubois authored Feb 01, 2022
  
  574f3b89 Browse Files
- Merge upstream master into patched/master · ed2432f1
  github-actions authored Feb 01, 2022
  
  ed2432f1 Browse Files
- Add AddressToUintMap (#3150) · ca755ce7
```
* add AddressToUintMap

* Update contracts/utils/structs/EnumerableMap.sol

Co-authored-by: Francisco Giordano <frangio.1@gmail.com>

* address comments

* lint code

* merge mocks into a single file

* add PR link to changelog entry

Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
```
  Gaspar Dip authored Feb 01, 2022
  ca755ce7 Browse Files
- Merge upstream master into patched/master · 28983bb7
  github-actions authored Feb 01, 2022
  
  28983bb7 Browse Files
- Simplify inheritance to avoid overrides · fc01c51c
  Francisco Giordano authored Jan 31, 2022
  
  fc01c51c Browse Files
31 Jan, 2022 6 commits
- Merge upstream master into patched/master · 8b590a58
  github-actions authored Jan 31, 2022
  
  8b590a58 Browse Files
- Update Copyright notice and include contributors · 21c5d623
  Francisco Giordano authored Jan 31, 2022
  
  21c5d623 Browse Files
- Merge upstream master into patched/master · 763f302b
  Francisco Giordano authored Jan 31, 2022
  
  763f302b Browse Files
- udpate patches for transpiler 0.3.6 · 863ded1d
  Francisco Giordano authored Jan 31, 2022
  
  863ded1d Browse Files
- Add test and docs describing a misuse of MerkleProof (#3090) · 4f8af2dc
```
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
```
  Doug Hoyte authored Jan 31, 2022
  4f8af2dc Browse Files
- Fix typo in retrieval of onERC721Received selector (#3151) · a81b07ce
  Harsh Vakharia authored Jan 31, 2022
  
  a81b07ce Browse Files
29 Jan, 2022 1 commit
- Add function documentation for SignatureChecker. · f55d2716
  Francisco Giordano authored Jan 28, 2022
  
  f55d2716 Browse Files
27 Jan, 2022 1 commit
- Fix typo in CHANGELOG (#3138) · ae54e6de
```
Remove repeated word "the".
```
  GitHubPang authored Jan 27, 2022
  ae54e6de Browse Files
26 Jan, 2022 3 commits
- Add a virtual `_checkRole(bytes32)` internal function to `AccessControl` (#3137) · fb950c61
```
* add a virtual _onlyRole(bytes32) modifier

* _onlyRole(role) → _checkRole(role)

* update doc
```
  Hadrien Croubois authored Jan 26, 2022
  fb950c61 Browse Files
- Make royaltyInfo(uint256 _tokenId, uint256 _salePrice) virtual (#3133) · 6fb1e843
```
* Make royaltyInfo(uint256 _tokenId, uint256 _salePrice) virtual

Should be cherrypicked in release 4.5

* fix lint
```
  Hadrien Croubois authored Jan 26, 2022
  6fb1e843 Browse Files
- Fix typo in CHANGELOG (#3135) · 78deae5a
```
Change `ERC2891` > `ERC2981`.
```
  GitHubPang authored Jan 26, 2022
  78deae5a Browse Files
25 Jan, 2022 1 commit

Simplification of ERC777's transfer & transferFrom by using _send (#3128) · e298476a

* Update ERC777.sol

* Update ERC777.sol

* Update ERC777.sol

* Update ERC777.sol

* fix revert reasons

Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>

authored Jan 26, 2022

e298476a Browse Files

24 Jan, 2022 2 commits
- Fix use of ^ (xor) instead of ** (power) (#3130) · a5e042ce
  Hadrien Croubois authored Jan 24, 2022
  
  a5e042ce Browse Files
- Lint · d57593c1
  Francisco Giordano authored Jan 24, 2022
  
  d57593c1 Browse Files
23 Jan, 2022 2 commits
- Add workflow to generate and update docs branches · 7c47ac71
  Francisco Giordano authored Jan 23, 2022
  
  7c47ac71 Browse Files
- Fix typo in ERC721.sol (#3127) · 8f70c886
  Muhammad Anas Baig authored Jan 23, 2022
  
  8f70c886 Browse Files
21 Jan, 2022 1 commit
- Add Slither reentrancy check in CI (#3047) · b3b83b55
```
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
```
  JulissaDantes authored Jan 20, 2022
  b3b83b55 Browse Files
18 Jan, 2022 2 commits
- Merge upstream master into patched/master · 7a9d9db1
  github-actions authored Jan 18, 2022
  
  7a9d9db1 Browse Files
- upgrade solidity-coverage to 0.7.18 to support ERC165 coverage (#3117) · 783ac759
  Hadrien Croubois authored Jan 18, 2022
  
  783ac759 Browse Files
16 Jan, 2022 2 commits
- Merge upstream master into patched/master · 10a893f1
  github-actions authored Jan 16, 2022
  
  10a893f1 Browse Files
- Fix broken pull request links in change log (#3114) · 25eeb80b
```
Co-authored-by: Han Lin Yap <codler@users.noreply.github.com>
```
  Hadrien Croubois authored Jan 16, 2022
  25eeb80b Browse Files
14 Jan, 2022 2 commits
- Merge upstream master into patched/master · 867bccfc
  github-actions authored Jan 14, 2022
  
  867bccfc Browse Files
- Move abs(int256) from Math to SafeMath (#3110) · 3eb2d43b
```
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
```
  Hadrien Croubois authored Jan 14, 2022
  3eb2d43b Browse Files
13 Jan, 2022 5 commits
- Merge upstream master into patched/master · debaffad
  github-actions authored Jan 13, 2022
  
  debaffad Browse Files
- inline functionDelegateCall · 12024acb
  Francisco Giordano authored Jan 13, 2022
  
  12024acb Browse Files
- Merge upstream master into patched/master · 7e18ffd5
  github-actions authored Jan 13, 2022
  
  7e18ffd5 Browse Files
- Merge branch 'master' of OpenZeppelin/openzeppelin-contracts into patches · 5230b7f1
  Francisco Giordano authored Jan 13, 2022
  
  5230b7f1 Browse Files
- Merge upstream master into patched/master · fdd75d5f
  Francisco Giordano authored Jan 13, 2022
  
  fdd75d5f Browse Files