Commit Graph

1133 Commits

Author SHA1 Message Date
Trung Nguyen 712f4907ee
permission: refactor hex node id to avoid many changes 2019-09-09 16:19:57 -04:00
Trung Nguyen a5c8e7af32
permission: minor fixes and update with master 2019-09-04 14:39:53 -04:00
Zhou Zhiyao 4b45dd2004 Minor fixes (#803) 2019-08-17 08:37:57 -04:00
vsmk98 2e63f9c9e8 Merge remote-tracking branch 'remotes/upstream/master' into feature/permissioning-1.8.18-suborgs-docs
# Conflicts:
#	cmd/geth/consolecmd_test.go
#	core/vm/evm.go
#	docs/Getting Started/Getting-Started-From-Scratch.md
#	docs/Permissioning/Framework/Quorum Network Security/Nodes/Permissioning/Network Permissioning.md
#	docs/Permissioning/Old Permissioning.md
#	docs/README.md
#	docs/Security/Security & Permissioning.md
#	mkdocs.yml
2019-08-06 11:48:12 +08:00
Satpal a9f96e0954 Bugfix/geth console displays incorrect block timestamp (#762)
Fix issue where geth console displays incorrect timestamp under Raft, due to Raft holding block timestamp in nanoseconds, instead of seconds.
2019-07-17 17:11:37 -04:00
amalraj.manigmail.com 6d8f451f45 Merge remote-tracking branch 'remotes/quoeng/feature/permissioning-1.8.18-suborgs-docs' into permissioning-suborgs-review
# Conflicts:
#	cmd/geth/main.go
#	controls/bind/permission/permission_impl.go
#	controls/bind/permission/permission_interface.go
#	controls/bind/permission/permission_upgr.go
#	core/types/permissions_cache.go
#	docs/README.md
#	docs/permissions.md
#	eth/backend.go
#	internal/ethapi/api.go
#	permission/api.go
#	permission/bind/implementation.go
#	permission/bind/interface.go
#	permission/bind/permission_impl.go
#	permission/bind/permission_interface.go
#	permission/bind/permission_upgr.go
#	permission/bind/upgradable.go
#	permission/contract/OrgManager.sol
#	permission/contract/PermissionsInterface.sol
#	permission/contract/PermissionsUpgradable.sol
#	permission/contract/abi/OrgManager.abi
#	permission/contract/abi/PermissionsImplementation.abi
#	permission/contract/abi/PermissionsInterface.abi
#	permission/permission.go
2019-07-08 18:57:26 +08:00
Trung Nguyen 64c20b3910
cross reference MinerGasCeil 2019-05-20 12:44:49 -04:00
Trung Nguyen 33ea926984
encapsulated calculate gas limit logic 2019-05-20 12:27:36 -04:00
Trung Nguyen bc204f148d
run goimports 2019-05-20 11:23:12 -04:00
vsmk98 045d936369 permission: Code and documentation clean up 2019-05-15 17:12:11 +08:00
vsmk98 e5b14b0a71 permission: code clean up. removal of unnecessary code. 2019-05-15 15:59:46 +08:00
vsmk98 b4756e56d3 permission: Reverted privateAbigen related changes as separate PR is there for this 2019-05-15 11:12:18 +08:00
vsmk98 cbad8d7b5d permissions: code clean up based on review comments 2019-05-13 15:29:47 +08:00
amalraj.manigmail.com 7e4b3ff310 permission: implement permission as standard service of the node 2019-05-08 14:07:23 +08:00
vsmk98 2716937f2e permissions: changes to check for node syncing before starting permissions 2019-05-03 15:31:26 +08:00
amalraj.manigmail.com 32c600bbee set the default ceil and floor gas limit to 800M and 700M 2019-05-03 11:29:11 +08:00
vsmk98 385a2334d8 permissions: Changes for the following:
1. added hack to check block syncing before starting permissions api
2. reduced the default gas limit
2019-04-30 18:28:09 +08:00
vsmk98 afc9e3a967 permissions: node level validation for transactions 2019-04-17 19:16:16 +08:00
amalraj.manigmail.com 62c00b637c permission: set default gas ceil and floor to 700M which is the default minGasLimit 2019-04-16 18:05:29 +08:00
amalraj.manigmail.com 5836df7d8c permission: add web3api calls 2019-04-01 18:22:41 +08:00
amalraj.manigmail.com a8c050df22 Merge remote-tracking branch 'remotes/quoeng/feature/permissioning-1.8.12' into feature/permissioning-1.8.18
# Conflicts:
#	cmd/bootnode/main.go
#	internal/web3ext/web3ext.go
#	p2p/discover/udp.go
#	p2p/discover/udp_test.go
#	p2p/permissions.go
#	p2p/server.go

poc to pass permission contract via command line
2019-03-08 17:09:24 +08:00
amalraj.manigmail.com d5e4ae7b87 Merge remote-tracking branch 'remotes/quoeng/feature/permissioning-1.8.12' into feature/permissioning-1.8.18
# Conflicts:
#	cmd/bootnode/main.go
#	internal/web3ext/web3ext.go
#	p2p/discover/udp.go
#	p2p/discover/udp_test.go
#	p2p/permissions.go
#	p2p/server.go
2019-03-08 12:53:46 +08:00
amalraj.manigmail.com 32729b9f28 remove TODO related to review 2019-02-25 16:30:54 +08:00
amalraj.manigmail.com a8f7b2ca33 update newly added methods 2019-02-12 22:08:42 +08:00
vsmk98 13bccaa9c6 code changes to fix review comments 2019-02-12 09:54:13 +08:00
amalraj.manigmail.com c2b98220eb Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.18-latest
# Conflicts:
#	.travis.yml
#	cmd/geth/consolecmd_test.go
#	vendor/github.com/rjeczalik/notify/watcher_readdcw.go
#	vendor/golang.org/x/sys/cpu/cpu.go
#	vendor/golang.org/x/sys/cpu/cpu_arm.go
#	vendor/golang.org/x/sys/cpu/cpu_arm64.go
#	vendor/golang.org/x/sys/cpu/cpu_mips64x.go
#	vendor/golang.org/x/sys/cpu/cpu_mipsx.go
#	vendor/golang.org/x/sys/cpu/cpu_ppc64x.go
#	vendor/golang.org/x/sys/cpu/cpu_s390x.go
#	vendor/vendor.json
2019-02-10 20:31:51 +08:00
amalraj.manigmail.com 73667e7942 merge 1.8.18 with quorum/master
refactor raft & istanbul based on upstream changes
fix unit test cases
2019-02-08 17:29:01 +08:00
amalraj.manigmail.com 4dbd95947d 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:50 +08: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 8e30fc202a 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:29:22 +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
vsmk98 061c9b85ce merge with master 2019-01-14 13:53:05 +08:00
Peter Fox 126d051943 Added comment to explain the change 2019-01-07 10:00:50 +00:00
vsmk98 99e717bd1a changed api signature from key managment to org management 2019-01-07 10:23:22 +08:00
Peter Fox 569719975f Allow processing of sync content whilst it is being downloaded when
using a bounded sync
2019-01-03 10:00:07 +00:00
Samer Falah 004dd53a68
Merge pull request #598 from jbhurat/miner-setcoinbase
Prevent deadlock when miner.setEtherbase is called for Istanbul consensus
2018-12-13 15:19:45 -05:00
Jitendra Bhurat aea11d53a8 calling unlock using defer, preventing deadlock when miner.setEtherbase() returns an error 2018-12-13 12:31:50 -05:00
vsmk98 7903dac340 latest changes for cluster key management 2018-12-11 10:07:19 +05:30
Jitendra Bhurat 7803a2f7ef Setting the private state to public state if contract address is not present in the private state 2018-12-06 11:02:12 -05:00
Samer Falah d4db92f69e
Merge pull request #570 from jbhurat/missing-logs-events
Adding private log blooms to DB in addition to public log bloom
2018-12-02 20:08:30 -05: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
vsmk98 3da089da31 changes to check the details of node for approval 2018-11-19 11:58:34 +08:00
amalraj.manigmail.com 5ab90bfe92 quorum api seperation 2018-11-15 12:23:03 +08:00
mr_franklin 4fecc7a3b1 eth: fix minor grammar issue in comment (#18091) 2018-11-13 11:57:46 +02:00
Corey Lin a5dc087845 core/vm, eth/tracers: use pointer receiver for GetRefund (#18018) 2018-11-08 13:07:15 +01:00
Corey Lin 212bf266c5 eth, p2p: fix comment typos (#18014) 2018-11-08 12:25:14 +01:00
Felix Lange 0bcff8f525
eth/downloader: speed up tests by generating chain only once (#17916)
* core: speed up GenerateChain

Use a mock implementation of ChainReader instead of creating
and destroying a BlockChain object for each generated block.

* eth/downloader: speed up tests by generating chain only once

This change reworks the downloader tests so they share a common test
blockchain instead of generating a chain in every test. The tests are
roughly twice as fast now.
2018-11-07 15:07:43 +01:00
SatpalSandhu61 470f34a784 Revert fix for eth_estimateGas due to side-effect where attempt to purely read private state doesn't work correctly. 2018-11-07 13:51:05 +00:00
Wenbiao Zheng b35165555d eth/downloader: remove the expired id directly (#17963) 2018-11-07 15:30:19 +02:00
Martin Holst Swende eea3ae42a3 core, eth/downloader: fix validation flaw, fix downloader printout flaw (#17974) 2018-11-07 14:47:11 +02:00