v1.3.7

Author: vans163

ex/build.Dockerfile

@@ -4,8 +4,8 @@ FROM ubuntu:24.04
 ENV DEBIAN_FRONTEND noninteractive
 
 ENV SSL_VERSION=3.5.4
-ENV OTP_VERSION=OTP-28.1.1
-ENV ELIXIR_VERSION=v1.19.3
+ENV OTP_VERSION=OTP-28.2
+ENV ELIXIR_VERSION=v1.19.4
 
 RUN apt-get update && apt-get install -y vim git curl locate wget apt-transport-https apt-utils locales
 ENV LANGUAGE en_US.UTF-8

ex/lib/api/api_chain.ex

@@ -80,10 +80,10 @@ defmodule API.Chain do
         tx_pool_size: TXPool.size(),
         cur_validator: DB.Chain.validator_for_height_current() |> Base58.encode(),
         next_validator: DB.Chain.validator_for_height_next() |> Base58.encode(),
-        emission_for_epoch: BIC.Coin.from_flat(BIC.Epoch.epoch_emission(DB.Chain.epoch())),
-        circulating: BIC.Coin.from_flat(BIC.Epoch.circulating_without_burn(DB.Chain.epoch())),
-        total_supply_y3: BIC.Coin.from_flat(BIC.Epoch.circulating_without_burn(500*3)),
-        total_supply_y30: BIC.Coin.from_flat(BIC.Epoch.circulating_without_burn(500*30)),
+        emission_for_epoch: BIC.Coin.from_flat(RDB.protocol_epoch_emission(DB.Chain.epoch())),
+        circulating: BIC.Coin.from_flat(RDB.protocol_circulating_without_burn(DB.Chain.epoch())),
+        total_supply_y3: BIC.Coin.from_flat(RDB.protocol_circulating_without_burn(500*3)),
+        total_supply_y30: BIC.Coin.from_flat(RDB.protocol_circulating_without_burn(500*30)),
         pflops: pflops(),
         burned: API.Contract.total_burned().float,
         txs_per_sec: stat_txs_sec(),

ex/lib/native/rdb.ex

@@ -56,6 +56,8 @@ defmodule RDB do
   def bintree_contractstate_root_prove(_db, _key), do: :erlang.nif_error(:nif_not_loaded)
 
   def protocol_constants(), do: :erlang.nif_error(:nif_not_loaded)
+  def protocol_epoch_emission(_epoch), do: :erlang.nif_error(:nif_not_loaded)
+  def protocol_circulating_without_burn(_epoch), do: :erlang.nif_error(:nif_not_loaded)
 end
 
 defmodule RDBProtocol do

ex/lib/node/node_anr.ex

@@ -116,7 +116,7 @@ defmodule NodeANR do
     routed = if !Application.fetch_env!(:ama, :check_routed_peer) do true else CymruRouting.globally_routed?(anr.ip4) end
     cond do
       !routed -> nil
-      !old_anr -> insert_new(anr)
+      !old_anr or !old_anr[:ts] -> insert_new(anr)
       anr.ts <= old_anr.ts -> nil
       old_anr.ip4 == anr.ip4 and old_anr.port == anr.port -> MnesiaKV.merge(NODEANR, anr.pk, anr)
       true -> insert_new(anr)

ex/mix.exs

@@ -6,7 +6,7 @@ defmodule Ama.MixProject do
   def project do
     [
       app: @app,
-      version: "1.3.6",
+      version: "1.3.7",
       elixir: ">= 1.19.0",
       start_permanent: Mix.env() == :prod,
       deps: deps(),

ex/native/rdb/src/lib.rs

@@ -928,4 +928,14 @@ fn protocol_constants<'a>(env: Env<'a>) -> Term<'a> {
     (map).encode(env)
 }
 
+#[rustler::nif]
+fn protocol_epoch_emission<'a>(env: Env<'a>, epoch: u64) -> i128 {
+    crate::consensus::bic::epoch::epoch_emission(epoch)
+}
+
+#[rustler::nif]
+fn protocol_circulating_without_burn<'a>(env: Env<'a>, epoch: u64) -> i128 {
+    crate::consensus::bic::epoch::circulating_without_burn(epoch)
+}
+
 rustler::init!("Elixir.RDB", load = on_load);