diff options
author | Fabio Berger <me@fabioberger.com> | 2018-05-23 02:42:58 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-05-23 02:42:58 +0800 |
commit | c579db1a7bec0b5fdec8d120121375224de46d5d (patch) | |
tree | acb53a5cd5dbed6f5f24a24bdb7b89d2083bb699 /packages/metacoin/contracts | |
parent | 61fa34e2ce9481333c0632dabdaf03582c71a78a (diff) | |
parent | 96febf663924445363e0120b7341bf0c12b03700 (diff) | |
download | dexon-sol-tools-c579db1a7bec0b5fdec8d120121375224de46d5d.tar dexon-sol-tools-c579db1a7bec0b5fdec8d120121375224de46d5d.tar.gz dexon-sol-tools-c579db1a7bec0b5fdec8d120121375224de46d5d.tar.bz2 dexon-sol-tools-c579db1a7bec0b5fdec8d120121375224de46d5d.tar.lz dexon-sol-tools-c579db1a7bec0b5fdec8d120121375224de46d5d.tar.xz dexon-sol-tools-c579db1a7bec0b5fdec8d120121375224de46d5d.tar.zst dexon-sol-tools-c579db1a7bec0b5fdec8d120121375224de46d5d.zip |
Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-prototype
* 'v2-prototype' of github.com:0xProject/0x-monorepo:
Update artifacts
Update yarn.lock
Fix warnings in Metacoin
Upgrade UglifyJS to include ES6 support
Add CancelOrder and MatchOrder types
Add missing return types
Ignore classnames linter rule
Diffstat (limited to 'packages/metacoin/contracts')
-rw-r--r-- | packages/metacoin/contracts/Metacoin.sol | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/metacoin/contracts/Metacoin.sol b/packages/metacoin/contracts/Metacoin.sol index ac212b32e..dc67e6242 100644 --- a/packages/metacoin/contracts/Metacoin.sol +++ b/packages/metacoin/contracts/Metacoin.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.21; +pragma solidity ^0.4.24; pragma experimental ABIEncoderV2; contract Metacoin { @@ -16,7 +16,7 @@ contract Metacoin { uint32 callback; } - function Metacoin() public { + constructor () public { balances[msg.sender] = 10000; } @@ -24,7 +24,7 @@ contract Metacoin { if (balances[msg.sender] < transferData.amount) return false; balances[msg.sender] -= transferData.amount; balances[transferData.to] += transferData.amount; - Transfer(msg.sender, transferData.to, transferData.amount); + emit Transfer(msg.sender, transferData.to, transferData.amount); return true; } |