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

Smart Contract Interpreter versionning #895

Merged
merged 7 commits into from
Mar 14, 2023
Merged

Smart Contract Interpreter versionning #895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0508467
Smart Contract Interpreter versionning
bchamagne Feb 6, 2023
1d61ed5
contract.version && interpreter.valid_conditions?/3
bchamagne Feb 7, 2023
74bde29
interpreter.execute_trigger/3 to remove dependency on version0 from w…
bchamagne Feb 7, 2023
9f68495
strict versionning (forbid version not handled)
bchamagne Feb 7, 2023
273ef20
Enhance smart contract Interpreter (new version: v1) (#903)
bchamagne Mar 8, 2023
97e25e0
rename version0 to legacy
bchamagne Mar 9, 2023
dc8155d
move version1 into interpreter
bchamagne Mar 9, 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: 7 additions & 7 deletions lib/archethic/contracts.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ defmodule Archethic.Contracts do
alias __MODULE__.Contract
alias __MODULE__.ContractConditions, as: Conditions
alias __MODULE__.ContractConstants, as: Constants
alias __MODULE__.ConditionInterpreter
alias __MODULE__.Interpreter
alias __MODULE__.Loader
alias __MODULE__.TransactionLookup
Expand Down Expand Up @@ -47,7 +46,7 @@ defmodule Archethic.Contracts do
content: {:==, [line: 2], [
true,
{
{:., [line: 2], [{:__aliases__, [alias: Archethic.Contracts.Interpreter.Library], [:Library]}, :regex_match?]},
{:., [line: 2], [{:__aliases__, [alias: Archethic.Contracts.Interpreter.Legacy.Library], [:Library]}, :regex_match?]},
[line: 2],
[{:get_in, [line: 2], [{:scope, [line: 2], nil}, ["next", "content"]]}, "^(Mr.X: ){1}([0-9]+), (Mr.Y: ){1}([0-9])+$"]
}
Expand All @@ -68,15 +67,15 @@ defmodule Archethic.Contracts do
[line: 7],
[
{:scope, [line: 7], nil},
{:update_in, [line: 7], [{:scope, [line: 7], nil}, ["next_transaction"], {:&, [line: 7], [{{:., [line: 7], [{:__aliases__, [alias: Archethic.Contracts.Interpreter.TransactionStatements], [:TransactionStatements]}, :set_type]}, [line: 7], [{:&, [line: 7], [1]}, "hosting"]}]}]}
{:update_in, [line: 7], [{:scope, [line: 7], nil}, ["next_transaction"], {:&, [line: 7], [{{:., [line: 7], [{:__aliases__, [alias: Archethic.Contracts.Interpreter.Legacy.TransactionStatements], [:TransactionStatements]}, :set_type]}, [line: 7], [{:&, [line: 7], [1]}, "hosting"]}]}]}
]
},
{
:=,
[line: 8],
[
{:scope, [line: 8], nil},
{:update_in, [line: 8], [{:scope, [line: 8], nil}, ["next_transaction"], {:&, [line: 8], [{{:., [line: 8], [{:__aliases__, [alias: Archethic.Contracts.Interpreter.TransactionStatements], [:TransactionStatements]}, :set_content]}, [line: 8], [{:&, [line: 8], [1]}, "Mr.X: 10, Mr.Y: 8"]}]}]}
{:update_in, [line: 8], [{:scope, [line: 8], nil}, ["next_transaction"], {:&, [line: 8], [{{:., [line: 8], [{:__aliases__, [alias: Archethic.Contracts.Interpreter.Legacy.TransactionStatements], [:TransactionStatements]}, :set_content]}, [line: 8], [{:&, [line: 8], [1]}, "Mr.X: 10, Mr.Y: 8"]}]}]}
]
}
]},
Expand Down Expand Up @@ -147,6 +146,7 @@ defmodule Archethic.Contracts do
) do
{:ok,
%Contract{
version: version,
triggers: triggers,
conditions: %{inherit: inherit_conditions}
}} = Interpreter.parse(code)
Expand All @@ -156,7 +156,7 @@ defmodule Archethic.Contracts do
"next" => Constants.from_transaction(next_tx)
}

with :ok <- validate_conditions(inherit_conditions, constants),
with :ok <- validate_conditions(version, inherit_conditions, constants),
:ok <- validate_triggers(triggers, next_tx, date) do
true
else
Expand All @@ -165,8 +165,8 @@ defmodule Archethic.Contracts do
end
end

defp validate_conditions(inherit_conditions, constants) do
if ConditionInterpreter.valid_conditions?(inherit_conditions, constants) do
defp validate_conditions(version, inherit_conditions, constants) do
if Interpreter.valid_conditions?(version, inherit_conditions, constants) do
:ok
else
Logger.error("Inherit constraints not respected")
Expand Down
2 changes: 2 additions & 0 deletions lib/archethic/contracts/contract.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ defmodule Archethic.Contracts.Contract do
alias Archethic.TransactionChain.TransactionData

defstruct triggers: %{},
version: 0,
conditions: %{
transaction: %Conditions{},
inherit: %Conditions{},
Expand All @@ -31,6 +32,7 @@ defmodule Archethic.Contracts.Contract do
triggers: %{
trigger_type() => Macro.t()
},
version: integer(),
conditions: %{
transaction: Conditions.t(),
inherit: Conditions.t(),
Expand Down
Loading