diff options
| author | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-01-16 00:27:07 +0800 |
|---|---|---|
| committer | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-01-16 00:27:07 +0800 |
| commit | 6d02c0d392762203dc150203ce0f315654aed5c2 (patch) | |
| tree | e6c51635dae8245effc9b570de4f8cb00a117b1c /example | |
| parent | 508f116738517efc8c21233e9d50349ba30e223c (diff) | |
| parent | ec74fc05d438806ece64fe34b0f28c8f45f5167e (diff) | |
| download | go-tangerine-6d02c0d392762203dc150203ce0f315654aed5c2.tar go-tangerine-6d02c0d392762203dc150203ce0f315654aed5c2.tar.gz go-tangerine-6d02c0d392762203dc150203ce0f315654aed5c2.tar.bz2 go-tangerine-6d02c0d392762203dc150203ce0f315654aed5c2.tar.lz go-tangerine-6d02c0d392762203dc150203ce0f315654aed5c2.tar.xz go-tangerine-6d02c0d392762203dc150203ce0f315654aed5c2.tar.zst go-tangerine-6d02c0d392762203dc150203ce0f315654aed5c2.zip | |
Merge commit '1a6dbeff6e86d65cae6d7db366cbaa4182eaff7f' into ethereumjs
Conflicts:
libjsqrc/ethereumjs/dist/ethereum.js
libjsqrc/ethereumjs/dist/ethereum.js.map
libjsqrc/ethereumjs/dist/ethereum.min.js
libjsqrc/ethereumjs/lib/abi.js
Diffstat (limited to 'example')
| -rw-r--r-- | example/contract.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/example/contract.html b/example/contract.html index 403d8c9d1..9666678a8 100644 --- a/example/contract.html +++ b/example/contract.html @@ -43,7 +43,7 @@ // create contract web3.eth.transact({code: web3.eth.solidity(source)}).then(function (address) { - contract = web3.contract(address, desc); + contract = web3.eth.contract(address, desc); document.getElementById('call').style.visibility = 'visible'; }); } |