From ed9d9c7ae671bccf0597ef54d01dd6956faab884 Mon Sep 17 00:00:00 2001
From: Remy <remy.haemmerle@daml.com>
Date: Thu, 3 Nov 2022 00:36:33 +0100
Subject: [PATCH] [Speedy]  move submissionTime in OnLedger case class (#15427)

---
 .../main/scala/com/digitalasset/daml/lf/engine/Engine.scala  | 2 +-
 .../scala/com/digitalasset/daml/lf/speedy/SBuiltin.scala     | 2 +-
 .../main/scala/com/digitalasset/daml/lf/speedy/Speedy.scala  | 5 ++---
 .../com/digitalasset/daml/lf/speedy/SpeedyTestLib.scala      | 1 -
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/daml-lf/engine/src/main/scala/com/digitalasset/daml/lf/engine/Engine.scala b/daml-lf/engine/src/main/scala/com/digitalasset/daml/lf/engine/Engine.scala
index 4805543a91..2c61761630 100644
--- a/daml-lf/engine/src/main/scala/com/digitalasset/daml/lf/engine/Engine.scala
+++ b/daml-lf/engine/src/main/scala/com/digitalasset/daml/lf/engine/Engine.scala
@@ -453,7 +453,7 @@ class Engine(val config: EngineConfig = Engine.StableConfig) {
         deps(tx).flatMap { deps =>
           val meta = Tx.Metadata(
             submissionSeed = None,
-            submissionTime = machine.submissionTime,
+            submissionTime = onLedger.submissionTime,
             usedPackages = deps,
             dependsOnTime = onLedger.getDependsOnTime,
             nodeSeeds = nodeSeeds,
diff --git a/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/SBuiltin.scala b/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/SBuiltin.scala
index 3a37f7f497..e6d36eddea 100644
--- a/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/SBuiltin.scala
+++ b/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/SBuiltin.scala
@@ -981,7 +981,7 @@ private[lf] object SBuiltin {
         case _ =>
           onLedger.ptx
             .insertCreate(
-              submissionTime = machine.submissionTime,
+              submissionTime = onLedger.submissionTime,
               templateId = cached.templateId,
               arg = createArgValue,
               agreementText = agreement,
diff --git a/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/Speedy.scala b/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/Speedy.scala
index 1422886bf6..768eb26a65 100644
--- a/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/Speedy.scala
+++ b/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/Speedy.scala
@@ -126,6 +126,7 @@ private[lf] object Speedy {
 
   final case class OnLedger(
       validating: Boolean,
+      submissionTime: Time.Timestamp,
       contractKeyUniqueness: ContractKeyUniquenessMode,
       /* The current partial transaction */
       private[speedy] var ptx: PartialTransaction,
@@ -300,7 +301,6 @@ private[lf] object Speedy {
       var compiledPackages: CompiledPackages,
       /* Profile of the run when the packages haven been compiled with profiling enabled. */
       val profile: Profile = new Profile(),
-      val submissionTime: Time.Timestamp,
       /* True if we are running on ledger building transactions, false if we
          are running off-ledger code, e.g., Daml Script or
          Triggers. It is safe to use on ledger for off ledger code but
@@ -927,9 +927,9 @@ private[lf] object Speedy {
 
       new Machine(
         sexpr = exprWithDisclosures,
-        submissionTime = submissionTime,
         ledgerMode = OnLedger(
           validating = validating,
+          submissionTime = submissionTime,
           ptx = PartialTransaction
             .initial(
               contractKeyUniqueness,
@@ -1034,7 +1034,6 @@ private[lf] object Speedy {
     )(implicit loggingContext: LoggingContext): Machine = {
       new Machine(
         sexpr = expr,
-        submissionTime = Time.Timestamp.Epoch,
         ledgerMode = OffLedger,
         traceLog = traceLog,
         warningLog = warningLog,
diff --git a/daml-lf/interpreter/src/test/scala/com/digitalasset/daml/lf/speedy/SpeedyTestLib.scala b/daml-lf/interpreter/src/test/scala/com/digitalasset/daml/lf/speedy/SpeedyTestLib.scala
index 9459835bcc..1d0d9c4f6b 100644
--- a/daml-lf/interpreter/src/test/scala/com/digitalasset/daml/lf/speedy/SpeedyTestLib.scala
+++ b/daml-lf/interpreter/src/test/scala/com/digitalasset/daml/lf/speedy/SpeedyTestLib.scala
@@ -151,7 +151,6 @@ private[speedy] object SpeedyTestLib {
           loggingContext = machine.loggingContext,
           compiledPackages = machine.compiledPackages,
           profile = machine.profile,
-          submissionTime = machine.submissionTime,
           ledgerMode = machine.ledgerMode,
         )
       }