Skip to content

Commit

Permalink
Merge branch 'master' into jord/6622-chunk-service-event-count-field
Browse files Browse the repository at this point in the history
  • Loading branch information
jordanschalm committed Dec 11, 2024
2 parents 27bd143 + f27a41d commit f637834
Show file tree
Hide file tree
Showing 64 changed files with 18,054 additions and 1,286 deletions.
61 changes: 61 additions & 0 deletions .github/workflows/ci-manual-publish-jvm-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Manually Publish Release - JVM Protobuf
on:
workflow_dispatch:
branches:
- master
jobs:
build:
name: Manually publish release
runs-on: ubuntu-latest
env:
JAVA_OPTS: -Xmx2g -Dorg.gradle.daemon=false
#services:
# flow-emulator:
# image: gcr.io/flow-container-registry/emulator
# env:
# FLOW_VERBOSE: true
# FLOW_PORT: 3569
# FLOW_INTERVAL: 5s
# FLOW_PERSIST: false
# ports:
# - 3569:3569
steps:
- name: Get current date
id: date
run: echo "::set-output name=date::$(date +'%Y%m%d%H%M%S')"

- name: Checkout code
uses: actions/checkout@v3

- name: Setup Java
uses: actions/setup-java@v2
with:
java-version: '21'
java-package: jdk
distribution: 'adopt'

- name: Make gradle executable
run: chmod +x ./protobuf/gradlew

- name: Build
id: build
run: cd protobuf && ./gradlew --warning-mode all check build

- name: Publish release
env:
JAVA_OPTS: -Xmx2g -Dorg.gradle.daemon=false
ORG_GRADLE_PROJECT_mavenCentralUsername: '${{ secrets.FLOW_JVM_SDK_SONATYPE_USERNAME }}'
ORG_GRADLE_PROJECT_mavenCentralPassword: '${{ secrets.FLOW_JVM_SDK_SONATYPE_PASSWORD }}'
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.FLOW_JVM_SDK_SIGNING_KEY }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.FLOW_JVM_SDK_SIGNING_PASSWORD }}

run: |
cd protobuf
if [[ "${{ secrets.FLOW_JVM_SDK_CICD_PUBLISH_ENABLED }}" != "true" ]];
then
exit 0;
fi
./gradlew \
-Psigning.key="${{ secrets.FLOW_JVM_SDK_SIGNING_KEY }}" \
-Psigning.password="${{ secrets.FLOW_JVM_SDK_SIGNING_PASSWORD }}" \
publishAndReleaseToMavenCentral --no-configuration-cache
61 changes: 61 additions & 0 deletions .github/workflows/ci-manual-publish-jvm-snapshot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Manually Publish Snapshot - JVM Protobuf
on:
workflow_dispatch:
branches:
- master
jobs:
build:
name: Manually publish snapshot
runs-on: ubuntu-latest
env:
JAVA_OPTS: -Xmx2g -Dorg.gradle.daemon=false
#services:
# flow-emulator:
# image: gcr.io/flow-container-registry/emulator
# env:
# FLOW_VERBOSE: true
# FLOW_PORT: 3569
# FLOW_INTERVAL: 5s
# FLOW_PERSIST: false
# ports:
# - 3569:3569
steps:
- name: Get current date
id: date
run: echo "::set-output name=date::$(date +'%Y%m%d%H%M%S')"

- name: Checkout code
uses: actions/checkout@v3

- name: Setup Java
uses: actions/setup-java@v2
with:
java-version: '21'
java-package: jdk
distribution: 'adopt'

- name: Make gradle executable
run: chmod +x ./protobuf/gradlew

- name: Build
id: build
run: cd protobuf && ./gradlew --warning-mode all check build

- name: Publish snapshot
env:
JAVA_OPTS: -Xmx2g -Dorg.gradle.daemon=false
ORG_GRADLE_PROJECT_mavenCentralUsername: '${{ secrets.FLOW_JVM_SDK_SONATYPE_USERNAME }}'
ORG_GRADLE_PROJECT_mavenCentralPassword: '${{ secrets.FLOW_JVM_SDK_SONATYPE_PASSWORD }}'
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.FLOW_JVM_SDK_SIGNING_KEY }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.FLOW_JVM_SDK_SIGNING_PASSWORD }}

run: |
cd protobuf
if [[ "${{ secrets.FLOW_JVM_SDK_CICD_PUBLISH_ENABLED }}" != "true" ]];
then
exit 0;
fi
./gradlew \
-Psigning.key="${{ secrets.FLOW_JVM_SDK_SIGNING_KEY }}" \
-Psigning.password="${{ secrets.FLOW_JVM_SDK_SIGNING_PASSWORD }}" \
publishToMavenCentral --no-configuration-cache
36 changes: 36 additions & 0 deletions .github/workflows/ci-pull-request-jvm-protobuf.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Build Pull Request - JVM Protobuf
on: pull_request

