Commit Graph

305 Commits

Author SHA1 Message Date
Benjamin Diamond 4770d48a74 kill add function
as of 445cef33d1, no longer used.
2019-05-12 15:51:28 -04:00
Benjamin Diamond bc3a07c771 Merge branch 'master' of https://github.com/jpmorganchase/quorum into anonymous 2019-05-07 16:45:41 -04:00
amalraj.manigmail.com b286409b7a merge with quorum upstream
params: config.go and denomination.go merged with conflicts
2019-03-18 11:43:03 +08:00
amalraj.manigmail.com 849eca21da merge with quorum upstream
params: config.go and denomination.go merged with conflicts
2019-03-18 11:34:09 +08:00
Benjamin Diamond 93b1c4c0f6 kill "adjust" function
This is only necessary if you attempt to track `acc` locally. Have to re-pull everything _anyway_ for transfers; thus only relevant for withdrawals. seems not worth it probably
2019-03-06 19:19:56 -05:00
Benjamin Diamond 8073d834e2 finalized add and adjust functions 2019-03-05 17:33:14 -05:00
Benjamin Diamond dbce5562a8 resurrect the "add" function
appears that i need it back now, now that rolling over is happening again
2019-03-04 16:00:10 -05:00
Benjamin Diamond 3a3589e076 epoch just an integer / string fixes
actually, still need to replicate the computation of u on the go side, will be a pain.
2019-03-04 15:57:51 -05:00
Peter Fox e1e5fa0e8f Require the addition of the extra intrinsic gas cost to remain under the
user input gas limit.
2019-02-21 17:00:28 +00:00
Peter Fox a872dd10c2 Compare intrinsic gas of public transaction versus the private version
that contains the PTM hash instead. If there is a difference, add it on
to the execution cost.
2019-02-21 15:56:35 +00:00
Benjamin Diamond 960b24addc killed the add function
Glad to no longer need this... It was a bad fix
2019-02-20 16:27:17 -05:00
zzy96 baeb66d3a4 geth precompiled/api is able to connect with rpc service outside 2019-02-18 18:26:46 +08:00
Benjamin Diamond c2ea1e8007 add elliptic add routine in zether
This is hopefully a temporary solution. Much better would be to get full utilities within the geth console.
2019-02-06 16:55:38 -05:00
Benjamin Diamond d23d629c23 rename create --> prove, add proof type 2019-02-06 14:47:35 -05:00
Benjamin Diamond 3c98621de1 ready for java integration
Also added support for specifying a range in ReadBalance
2019-02-06 10:22:15 -05:00
Benjamin Diamond a349741c26 rename zsc --> zether
avoids a name collision with the ZSC smart contract.
2019-02-05 17:12:19 -05:00
Benjamin Diamond 8ca8c32f10 add web3 extend 2019-02-05 13:36:14 -05:00
amalraj.manigmail.com bc529a509d Merge branch 'goeth-1.8.18' into geth-upgrade-1.8.18
# Conflicts:
#	.github/CONTRIBUTING.md
#	.travis.yml
#	core/blockchain.go
#	core/vm/evm.go
#	core/vm/logger_test.go
#	eth/handler_test.go
#	eth/tracers/tracer_test.go
#	internal/ethapi/api.go
#	internal/web3ext/web3ext.go
#	p2p/discover/node.go
#	p2p/server.go
#	swarm/network/simulations/discovery/discovery_test.go
2019-01-29 19:08:14 +08:00
amalraj.manigmail.com 2914b3c99d Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.18
# Conflicts:
#	consensus/ethash/consensus.go
#	eth/bloombits.go
#	params/protocol_params.go
2019-01-25 22:24:03 +08:00
namtruong e92052b3a4 return error when sendRawPrivateTransaction is called to submit public transaction (privateFor list empty) 2019-01-03 15:26:42 +00:00
namtruong c49a833eb9 add support for private sendRawTransaction - merge with latest quorum 2018-12-05 14:30:42 +00:00
amalraj.manigmail.com 13a9f26f9a Merge remote-tracking branch 'quorum/master' into geth-upgrade-1.8.16 2018-11-29 17:56:02 +08:00
amalraj.manigmail.com 519337a9d0 Merge remote-tracking branch 'quorum/master' into geth-upgrade-1.8.16 2018-11-29 16:57:27 +08:00
Ryan Schneider bd519ab8ae internal/web3ext: add eth.getProof (#18052) 2018-11-08 13:18:38 +01:00
Simon Jentzsch 97fb08342d EIP-1186 eth_getProof (#17737)
* first impl of eth_getProof

* fixed docu

* added comments and refactored based on comments from holiman

* created structs

* handle errors correctly

* change Value to *hexutil.Big in order to have the same output as parity

* use ProofList as return type
2018-10-18 21:41:22 +02:00
Péter Szilágyi aff421e78c
internal/ethapi: warn on failed account accesses 2018-10-10 12:29:05 +03:00
amalraj.manigmail.com fcfc7b6d45 merge with quorum upstream master 2018-10-09 16:01:11 +08:00
Samer Falah 4d015bb488
Merge pull request #541
Update signing issue for eth_sendTransactionAsync RPC call
2018-10-08 16:29:51 -04:00
Martin Holst Swende 89a32451ae core/vm: faster create/create2 (#17806)
* core/vm/runtim: benchmark create/create2

* core/vm: do less hashing in CREATE2

* core/vm: avoid storing jumpdest analysis for initcode

* core/vm: avoid unneccesary lookups, remove unused fields

* core/vm: go formatting tests

* core/vm: save jumpdest analysis locally

* core/vm: use common.Hash instead of nil, fix review comments

* core/vm: removed type destinations

* core/vm: correct check for empty hash

* eth: more elegant api_tracer

* core/vm: address review concerns
2018-10-04 18:15:37 +03:00
amalraj.manigmail.com 2c4081d89f Merge remote-tracking branch 'remotes/goeth/release/1.8' into geth-upgrade-1.8.15_new
fix compilation issues on programs impcted by this merge
2018-10-04 16:21:20 +08:00
amalraj.manigmail.com 47571689ee Merge remote-tracking branch 'remotes/goeth/release/1.8' into geth-upgrade-1.8.15_new
# Conflicts:
#	.travis.yml
#	README.md
#	cmd/utils/flags.go
#	consensus/consensus.go
#	consensus/ethash/consensus.go
#	consensus/ethash/ethash.go
#	core/blockchain.go
#	core/genesis_test.go
#	core/state/state_object.go
#	core/state_processor.go
#	core/vm/errors.go
#	core/vm/evm.go
#	core/vm/gas_table.go
#	core/vm/instructions_test.go
#	core/vm/interface.go
#	eth/api_tracer.go
#	eth/backend.go
#	eth/config.go
#	eth/filters/filter.go
#	les/backend.go
#	les/helper_test.go
#	miner/worker.go
#	params/config.go
#	params/version.go
2018-10-04 16:19:02 +08:00
Nguyen Kien Trung 40f7d2b8b4 Value Transfer in Private Transactions (#538)
Fix #528
2018-10-01 14:37:05 -04:00
Peter Fox 2474f53efd Add API docs 2018-10-01 12:16:31 +01:00
Peter Fox c3f565db34 Updated import order 2018-10-01 10:09:14 +01:00
Peter Fox 5944ff2346 Added back the async throttling, fixing an issue where it could block
when the channel is full. Now it returns immediately with an error
indicating the channel is overloaded.
2018-10-01 10:07:50 +01:00
HackyMiner 107f556b2d internal/ethapi: add eth_chainId method (#17617)
This implements EIP-695.
2018-09-29 22:07:02 +02:00
HackyMiner 44eb69561a internal/debug: support color terminal for cygwin/msys2 (#17740)
- update go-colorable, go-isatty, go-runewidth packages
- use go-isatty instead of log/term and remove log/term package
2018-09-29 16:15:39 +02:00
vsmk98 8e21004b6b removed import of sync 2018-09-28 08:19:57 +00:00
amalraj.manigmail.com d35f6e2c5e Merge remote-tracking branch 'remotes/peter/bugfix/sendTransactionAsync-updates' into geth-upgrade-1.8.12
# Conflicts:
#	internal/ethapi/api.go
2018-09-28 15:51:27 +08:00
amalraj.manigmail.com 72270b10c7 Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.12
# Conflicts:
#	.travis.yml
#	README.md
#	cmd/geth/genesis_test.go
#	core/genesis.go
#	core/genesis_test.go
#	core/state_processor.go
#	eth/config.go
#	eth/downloader/downloader_test.go
#	eth/protocol_test.go
#	params/config.go
2018-09-27 18:55:55 +08:00
Liang ZOU 6663e5da10 all: fix various comment typos (#17748) 2018-09-25 12:26:35 +02:00
Peter Fox 237bdbace5 Rearrange method to remove unneeded goroutine (since we are already in
a goroutine at this point)
2018-09-20 13:26:12 +01:00
Peter Fox 93793cff0b Adds the RPC request ID to the context which is passed to called method.
Update request/response data structs to include extra fields

Refactor the SendTransactionAsync method to just call the
SendTransaction method in a goroutine, instead of reimplementing logic
for a new transaction.
2018-09-20 12:13:09 +01:00
Samuel Marks 67c332e9b5
travis, Dockerfile, appveyor, build: bump to Go 1.11 2018-09-19 11:29:29 +03:00
apratt3377 0af7ad0664 Feature/410/expose raft cluster api (#501)
* Added an endpoint to expose raft cluster details
2018-09-11 15:05:42 -04:00
Péter Szilágyi e8f229b82e
cmd, core, eth, miner, params: configurable gas floor and ceil 2018-08-29 12:40:12 +03:00
gary rong b2c644ffb5 cmd, eth, miner: make recommit configurable (#17444)
* cmd, eth, miner: make recommit configurable

* cmd, eth, les, miner: polish a bit

* miner: filter duplicate sealing work

* cmd: remove uncessary conversion

* miner: avoid microptimization in favor of cleaner code
2018-08-21 22:56:54 +03:00
amalraj.manigmail.com d6a49e36ca internal/ethapi: fix nil pointer exception for private send txn 2018-08-06 23:57:39 +08:00
Felföldi Zsolt c4df67461f
Merge pull request #16333 from shazow/addremovetrustedpeer
rpc: Add admin_addTrustedPeer and admin_removeTrustedPeer.
2018-08-06 13:30:04 +02:00
amalraj.manigmail.com 95a1b03c3e merge 1.8.12 with upstream/master to apply the fixes/changes added newly 2018-08-06 19:03:51 +08:00