Skip to content

Commit

Permalink
Modify Github workflow to only on MESH- tags. Fixed issue introduced …
Browse files Browse the repository at this point in the history
…after rebase latest pocket-network/pocket-core staging branch.
  • Loading branch information
jorgecuesta committed May 2, 2024
1 parent 8e9b959 commit 6394be7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ on:
workflow_dispatch:
push:
branches: [geo-mesh]
tags: ['*']
tags:
- 'MESH-*'
pull_request:
branches: [geo-mesh]

Expand Down
8 changes: 4 additions & 4 deletions x/pocketcore/keeper/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (k Keeper) HandleRelay(ctx sdk.Ctx, relay pc.Relay, isMesh bool) (*pc.Relay
fmt.Sprintf("could not validate relay for app: %s for chainID: %v on node %s with error: %s",
relay.Proof.Token.ApplicationPublicKey,
relay.Proof.Blockchain,
nodeAddress.String(),
servicerNodeAddr.String(),
e1.Error(),
),
)
Expand All @@ -72,14 +72,14 @@ func (k Keeper) HandleRelay(ctx sdk.Ctx, relay pc.Relay, isMesh bool) (*pc.Relay
}
// move this to a worker that will insert this proof in a serie style to avoid memory consumption and relay proof race conditions
// https://github.com/pokt-network/pocket-core/issues/1457
if evidenceWorker, ok := pc.GlobalEvidenceWorkerMap.Load(nodeAddress.String()); ok {
ctx.Logger().Debug(fmt.Sprintf("adding relay to evidence worker for address=%s", nodeAddress.String()))
if evidenceWorker, ok := pc.GlobalEvidenceWorkerMap.Load(servicerNodeAddr.String()); ok {
ctx.Logger().Debug(fmt.Sprintf("adding relay to evidence worker for address=%s", servicerNodeAddr.String()))
evidenceWorker.Submit(func() {
// store the proof before execution, because the proof corresponds to the previous relay
relay.Proof.Store(maxPossibleRelays, servicerNode.EvidenceStore)
})
} else {
ctx.Logger().Error(fmt.Sprintf("evidence worker not found for address=%s", nodeAddress.String()))
ctx.Logger().Error(fmt.Sprintf("evidence worker not found for address=%s", servicerNodeAddr.String()))
}

// store the proof before execution, because the proof corresponds to the previous relay
Expand Down

0 comments on commit 6394be7

Please sign in to comment.