Commit Graph

11438 Commits

Author SHA1 Message Date
Samer Falah 1c07c0c8c4
Merge pull request #680 from jpmorganchase/fix/raft-calcgaslimit
raft: pass gas floor and gas ceil to calcGasLimit when minting block
2019-05-31 09:49:30 -04:00
vsmk98 bc91ea034b permission: Code changes as per review comments 2019-05-31 14:29:09 +08:00
vsmk98 b6f4529629 permission: Code changes as per review comments 2019-05-31 14:25:56 +08:00
amalraj.manigmail.com 10e01f4fb3 Merge remote-tracking branch 'remotes/origin/master' into fix/raft-calcgaslimit-1 2019-05-31 10:36:00 +08:00
amalraj.manigmail.com 1632f12293 Merge remote-tracking branch 'origin/fix/raft-calcgaslimit' into fix/raft-calcgaslimit-1 2019-05-31 10:35:14 +08:00
fixanoid 43806e165b
Adding Quorum compatibility table to FAQ (#726) 2019-05-29 10:42:18 -04:00
libby kent d1475ee296 Adding signer tests for EIP155, Homestead and private tx. (#682)
Adding signer tests for EIP155, Homestead and private tx.
2019-05-24 15:46:49 -04:00
vsmk98 c7827f276e permission: updating api documentation 2019-05-24 09:35:47 +08:00
chris-j-h abac88ea97 Add logo favicon and other minor doc fixes/changes: (#723)
- Fix incorrectly documented Tessera server config field name
- Add Quorum logo favicon
- Add 404.html from material theme to try fix 404 not displaying properly
- FAQ ordering and phrasing changes
- Fix formatting in Tessera TLS config docs
2019-05-23 18:37:52 -04:00
Samer Falah 7511778d0d
Merge branch 'master' into fix/raft-calcgaslimit 2019-05-23 12:12:22 -04:00
vsmk98 7744425aae permission: updating api documentation 2019-05-23 18:12:17 +08:00
vsmk98 b6d2742bab permission: updating api documentation 2019-05-23 18:10:44 +08:00
vsmk98 b9a1b67bda permission: updating api documentation 2019-05-23 17:01:43 +08:00
vsmk98 567ec19934 permission: updating api documentation 2019-05-23 15:25:15 +08:00
vsmk98 d9be29fb4c permission: updating api documentation 2019-05-23 13:25:10 +08:00
vsmk98 2681a23335 Merge remote-tracking branch 'remotes/origin/feature/permissioning-1.8.18-suborgs-docs' into feature/permissioning-1.8.18-suborgs-docs 2019-05-23 09:43:25 +08:00
vsmk98 febbe84521 permission: changes as per code review comments 2019-05-23 09:35:22 +08:00
Trung Nguyen 2e5da2552c
some minor typos and reformatting 2019-05-22 13:39:23 -04:00
Samer Falah 321f7b27f8
Merge branch 'master' into feature/permissioning-1.8.18-suborgs-docs 2019-05-22 09:24:54 -04:00
vsmk98 57c7b2c37b permission: added check to ensure that network admin org cannot be deactivated 2019-05-22 18:34:59 +08:00
vsmk98 d31a747192 permission: documentation update 2019-05-22 18:02:06 +08:00
Samer Falah 2c9811ffbc
Merge pull request #679 from jpmorganchase/bugfix/personal_sendTransaction
ETHAPI: Private tx bug fix for personal_sendTransaction API
2019-05-21 16:53:45 -04:00
Samer Falah c46d47a0ac
Merge branch 'master' into bugfix/personal_sendTransaction 2019-05-21 14:56:20 -04:00
Samer Falah 5de5126b08
Merge branch 'master' into fix/raft-calcgaslimit 2019-05-21 14:15:25 -04:00
Samer Falah 7504dcf722
Merge pull request #721 from trung/ignore-swarm-tests
ignore tests in `swarm` package for PR builds
2019-05-21 13:50:55 -04:00
Nguyen Kien Trung d484e4621a
Merge branch 'master' into ignore-swarm-tests 2019-05-21 09:29:29 -04:00
Krish1979 2bfbb1381f
Merge pull request #722 from trung/update-docs
updated quorum examples docs
2019-05-21 09:51:44 +01:00
amalraj.manigmail.com 54121422d4 Merge remote-tracking branch 'origin/fix/raft-calcgaslimit' into fix/raft-calcgaslimit-1
# Conflicts:
#	eth/config.go
2019-05-21 15:44:11 +08:00
vsmk98 96f1e0a59a permission: fix for sporadic - "failed to execute permissions action: Account not authorized for this operation" error 2019-05-21 11:57:10 +08:00
Krish1979 9c5f0bbd4e
Merge branch 'master' into update-docs 2019-05-20 22:23:33 +01:00
Krish1979 2b66204b7f
Merge pull request #720 from Krish1979/master
Updated FAQ Section in Quorum docs
2019-05-20 22:20:02 +01:00
Nguyen Kien Trung a55573bfc8
Merge branch 'master' into update-docs 2019-05-20 16:52:20 -04:00
Trung Nguyen 31d7309a86
updated quorum examples docs 2019-05-20 16:50:21 -04:00
Nguyen Kien Trung 82b1649859
Merge branch 'master' into ignore-swarm-tests 2019-05-20 15:57:14 -04:00
Trung Nguyen c8d9ed1741
ignore swarm package when running tests for PR 2019-05-20 15:54:50 -04:00
Krish1979 ee41b85847
Merge branch 'master' into master 2019-05-20 19:10:19 +01:00
Nguyen Kien Trung 0007a10812
Merge branch 'master' into fix/raft-calcgaslimit 2019-05-20 13:57:29 -04:00
Samer Falah 5637f7ad58
Merge pull request #717 from jpmorganchase/fix/go-test
whisper test: reduce the number of nodes in TestSimulation
2019-05-20 13:40:30 -04:00
fixanoid 2617579f55
Merge branch 'master' into master 2019-05-20 13:37:09 -04:00
Trung Nguyen 64c20b3910
cross reference MinerGasCeil 2019-05-20 12:44:49 -04:00
Trung Nguyen 12ffa7b083
merged with upstream 2019-05-20 12:29:56 -04:00
Trung Nguyen 33ea926984
encapsulated calculate gas limit logic 2019-05-20 12:27:36 -04:00
Samer Falah ef6462b5d5
Merge branch 'master' into fix/go-test 2019-05-20 11:41:25 -04:00
Samer Falah 89f811a6a6
Merge pull request #684 from jbhurat/lock_writewithblockstate
Adding a lock around WriteBlockWithState while processing sealing result
2019-05-20 11:37:42 -04:00
Trung Nguyen bc204f148d
run goimports 2019-05-20 11:23:12 -04:00
namtruong b2aa415eb9 info admonition 2019-05-20 14:11:27 +01:00
namtruong fe7ef9177a update relative links 2019-05-20 13:58:57 +01:00
Krish1979 148381a952
Update FAQ.md 2019-05-20 13:54:07 +01:00
Krish1979 4f6ae6ac97
Update FAQ.md 2019-05-20 13:52:37 +01:00
namtruong 48273602f5 update faq styling 2019-05-20 13:44:45 +01:00