Commit graph

77 commits

Author SHA1 Message Date
Christopher Franko
0f519942a4 Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.3.2 2015-11-28 18:40:20 -05:00
Péter Szilágyi
bddb13d436 jsre: fix #1876, sleep too short on a slow test server 2015-11-05 11:36:10 +02:00
Christopher Franko
789e52afdf fix web3.js 2015-10-13 14:20:07 -04:00
Christopher Franko
1299522681 update from expanse-project to org 2015-10-13 12:59:29 -04:00
Christopher Franko
135b401a06 update rpc mapping
🎱

moving stuff around

fixed import

one more replace

one more

wasnt he last but close

last one
2015-10-13 12:44:36 -04:00
Christopher Franko
6a6cd10299 rebase 1.2.2 2015-10-13 11:56:11 -04:00
Felix Lange
69f48e4689 Merge pull request #1811 from bas-vk/timer-clearinterval
timer bugfix when clearInterval was called from within the callback
2015-09-17 19:21:49 +02:00
Bas van Kervel
2f65ddc501 jsre: timer bugfix when clearInterval was called from within the callback 2015-09-16 11:57:33 +02:00
Péter Szilágyi
d4d3fc6a70 jsre, rpc/api: pull in new web3 and use hex numbers 2015-09-15 17:05:12 +03:00
Christopher Franko
164a9acc5d updated copyright headers 2015-09-12 18:17:11 -04:00
Christopher Franko
ec3fb93c03 Update legalese 2015-09-11 08:22:53 -04:00
Christopher Franko
1c45431c53 update testnet block
update docker

update docker file

docker update 2

oi

docker again

update testnet block

update docker

update docker file

docker update 2

oi

docker again

update testnet block

update docker

update docker file

docker update 2

oi

docker again

docker2

docker3

fixed gvm

docker change

docking is meh

i hate docker

dockingsucks

update blockreward to 8

because its a lucky number 💃

update 60606 to 42786

60606 looks evil
42786 is my birthday

update jsre

replace eth for exp

update blocktime and test_genesis

fix test genesis
2015-09-07 20:25:05 -04:00
Christopher Franko
4dab840f71 expanse 2015-09-01 20:42:36 -04:00
Franko
554f07b16e changes 2015-09-01 18:56:30 -04:00
Christopher Franko
1cfc9ec1e9 ether to expanse 2015-09-01 18:26:59 -04:00
Christopher Franko
9d6221444c test change lol 2015-09-01 18:24:03 -04:00
Felix Lange
1086e2f298 jsre: fix annoying indentation when printing arrays of objects
The pretty printer, dumb as it is, printed arrays of objects as

  [{
    ...
    }]

With this change, they now print as:

  [{
    ...
  }]
2015-08-16 00:35:00 +01:00
Felix Lange
49703bea0a jsre: bind the pretty printer to "inspect" in JS 2015-08-15 23:55:42 +01:00
Christopher Franko
08e1345682 ether to expanse 2015-08-13 09:03:28 -04:00
Felix Lange
0ef80bb3d0 cmd/geth, jsre: restore command line editing on windows
PR #856 broke command line editing by wrapping stdout with a filter that
interprets ANSI escape sequences to fix colored printing on windows.
Implement the printer in Go instead so it can do its own
platform-dependent coloring.

As a nice side effect, the JS console is now noticeably more responsive
when printing results.

Fixes #1608
Fixes #1612
2015-08-12 12:04:00 +02:00
Jeffrey Wilcke
bf6ea2919d web3: updated 2015-08-11 17:17:20 +02:00
Christopher Franko
d368397fc2 test change lol 2015-08-07 15:37:14 -04:00
Jeffrey Wilcke
a33726b7db web3: regression. Fixes #1613 2015-08-07 12:33:12 +02:00
Felix Lange
3832019964 common/compiler, common/docserver, jsre: fix tests on windows 2015-08-06 17:18:59 +02:00
Jeffrey Wilcke
1fad8798ec Merge pull request #1515 from fjl/license-fixes
all: fix license headers one more time
2015-07-28 04:29:42 -07:00
Jeffrey Wilcke
5001f778aa web3: updated 0.9.1 2015-07-25 12:22:39 +02:00
Felix Lange
bfbcfbe4a9 all: fix license headers one more time
I forgot to update one instance of "go-ethereum" in commit 3f047be5a.
2015-07-23 18:35:11 +02:00
Felix Lange
3f047be5aa all: update license headers to distiguish GPL/LGPL
All code outside of cmd/ is licensed as LGPL. The headers
now reflect this by calling the whole work "the go-ethereum library".
2015-07-22 18:51:45 +02:00
Jeffrey Wilcke
97d22be318 Merge pull request #1441 from obscuren/logs-return-fix
miner, xeth: fire log event during mining. Fix return raw tx
2015-07-09 07:24:35 -07:00
Jeffrey Wilcke
d25634662b web3: updated 2015-07-08 15:47:33 +02:00
Bas van Kervel
e84f3ec1d4 added net.version 2015-07-08 08:03:20 +02:00
Jeffrey Wilcke
c5972b4ac7 web3 update 2015-07-07 15:21:24 +02:00
Felix Lange
bdae4fd573 all: add some godoc synopsis comments 2015-07-07 14:12:45 +02:00
Felix Lange
ea54283b30 all: update license information 2015-07-07 14:12:44 +02:00
Bas van Kervel
6ea28f93b9 output BigNumbers objects in console as strings 2015-07-07 10:43:49 +02:00
Jeffrey Wilcke
b0aec6402a web3: updated 2015-07-06 14:01:03 +02:00
Bas van Kervel
8150c0a726 upgrade web3 to version 0.7.1 2015-07-03 17:08:41 +02:00
Bas van Kervel
5f8e5a4875 upgrade web3.js with _extend support 2015-06-11 14:01:41 +02:00
Bas van Kervel
a1a475fb92 added console command 2015-06-11 14:01:39 +02:00
Péter Szilágyi
d6f4c515f5 jsre: print function arguments too 2015-06-09 17:23:44 +03:00
Péter Szilágyi
7842559353 jsre: sort pretty print output, fields before funcs 2015-06-09 17:19:56 +03:00
Péter Szilágyi
3f4ce70d92 jsre: fix wrong separator comma placing due to non consistent field orders 2015-06-09 13:27:45 +03:00
obscuren
598e454d46 cmd/geth: updated web3 2015-05-28 13:24:09 +02:00
Felix Lange
e221a449e0 cmd/geth, jsre, rpc: run all JS code on the event loop
Some JSRE methods (PrettyPrint, ToVal) bypassed the event loop. All
calls to the JS VM are now wrapped. In order to make this somewhat more
foolproof, the otto VM is now a local variable inside the event loop.
2015-05-25 02:27:37 +02:00
zelig
ea893aca8f update web3.js to 0.4.2 2015-05-20 02:58:49 +01:00
Daniel A. Nagy
62dd9833ec Merge branch 'develop' of github.com:ethereum/go-ethereum into develop 2015-05-08 17:55:53 +02:00
Daniel A. Nagy
3a01e3e39b Signing (almost) works. 2015-05-08 17:52:44 +02:00
Jeffrey Wilcke
f819ac7158 Merge pull request #882 from zsfelfoldi/develop
Otto.ToValue concurrency error fixed
2015-05-08 04:54:22 -07:00
zsfelfoldi
d7dabce732 ToVal serialization fix 2015-05-08 13:29:48 +02:00
obscuren
351d6b0d44 jsre, cmd/geth: updated web3.js and altered settimeout 2015-05-08 13:05:20 +02:00