Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add buning address to io storage nodes only if burning is intentionna… #749

Merged
merged 12 commits into from
Dec 22, 2022
Merged

Add buning address to io storage nodes only if burning is intentionna… #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1f352cf
Add buning address to io storage nodes only if burning is intentionna…
netboz Dec 7, 2022
900af14
Removing unneeded potential addition of burning address
netboz Dec 15, 2022
42ca04b
Remove fetching the last address of burning addresses
netboz Dec 15, 2022
a8658fe
Fixing incorrect type
netboz Dec 15, 2022
c455719
Removing unneeded call to maybe_add_burning_address
netboz Dec 15, 2022
7976472
Removing unneeded addon of burning address to transaction movements
netboz Dec 18, 2022
c952364
Fixing compilation warnings
netboz Dec 21, 2022
812d0b5
Formatting
netboz Dec 21, 2022
ccf671d
Re-adding burning address only if part of recipients originally
netboz Dec 21, 2022
003833c
Updating tests wip
netboz Dec 21, 2022
3993d38
Add missing pattern for matching burning address
netboz Dec 21, 2022
7b17504
Fixing test plus new assertion
netboz Dec 22, 2022
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
28 changes: 0 additions & 28 deletions lib/archethic/account/mem_tables_loader.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ defmodule Archethic.Account.MemTablesLoader do

alias Archethic.Crypto

alias Archethic.Election

alias Archethic.P2P

alias Archethic.TransactionChain
alias Archethic.TransactionChain.Transaction
alias Archethic.TransactionChain.Transaction.ValidationStamp
Expand All @@ -24,8 +20,6 @@ defmodule Archethic.Account.MemTablesLoader do

alias Archethic.TransactionChain.Transaction.ValidationStamp.LedgerOperations.VersionedUnspentOutput

alias Archethic.Utils

require Logger

alias Archethic.Reward
Expand Down Expand Up @@ -81,7 +75,6 @@ defmodule Archethic.Account.MemTablesLoader do
timestamp: timestamp,
protocol_version: protocol_version,
ledger_operations: %LedgerOperations{
fee: fee,
unspent_outputs: unspent_outputs,
transaction_movements: transaction_movements
}
Expand All @@ -96,27 +89,6 @@ defmodule Archethic.Account.MemTablesLoader do
TokenLedger.spend_all_unspent_outputs(previous_address)
end

burn_storage_nodes =
Election.storage_nodes(
LedgerOperations.burning_address(),
P2P.authorized_and_available_nodes(timestamp)
)

transaction_movements =
if Utils.key_in_node_list?(burn_storage_nodes, Crypto.first_node_public_key()) and
fee > 0 do
[
%TransactionMovement{
to: LedgerOperations.burning_address(),
amount: fee,
type: :UCO
}
| transaction_movements
]
else
transaction_movements
end

:ok =
set_transaction_movements(
address,
Expand Down
2 changes: 0 additions & 2 deletions lib/archethic/mining/distributed_workflow.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ defmodule Archethic.Mining.DistributedWorkflow do

alias Archethic.TransactionChain
alias Archethic.TransactionChain.Transaction
alias Archethic.TransactionChain.Transaction.ValidationStamp.LedgerOperations
alias Archethic.TransactionChain.Transaction.CrossValidationStamp
alias Archethic.TransactionChain.Transaction.ValidationStamp
alias Archethic.TransactionChain.TransactionSummary
Expand Down Expand Up @@ -189,7 +188,6 @@ defmodule Archethic.Mining.DistributedWorkflow do
else
resolved_addresses
|> Enum.map(fn {_origin, resolved} -> resolved end)
|> Enum.concat([LedgerOperations.burning_address()])
|> Election.io_storage_nodes(authorized_nodes)
end

Expand Down
2 changes: 0 additions & 2 deletions lib/archethic/mining/standalone_workflow.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ defmodule Archethic.Mining.StandaloneWorkflow do

alias Archethic.TransactionChain
alias Archethic.TransactionChain.Transaction
alias Archethic.TransactionChain.Transaction.ValidationStamp.LedgerOperations
alias Archethic.TransactionChain.TransactionSummary

require Logger
Expand Down Expand Up @@ -79,7 +78,6 @@ defmodule Archethic.Mining.StandaloneWorkflow do
else
resolved_addresses
|> Enum.map(fn {_origin, resolved} -> resolved end)
|> Enum.concat([LedgerOperations.burning_address()])
|> Election.io_storage_nodes(authorized_nodes)
end

Expand Down
10 changes: 10 additions & 0 deletions lib/archethic/transaction_chain.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ defmodule Archethic.TransactionChain do
alias __MODULE__.TransactionData
alias __MODULE__.Transaction.ValidationStamp

alias __MODULE__.Transaction.ValidationStamp.LedgerOperations

alias __MODULE__.Transaction.ValidationStamp.LedgerOperations.TransactionMovement.Type,
as: TransactionMovementType

Expand Down Expand Up @@ -539,6 +541,8 @@ defmodule Archethic.TransactionChain do
tx = %Transaction{data: %TransactionData{recipients: recipients}},
time = %DateTime{}
) do
burning_address = LedgerOperations.burning_address()

addresses =
tx
|> Transaction.get_movements()
Expand All @@ -549,6 +553,9 @@ defmodule Archethic.TransactionChain do
TaskSupervisor,
addresses,
fn
{^burning_address, type} ->
{{burning_address, type}, burning_address}

{to, type} ->
case resolve_last_address(to, time) do
{:ok, resolved} ->
Expand All @@ -558,6 +565,9 @@ defmodule Archethic.TransactionChain do
{{to, type}, to}
end

^burning_address ->
{burning_address, burning_address}

to ->
case resolve_last_address(to, time) do
{:ok, resolved} ->
Expand Down
9 changes: 8 additions & 1 deletion test/archethic/account/mem_tables_loader_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,9 @@ defmodule Archethic.Account.MemTablesLoaderTest do
timestamp: ^timestamp
}
}
] = UCOLedger.get_unspent_outputs(LedgerOperations.burning_address())
] = TokenLedger.get_unspent_outputs(LedgerOperations.burning_address())

assert [] = UCOLedger.get_unspent_outputs(LedgerOperations.burning_address())

assert [
%VersionedUnspentOutput{
Expand Down Expand Up @@ -255,6 +257,11 @@ defmodule Archethic.Account.MemTablesLoaderTest do
to: "@Bob3",
amount: 1_000_000_000,
type: {:token, "@CharlieToken", 0}
},
%TransactionMovement{
to: LedgerOperations.burning_address(),
amount: 100_000_000,
type: {:token, "@Charlie2", 0}
}
],
unspent_outputs: [
Expand Down