Skip to content

Commit 8509340

Browse files
authored
Merge pull request #2657 from hyperledger-bevel/develop
[chore]: merge develop into main for release 1.3.0
2 parents 2c05bea + 35d5589 commit 8509340

File tree

46 files changed

+951
-662
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+951
-662
lines changed

docs/source/contributing/how-to-contribute.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,36 @@ Each commit must include a "Signed-off-by" line in the commit message (`git comm
4848

4949
Your commit email address must match your GitHub email address. For more information, see https://help.github.com/articles/setting-your-commit-email-address-in-git/
5050

51+
### Maintainers
52+
Being a maintainer of a Hyperledger project means taking on a leadership role in overseeing and managing the development, maintenance, and governance of the project. The responsibilities include:
53+
54+
1. Code Review and Merging: Reviewing contributions (pull requests) from the community and deciding which ones should be merged into the project’s codebase.
55+
56+
2. Releasing Updates: Ensuring that the project is updated regularly with bug fixes, new features, and security patches, and managing the release process.
57+
58+
3. Community Engagement: Actively engaging with the project’s community, including addressing issues, participating in discussions, mentoring contributors, and encouraging new participants to get involved.
59+
60+
4. Maintaining Documentation: Keeping the project's documentation accurate, up-to-date, and comprehensive for both developers and users.
61+
62+
5. Project Roadmap and Strategy: Helping to define the vision, roadmap, and direction of the project, ensuring alignment with the overall goals of the LF Decentralized Trust ecosystem.
63+
64+
6. Ensuring Quality and Security: Ensuring that the codebase is secure, high-quality, and adheres to industry best practices.
65+
66+
Being a maintainer requires strong technical expertise, leadership, and a commitment to the project's success and the broader open-source community.
67+
68+
### Becoming a maintainer
69+
The project's maintainers will, from time-to-time, consider adding a maintainer, based on the following criteria:
70+
71+
- Demonstrated track record of PR reviews (both quality and quantity of reviews)
72+
- Demonstrated thought leadership in the project
73+
- Contributions to the community, such as blog posts, webinars, or demos about the tool, are a plus
74+
- Demonstrated shepherding of project work and contributors
75+
- Demonstrated influential contributions that have notably enhanced the source code.
76+
- Demonstrated through contributions that you have outstanding knowledge and skills in Blockchain technology and the different DLTs under the LF Decentralized Trust ecosystem, automation, and cloud environments to be a maintainer of Bevel.
77+
- An existing maintainer can submit a pull request to the maintainers file. A nominated Contributor may become a Maintainer by a majority approval of the proposal by the existing Maintainers. Once approved, the change set is then merged and the individual is added to the maintainers group.
78+
79+
Maintainers may be removed by explicit resignation, for prolonged inactivity (e.g. 3 or more months with no review comments), or for some infraction of the code of conduct or by consistently demonstrating poor judgement. A proposed removal also requires a majority approval. A maintainer removed for inactivity should be restored following a sustained resumption of contributions and reviews (a month or more) demonstrating a renewed commitment to the project.
80+
5181
### Important GitHub Requirements
5282

5383
A pull request cannot merged until it has passed these status checks:

platforms/hyperledger-besu/charts/besu-genesis/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ These parameters are refered to as same in each parent or child chart
9494
| `rawGenesisConfig.genesis.difficulty` | Difficulty setting | `'0x1'` |
9595
| `rawGenesisConfig.genesis.coinbase` | Coinbase setting | `'0x0000000000000000000000000000000000000000'` |
9696
| `rawGenesisConfig.genesis.includeQuickStartAccounts` | Flag to include default accounts | `false` |
97+
| `rawGenesisConfig.genesis.initialContractDeployment.enabled` | Flag to enable initial contract deployment | `false` |
9798
| `rawGenesisConfig.blockchain.nodes.generate` | Flag to generate the initial nodes as per the `count` below | `true` |
9899
| `rawGenesisConfig.blockchain.nodes.count` | Number of validators/signers. | `4` |
99100
| `rawGenesisConfig.blockchain.accountPassword` | Default password for the new accounts | `'password'` |

platforms/hyperledger-besu/charts/besu-genesis/templates/genesis-job-init.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,11 @@ spec:
172172
{{- range .Values.rawGenesisConfig.genesis.additionalAccounts }}
173173
echo "$(jq '.alloc += {($address): {"balance": "90000000000000000000000"}}' --arg address {{ . }} /tmp/genesis.json.raw)" > /tmp/genesis.json.raw
174174
{{- end }}
175+
{{- if .Values.rawGenesisConfig.initialContractDeployment.enabled }}
176+
{{- range .Values.rawGenesisConfig.initialContractDeployment.contracts }}
177+
echo "$(jq '.alloc += {($address): {"balance": "90000000000000000000000", "code": ($bytecode)}}' --arg address {{ .address }} --arg bytecode {{ .bytecode }} /tmp/genesis.json.raw)" > /tmp/genesis.json.raw
178+
{{- end }}
179+
{{- end }}
175180
{{- if .Values.rawGenesisConfig.genesis.permissioning }}
176181
echo "Adding permissioning contracts to genesis"
177182
echo "$(jq '.alloc += {
@@ -196,8 +201,8 @@ spec:
196201
}
197202
}}' /tmp/genesis.json.raw)" > /tmp/genesis.json.raw
198203
{{- end }}
204+
echo "$(jq '.config += {"contractSizeLimit": 2147483647}' /tmp/genesis.json.raw)" > /tmp/genesis.json.raw
199205
cp /tmp/genesis.json.raw $FOLDER_PATH/besu/genesis.json
200-
201206
echo $FOLDER_PATH
202207
echo "Creating genesis configmap in k8s ..."
203208
safeWriteGenesisConfigmap $FOLDER_PATH

platforms/hyperledger-besu/charts/besu-genesis/values.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,16 @@ rawGenesisConfig:
6060
blockperiodseconds: 10
6161
epochlength: 30000
6262
requesttimeoutseconds: 20
63-
gasLimit: '0xf7b760'
63+
gasLimit: '0x1fffffffffffff'
6464
difficulty: '0x1'
6565
coinbase: '0x0000000000000000000000000000000000000000'
6666
contractSizeLimit: 2147483647
6767
transactionSizeLimit: 128
6868
includeQuickStartAccounts: false
6969
additionalAccounts: []
7070
permissioning: false
71+
initialContractDeployment:
72+
enabled: false
7173
blockchain:
7274
nodes:
7375
generate: true

platforms/hyperledger-besu/charts/besu-node/templates/besu-config-configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ data:
2727
node-private-key-file={{.Values.node.besu.privateKeyPath | quote }}
2828
2929
# Transaction Pool
30-
tx-pool-max-size={{ .Values.node.besu.txPool.maxCapacity }}
30+
tx-pool-layer-max-capacity={{ .Values.node.besu.txPool.maxCapacity }}
3131
3232
{{ if .Values.node.besu.p2p.enabled -}}
3333
# P2P network

platforms/hyperledger-besu/charts/besu-node/templates/node-service.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,16 @@ spec:
130130
port: {{ .Values.global.proxy.p2p }}
131131
service: {{ include "besu-node.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.node.besu.p2p.port }}
132132
{{- end }}
133+
## Mapping for ws
134+
---
135+
apiVersion: getambassador.io/v3alpha1
136+
kind: Mapping
137+
metadata:
138+
name: {{ include "besu-node.fullname" . }}-ws
139+
namespace: {{ .Release.Namespace }}
140+
spec:
141+
hostname: '{{ .Release.Name }}ws.{{ .Values.global.proxy.externalUrlSuffix }}'
142+
prefix: /
143+
service: {{ include "besu-node.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.node.besu.ws.port }}
144+
allow_upgrade:
145+
- websocket

platforms/hyperledger-besu/charts/besu-tessera-node/templates/statefulset.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,15 +182,17 @@ spec:
182182
183183
# create an SQL script file
184184
# This SQL script updates user passwords and creates database tables
185+
# root user is being created for '%' host
186+
185187
cat << EOF > /docker-entrypoint-initdb.d/createTables.sql
186-
UPDATE mysql.user SET authentication_string = PASSWORD('$pass') WHERE User = 'demouser';
187-
UPDATE mysql.user SET authentication_string = PASSWORD('$pass') WHERE User = 'root';
188-
CREATE TABLE IF NOT EXISTS ENCRYPTED_TRANSACTION (ENCODED_PAYLOAD BLOB NOT NULL, HASH VARBINARY(100) NOT NULL, TIMESTAMP BIGINT, PRIMARY KEY (HASH));
188+
CREATE USER'root'@'%' IDENTIFIED BY '$pass';
189+
ALTER USER 'demouser'@'%' IDENTIFIED BY '$pass';
190+
CREATE TABLE IF NOT EXISTS ENCRYPTED_TRANSACTION (ENCODED_PAYLOAD BLOB NOT NULL, PAYLOAD_CODEC VARCHAR(50), HASH VARBINARY(100) NOT NULL, TIMESTAMP BIGINT, PRIMARY KEY (HASH));
189191
CREATE TABLE IF NOT EXISTS PRIVACY_GROUP(ID VARBINARY(100) NOT NULL, LOOKUP_ID BLOB NOT NULL, DATA BLOB NOT NULL, TIMESTAMP BIGINT, PRIMARY KEY (ID));
190192
CREATE TABLE IF NOT EXISTS ENCRYPTED_RAW_TRANSACTION (ENCRYPTED_KEY BLOB NOT NULL, ENCRYPTED_PAYLOAD BLOB NOT NULL, NONCE BLOB NOT NULL, SENDER BLOB NOT NULL, TIMESTAMP BIGINT, HASH VARBINARY(100) NOT NULL, PRIMARY KEY (HASH));
191-
CREATE TABLE ST_TRANSACTION(ID BIGINT(19) NOT NULL, HASH VARCHAR(100) NOT NULL, PAYLOAD BLOB, PRIVACY_MODE BIGINT(10), TIMESTAMP BIGINT(19), VALIDATION_STAGE BIGINT(19), PRIMARY KEY (ID));
193+
CREATE TABLE ST_TRANSACTION(ID BIGINT(19) NOT NULL, PAYLOAD_CODEC VARCHAR(50), HASH VARCHAR(100) NOT NULL, PAYLOAD BLOB, PRIVACY_MODE BIGINT(10), TIMESTAMP BIGINT(19), VALIDATION_STAGE BIGINT(19), PRIMARY KEY (ID));
192194
CREATE TABLE ST_AFFECTED_TRANSACTION(ID BIGINT(19) NOT NULL, AFFECTED_HASH VARCHAR(100) NOT NULL, TXN_ID BIGINT(19) NOT NULL, CONSTRAINT FK_ST_AFFECTED_TRANSACTION_TXN_ID FOREIGN KEY (TXN_ID) REFERENCES ST_TRANSACTION(ID), PRIMARY KEY (ID));
193-
CREATE INDEX IF NOT EXISTS ST_TRANSACTION_VALSTG ON ST_TRANSACTION(VALIDATION_STAGE);
195+
CREATE INDEX ST_TRANSACTION_VALSTG ON ST_TRANSACTION(VALIDATION_STAGE);
194196
EOF
195197
volumeMounts:
196198
- name: mysql

platforms/hyperledger-besu/charts/values/noproxy-and-novault/genesis.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,14 @@ rawGenesisConfig:
1616
blockperiodseconds: 10
1717
epochlength: 30000
1818
requesttimeoutseconds: 20
19-
gasLimit: '0xf7b760'
19+
gasLimit: '0x1fffffffffffff'
2020
difficulty: '0x1'
2121
coinbase: '0x0000000000000000000000000000000000000000'
22+
initialContractDeployment:
23+
enabled: false
24+
contracts:
25+
- address: "0x71C7656EC7ab88b098defB751B7401B5f6d8976F"
26+
bytecode: "53450942895849203584032548320548235492305423854923054238594320584329543205843902865029568459348205849230583428549328053428"
2227
blockchain:
2328
nodes:
2429
generate: true

platforms/hyperledger-besu/charts/values/proxy-and-vault/genesis.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,14 @@ rawGenesisConfig:
2323
blockperiodseconds: 10
2424
epochlength: 30000
2525
requesttimeoutseconds: 20
26-
gasLimit: '0xf7b760'
26+
gasLimit: '0x1fffffffffffff'
2727
difficulty: '0x1'
2828
coinbase: '0x0000000000000000000000000000000000000000'
29+
initialContractDeployment:
30+
enabled: false
31+
contracts:
32+
- address: "0x71C7656EC7ab88b098defB751B7401B5f6d8976F"
33+
bytecode: "53450942895849203584032548320548235492305423854923054238594320584329543205843902865029568459348205849230583428549328053428"
2934
blockchain:
3035
nodes:
3136
generate: true

platforms/hyperledger-besu/charts/values/proxy-and-vault/txnode-sec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ node:
6767
image:
6868
besu:
6969
repository: hyperledger/besu
70-
tag: 22.10.2
70+
tag: 23.10.2

0 commit comments

Comments
 (0)