258 Commits

Author SHA1 Message Date
Marek Kotewicz
706fc21128 Merge branch 'develop' into ipcProvider
Conflicts:
	dist/web3-light.js
	dist/web3-light.min.js
	dist/web3.js
	dist/web3.js.map
	dist/web3.min.js
2015-07-09 12:02:53 +02:00
Fabian Vogelsteller
9da4645acb fixed events 2015-07-08 12:19:36 +02:00
Fabian Vogelsteller
3b941cfd43 fixed contract deploy 2015-07-07 19:46:26 +02:00
Fabian Vogelsteller
08639a1324 add new contract.new behaviour 2015-07-06 16:47:49 +02:00
Fabian Vogelsteller
d25fe2527c add getTransactionReceipt test 2015-07-06 10:25:22 +02:00
Marek Kotewicz
d9b785ec41 fixed #248 2015-06-30 13:01:30 +02:00
Marek Kotewicz
490dde52a7 fixed encoding/decoding strings, #249 2015-06-30 12:02:46 +02:00
Marek Kotewicz
b3f5d0927c fixed long bytes dynamic decoding/encoding, #249 2015-06-30 11:16:15 +02:00
Marek Kotewicz
93c8006537 tests for encoding and decoding prematurely terminated strings and strings containing internal zeros 2015-06-25 12:40:03 +02:00
Marek Kotewicz
7dd44e7d60 Merge branch 'strings' of https://github.com/ethereum/ethereum.js into strings
Conflicts:
	dist/web3-light.js
	dist/web3-light.js.map
	dist/web3-light.min.js
	dist/web3.js
	dist/web3.js.map
	dist/web3.min.js
2015-06-25 12:15:04 +02:00
Marek Kotewicz
390a9ff933 Merge branch 'develop' into strings
Conflicts:
	dist/web3-light.js
	dist/web3-light.min.js
	dist/web3.js
	dist/web3.min.js
2015-06-25 12:12:39 +02:00
Fabian Vogelsteller
aca26bbb0f add errors tests 2015-06-25 09:34:29 +02:00
Fabian Vogelsteller
14f1c5c903 add more tests 2015-06-24 21:50:27 +02:00
Fabian Vogelsteller
ac3502a34e merged develop 2015-06-24 15:02:34 +02:00
Fabian Vogelsteller
ab4af82d5d add ipc provider 2015-06-24 14:56:40 +02:00
Marek Kotewicz
7aca17e071 Merge branch 'develop' into allevents
Conflicts:
	dist/web3-light.js
	dist/web3-light.min.js
	dist/web3.js
	dist/web3.js.map
	dist/web3.min.js
	test/contract.js
2015-06-24 12:09:04 +02:00
Fabian Vogelsteller
d78b512fa5 add possible callback to filters 2015-06-24 10:28:12 +02:00
Marek Kotewicz
af9c027e7a all events filter 2015-06-24 08:50:19 +02:00
Fabian Vogelsteller
0e3b29c7c2 fixed coverage issue 2015-06-19 13:33:43 +02:00
Fabian Vogelsteller
bd6d9ba5b2 merged develop 2015-06-09 12:56:05 +02:00
Marek Kotewicz
f454dda8e6 Merge branch 'develop' of https://github.com/asinyagin/web3.js into develop
Conflicts:
	dist/web3-light.js
	dist/web3-light.min.js
	dist/web3.js
	dist/web3.min.js
2015-06-08 18:04:05 +02:00
Marek Kotewicz
b09bf319bd Merge branch 'develop' into allAsync
Conflicts:
	dist/web3-light.js.map
	dist/web3-light.min.js
	dist/web3.js.map
	dist/web3.min.js
