Upgrading PoC [DO NOT MERGE]

daml.yaml

@@ -7,7 +7,7 @@
 # update the hashes. The sdk-version refers to the release folder names (or tags) found here:
 # https://github.com/digital-asset/daml/releases
 # For example 2.9.0-rc1 (in case of a release candidate) or 2.8.0 (for a regular release)
-sdk-version: 2.9.5
+sdk-version: 2.10.0-snapshot.20241106.0
 # daml-version is not used by the daml assistant, only by the finance nix config
 # It refers to the version number of the files of the release folder.
 # For example, if you use a release candidate like:
@@ -16,15 +16,15 @@ sdk-version: 2.9.5
 # On the other hand, if you use a regular release like:
 # https://github.com/digital-asset/daml/releases/tag/v2.8.0
 # the daml-version would simply be: 2.8.0
-daml-version: 2.9.5
+daml-version: 2.10.0-snapshot.20241101.13047.0.v1e6d5c93
 name: daml-finance
 source: src/test/daml
 # version is independent of the actual sdk-version. It is used to create an assembly artifact here
 # https://digitalasset.jfrog.io/ui/repos/tree/General/assembly/daml-finance which is referenced by
 # docs.daml.com (in the docs/<sdk-version>/version.json files). The purpose of having an independent
 # version number is to allow the release of new assembly versions without waiting for a new SDK
 # release. For each new SDK release, we increment the minor version of the assembly.
-version: 1.5.0
+version: 4.0.0
 dependencies:
   - daml-prim
   - daml-stdlib
@@ -33,3 +33,6 @@ data-dependencies:
   - .lib/daml-ctl/v2.4.1/daml-ctl-2.4.1.dar
 build-options:
   - --include=src/main/daml
+  - --target=1.17
+  - -Wno-upgrade-interfaces
+  - -Wno-upgrade-exceptions

docs/code-samples/getting-started/daml.yaml

@@ -3,7 +3,7 @@
 
 # *** DO NOT COPY THIS FILE TO THE DAML REPO ***
 
-sdk-version: 2.9.5
+sdk-version: 2.10.0-snapshot.20241106.0
 name: quickstart-finance
 source: daml
 init-script: Scripts.Transfer:runTransfer

docs/code-samples/lifecycling/daml.yaml

@@ -3,7 +3,7 @@
 
 # *** DO NOT COPY THIS FILE TO THE DAML REPO ***
 
-sdk-version: 2.9.5
+sdk-version: 2.10.0-snapshot.20241106.0
 name: finance-lifecycling
 source: daml
 init-script: Scripts.FixedRateBond:runFixedRateBond

docs/code-samples/payoff-modeling/daml.yaml

@@ -3,7 +3,7 @@
 
 # *** DO NOT COPY THIS FILE TO THE DAML REPO ***
 
-sdk-version: 2.9.5
+sdk-version: 2.10.0-snapshot.20241106.0
 name: finance-payoff-modeling
 source: daml
 init-script: PayoffBuilder:runCreateAndLifecycle

docs/code-samples/settlement/daml.yaml

@@ -3,7 +3,7 @@
 
 # *** DO NOT COPY THIS FILE TO THE DAML REPO ***
 
-sdk-version: 2.9.5
+sdk-version: 2.10.0-snapshot.20241106.0
 name: finance-settlement
 source: daml
 init-script: Scripts.Transfer:runDualControlTransfer

docs/code-samples/upgrades/daml.yaml

@@ -3,7 +3,7 @@
 
 # *** DO NOT COPY THIS FILE TO THE DAML REPO ***
 
-sdk-version: 2.9.5
+sdk-version: 2.10.0-snapshot.20241106.0
 name: finance-upgrades
 source: daml
 init-script: Scripts.UpgradeHolding:upgradeHolding

nix/daml.nix

@@ -1,5 +1,6 @@
-{ stdenv, jdk, curl, curl_cert, sdkVersion, damlVersion, os, osJFrog, hashes }:
+{ stdenv, jdk, curl, curl_cert, sdkVersion, damlVersion, tarPath, os, osJFrog, hashes }:
 let
