vsmk98
68fb3977b8
resolving lint issues.
2020-05-14 11:40:15 +08:00
vsmk98
72a4cf87b3
Merge branch 'master' into permission-cache-impl
...
# Conflicts:
# core/types/permissions_cache_test.go
# params/quorum.go
# permission/api.go
# permission/permission.go
# permission/permission_test.go
2020-05-14 10:52:49 +08:00
Trung Nguyen
3034c75403
fix linting issues ( #995 )
2020-05-11 16:15:27 -04:00
vsmk98
83403b9142
Merge branch 'master' into permission-cache-impl
2020-05-09 08:51:56 +08:00
jpmsam
9339be03f9
Quorum v2.6.0
2020-05-04 10:39:58 -04:00
vsmk98
9878b522d4
Merge branch 'master' into permission-cache-impl
...
# Conflicts:
# permission/bind/accounts.go
# permission/bind/nodes.go
# permission/bind/org.go
# permission/bind/permission_impl.go
# permission/bind/permission_interface.go
# permission/bind/permission_upgr.go
# permission/bind/roles.go
# permission/bind/voter.go
# permission/contract/gen/AccountManager.bin
# permission/contract/gen/NodeManager.bin
# permission/contract/gen/OrgManager.bin
# permission/contract/gen/PermissionsImplementation.bin
# permission/contract/gen/PermissionsInterface.bin
# permission/contract/gen/PermissionsUpgradable.bin
# permission/contract/gen/RoleManager.bin
# permission/contract/gen/VoterManager.bin
# permission/permission.go
2020-05-04 13:34:25 +08:00
Sai V
b4e2199ca1
Enable networks to change maxCodeSize multiple times ( #975 )
2020-04-30 11:48:23 -04:00
Sai V
4c6727c959
changes to set immutability threshold before freezer db is opened ( #981 )
2020-04-30 11:07:19 -04:00
Sai V
c215989c10
Quorum geth upgrade to 1.9.7 ( #960 )
...
Co-authored-by: amalraj.manigmail.com <amalraj.manigmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
Co-authored-by: Flash Sheridan <flash@pobox.com>
Co-authored-by: Martin Holst Swende <martin@swende.se>
Co-authored-by: Nguyen Kien Trung <trung.n.k@gmail.com>
Co-authored-by: Felix Lange <fjl@twurst.com>
Co-authored-by: Rob Mulholand <rmulholand@8thlight.com>
Co-authored-by: Felföldi Zsolt <zsfelfoldi@gmail.com>
Co-authored-by: soc1c <soc1c@users.noreply.github.com>
Co-authored-by: Rafael Matias <rafael@skyle.net>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Lucas Hendren <lhendre2@gmail.com>
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: ywzqwwt <39263032+ywzqwwt@users.noreply.github.com>
Co-authored-by: zcheng9 <zcheng9@hawk.iit.edu>
Co-authored-by: zzy96 <zhou0250@e.ntu.edu.sg>
Co-authored-by: kikilass <36239971+kikilass@users.noreply.github.com>
Co-authored-by: Darrel Herbst <dherbst@gmail.com>
Co-authored-by: Ross <9055337+Chadsr@users.noreply.github.com>
Co-authored-by: Jeffery Robert Walsh <rlxrlps@gmail.com>
Co-authored-by: Marius Kjærstad <sandakersmann@users.noreply.github.com>
Co-authored-by: Piotr Dyraga <piotr.dyraga@keep.network>
Co-authored-by: Guillaume Ballet <gballet@gmail.com>
Co-authored-by: Michael Forney <mforney@mforney.org>
Co-authored-by: Samuel Marks <807580+SamuelMarks@users.noreply.github.com>
2020-04-29 10:50:56 -04:00
Satpal
4c9740bfaa
Add configurable threshold for 'future block' check for Istanbul & Clique ( #800 )
2020-04-08 09:34:02 -04:00
vsmk98
db836bf646
updated error handling
2020-04-05 10:27:26 +08:00
vsmk98
1afcf87a7f
error handling in getSubOrgIndex from contract. fixed a unit test failure
2020-04-03 10:01:29 +08:00
jpmsam
27bfed769e
v2.5.0
2020-03-03 13:11:13 -05:00
Sai V
439f52942a
added a maxCodeSizeChangeBlock to track the block height when maxCodeSize changes from default value of 24K to the given value in genesis.json ( #947 )
2020-02-21 12:38:55 -05:00
jpmsam
20c95e5d83
Quorum v2.4.0
2019-12-04 13:18:33 -05:00
Vinod Damle
b1f71b35aa
Print TransactionSizeLimit and MaxCodeSize genesis config ( #872 )
...
log file does not show any custom settings to these parameters in
genesis config
2019-11-04 22:54:40 -05:00
jpmsam
99f7fd6733
Quorum v2.3.0
2019-10-04 13:40:57 -04:00
vsmk98
1db7d6a36b
Merge remote-tracking branch 'remotes/origin/master' into permissions-master-merge
...
# Conflicts:
# params/config.go
2019-10-04 11:20:58 +08:00
Amit Panghal
e1278520d0
Chain stalls while scaling out from 1 to 4 nodes, changing quorum size fixes things ( #796 )
...
* Adding Ceil2Nby3Block genesis config option to specify the number of blocks required to transition from 2f+1 to Ceil(2n/3) in IBFT
* Add support for using ceil(2N/3) in IBFT
2019-09-30 15:26:13 -04:00
vsmk98
4280bdadac
permission: Enabled QIP714Block to allow staggered migration of network for enabling new permissions
2019-09-26 15:38:45 +08:00
vsmk98
afb61f089c
permission: removed unused code
2019-09-24 17:09:22 +08:00
Trung Nguyen
a5c8e7af32
permission: minor fixes and update with master
2019-09-04 14:39:53 -04:00
Trung Nguyen
2b70d2bfbf
permissions: add unit tests
2019-08-19 09:39:18 -04:00
Zhou Zhiyao
4b45dd2004
Minor fixes ( #803 )
2019-08-17 08:37:57 -04:00
vsmk98
b53841d1d7
permission: changed the signature of IsNodePermissioned to avoid passing ctx. Removed hardcoding of permission-config.json.
2019-08-14 10:54:13 +08:00
jpmsam
c894c2d70e
v2.2.5
2019-08-08 15:24:12 -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
Brajesh Awasthi
baa7efcf3d
max code size option in genesis config ( #786 )
2019-08-02 15:53:15 -04:00
jpmsam
30d4d72476
patch version update
2019-06-19 14:36:21 -04:00
vsmk98
0cd8c89018
permission: code clean up based on review comments
2019-05-17 16:12:53 +08:00
vsmk98
e5b14b0a71
permission: code clean up. removal of unnecessary code.
2019-05-15 15:59:46 +08:00
amalraj.manigmail.com
32e5f8e581
params: customize max code size for quorum
2019-05-15 15:10:20 +08:00
amalraj.manigmail.com
0ce58c23c3
Merge remote-tracking branch 'remotes/origin/master' into feature/permissioning-1.8.18-suborgs
...
# Conflicts:
# docs/README.md
2019-05-08 18:13:51 +08:00
vsmk98
34565b5252
permissions: Changes for the following:
...
1. Enabling allow a role to marked as admin role
2. managing error handling
2019-04-26 16:35:51 +08:00
vsmk98
78dbedb254
permissions: Changes for the following:
...
1. Enabling change of org admin
2. Enabling adding a new or existing account as network admin
3. related changes transaction permissions
2019-04-24 14:40:28 +08:00
jpmsam
2d22fd0044
version update
2019-04-04 16:45:40 -04:00
jpmsam
17f558dae9
version update
2019-04-03 11:22:12 -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
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
fixanoid
0f68921124
Renaming to TransactionSizeLimit for clarity
2019-02-14 09:01:22 -05:00
vsmk98
564d35f94a
changes to error handling and fixing code review comments
2019-02-14 10:24:32 +08:00
fixanoid
cca2e84c18
Transaction size limit support via genesis
2019-02-12 17:23:59 -05: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
Samer Falah
b5920e005c
Merge pull request #616 from jpmorganchase/quorum-node-info
...
Adding Quorum version into node info
2019-02-04 12:00:52 -05: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
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