Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
204 changes: 0 additions & 204 deletions infrastructure/nomad/playbooks/templates/jobs/instant-bridge.nomad.j2

This file was deleted.

57 changes: 0 additions & 57 deletions infrastructure/nomad/playbooks/variables/profiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ artifacts:
beacon-emulator: &beacon_emulator_artifact
type: binary
path: tools/beacon-emulator
instant-bridge: &instant_bridge_artifact
type: binary
path: tools/instant-bridge
preconf-rpc: &preconf_rpc_artifact
type: binary
path: tools/preconf-rpc
Expand Down Expand Up @@ -723,24 +720,6 @@ jobs:
env:
l1_rpc_url: "{{ resolved_l1_rpc_urls.split(',')[0] }}"

instant_bridge: &instant_bridge_job
name: instant-bridge
template: instant-bridge.nomad.j2
artifacts:
- *instant_bridge_artifact
- keystores:
instant_bridge_keystore:
count: 1
target: *mev_commit_bidder_node1_job
ports:
- http:
to: 8080
env:
l1_chain_id: "{{ environments[env].chain_id }}"
l1_rpc_urls: "{{ resolved_l1_rpc_urls }}"
settlement_rpc_url: "{{ settlement_rpc_url if settlement_rpc_url is defined else '' }}"
contracts_json_url: "{{ contracts_json_url if contracts_json_url is defined else '' }}"

preconf_rpc: &preconf_rpc_job
name: preconf-rpc
template: preconf-rpc.nomad.j2
Expand Down Expand Up @@ -941,35 +920,6 @@ profiles:
- *mev_commit_faucet_job
- *datadog_agent_metrics_collector_job

instant-bridge-test:
jobs:
- *artifacts_job
- *datadog_agent_logs_collector_job
- *otel_collector_job
- *beacon_emulator_job
- *mock_l1_job
- *l1_transactor_job
- *mev_commit_geth_bootnode1_job
- *mev_commit_geth_signer_node1_job
- *mev_commit_geth_member_node_job
- *relay_emulator_job
- *contracts_deployer_job
- *mev_commit_bridge_job
- *mev_commit_dashboard_job
- *mev_commit_bootnode1_job
- *mev_commit_provider_node1_job
- *mev_commit_provider_node1_funder_job
- *mev_commit_provider_node2_job
- *mev_commit_provider_node2_funder_job
- *mev_commit_provider_node3_job
- *mev_commit_provider_node3_funder_job
- *mev_commit_provider_emulator_nodes_job
- *mev_commit_oracle_job
- *mev_commit_bidder_node1_job
- *mev_commit_bidder_node1_funder_job
- *instant_bridge_job
- *datadog_agent_metrics_collector_job

preconf-rpc-test:
jobs:
- *artifacts_job
Expand Down Expand Up @@ -998,13 +948,6 @@ profiles:
- *preconf_rpc_job
- *datadog_agent_metrics_collector_job

instant-bridge:
jobs:
- *artifacts_job
- *datadog_agent_logs_collector_job
- *mev_commit_bidder_node1_job
- *instant_bridge_job

archive:
jobs:
- *artifacts_job
Expand Down
18 changes: 18 additions & 0 deletions p2p/pkg/preconfirmation/preconfirmation.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"errors"
"log/slog"
"math/big"
"slices"
"sync"
"time"

Expand All @@ -20,6 +21,7 @@ import (
providerapi "github.com/primev/mev-commit/p2p/pkg/rpc/provider"
"github.com/primev/mev-commit/p2p/pkg/topology"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"
)

Expand Down Expand Up @@ -147,6 +149,22 @@ func (p *Preconfirmation) SendBid(
return nil, errors.New("no providers available")
}

md, ok := metadata.FromIncomingContext(ctx)
if ok {
ignoredProviders := md.Get("ignore-provider")
p.logger.Info("ignoring providers for this bid", "providers", ignoredProviders, "bid", bid)
for _, ip := range ignoredProviders {
ignoredAddr := common.HexToAddress(ip)
idx := slices.IndexFunc(providers, func(p p2p.Peer) bool {
return p.EthAddress == ignoredAddr
})
if idx != -1 {
p.logger.Info("ignoring provider for this bid", "provider", ignoredAddr.Hex(), "bid", bid)
providers = append(providers[:idx], providers[idx+1:]...)
}
}
}

// Create a new channel to receive preConfirmations
preConfirmations := make(chan *preconfpb.PreConfirmation, len(providers))

Expand Down
64 changes: 0 additions & 64 deletions tools/instant-bridge/.goreleaser.yml

This file was deleted.

Loading
Loading