2015-06-08 17:31:58 +02:00
Alexander Sinyagin
6ea0d670b6 Set requests content type to application/json 2015-06-08 20:30:14 +05:00
Fabian Vogelsteller
a90a85aa5c mereg develop 2015-06-08 17:07:23 +02:00
Fabian Vogelsteller
a2e5fbdf63 add tests for the outputformatters 2015-06-08 17:06:20 +02:00
Fabian Vogelsteller
7518ed47f8 changed extend to _extend 2015-06-08 14:46:19 +02:00
Fabian Vogelsteller
b6c49d4db7 improved async polling 2015-06-08 14:38:16 +02:00
Fabian Vogelsteller
f242489f81 add optional default block parameter to contract call fixes #159 2015-06-05 11:34:50 +02:00
Fabian Vogelsteller
cc533d9e83 fixed bytes wrong encoding 2015-06-04 23:13:33 +02:00
Fabian Vogelsteller
733e19e474 add extend method and tests 2015-06-04 12:25:46 +02:00
Marek Kotewicz
8c6f9769e0 Merge branch 'develop' into strings
Conflicts:
	dist/web3-light.js
	dist/web3-light.min.js
	dist/web3.js
	dist/web3.min.js
2015-06-03 17:19:24 +02:00
Fabian Vogelsteller
61f1ba6dda Merge pull request #224 from alexvandesande/prefix-name-reorg
Prefix name reorg
2015-06-03 17:16:05 +02:00
Fabian Vogelsteller
189484f057 add extra int tests 2015-06-02 10:18:20 +02:00
Marek Kotewicz
fa3239f457 abi string type, fixes #216, #218, #219 2015-06-01 19:50:45 +02:00
Marek Kotewicz
fbb9a41bec Merge branch 'develop' into icap
Conflicts:
	dist/web3-light.js
	dist/web3-light.js.map
	dist/web3-light.min.js
	dist/web3.js
	dist/web3.js.map
	dist/web3.min.js
2015-05-26 20:48:04 +02:00
Marek Kotewicz
3bb6e4f723 sha3 backward compatibility. #205 2015-05-26 20:47:04 +02:00
Marek Kotewicz
95aabe3305 sendIBANTransaction && tests 2015-05-23 15:59:19 +02:00
Alexandre Van de Sande
5866f0882a milli should have two l's 2015-05-22 12:04:06 -03:00
Alexandre Van de Sande
bacb03cc5d Rename Kwei to kwei, added support for some SI base units for ether 2015-05-22 11:45:37 -03:00
Marek Kotewicz
d8ad2b7a98 Merge branch 'develop' into icap
Conflicts:
	dist/web3-light.js.map
	dist/web3-light.min.js
	dist/web3.js.map
	dist/web3.min.js
2015-05-21 12:04:05 +02:00
Marek Kotewicz
92e2a2f6a5 Merge branch 'master' into develop
Conflicts:
	dist/web3-light.min.js
	dist/web3.min.js
2015-05-21 11:38:39 +02:00
Marek Kotewicz
d03bec658e decoding of empty array, fixed #210, fixed #211 2015-05-21 11:38:19 +02:00
Marek Kotewicz
9abf38a349 fixed encoding of empty arrays 2015-05-21 11:28:15 +02:00
Fabian Vogelsteller
0594e7f53d add estimateGas to contract methods and fixed sendTransaction return value 2015-05-20 11:58:09 +02:00
Marek Kotewicz
55c46538b1 test/isIBAN.js 2015-05-19 15:39:05 +02:00
Marek Kotewicz
02556eaaf8 removed unnecessary file 2015-05-16 17:11:00 +02:00
Marek Kotewicz
d3205523e9 crypto-js integrated into project 2015-05-16 17:03:27 +02:00
Marek Kotewicz
adf91dfe8f sha3 init 2015-05-16 15:42:48 +02:00
Fabian Vogelsteller
55553d78dd add async error test 2015-05-13 18:08:38 +02:00
Marek Kotewicz
a0a36e5764 Merge branch 'develop' of https://github.com/ethereum/ethereum.js into develop 2015-05-13 11:20:22 +02:00