jobs:
build:
name: Build pull request
runs-on: ubuntu-latest
env:
JAVA_OPTS: -Xmx2g -Dorg.gradle.daemon=false
#services:
# flow-emulator:
# image: gcr.io/flow-container-registry/emulator
# env:
# FLOW_VERBOSE: true
# FLOW_PORT: 3569
# FLOW_INTERVAL: 5s
# FLOW_PERSIST: false
# ports:
# - 3569:3569
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Setup Java
uses: actions/setup-java@v2
with:
java-version: '21'
java-package: jdk
distribution: 'adopt'

- name: Make gradle executable
run: chmod +x ./protobuf/gradlew

- name: Build
id: build
run: cd protobuf && ./gradlew --warning-mode all check build
4 changes: 4 additions & 0 deletions agendas/2024/product-sync/2024-02-01-Protocol-Product-Sync.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Please add topics that you would like to discuss

1. Release notes for HCU
2. Operator for HCU
4 changes: 4 additions & 0 deletions agendas/2024/product-sync/2024-02-08-Protocol-Product-Sync.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
### Please add agenda items below.

1. Reminder: Please share agenda for working group meeting and OKRs (vishal)
2. Plan for moving 16 operator consensus nodes (vishal)
11 changes: 11 additions & 0 deletions agendas/2024/product-sync/2024-02-15-Protocol-Product-Sync.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## Please enter agenda items below

1. Consensus block rate improvements

Further reading
* [Cruise-Control headroom for speedups](https://www.notion.so/dapperlabs/Cruise-Control-headroom-for-speedups-56768a92b66745f1af3e4d15b2b6e8ae?pvs=4)
* [Epic #5302](https://github.com/onflow/flow-go/issues/5302)

2. QN contract renewal


5 changes: 5 additions & 0 deletions agendas/2024/product-sync/2024-02-22-Protocol-Product-Sync.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## Please add agenda items below

1. Passkey support - will this require a spork?
2. Rosetta for FlowEVM

8 changes: 8 additions & 0 deletions agendas/2024/product-sync/2024-02-29-Protocol-Product-Sync.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Please add agenda items below

1. Event Streaming - @vishal
- Should this be its own KR?

2. Rosetta for FlowEVM - @vishal

3. QuickNode support for FlowEVM - @vishal
5 changes: 5 additions & 0 deletions agendas/2024/product-sync/2024-03-07-Protocol-Product-Sync.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Please add agenda items below

1. Vishal's time off (March 19th to March 27th)
2. Fastbreak analysis - What are the things to consider?

7 changes: 7 additions & 0 deletions agendas/2024/product-sync/2024-03-21-Protocol-Product-Sync.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Please add agenda items below

1. Hiring/ Recruitment </br>
a. Probably need a TPM - Come up with a list of priorities, @Kan and @Sean would draft and share JD for this role. Check with UX WG's priorities </br>
b. Engineering hires - plans to hire interns, young grads. Protocol should figure the engg resources we'd need. Young grads are preferred (for delegation); senior hiring and onboarding is time-consuming

2. Flow as a data availability layer - to be discussed with @dete
3 changes: 3 additions & 0 deletions agendas/2024/product-sync/2024-03-28-Protocol-Product-Sync.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Please add agenda items below

1.
4 changes: 4 additions & 0 deletions agendas/2024/product-sync/2024-04-04-Protocol-Product-Sync.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Please add agenda items below

1. Discuss Protocol Product meeting scope and length, frequency etc
2.
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Please enter agenda items below

1. Consensus block rate improvement rollout plan ([Data Analysis](https://www.notion.so/flowfoundation/Cruise-Control-headroom-for-speedups-46dc17e07ae14462b03341e4432a907d?pvs=4))

Proposal for Next Steps:
1. Review the results in the `Core-Protocol Working Group` (next meeting is scheduled March 28)
2. Discussion on how to adjust cruise-control parameters specifically in `Byzantine Fault Tolerance [BFT]` sub-working-group (schedule a meeting on April 4th?).
3. Governance multi-sig and possible an update of the Epoch smart contract to deploy the new parameter set for Cruise Control [DRI: Vishal]
4. some technical background content for marketing.

When do we want to deploy consensus speedup? Timed with Crescendo? Or earlier?
Loading

0 comments on commit f637834

Please sign in to comment.