+  nixTarPath = if tarPath == null then null else /. + tarPath;
   tarball = stdenv.mkDerivation {
     pname = "daml-tarball";
     version = sdkVersion;
@@ -14,6 +15,17 @@ let
         source .envrc.private
       fi
 
+      get_local() (
+        tar_path="${if nixTarPath == null then "" else nixTarPath}"
+        if [ -z $tar_path ]; then
+          echo "No explict tar set, attempting to download"
+          exit 1
+        else
+          echo "Using explicit tar"
+          cp $tar_path $out
+          chmod -x $out
+        fi
+      )
       get_os() (
         echo "Downloading SDK from GitHub..."
         curl --location \
@@ -33,7 +45,7 @@ let
         fi
       )
 
-      get_os || get_ee
+      get_local || get_os || get_ee
     '';
     dontInstall = true;
     outputHashAlgo = "sha256";
@@ -54,7 +66,7 @@ in
     installPhase = ''
       cd daml
       export DAML_HOME=$out
-      ./daml/daml install --install-assistant yes --install-with-internal-version yes $src
+      ./daml/daml install --install-assistant yes --install-with-custom-version $version $src
     '';
     propagatedBuildInputs = [ jdk ];
     preFixup = ''

package/main/daml/ContingentClaims.Core/daml.yaml

@@ -1,14 +1,14 @@
 # Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-sdk-version: 2.9.5
+sdk-version: 2.10.0-snapshot.20241106.0
 name: contingent-claims-core
 source: daml
-version: 2.0.2
+version: 4.0.0
 dependencies:
   - daml-prim
   - daml-stdlib
 data-dependencies:
   - .lib/daml-ctl/v2.4.1/daml-ctl-2.4.1.dar
-build-options: null
-
+build-options:
+  - --target=1.17

package/main/daml/ContingentClaims.Lifecycle/daml.yaml

@@ -1,15 +1,16 @@
 # Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-sdk-version: 2.9.5
+sdk-version: 2.10.0-snapshot.20241106.0
 name: contingent-claims-lifecycle
 source: daml
-version: 2.0.2
+version: 4.0.0
 dependencies:
   - daml-prim
   - daml-stdlib
 data-dependencies:
   - .lib/daml-ctl/v2.4.1/daml-ctl-2.4.1.dar
-  - .lib/daml-finance/ContingentClaims.Core/2.0.2/contingent-claims-core-2.0.2.dar
-build-options: null
+  - .lib/daml-finance/ContingentClaims.Core/4.0.0/contingent-claims-core-4.0.0.dar
+build-options:
+  - --target=1.17
 

package/main/daml/ContingentClaims.Valuation/daml.yaml

@@ -1,15 +1,15 @@
 # Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-sdk-version: 2.9.5
+sdk-version: 2.10.0-snapshot.20241106.0
 name: contingent-claims-valuation
 source: daml
-version: 0.2.3
+version: 4.0.0
 dependencies:
   - daml-prim
   - daml-stdlib
 data-dependencies:
   - .lib/daml-ctl/v2.4.1/daml-ctl-2.4.1.dar
-  - .lib/daml-finance/ContingentClaims.Core/2.0.2/contingent-claims-core-2.0.2.dar
-build-options: null
-
+  - .lib/daml-finance/ContingentClaims.Core/4.0.0/contingent-claims-core-4.0.0.dar
+build-options:
+  - --target=1.17

package/main/daml/Daml.Finance.Account/daml.yaml

@@ -1,18 +1,19 @@
 # Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-sdk-version: 2.9.5
+sdk-version: 2.10.0-snapshot.20241106.0
 name: daml-finance-account
 source: daml
-version: 3.0.1
+version: 4.0.0
 dependencies:
   - daml-prim
   - daml-stdlib
 data-dependencies:
-  - .lib/daml-finance/Daml.Finance.Interface.Account/3.0.1/daml-finance-interface-account-3.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Holding/3.0.1/daml-finance-interface-holding-3.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Types.Common/2.0.1/daml-finance-interface-types-common-2.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Util/2.1.1/daml-finance-interface-util-2.1.1.dar
-  - .lib/daml-finance/Daml.Finance.Util/3.1.1/daml-finance-util-3.1.1.dar
-build-options: null
+  - .lib/daml-finance/Daml.Finance.Interface.Account/4.0.0/daml-finance-interface-account-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Holding/4.0.0/daml-finance-interface-holding-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Types.Common/4.0.0/daml-finance-interface-types-common-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Util/4.0.0/daml-finance-interface-util-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Util/4.0.0/daml-finance-util-4.0.0.dar
+build-options:
+  - --target=1.17
 

package/main/daml/Daml.Finance.Claims/daml.yaml

@@ -1,24 +1,24 @@
 # Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-sdk-version: 2.9.5
+sdk-version: 2.10.0-snapshot.20241106.0
 name: daml-finance-claims
 source: daml
-version: 2.1.1
+version: 4.0.0
 dependencies:
   - daml-prim
   - daml-stdlib
 data-dependencies:
-  - .lib/daml-finance/ContingentClaims.Core/2.0.2/contingent-claims-core-2.0.2.dar
-  - .lib/daml-finance/ContingentClaims.Lifecycle/2.0.2/contingent-claims-lifecycle-2.0.2.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Claims/3.0.1/daml-finance-interface-claims-3.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Instrument.Base/3.0.1/daml-finance-interface-instrument-base-3.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Instrument.Types/1.0.1/daml-finance-interface-instrument-types-1.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Lifecycle/3.0.1/daml-finance-interface-lifecycle-3.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Types.Common/2.0.1/daml-finance-interface-types-common-2.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Types.Date/2.1.1/daml-finance-interface-types-date-2.1.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Util/2.1.1/daml-finance-interface-util-2.1.1.dar
-  - .lib/daml-finance/Daml.Finance.Lifecycle/3.0.1/daml-finance-lifecycle-3.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Util/3.1.1/daml-finance-util-3.1.1.dar
-build-options: null
-
+  - .lib/daml-finance/ContingentClaims.Core/4.0.0/contingent-claims-core-4.0.0.dar
+  - .lib/daml-finance/ContingentClaims.Lifecycle/4.0.0/contingent-claims-lifecycle-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Claims/4.0.0/daml-finance-interface-claims-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Instrument.Base/4.0.0/daml-finance-interface-instrument-base-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Instrument.Types/4.0.0/daml-finance-interface-instrument-types-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Lifecycle/4.0.0/daml-finance-interface-lifecycle-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Types.Common/4.0.0/daml-finance-interface-types-common-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Types.Date/4.0.0/daml-finance-interface-types-date-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Util/4.0.0/daml-finance-interface-util-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Lifecycle/4.0.0/daml-finance-lifecycle-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Util/4.0.0/daml-finance-util-4.0.0.dar
+build-options:
+  - --target=1.17

package/main/daml/Daml.Finance.Data/daml.yaml

@@ -1,19 +1,19 @@
 # Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-sdk-version: 2.9.5
+sdk-version: 2.10.0-snapshot.20241106.0
 name: daml-finance-data
 source: daml
-version: 3.0.1
+version: 4.0.0
 dependencies:
   - daml-prim
   - daml-stdlib
 data-dependencies:
-  - .lib/daml-finance/Daml.Finance.Interface.Data/3.1.1/daml-finance-interface-data-3.1.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Lifecycle/3.0.1/daml-finance-interface-lifecycle-3.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Types.Common/2.0.1/daml-finance-interface-types-common-2.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Types.Date/2.1.1/daml-finance-interface-types-date-2.1.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Util/2.1.1/daml-finance-interface-util-2.1.1.dar
-  - .lib/daml-finance/Daml.Finance.Util/3.1.1/daml-finance-util-3.1.1.dar
-build-options: null
-
+  - .lib/daml-finance/Daml.Finance.Interface.Data/4.0.0/daml-finance-interface-data-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Lifecycle/4.0.0/daml-finance-interface-lifecycle-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Types.Common/4.0.0/daml-finance-interface-types-common-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Types.Date/4.0.0/daml-finance-interface-types-date-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Util/4.0.0/daml-finance-interface-util-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Util/4.0.0/daml-finance-util-4.0.0.dar
+build-options:
+  - --target=1.17

package/main/daml/Daml.Finance.Holding/daml.yaml

@@ -1,18 +1,19 @@
 # Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-sdk-version: 2.9.5
+sdk-version: 2.10.0-snapshot.20241106.0
 name: daml-finance-holding
 source: daml
-version: 3.0.2
+version: 4.0.0
 dependencies:
   - daml-prim
   - daml-stdlib
 data-dependencies:
-  - .lib/daml-finance/Daml.Finance.Interface.Account/3.0.1/daml-finance-interface-account-3.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Holding/3.0.1/daml-finance-interface-holding-3.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Types.Common/2.0.1/daml-finance-interface-types-common-2.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Util/2.1.1/daml-finance-interface-util-2.1.1.dar
-  - .lib/daml-finance/Daml.Finance.Util/3.1.1/daml-finance-util-3.1.1.dar
-build-options: null
+  - .lib/daml-finance/Daml.Finance.Interface.Account/4.0.0/daml-finance-interface-account-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Holding/4.0.0/daml-finance-interface-holding-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Types.Common/4.0.0/daml-finance-interface-types-common-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Util/4.0.0/daml-finance-interface-util-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Util/4.0.0/daml-finance-util-4.0.0.dar
+build-options:
+  - --target=1.17
 

package/main/daml/Daml.Finance.Instrument.Bond/daml.yaml

@@ -1,24 +1,24 @@
 # Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-sdk-version: 2.9.5
+sdk-version: 2.10.0-snapshot.20241106.0
 name: daml-finance-instrument-bond
 source: daml
-version: 2.0.1
+version: 4.0.0
 dependencies:
   - daml-prim
   - daml-stdlib
 data-dependencies:
-  - .lib/daml-finance/ContingentClaims.Core/2.0.2/contingent-claims-core-2.0.2.dar
-  - .lib/daml-finance/Daml.Finance.Claims/2.1.1/daml-finance-claims-2.1.1.dar
-  - .lib/daml-finance/Daml.Finance.Data/3.0.1/daml-finance-data-3.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Claims/3.0.1/daml-finance-interface-claims-3.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Instrument.Base/3.0.1/daml-finance-interface-instrument-base-3.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Instrument.Bond/2.0.1/daml-finance-interface-instrument-bond-2.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Instrument.Types/1.0.1/daml-finance-interface-instrument-types-1.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Types.Common/2.0.1/daml-finance-interface-types-common-2.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Types.Date/2.1.1/daml-finance-interface-types-date-2.1.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Util/2.1.1/daml-finance-interface-util-2.1.1.dar
-  - .lib/daml-finance/Daml.Finance.Util/3.1.1/daml-finance-util-3.1.1.dar
-build-options: null
-
+  - .lib/daml-finance/ContingentClaims.Core/4.0.0/contingent-claims-core-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Claims/4.0.0/daml-finance-claims-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Data/4.0.0/daml-finance-data-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Claims/4.0.0/daml-finance-interface-claims-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Instrument.Base/4.0.0/daml-finance-interface-instrument-base-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Instrument.Bond/4.0.0/daml-finance-interface-instrument-bond-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Instrument.Types/4.0.0/daml-finance-interface-instrument-types-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Types.Common/4.0.0/daml-finance-interface-types-common-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Types.Date/4.0.0/daml-finance-interface-types-date-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Util/4.0.0/daml-finance-interface-util-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Util/4.0.0/daml-finance-util-4.0.0.dar
+build-options:
+  - --target=1.17

package/main/daml/Daml.Finance.Instrument.Equity/daml.yaml

@@ -1,19 +1,20 @@
 # Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-sdk-version: 2.9.5
+sdk-version: 2.10.0-snapshot.20241106.0
 name: daml-finance-instrument-equity
 source: daml
-version: 0.4.1
+version: 4.0.0
 dependencies:
   - daml-prim
   - daml-stdlib
 data-dependencies:
-  - .lib/daml-finance/Daml.Finance.Interface.Instrument.Base/3.0.1/daml-finance-interface-instrument-base-3.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Instrument.Equity/0.4.1/daml-finance-interface-instrument-equity-0.4.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Types.Common/2.0.1/daml-finance-interface-types-common-2.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Interface.Util/2.1.1/daml-finance-interface-util-2.1.1.dar
-  - .lib/daml-finance/Daml.Finance.Lifecycle/3.0.1/daml-finance-lifecycle-3.0.1.dar
-  - .lib/daml-finance/Daml.Finance.Util/3.1.1/daml-finance-util-3.1.1.dar
-build-options: null
+  - .lib/daml-finance/Daml.Finance.Interface.Instrument.Base/4.0.0/daml-finance-interface-instrument-base-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Instrument.Equity/4.0.0/daml-finance-interface-instrument-equity-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Types.Common/4.0.0/daml-finance-interface-types-common-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Interface.Util/4.0.0/daml-finance-interface-util-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Lifecycle/4.0.0/daml-finance-lifecycle-4.0.0.dar
+  - .lib/daml-finance/Daml.Finance.Util/4.0.0/daml-finance-util-4.0.0.dar
+build-options:
+  - --target=1.17