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

SC: ActionInterpreter.execute might return nil to not create a next tx #863

Merged
merged 3 commits into from
Feb 1, 2023
Merged

SC: ActionInterpreter.execute might return nil to not create a next tx #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
031c323
ActionInterpreter.execute might return nil to not create a next tx
bchamagne Jan 24, 2023
16ffe48
lint: pattern match on struct instead of not nil
bchamagne Jan 25, 2023
06e95b4
reduce log severity + remove the error log
bchamagne Jan 31, 2023
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: 10 additions & 4 deletions lib/archethic/contracts/interpreter/action.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,18 +321,24 @@ defmodule Archethic.Contracts.ActionInterpreter do
end

@doc """
Execute actions code and returns a transaction as result
Execute actions code and returns either the next transaction or nil
"""
@spec execute(Macro.t(), map()) :: Transaction.t()
@spec execute(Macro.t(), map()) :: Transaction.t() | nil
def execute(code, constants \\ %{}) do
{%{"next_transaction" => next_transaction}, _} =
result =
Code.eval_quoted(code,
scope:
Map.put(constants, "next_transaction", %Transaction{
data: %TransactionData{}
})
)

next_transaction
case result do
{%{"next_transaction" => next_transaction}, _} ->
next_transaction

_ ->
nil
end
end
end
25 changes: 18 additions & 7 deletions lib/archethic/contracts/worker.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,16 @@ defmodule Archethic.Contracts.Worker do
contract_transaction = Constants.to_transaction(contract_constants)

with true <- ConditionInterpreter.valid_conditions?(transaction_condition, constants),
next_tx <- ActionInterpreter.execute(Map.fetch!(triggers, :transaction), constants),
next_tx = %Transaction{} <-
ActionInterpreter.execute(Map.fetch!(triggers, :transaction), constants),
{:ok, next_tx} <- chain_transaction(next_tx, contract_transaction) do
handle_new_transaction(next_tx)
{:noreply, state}
else
nil ->
# returned by ActionInterpreter.execute when contract did not create a next tx
{:noreply, state}

false ->
Logger.debug("Incoming transaction didn't match the condition",
transaction_address: Base.encode16(incoming_tx.address),
Expand Down Expand Up @@ -150,7 +155,7 @@ defmodule Archethic.Contracts.Worker do

contract_tx = Constants.to_transaction(contract_constants)

with next_tx <-
with next_tx = %Transaction{} <-
ActionInterpreter.execute(Map.fetch!(triggers, {:datetime, timestamp}), constants),
{:ok, next_tx} <- chain_transaction(next_tx, contract_tx) do
handle_new_transaction(next_tx)
Expand Down Expand Up @@ -184,7 +189,7 @@ defmodule Archethic.Contracts.Worker do
contract_transaction = Constants.to_transaction(contract_constants)

with true <- enough_funds?(address),
next_tx <-
next_tx = %Transaction{} <-
ActionInterpreter.execute(Map.fetch!(triggers, {:interval, interval}), constants),
{:ok, next_tx} <- chain_transaction(next_tx, contract_transaction),
:ok <- ensure_enough_funds(next_tx, address) do
Expand Down Expand Up @@ -218,23 +223,29 @@ defmodule Archethic.Contracts.Worker do
contract_transaction = Constants.to_transaction(contract_constants)

if Conditions.empty?(oracle_condition) do
with next_tx <- ActionInterpreter.execute(Map.fetch!(triggers, :oracle), constants),
with next_tx = %Transaction{} <-
ActionInterpreter.execute(Map.fetch!(triggers, :oracle), constants),
{:ok, next_tx} <- chain_transaction(next_tx, contract_transaction),
:ok <- ensure_enough_funds(next_tx, address) do
handle_new_transaction(next_tx)
end
else
with true <- ConditionInterpreter.valid_conditions?(oracle_condition, constants),
next_tx <- ActionInterpreter.execute(Map.fetch!(triggers, :oracle), constants),
next_tx = %Transaction{} <-
ActionInterpreter.execute(Map.fetch!(triggers, :oracle), constants),
{:ok, next_tx} <- chain_transaction(next_tx, contract_transaction),
:ok <- ensure_enough_funds(next_tx, address) do
handle_new_transaction(next_tx)
else
nil ->
# returned by ActionInterpreter.execute when contract did not create a next tx
:ok

false ->
Logger.error("Invalid oracle conditions", contract: Base.encode16(address))
Logger.info("Invalid oracle conditions", contract: Base.encode16(address))

{:error, e} ->
Logger.error("#{inspect(e)}", contract: Base.encode16(address))
Logger.info("#{inspect(e)}", contract: Base.encode16(address))
end
end
end
Expand Down