Skip to content

Commit

Permalink
Merge pull request #569 from tokencard/new_tag
Browse files Browse the repository at this point in the history
  • Loading branch information
mischat committed Apr 23, 2020
2 parents 33ace69 + 720aecb commit be9f35f
Show file tree
Hide file tree
Showing 22 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion build/mocks/isValidSignatureExporter/DailyLimitTrait.bin

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/mocks/isValidSignatureExporter/Wallet.bin

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/mocks/isValidSignatureExporter/combined.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/wallet/DailyLimitTrait.bin

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/wallet/Wallet.bin

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/wallet/combined.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/walletCache/DailyLimitTrait.bin

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/walletCache/Wallet.bin

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/walletCache/WalletCache.bin

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/walletCache/combined.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/walletDeployer/DailyLimitTrait.bin

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/walletDeployer/Wallet.bin

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/walletDeployer/WalletCache.bin

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/walletDeployer/WalletDeployer.bin

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/walletDeployer/combined.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion contracts/wallet.sol
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ contract Wallet is ENSResolvable, GasTopUpLimit, LoadLimit, AddressWhitelist, Sp
event Transferred(address _to, address _asset, uint256 _amount);
event UpdatedAvailableLimit(); // This is here because our tests don't inherit events from a library

string public constant WALLET_VERSION = "3.1.1";
string public constant WALLET_VERSION = "3.2.0";

// keccak256("isValidSignature(bytes,bytes)") = 20c13b0bc670c284a9f19cdf7a533ca249404190f8dc132aac33e733b965269e
bytes4 private constant _EIP_1271 = 0x20c13b0b;
Expand Down
Loading

0 comments on commit be9f35f

Please sign in to comment.