Skip to content

Commit 154bbb8

Browse files
committed
Merge branch 'master' into cody/add_raw_tx_forwarder
2 parents 80c80a9 + be37779 commit 154bbb8

File tree

25 files changed

+2904
-1356
lines changed

25 files changed

+2904
-1356
lines changed

.env.example

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ TIPS_AUDIT_S3_ACCESS_KEY_ID=minioadmin
3232
TIPS_AUDIT_S3_SECRET_ACCESS_KEY=minioadmin
3333

3434
# TIPS UI
35+
NEXT_PUBLIC_BLOCK_EXPLORER_URL=https://base.blockscout.com
36+
TIPS_UI_RPC_URL=http://localhost:8549
3537
TIPS_UI_AWS_REGION=us-east-1
3638
TIPS_UI_S3_BUCKET_NAME=tips
3739
TIPS_UI_S3_CONFIG_TYPE=manual

.github/workflows/stale.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Mark stale issues and PRs
2+
3+
on:
4+
schedule:
5+
- cron: '30 0 * * *'
6+
workflow_dispatch:
7+
permissions:
8+
contents: read
9+
10+
jobs:
11+
stale:
12+
runs-on: ubuntu-latest
13+
permissions:
14+
actions: write
15+
issues: write
16+
pull-requests: write
17+
steps:
18+
- name: Harden the runner (Audit all outbound calls)
19+
uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
20+
with:
21+
egress-policy: audit
22+
23+
- uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
24+
with:
25+
days-before-stale: 14
26+
days-before-close: 5
27+
stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
28+
stale-pr-message: 'This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
29+
close-issue-message: 'This issue was closed because it has been inactive for 5 days since being marked as stale.'
30+
close-pr-message: 'This pull request was closed because it has been inactive for 5 days since being marked as stale.'
31+
exempt-issue-labels: keep-open
32+
exempt-pr-labels: keep-open

Cargo.lock

Lines changed: 3 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,11 @@ wiremock = "0.6.2"
5555
axum = "0.8.3"
5656

5757
# Kafka and S3 dependencies
58-
rdkafka = { version = "0.37.0", features = ["libz-static", "ssl-vendored"] }
58+
rdkafka = { version = "0.37.0", features = ["zstd", "ssl-vendored"] }
5959
aws-config = "1.1.7"
6060
aws-sdk-s3 = "1.106.0"
6161
aws-credential-types = "1.1.7"
6262
bytes = { version = "1.8.0", features = ["serde"] }
63-
lz4_flex = "0.12"
6463

6564
# tips-ingress
6665
backon = "1.5.2"

crates/audit/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ aws-config = { workspace = true }
3232
aws-sdk-s3 = { workspace = true }
3333
aws-credential-types = { workspace = true }
3434
bytes = { workspace = true }
35-
lz4_flex = { workspace = true }
3635

3736
[dev-dependencies]
3837
testcontainers = { workspace = true }

crates/audit/src/publisher.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ impl KafkaBundleEventPublisher {
2626
async fn send_event(&self, event: &BundleEvent) -> Result<()> {
2727
let bundle_id = event.bundle_id();
2828
let key = event.generate_event_key();
29-
let json_bytes = serde_json::to_vec(event)?;
30-
let payload = lz4_flex::compress_prepend_size(&json_bytes);
29+
let payload = serde_json::to_vec(event)?;
3130

3231
let record = FutureRecord::to(&self.topic).key(&key).payload(&payload);
3332

crates/audit/src/reader.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,7 @@ impl EventReader for KafkaAuditLogReader {
7777
.as_millis() as i64,
7878
};
7979

80-
let json_bytes = lz4_flex::decompress_size_prepended(payload)
81-
.map_err(|e| anyhow::anyhow!("Failed to decompress LZ4: {e}"))?;
82-
let event: BundleEvent = serde_json::from_slice(&json_bytes)?;
80+
let event: BundleEvent = serde_json::from_slice(payload)?;
8381

8482
debug!(
8583
bundle_id = %event.bundle_id(),

crates/core/src/types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ pub struct TransactionResult {
278278
pub execution_time_us: u128,
279279
}
280280

281-
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
281+
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Default)]
282282
#[serde(rename_all = "camelCase")]
283283
pub struct MeterBundleResponse {
284284
pub bundle_gas_price: U256,

crates/core/src/user_ops_types.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ mod tests {
8181
assert_eq!(user_operation.signature, Bytes::from_str("0x01").unwrap());
8282
}
8383
_ => {
84-
panic!("Expected EntryPointV06, got {user_operation:?}");
84+
panic!("Expected EntryPointV06, got {:?}", user_operation);
8585
}
8686
}
8787
}
@@ -132,7 +132,7 @@ mod tests {
132132
assert_eq!(user_operation.pre_verification_gas, Uint::from(0x186a0));
133133
}
134134
_ => {
135-
panic!("Expected EntryPointV07, got {user_operation:?}");
135+
panic!("Expected EntryPointV07, got {:?}", user_operation);
136136
}
137137
}
138138
}

crates/ingress-rpc/Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,7 @@ metrics.workspace = true
4040
metrics-derive.workspace = true
4141
metrics-exporter-prometheus.workspace = true
4242
axum.workspace = true
43+
44+
[dev-dependencies]
45+
wiremock.workspace = true
46+
serde_json.workspace = true

0 commit comments

Comments
 (0)