Skip to content

Commit

Permalink
Branch v3.0.0 (#5)
Browse files Browse the repository at this point in the history
Co-authored-by: Jan-Paul Azucena <[email protected]>
Co-authored-by: Nathan Sala <[email protected]>
  • Loading branch information
3 people authored Jun 17, 2020
1 parent 0b8845f commit 19e1aab
Show file tree
Hide file tree
Showing 6 changed files with 4,431 additions and 1,350 deletions.
7 changes: 4 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Changelog

## 2.0.1 (28/05/2020)
## 3.0.0 (17/06/2020)

### Bugfixes
* Removed merge artifacts.
### Breaking changes
* Contracts compiler version fixed at solidity 0.6.8.
* Updated `@animoca/ethereum-contracts-core_library` to version 3 and downgraded it to be a dev dependency.

## 2.0.0 (27/05/2020)

Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ This project serves as a base dependency for Solidity-based ERC20 contract proje

## Overview


### Installation

Install as a module dependency in your host NodeJS project:

```bash
$ npm install --save @animoca/ethereum-contracts-erc20_base
npm install --save-dev @animoca/ethereum-contracts-erc20_base
```


Expand Down
12 changes: 12 additions & 0 deletions contracts/metatx/ERC20Fees.sol
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,22 @@ abstract contract ERC20Fees is GSNRecipient, PayoutWallet
);
}

/**
* @dev Replacement for msg.sender. Returns the actual sender of a transaction: msg.sender for regular transactions,
* and the end-user for GSN relayed calls (where msg.sender is actually `RelayHub`).
*
* IMPORTANT: Contracts derived from {GSNRecipient} should never use `msg.sender`, and use {_msgSender} instead.
*/
function _msgSender() internal virtual override(Context, GSNRecipient) view returns (address payable) {
return GSNRecipient._msgSender();
}

/**
* @dev Replacement for msg.data. Returns the actual calldata of a transaction: msg.data for regular transactions,
* and a reduced version for GSN relayed calls (where msg.data contains additional information).
*
* IMPORTANT: Contracts derived from {GSNRecipient} should never use `msg.data`, and use {_msgData} instead.
*/
function _msgData() internal virtual override(Context, GSNRecipient) view returns (bytes memory) {
return GSNRecipient._msgData();
}
Expand Down
Loading

0 comments on commit 19e1aab

Please sign in to comment.