From 8a0bef61b9683615116a0b3033a8ec668edfaa18 Mon Sep 17 00:00:00 2001 From: JamesPiechota Date: Thu, 29 Feb 2024 21:04:49 -0500 Subject: [PATCH] Bump release number 68, 2.7.2 (#386) Set HF activation height 1391330, Targeting 2024-03-26 14:00 UTC Set upper and lower price bound: Upper Bound: 340 Winston per GiB/Minute or ~0.714 AR per GiB upload Lower Bound: 170 Winston per GiB/Minute or ~0.357 AR per GiB upload --- apps/arweave/include/ar.hrl | 2 +- apps/arweave/src/ar_fork.erl | 2 +- apps/arweave/src/ar_node_worker.erl | 2 +- apps/arweave/src/ar_pricing_transition.erl | 12 ++++++------ apps/arweave/src/arweave.app.src | 2 +- rebar.config | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/arweave/include/ar.hrl b/apps/arweave/include/ar.hrl index 47435c86e..e058a69ce 100644 --- a/apps/arweave/include/ar.hrl +++ b/apps/arweave/include/ar.hrl @@ -21,7 +21,7 @@ -define(CLIENT_VERSION, 5). %% The current build number -- incremented for every release. --define(RELEASE_NUMBER, 67). +-define(RELEASE_NUMBER, 68). -define(DEFAULT_REQUEST_HEADERS, [ diff --git a/apps/arweave/src/ar_fork.erl b/apps/arweave/src/ar_fork.erl index 523e27bc4..a518eb50c 100644 --- a/apps/arweave/src/ar_fork.erl +++ b/apps/arweave/src/ar_fork.erl @@ -144,6 +144,6 @@ height_2_7_2() -> 0. -else. height_2_7_2() -> - 1378640. % Targeting 2024-03-07 14:00 UTC + 1391330. % Targeting 2024-03-26 14:00 UTC -endif. -endif. \ No newline at end of file diff --git a/apps/arweave/src/ar_node_worker.erl b/apps/arweave/src/ar_node_worker.erl index eb73aa1f1..8f27ba40d 100644 --- a/apps/arweave/src/ar_node_worker.erl +++ b/apps/arweave/src/ar_node_worker.erl @@ -980,7 +980,7 @@ handle_task(compute_mining_difficulty, State) -> Diff = get_current_diff(), case ar_node:get_height() of Height when (Height + 1) rem 10 == 0 -> - ?LOG_INFO([{event, current_mining_difficulty}, {difficulty, Diff}]); + ?LOG_INFO([{event, current_mining_difficulty}, {height, Height}, {difficulty, Diff}]); _ -> ok end, diff --git a/apps/arweave/src/ar_pricing_transition.erl b/apps/arweave/src/ar_pricing_transition.erl index 3d8c24d2f..7ec42c765 100644 --- a/apps/arweave/src/ar_pricing_transition.erl +++ b/apps/arweave/src/ar_pricing_transition.erl @@ -132,9 +132,9 @@ -define(PRICE_2_7_2_PER_GIB_MINUTE_UPPER_BOUND, 30000). -else. -ifndef(PRICE_2_7_2_PER_GIB_MINUTE_UPPER_BOUND). - %% 1_100_000_000_000 / (200 (years) * 365 (days) * 24 * 60) / 20 (replicas) - %% = ~520 Winston per GiB per minute. - -define(PRICE_2_7_2_PER_GIB_MINUTE_UPPER_BOUND, 520). + %% 714_000_000_000 / (200 (years) * 365 (days) * 24 * 60) / 20 (replicas) + %% = ~340 Winston per GiB per minute. + -define(PRICE_2_7_2_PER_GIB_MINUTE_UPPER_BOUND, 340). -endif. -endif. @@ -142,9 +142,9 @@ -define(PRICE_2_7_2_PER_GIB_MINUTE_LOWER_BOUND, 0). -else. -ifndef(PRICE_2_7_2_PER_GIB_MINUTE_LOWER_BOUND). - %% 550_000_000_000 / (200 (years) * 365 (days) * 24 * 60) / 20 (replicas) - %% = ~260 Winston per GiB per minute. - -define(PRICE_2_7_2_PER_GIB_MINUTE_LOWER_BOUND, 260). + %% 357_000_000_000 / (200 (years) * 365 (days) * 24 * 60) / 20 (replicas) + %% = ~170 Winston per GiB per minute. + -define(PRICE_2_7_2_PER_GIB_MINUTE_LOWER_BOUND, 170). -endif. -endif. diff --git a/apps/arweave/src/arweave.app.src b/apps/arweave/src/arweave.app.src index 16ea83121..27ef40c7b 100644 --- a/apps/arweave/src/arweave.app.src +++ b/apps/arweave/src/arweave.app.src @@ -1,6 +1,6 @@ {application, arweave, [ {description, "Arweave"}, - {vsn, "2.7.1"}, + {vsn, "2.7.2"}, {mod, {ar, []}}, {applications, [ kernel, diff --git a/rebar.config b/rebar.config index 20e4837ed..dca3fd591 100644 --- a/rebar.config +++ b/rebar.config @@ -26,7 +26,7 @@ ]}. {relx, [ - {release, {arweave, "2.7.1"}, [ + {release, {arweave, "2.7.2"}, [ {arweave, load}, b64fast, jiffy,