Commit Graph

2851 Commits

Author SHA1 Message Date
obscuren
a125b0fbc3 Merge branch 'import_presale_keys' of https://github.com/Gustav-Simonsson/go-ethereum into Gustav-Simonsson-import_presale_keys
Conflicts:
	crypto/crypto.go
2015-01-22 22:42:39 +01:00
obscuren
a216225827 Merge branch 'pr/evmjit' of https://github.com/chfast/go-ethereum into chfast-pr/evmjit 2015-01-22 21:47:36 +01:00
obscuren
0dfe511370 Use curve params instead of hardcoded 32 bytes 2015-01-22 18:15:11 +01:00
obscuren
d4cc2d3503 Pad private key when signing & length check for hashes in sign 2015-01-22 18:12:05 +01:00
Paweł Bylica
d5f38f5690 JitVM: the EVM JIT bridge 2015-01-22 18:00:15 +01:00
Marek Kotewicz
c01f0ae825 Merge commit 'b1971f46cce7d21be5f6277c9f8c406a0d195f78' into natspec 2015-01-22 17:57:53 +01:00
Marek Kotewicz
81bbe8c93b simplified synchronous polling 2015-01-22 17:57:26 +01:00
Marek Kotewicz
29fa57e9b3 natspec.js updated to use sync api 2015-01-22 15:38:48 +01:00
Marek Kotewicz
13f39afbdd Merge commit '93fa6855afad7a7eb86e49efe384372a6060da35' into natspec 2015-01-22 15:33:47 +01:00
Marek Kotewicz
3073511e30 not parsing transaction output 2015-01-22 15:32:52 +01:00
Marek Kotewicz
6c4432d417 Merge commit 'b32dedc5b54f853cf63bb2663c8bca6aa4272b0b' into natspec 2015-01-22 15:18:59 +01:00
Marek Kotewicz
e45db42e94 fixed contract.js 2015-01-22 15:18:21 +01:00
Marek Kotewicz
375ca542ab Merge commit '8e3ba3a4285cc7e902a018196b3849df56944dd0' into natspec 2015-01-22 14:38:04 +01:00
Marek Kotewicz
0202b05a5d implicit solidity method call 2015-01-22 14:37:34 +01:00
Marek Kotewicz
d6a92b18d4 fixed natspec example 2015-01-22 13:39:32 +01:00
Marek Kotewicz
5e623f14f3 Merge commit 'cdd7af2a6e87363d0ff7d2528f9d9b521bf2ef20' into natspec 2015-01-22 13:06:11 +01:00
Marek Kotewicz
22c77c607e qt sync provider 2015-01-22 13:04:28 +01:00
obscuren
b777d6aa3f UI Updates
* Browser now has tabs
* Fixed a callback issue
2015-01-22 12:35:31 +01:00
obscuren
4df2e1ef5c updated tests 2015-01-22 00:37:58 +01:00
obscuren
67f9783e6a Moved obscuren secp256k1-go 2015-01-22 00:35:00 +01:00
obscuren
6eaa404187 Moved sha3 from obscuren 2015-01-22 00:25:00 +01:00
obscuren
0045ce4cde Future blocks not allowed 2015-01-22 00:24:30 +01:00
obscuren
465b0a79d8 Updated browser & pass view to callback function 2015-01-22 00:24:20 +01:00
Marek Kotewicz
ad8e92e9c6 Merge commit 'eb4984c0d036c1420e782ca136810e851e33fb37' into natspec 2015-01-21 21:54:51 +01:00
Marek Kotewicz
edfb874527 changes in filter.js (not yet working) 2015-01-21 21:54:03 +01:00
Marek Kotewicz
c2d9c1a6f1 toDecimal/fromDecimal is using bignumber.js now 2015-01-21 21:35:15 +01:00
Marek Kotewicz
81a5813270 removed unused pieces of code 2015-01-21 21:24:40 +01:00
Marek Kotewicz
08e2696627 removed send queues from providermanager 2015-01-21 21:22:05 +01:00
Marek Kotewicz
c9693b4746 contract.html example is working with sync api 2015-01-21 21:12:07 +01:00
Marek Kotewicz
ceb4357a8d sync api tests running, removed unused pieces of code 2015-01-21 20:43:20 +01:00
Marek Kotewicz
fc986a3fbe removed unused providers 2015-01-21 20:30:32 +01:00
Marek Kotewicz
0d2cccc2ce http sync api 2015-01-21 20:29:02 +01:00
Gustav Simonsson
8af42d42da CamelCase aesCBCDecrypt 2015-01-21 19:08:05 +01:00
Marek Kotewicz
81ff253e68 Merge commit 'c4638ba3edbd14677da5441d61f7845668df2b22' into natspec 2015-01-21 18:58:33 +01:00
Marek Kotewicz
e68f8e79ea natspec changes 2015-01-21 18:58:13 +01:00
Marek Kotewicz
e1fcffcc81 gulp 2015-01-21 18:58:01 +01:00
Marek Kotewicz
f3e78e50ff changes to for natspec 2015-01-21 18:56:30 +01:00
Gustav Simonsson
1f8290ca44 Add ImportPreSaleKey
* ImportPreSaleKey takes a KeyStore, a presale key JSON (e.g. file content)
  and a password string. It stores the key in the given key store.
* Refactored common AES decryption and moved some functions to crypto.go
2015-01-21 16:35:43 +01:00
Taylor Gerring
215780ab56 Move GetRequestReply to EthereumApi
Off of jsonWrapper
2015-01-20 13:58:51 -06:00
Taylor Gerring
a6d4ce2630 Move argument types to separate file 2015-01-20 13:57:51 -06:00
Taylor Gerring
0c77a96249 Move websockets out of cmd/util 2015-01-20 13:40:24 -06:00
Taylor Gerring
d92fde6980 Merge branch 'develop' into jsonrpc 2015-01-20 13:22:38 -06:00
obscuren
87f50659db fixed url bug in browser 2015-01-20 18:42:29 +01:00
Marek Kotewicz
689630d261 Merge commit '53b4fda16d0b191be8ab986379a328aa38aaf916' into natspec 2015-01-20 17:48:08 +01:00
Marek Kotewicz
848c54dc47 _currentAbi object 2015-01-20 17:46:37 +01:00
obscuren
9845029a75 StdVm by default 2015-01-20 15:49:12 +01:00
obscuren
375cc67ba6 Hide browser bar when coming from a DApp url 2015-01-20 15:48:38 +01:00
Marek Kotewicz
380c1522ac solidity methods "overloading" 2015-01-20 15:06:05 +01:00
obscuren
4dd7be7ed0 Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop 2015-01-20 15:04:30 +01:00
Jeffrey Wilcke
12fad65991 Merge pull request #259 from Gustav-Simonsson/develop
KeyStore (Low level key functionality)
2015-01-20 15:04:21 +01:00