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 consumed_utxo control also for recipient #1459

Merged
merged 1 commit into from
Mar 13, 2024
Merged

Add consumed_utxo control also for recipient #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions lib/archethic/utxo.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,11 @@ defmodule Archethic.UTXO do
) do
recipients
|> Enum.each(fn recipient ->
if Election.chain_storage_node?(recipient, node_public_key, authorized_nodes) do
%UnspentOutput{from: address, type: :call, timestamp: timestamp}
utxo = %UnspentOutput{from: address, type: :call, timestamp: timestamp}

with true <- Election.chain_storage_node?(recipient, node_public_key, authorized_nodes),
false <- utxo_consumed?(recipient, utxo) do
utxo
|> VersionedUnspentOutput.wrap_unspent_output(protocol_version)
|> Loader.add_utxo(recipient)
end
Expand Down
76 changes: 43 additions & 33 deletions test/archethic/contracts/worker_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,13 +222,14 @@ defmodule Archethic.Contracts.WorkerTest do

trigger_genesis = Transaction.previous_address(trigger_tx)

UTXO.load_transaction(trigger_tx, trigger_genesis)

me = self()

MockDB
|> stub(:get_last_chain_address, fn address -> {address, DateTime.utc_now()} end)
|> expect(:get_transaction, 0, fn ^trigger_address, _, _ -> {:ok, trigger_tx} end)

UTXO.load_transaction(trigger_tx, trigger_genesis)

MockClient
|> stub(:send_message, fn _, %StartMining{}, _ ->
send(me, :transaction_sent)
Expand Down Expand Up @@ -268,11 +269,10 @@ defmodule Archethic.Contracts.WorkerTest do

trigger_genesis = Transaction.previous_address(trigger_tx)

UTXO.load_transaction(trigger_tx, trigger_genesis)

me = self()

MockDB
|> stub(:get_last_chain_address, fn address -> {address, DateTime.utc_now()} end)
|> stub(:get_transaction, fn
^trigger_address, _, _ ->
{:ok, trigger_tx}
Expand All @@ -281,19 +281,22 @@ defmodule Archethic.Contracts.WorkerTest do
{:ok, %Transaction{validation_stamp: %ValidationStamp{timestamp: DateTime.utc_now()}}}
end)

MockClient
|> expect(:send_message, fn _, %StartMining{}, _ ->
send(me, :transaction_sent)
:ok
end)
UTXO.load_transaction(trigger_tx, trigger_genesis)

:persistent_term.put(:archethic_up, :up)
with_mock(Archethic, [:passthrough],
send_new_transaction: fn _, _ ->
send(me, :transaction_sent)
:ok
end
) do
:persistent_term.put(:archethic_up, :up)

{:ok, _pid} = Worker.start_link(contract: contract, genesis_address: contract_genesis)
{:ok, _pid} = Worker.start_link(contract: contract, genesis_address: contract_genesis)

assert_receive :transaction_sent
assert_receive :transaction_sent

:persistent_term.erase(:archethic_up)
:persistent_term.erase(:archethic_up)
end
end

test "should execute next call when node becomes up" do
Expand Down Expand Up @@ -322,11 +325,10 @@ defmodule Archethic.Contracts.WorkerTest do

trigger_genesis = Transaction.previous_address(trigger_tx)

UTXO.load_transaction(trigger_tx, trigger_genesis)

me = self()

MockDB
|> stub(:get_last_chain_address, fn address -> {address, DateTime.utc_now()} end)
|> stub(:get_transaction, fn
^trigger_address, _, _ ->
{:ok, trigger_tx}
Expand All @@ -335,21 +337,24 @@ defmodule Archethic.Contracts.WorkerTest do
{:ok, %Transaction{validation_stamp: %ValidationStamp{timestamp: DateTime.utc_now()}}}
end)

MockClient
|> expect(:send_message, fn _, %StartMining{}, _ ->
send(me, :transaction_sent)
:ok
end)
UTXO.load_transaction(trigger_tx, trigger_genesis)

:persistent_term.erase(:archethic_up)
with_mock(Archethic, [:passthrough],
send_new_transaction: fn _, _ ->
send(me, :transaction_sent)
:ok
end
) do
:persistent_term.erase(:archethic_up)

{:ok, _pid} = Worker.start_link(contract: contract, genesis_address: contract_genesis)
{:ok, _pid} = Worker.start_link(contract: contract, genesis_address: contract_genesis)

refute_receive :transaction_sent
refute_receive :transaction_sent

PubSub.notify_node_status(:node_up)
PubSub.notify_node_status(:node_up)

assert_receive :transaction_sent
assert_receive :transaction_sent
end
end
end

Expand All @@ -370,11 +375,12 @@ defmodule Archethic.Contracts.WorkerTest do
%Transaction{address: trigger_address} =
TransactionFactory.create_valid_transaction([], recipients: [%Recipient{address: genesis}])

UTXO.load_transaction(trigger_tx, Transaction.previous_address(trigger_tx))

MockDB
|> stub(:get_last_chain_address, fn address -> {address, DateTime.utc_now()} end)
|> expect(:get_transaction, fn ^trigger_address, _, _ -> {:ok, trigger_tx} end)

UTXO.load_transaction(trigger_tx, Transaction.previous_address(trigger_tx))

me = self()

with_mock(Archethic,
Expand Down Expand Up @@ -418,11 +424,12 @@ defmodule Archethic.Contracts.WorkerTest do
%Transaction{address: trigger_address} =
TransactionFactory.create_valid_transaction([], recipients: [%Recipient{address: genesis}])

UTXO.load_transaction(trigger_tx, Transaction.previous_address(trigger_tx))

MockDB
|> stub(:get_last_chain_address, fn address -> {address, DateTime.utc_now()} end)
|> expect(:get_transaction, fn ^trigger_address, _, _ -> {:ok, trigger_tx} end)

UTXO.load_transaction(trigger_tx, Transaction.previous_address(trigger_tx))

me = self()

with_mock(Archethic,
Expand Down Expand Up @@ -483,11 +490,12 @@ defmodule Archethic.Contracts.WorkerTest do
content: "Mr.X"
)

UTXO.load_transaction(trigger_tx, Transaction.previous_address(trigger_tx))

MockDB
|> stub(:get_last_chain_address, fn address -> {address, DateTime.utc_now()} end)
|> expect(:get_transaction, fn ^trigger_address, _, _ -> {:ok, trigger_tx} end)

UTXO.load_transaction(trigger_tx, Transaction.previous_address(trigger_tx))

me = self()

with_mock(Archethic,
Expand Down Expand Up @@ -609,7 +617,7 @@ defmodule Archethic.Contracts.WorkerTest do
TransactionFactory.create_valid_transaction([], ledger: ledger, recipients: [recipient])

MockDB
|> expect(:get_last_chain_address, fn address -> {address, DateTime.utc_now()} end)
|> stub(:get_last_chain_address, fn address -> {address, DateTime.utc_now()} end)
|> expect(:get_transaction, fn ^trigger_tx_address, _, _ -> {:ok, trigger_tx} end)

UTXO.load_transaction(trigger_tx, Transaction.previous_address(trigger_tx))
Expand Down Expand Up @@ -665,6 +673,7 @@ defmodule Archethic.Contracts.WorkerTest do
TransactionFactory.create_valid_transaction([], type: :data, recipients: [recipient])

MockDB
|> stub(:get_last_chain_address, fn address -> {address, DateTime.utc_now()} end)
|> expect(:get_transaction, fn ^trigger_tx_address, _, _ -> {:ok, trigger_tx} end)

UTXO.load_transaction(trigger_tx, Transaction.previous_address(trigger_tx))
Expand Down Expand Up @@ -713,7 +722,7 @@ defmodule Archethic.Contracts.WorkerTest do
TransactionFactory.create_valid_transaction([], ledger: ledger, recipients: [recipient])

MockDB
|> expect(:get_last_chain_address, fn address -> {address, DateTime.utc_now()} end)
|> stub(:get_last_chain_address, fn address -> {address, DateTime.utc_now()} end)
|> expect(:get_transaction, fn ^trigger_tx_address, _, _ -> {:ok, trigger_tx} end)

UTXO.load_transaction(trigger_tx, Transaction.previous_address(trigger_tx))
Expand Down Expand Up @@ -783,6 +792,7 @@ defmodule Archethic.Contracts.WorkerTest do
)

MockDB
|> stub(:get_last_chain_address, fn address -> {address, DateTime.utc_now()} end)
|> expect(:get_transaction, fn ^invalid_trigger_tx_address, _, _ ->
{:ok, invalid_trigger_tx}
end)
Expand Down
Loading