Skip to content

Commit

Permalink
Add timestamp in the SC intepreter constants
Browse files Browse the repository at this point in the history
  • Loading branch information
samuelmanzanera committed Oct 13, 2022
1 parent ac141e9 commit 38e42d1
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 9 deletions.
15 changes: 13 additions & 2 deletions lib/archethic/contracts/contract/constants.ex
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ defmodule Archethic.Contracts.Contract.Constants do
alias Archethic.TransactionChain.TransactionData.Ownership
alias Archethic.TransactionChain.TransactionData.UCOLedger
alias Archethic.TransactionChain.TransactionData.UCOLedger.Transfer, as: UCOTransfer
alias Archethic.TransactionChain.Transaction.ValidationStamp

@doc """
Extract constants from a transaction into a map
Expand All @@ -40,7 +41,8 @@ defmodule Archethic.Contracts.Contract.Constants do
}
},
recipients: recipients
}
},
validation_stamp: validation_stamp
}) do
%{
"address" => address,
Expand Down Expand Up @@ -75,7 +77,16 @@ defmodule Archethic.Contracts.Contract.Constants do
}

Map.update(acc, to, [token_transfer], &[token_transfer | &1])
end)
end),
"timestamp" =>
case validation_stamp do
# Happens during the transaction validation
nil ->
nil

%ValidationStamp{timestamp: timestamp} ->
DateTime.to_unix(timestamp)
end
}
end

Expand Down
22 changes: 15 additions & 7 deletions test/archethic/contracts/worker_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ defmodule Archethic.Contracts.WorkerTest do
alias Archethic.TransactionChain.TransactionData.UCOLedger.Transfer
alias Archethic.TransactionChain.TransactionData.TokenLedger
alias Archethic.TransactionChain.TransactionData.TokenLedger.Transfer, as: TokenTransfer
alias Archethic.TransactionChain.Transaction.ValidationStamp
alias Archethic.TransactionChain.Transaction.ValidationStamp.LedgerOperations.UnspentOutput

alias Archethic.PubSub
Expand Down Expand Up @@ -80,7 +81,8 @@ defmodule Archethic.Contracts.WorkerTest do
previous_public_key:
transaction_seed
|> Crypto.derive_keypair(0)
|> elem(0)
|> elem(0),
validation_stamp: %ValidationStamp{timestamp: DateTime.utc_now()}
}
|> Constants.from_transaction()

Expand Down Expand Up @@ -255,7 +257,8 @@ defmodule Archethic.Contracts.WorkerTest do
assert :ok =
Worker.execute(contract_address, %Transaction{
address: "@Bob3",
data: %TransactionData{}
data: %TransactionData{},
validation_stamp: %ValidationStamp{timestamp: DateTime.utc_now()}
})

receive do
Expand Down Expand Up @@ -301,7 +304,8 @@ defmodule Archethic.Contracts.WorkerTest do
assert :ok =
Worker.execute(contract_address, %Transaction{
address: "@Bob3",
data: %TransactionData{content: "Mr.X"}
data: %TransactionData{content: "Mr.X"},
validation_stamp: %ValidationStamp{timestamp: DateTime.utc_now()}
})

receive do
Expand All @@ -317,7 +321,8 @@ defmodule Archethic.Contracts.WorkerTest do
assert {:error, :invalid_condition} =
Worker.execute(contract_address, %Transaction{
address: "@Bob3",
data: %TransactionData{content: "Mr.Z"}
data: %TransactionData{content: "Mr.Z"},
validation_stamp: %ValidationStamp{timestamp: DateTime.utc_now()}
})

refute_receive {:transaction_sent, _}
Expand Down Expand Up @@ -367,7 +372,8 @@ defmodule Archethic.Contracts.WorkerTest do
assert :ok =
Worker.execute(contract_address, %Transaction{
address: "@Bob3",
data: %TransactionData{content: "Mr.X"}
data: %TransactionData{content: "Mr.X"},
validation_stamp: %ValidationStamp{timestamp: DateTime.utc_now()}
})

receive do
Expand Down Expand Up @@ -428,7 +434,8 @@ defmodule Archethic.Contracts.WorkerTest do
type: :oracle,
data: %TransactionData{
content: Jason.encode!(%{"uco" => %{"eur" => 0.21}})
}
},
validation_stamp: %ValidationStamp{timestamp: DateTime.utc_now()}
}

PubSub.notify_new_transaction("@Oracle1", :oracle, DateTime.utc_now())
Expand Down Expand Up @@ -500,7 +507,8 @@ defmodule Archethic.Contracts.WorkerTest do
}
},
recipients: [contract_address]
}
},
validation_stamp: %ValidationStamp{timestamp: DateTime.utc_now()}
})

receive do
Expand Down

0 comments on commit 38e42d1

Please sign in to comment.