fix: event source tracking #470
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,44 @@ | ||||||
| import 'package:ndk/ndk.dart'; | ||||||
| import 'package:ndk/shared/nips/nip01/bip340.dart'; | ||||||
| import 'package:test/test.dart'; | ||||||
|
|
||||||
| import '../mocks/mock_event_verifier.dart'; | ||||||
| import '../mocks/mock_relay.dart'; | ||||||
|
|
||||||
| void main() async { | ||||||
| test("braodcast should update source", () async { | ||||||
|
There was a problem hiding this comment. Typo in test name: "braodcast" should be "broadcast". Proposed fix- test("braodcast should update source", () async {
+ test("broadcast should update source", () async {📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||
| final relay = MockRelay(name: "relay"); | ||||||
|
|
||||||
| await relay.startServer(); | ||||||
|
|
||||||
| final ndk = Ndk(NdkConfig( | ||||||
| eventVerifier: MockEventVerifier(), | ||||||
| cache: MemCacheManager(), | ||||||
| bootstrapRelays: [relay.url], | ||||||
| )); | ||||||
|
|
||||||
| final keypair = Bip340.generatePrivateKey(); | ||||||
| final signer = Bip340EventSigner( | ||||||
| privateKey: keypair.privateKey, | ||||||
| publicKey: keypair.publicKey, | ||||||
| ); | ||||||
| ndk.accounts.loginExternalSigner(signer: signer); | ||||||
|
|
||||||
| final event = Nip01Event( | ||||||
| pubKey: keypair.publicKey, | ||||||
| kind: 1, | ||||||
| tags: [], | ||||||
| content: "content", | ||||||
| ); | ||||||
|
|
||||||
| await ndk.broadcast.broadcast(nostrEvent: event).broadcastDoneFuture; | ||||||
|
|
||||||
| final localEvent = await ndk.config.cache.loadEvent(event.id); | ||||||
|
|
||||||
| expect(localEvent, isNotNull); | ||||||
| expect(localEvent!.sources, isNotEmpty); | ||||||
|
Comment on lines
+34
to
+39
There was a problem hiding this comment. 🧩 Analysis chain🏁 Script executed: #!/bin/bash
# Check if broadcast updates cache with sources after relay responses
echo "=== Checking broadcast.dart for post-response cache updates ==="
cat packages/ndk/lib/domain_layer/usecases/broadcast/broadcast.dart
echo ""
echo "=== Looking for saveEvent calls with sources ==="
rg -n -C5 'saveEvent.*sources|sources.*saveEvent' --type dart
echo ""
echo "=== Checking if OK responses trigger cache updates ==="
rg -n -C5 '"OK".*sources|sources.*"OK"' --type dartRepository: relaystr/ndk Length of output: 8951 🏁 Script executed: #!/bin/bash
# Find where sources are assigned to events
echo "=== Looking for where sources are assigned/populated ==="
rg -n 'sources\s*=' --type dart | head -20
echo ""
echo "=== Checking relay_manager.dart for relay response handling ==="
fd -t f 'relay_manager.dart' -x cat {}
echo ""
echo "=== Checking for saveEvent calls and their context ==="
rg -n 'saveEvent' --type dart -B2 -A2Repository: relaystr/ndk Length of output: 50368 🏁 Script executed: #!/bin/bash
echo "=== Checking network_engine.dart for broadcast handling ==="
fd -t f 'network_engine.dart' -x cat {} | head -200
echo ""
echo "=== Looking at the test file ==="
cat packages/ndk/test/usecases/broadcast_sources_test.dartRepository: relaystr/ndk Length of output: 1919 The test documents unimplemented functionality: broadcast responses must update the cached event with sources. The event is saved to cache before broadcasting (line 81 in 🤖 Prompt for AI Agents |
||||||
|
|
||||||
| await ndk.destroy(); | ||||||
| await relay.stopServer(); | ||||||
| }); | ||||||
| } | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,54 @@ | ||||||
| import 'package:ndk/shared/nips/nip01/bip340.dart'; | ||||||
| import 'package:test/test.dart'; | ||||||
| import 'package:ndk/ndk.dart'; | ||||||
|
|
||||||
| import '../../mocks/mock_event_verifier.dart'; | ||||||
| import '../../mocks/mock_relay.dart'; | ||||||
|
|
||||||
| void main() async { | ||||||
| test("requests should update sources", () async { | ||||||
| final bannedWord = "cow"; | ||||||
|
|
||||||
| final relay1 = MockRelay(name: "relay 1"); | ||||||
| final relay2 = MockRelay(name: "relay 2"); | ||||||
| final relay3 = MockRelay(name: "relay 2", bannedWord: bannedWord); | ||||||
|
There was a problem hiding this comment. Copy-paste error in relay name.
Proposed fix- final relay3 = MockRelay(name: "relay 2", bannedWord: bannedWord);
+ final relay3 = MockRelay(name: "relay 3", bannedWord: bannedWord);📝 Committable suggestion
Suggested change
🤖 Prompt for AI AgentsThere was a problem hiding this comment.
final relay3 = MockRelay(name: "relay 3", bannedWord: bannedWord);This ensures each relay has a unique name, making test output and debugging much clearer. 🧠 Learnings used |
||||||
|
|
||||||
| await relay1.startServer(); | ||||||
| await relay2.startServer(); | ||||||
| await relay3.startServer(); | ||||||
|
|
||||||
| final ndk = Ndk(NdkConfig( | ||||||
| eventVerifier: MockEventVerifier(), | ||||||
| cache: MemCacheManager(), | ||||||
| bootstrapRelays: [relay1.url, relay2.url, relay3.url], | ||||||
| )); | ||||||
|
|
||||||
| final keypair = Bip340.generatePrivateKey(); | ||||||
| final signer = Bip340EventSigner( | ||||||
| privateKey: keypair.privateKey, | ||||||
| publicKey: keypair.publicKey, | ||||||
| ); | ||||||
| ndk.accounts.loginExternalSigner(signer: signer); | ||||||
|
|
||||||
| final event = Nip01Event( | ||||||
| pubKey: keypair.publicKey, | ||||||
| kind: 1, | ||||||
| tags: [], | ||||||
| content: bannedWord, | ||||||
| ); | ||||||
| await ndk.broadcast.broadcast(nostrEvent: event).broadcastDoneFuture; | ||||||
|
|
||||||
| await ndk.config.cache.clearAll(); | ||||||
|
|
||||||
| final query = ndk.requests.query(filter: Filter(ids: [event.id])); | ||||||
| final events = await query.future; | ||||||
|
|
||||||
| // The last event should have all merged sources | ||||||
| expect(events.last.sources.length, equals(2)); | ||||||
|
|
||||||
| await ndk.destroy(); | ||||||
| await relay1.stopServer(); | ||||||
| await relay2.stopServer(); | ||||||
| await relay3.stopServer(); | ||||||
| }); | ||||||
| } | ||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would prefer to keep the cacheManager out of relay manager. We are already dealing with cache outside, so I would want to keep it that way.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@1-leo wdyt?