Jp/p3 client 20230619

apps/arweave/include/ar.hrl

@@ -7,8 +7,6 @@
 %% (e.g. bin/test or bin/shell)
 -define(IS_TEST, erlang:get_cookie() == test).
 
--define(DATA_SIZE(Term), erlang:byte_size(term_to_binary(Term))).
-
 %% The mainnet name. Does not change at the hard forks.
 -ifndef(NETWORK_NAME).
 	-ifdef(DEBUG).

apps/arweave/include/ar_config.hrl

@@ -191,6 +191,7 @@
 			= ?DEFAULT_MAX_NONCE_LIMITER_LAST_STEP_VALIDATION_THREAD_COUNT,
 	nonce_limiter_server_trusted_peers = [],
 	nonce_limiter_client_peers = [],
+	p3_server_peers = [],
 	debug = false,
 	repair_rocksdb = [],
 	run_defragmentation = false,

apps/arweave/include/ar_peers.hrl

@@ -0,0 +1,21 @@
+-ifndef(AR_PEERS_HRL).
+-define(AR_PEERS_HRL, true).
+
+-include_lib("ar.hrl").
+
+%% factor to scale the average throughput by when rating gossiped data - lower is better
+-define(GOSSIP_ADVANTAGE, 0.5). 
+
+-record(performance, {
+	version = 3,
+	release = -1,
+	average_bytes = 0.0,
+	total_bytes = 0,
+	average_latency = 0.0,
+	total_latency = 0.0,
+	transfers = 0,
+	average_success = 1.0,
+	rating = 0
+}).
+
+-endif.

apps/arweave/src/ar.erl

@@ -541,6 +541,9 @@ parse_cli_args(["vdf_server_trusted_peer", Peer | Rest], C) ->
 parse_cli_args(["vdf_client_peer", RawPeer | Rest],
 		C = #config{ nonce_limiter_client_peers = Peers }) ->
 	parse_cli_args(Rest, C#config{ nonce_limiter_client_peers = [RawPeer | Peers] });
+parse_cli_args(["p3_server_peer", RawPeer | Rest],
+		C = #config{ p3_server_peers = Peers }) ->
+	parse_cli_args(Rest, C#config{ p3_server_peers = [RawPeer | Peers] });
 parse_cli_args(["debug" | Rest], C) ->
 	parse_cli_args(Rest, C#config{ debug = true });
 parse_cli_args(["repair_rocksdb", Path | Rest], #config{ repair_rocksdb = L } = C) ->

apps/arweave/src/ar_blacklist_middleware.erl

@@ -45,7 +45,6 @@ start() ->
 ban_peer(Peer, TTLSeconds) ->
 	Key = {ban, peer_to_ip_addr(Peer)},
 	Expires = os:system_time(seconds) + TTLSeconds,
-	ar_events:send(peer, {banned, Peer}),
 	ets:insert(?MODULE, {Key, Expires}).
 
 is_peer_banned(Peer) ->