Skip to content
Open

1.6.27 #1677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
75d45a8
Create node_setup.md
samuelmanzanera Mar 31, 2025
755c580
AUto generate the service environment file
samuelmanzanera Apr 15, 2025
f894184
Update 1.6.14
pvalette May 12, 2025
5cce082
Update ubuntu 22.04
pvalette May 12, 2025
2e25c1b
new node worldmap view
May 8, 2025
431e793
new worldmap
May 9, 2025
d919c92
Update 1.6.15
pvalette May 13, 2025
1d63292
Update worldmap_v2.js
pvalette May 13, 2025
ad66f9b
Update mix.exs
pvalette May 13, 2025
638de23
Update world_map_live.html.heex
pvalette May 13, 2025
d778965
Update world_map_live.html.heex
pvalette May 13, 2025
da0dced
Update worldmap_v2.js
pvalette May 13, 2025
076b5aa
Update mix.exs
pvalette May 13, 2025
a429dca
Update worldmap_v2.js
pvalette May 13, 2025
295a756
Update mix.exs
pvalette May 13, 2025
43bbdee
Update maxmind_db.ex
pvalette May 13, 2025
c88679f
Update mix.exs
pvalette May 13, 2025
952dbb0
Update maxmind_db.ex
pvalette May 13, 2025
b3913b9
Update mix.exs
pvalette May 13, 2025
f1098af
Update maxmind_db.ex
pvalette May 13, 2025
905bed4
Update mix.exs
pvalette May 13, 2025
e0bdef2
Adapt to GEOLITE2 structure for city/country
pvalette May 14, 2025
0722d66
1.6.22
pvalette May 14, 2025
d75c0de
Update maxmind_db.ex
pvalette May 14, 2025
fd2d400
Update worldmap_v2.js
pvalette May 14, 2025
14a0464
Update worldmap_v2.js
pvalette May 14, 2025
fa7dfdd
Update worldmap_v2.js
pvalette May 14, 2025
b47cdff
Update mix.exs
pvalette May 14, 2025
d0b75cb
Update worldmap_v2.js
pvalette May 14, 2025
3a454ed
Update worldmap_v2.js
pvalette May 14, 2025
2486fba
Update worldmap_v2.js
pvalette May 14, 2025
03bf6bd
Force Paris geo for local or not localized nodes
pvalette May 14, 2025
91d8c9e
Force Paris if no geolocalisation
pvalette May 14, 2025
4b3d32a
1.6.24
pvalette May 14, 2025
5cde8b4
Update worldmap_v2.js
pvalette May 14, 2025
7447c47
update tx at 1 UCO, Worldmap fix
May 14, 2025
e90829e
1.6.25
pvalette May 14, 2025
d462921
Merge branch 'master' into testnet
pvalette May 14, 2025
cb59630
Update fee =0 for the Network
pvalette May 15, 2025
991b981
1.6.26
pvalette May 15, 2025
b831f6b
Update fee.ex
pvalette May 15, 2025
ca62cf3
Update mix.exs
pvalette May 15, 2025
c983baa
Merge branch 'master' into testnet
pvalette May 15, 2025
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
14 changes: 11 additions & 3 deletions lib/archethic/mining/fee.ex
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,25 @@ defmodule Archethic.Mining.Fee do
def calculate(_, %Contract.Context{trigger: {:transaction, _, _}}, _, _, _, _, _), do: 0

def calculate(
_tx,
%Transaction{address: address, type: type},
_contract_context,
_uco_price_in_usd,
_timestamp,
_encoded_state,
_contract_recipient_fee,
protocol_version
)
when protocol_version > 10,
do: 1*@unit_uco
when protocol_version > 10 do
cond do
address == Bootstrap.genesis_address() ->
0

true == Transaction.network_type?(type) ->
0

true -> 1*@unit_uco
end
end

def calculate(
_tx,
Expand Down
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule Archethic.MixProject do
def project do
[
app: :archethic,
version: "1.6.25",
version: "1.6.27",
build_path: "_build",
config_path: "config/config.exs",
deps_path: "deps",
Expand Down
Loading