Merge remote-tracking branch 'refs/remotes/upstream/main'

sigeshuo · Jul 11, 2024 · 9746a1a · 9746a1a
2 parents 1b9d4a6 + e304f0b
commit 9746a1a
Show file tree

Hide file tree

Showing 24 changed files with 653 additions and 92 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,11 +1,7 @@
-## Motivation
+## Why is this change needed?
 
 Describe why this issue should be fixed and link to any relevant design docs, issues or other relevant items.
 
-## Change Summary
-
-Describe the changes being made in 1-2 concise sentences.
-
 ## Merge Checklist
 
 _Choose all relevant options below by adding an `x` now or at any time before submitting for review_
@@ -14,8 +10,3 @@ _Choose all relevant options below by adding an `x` now or at any time before su
 - [ ] PR has a [changeset](https://github.com/farcasterxyz/hub-monorepo/blob/main/CONTRIBUTING.md#35-adding-changesets)
 - [ ] PR has been tagged with a change label(s) (i.e. documentation, feature, bugfix, or chore)
 - [ ] PR includes [documentation](https://github.com/farcasterxyz/hub-monorepo/blob/main/CONTRIBUTING.md#32-writing-docs) if necessary.
-- [ ] All [commits have been signed](https://github.com/farcasterxyz/hub-monorepo/blob/main/CONTRIBUTING.md#22-signing-commits)
-
-## Additional Context
-
-If this is a relatively large or complex change, provide more details here that will help reviewers
diff --git a/apps/hubble/CHANGELOG.md b/apps/hubble/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @farcaster/hubble
 
+## 1.13.6
+
+### Patch Changes
+
+- fdcc3b52: chore: add stats for bundle message delays, stale contact info
+- fa5eef40: fix: Increase message threshold to reduce snapshot bandwidth usage
+- 795815af: fixed issue with cli arguments order in docker-compose.yml causing hub operator fid to be unset
+- b5ff774a: feat: add hub service agreement - there will be no rewards for running a hub
+- 2a82b3dc: feat: add unique peer map to sync engine to represent current active peers
+- aa02a48d: fix: validate gossip message for clock skew
+- 2bae6fb9: chore: Update curve25519-dalek from 4.1.1 to 4.1.3 in Rust extension
+
 ## 1.13.5
 
 ### Patch Changes
@@ -23,7 +35,7 @@
 
 - 2d26d305: CLI tool for measuring sync health
 - b150e900: fix: Use stricter socket timeout for gossip
-- eacf29c9: fix: http endoint return not found instead of internal database error
+- eacf29c9: fix: http endpoint return not found instead of internal database error
   - @farcaster/hub-nodejs@0.11.18
 
 ## 1.13.2
@@ -608,7 +620,7 @@
 - 08b652e: fix: Add txIndex to onchain events, fix wrong index being used in the primary key
 - b36eef2: fix: Extract snapshot on the fly while downloading snapshot
 - 93e43a8: fix: Use hashes to compare upgrade 'hubble.sh' versions
-- 7daaae4: fix: Simplify IP addr fetching, prefering ipv4
+- 7daaae4: fix: Simplify IP addr fetching, preferring ipv4
 - ac1f6ac: fix: Fetch envoy config during hubble.sh
 - baf983f: fix: Consume the FID rate limit only after a successful merge
 - Updated dependencies [08b652e]
@@ -742,7 +754,7 @@
 - f00d7d2: fix: Move validatorOrRevokeMessage and storageCache iterators to be managed
 - 115f1b5: feat: Do the validateOrRevokeMessages job fid-by-fid
 - 998979d: feat: Warn if there are no incoming connections
-- c1bb21c: fix: When retring messages due to failed signers, use a queue
+- c1bb21c: fix: When retrying messages due to failed signers, use a queue
 - 376ae0f: feat: Use a web based network config for hubble
   - @farcaster/hub-nodejs@0.9.1
 

diff --git a/apps/hubble/docker-compose.yml b/apps/hubble/docker-compose.yml
@@ -8,8 +8,6 @@
 #
 #   git fetch --tags --force && git checkout @latest && docker compose up
 
-version: '3.9'
-
 services:
   hubble:
     image: sigeshuo/hubble:latest
@@ -35,10 +33,10 @@ services:
         --eth-mainnet-rpc-url $ETH_MAINNET_RPC_URL
         --l2-rpc-url $OPTIMISM_L2_RPC_URL
         --network ${FC_NETWORK_ID:-1}
+        --hub-operator-fid ${HUB_OPERATOR_FID:-0}
         --rpc-subscribe-per-ip-limit ${RPC_SUBSCRIBE_PER_IP_LIMIT:-4}
         -b ${BOOTSTRAP_NODE:-/dns/nemes.farcaster.xyz/tcp/2282}
         --statsd-metrics-server $STATSD_METRICS_SERVER
-        --hub-operator-fid ${HUB_OPERATOR_FID:-0}
         --opt-out-diagnostics ${HUB_OPT_OUT_DIAGNOSTICS:-false}
         ${HUB_OPTIONS:-}
     ports:

diff --git a/apps/hubble/package.json b/apps/hubble/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@farcaster/hubble",
-  "version": "1.13.5",
+  "version": "1.13.6",
   "description": "Farcaster Hub",
   "author": "",
   "license": "",

diff --git a/apps/hubble/src/addon/Cargo.lock b/apps/hubble/src/addon/Cargo.lock
diff --git a/apps/hubble/src/defaultConfig.ts b/apps/hubble/src/defaultConfig.ts
@@ -10,7 +10,7 @@ const DEFAULT_GOSSIP_PORT = 2282;
 const DEFAULT_RPC_PORT = 2283;
 const DEFAULT_HTTP_API_PORT = 2281;
 const DEFAULT_NETWORK = 3; // Farcaster Devnet
-export const DEFAULT_CATCHUP_SYNC_SNAPSHOT_MESSAGE_LIMIT = 25_000_000;
+export const DEFAULT_CATCHUP_SYNC_SNAPSHOT_MESSAGE_LIMIT = 50_000_000;
 
 export const Config = {
   /** Path to a PeerId file */