Use multi package build

.circleci/config.yml

@@ -67,6 +67,7 @@ commands:
           - /home/circleci/.nix-channels
           - /home/circleci/.nix-defexpr
           - /home/circleci/.config/nix
+
   import_gpg_key:
     description: "Setup GPG for signing artifacts as part of a release"
     steps:
@@ -272,11 +273,13 @@ jobs:
           command: |
             set -euo pipefail
 
+            SDK_VERSION="$(yq e '.sdk-version' daml.yaml)"
+
             echo "Persisting DPM environment variables..."
             echo "export REPO_ROOT=$(pwd)" >> $BASH_ENV
             echo "export DPM_REGISTRY=europe-docker.pkg.dev/da-images/public-all" >> $BASH_ENV
             echo "export DPM_HOME=$(pwd)/.dpm" >> $BASH_ENV
-            echo "export DPM_SDK_VERSION=3.4.9" >> $BASH_ENV
+            echo "export DPM_SDK_VERSION=${SDK_VERSION}" >> "$BASH_ENV"
             echo "Configure DPM environment complete."
 
       - run:
@@ -371,10 +374,28 @@ jobs:
       - run:
           name: Build Packell
           command: |
+            echo "Building Packell with nix-build"
             nix-shell tools/packell/default.nix --run 'echo "Done building Packell."'
-            cp /nix/store/*packell*/bin/packell .
+            cp /nix/store/*packell-*/bin/packell .
+
+      # Verify Packell works
+      - run:
+          name: Verify Packell binary
+          command: |
+            echo "[Packell] Running packell --help"
+            ./packell --help
+
+      # Create tar.gz
+      - run:
+          name: Package packell into tar.gz
+          command: |
+            mkdir packell-linux
+            cp ./packell packell-linux/
+            tar -czvf packell-x86_64-linux.tar.gz packell-linux
+
+      # Upload tar.gz artifact
       - store_artifacts:
-          path: packell
+          path: packell-x86_64-linux.tar.gz
 
 workflows:
   version: 2

.envrc

@@ -5,6 +5,20 @@ PATH_add bin
 
 # --- DPM configuration ---
 export REPO_ROOT=$(pwd)
+export DPM_HOME="$REPO_ROOT/.dpm"
 export DPM_REGISTRY="europe-docker.pkg.dev/da-images/public-all"
-export DPM_HOME="${REPO_ROOT}/.dpm/"
-export DPM_SDK_VERSION="3.4.9"
+
+# Single source of truth: daml.yaml
+export DPM_SDK_VERSION="$(yq e '.sdk-version' daml.yaml)"
+
+# Ensure SDK is present in repo-local DPM_HOME
+if command -v dpm >/dev/null 2>&1; then
+  if ! dpm version --all -o json 2>/dev/null \
+    | jq -e --arg v "$DPM_SDK_VERSION" \
+      'any(.[]; .version == $v and .installed == true)' \
+      >/dev/null 2>&1
+  then
+    echo "Installing DPM SDK $DPM_SDK_VERSION into $DPM_HOME..."
+    dpm install "$DPM_SDK_VERSION"
+  fi
+fi

.gitignore

@@ -2,7 +2,15 @@
 *.log
 **/.DS_Store
 .cache/
-.lib/
+
+# Ignore .lib by default
+.lib/*
+# Allow required subfolders
+!.lib/splice/
+!.lib/splice/*
+!.lib/daml-ctl/
+!.lib/daml-ctl/*
+
 .dars/
 .vscode/
 docs/build/
@@ -14,3 +22,4 @@ __pycache__
 .bundle/
 .idea
 log/
+.lib/

Makefile

@@ -1,7 +1,6 @@
 SCRIPTS_DIR := scripts
-
-##########################
-# Project Source (./src) #
+########################## 
+# Project (workspace)    #
 ##########################
 
 .PHONY: install
@@ -10,11 +9,11 @@ install:
 
 .PHONY: build
 build: install
-	dpm build
+	dpm build --all
 
 .PHONY: test
 test: build
-	dpm test
+	dpm test --all
 
 .PHONY: clean
 clean:
@@ -53,8 +52,8 @@ validate-packages: build-packages
 update-packages:
 	git fetch
 	packell versioning update
-	packell data-dependencies update
 	make headers-update
+# Remove: packell data-dependencies update
 
 ###############################
 # Project Source and Packages #
@@ -64,10 +63,11 @@ update-packages:
 build-all: build build-packages
 
 .PHONY: test-all
-test-all: test test-packages
+test-all: build
+	make ci-test
 
 .PHONY: clean-all
-clean-all: clean clean-packages clean-docs
+clean-all: clean clean-packages clean-docs clean-cache
 
 .PHONY: generate-docs
 generate-docs: doc-code
@@ -110,7 +110,7 @@ ci-build-js:
 		--run 'dpm codegen-js -o .dars/.js .dars/*'
 
 # Find all test projects that contain a daml.yaml in BOTH locations:
-daml-test-projects := $(shell find package/test src/test -maxdepth 6 -name daml.yaml -exec dirname {} \; 2>/dev/null)
+daml-test-projects := $(shell find package/test -maxdepth 6 -name daml.yaml -exec dirname {} \; 2>/dev/null)
 
 .PHONY: ci-test
 ci-test:
@@ -193,25 +193,31 @@ headers-update:
 # Documentation Generation #
 ############################
 
-DAML_SRC := $(shell find src/main/daml -name '*.daml')
+DAML_SRC := $(shell \
+	find package/main/daml \
+		-path '*/.daml' -prune -o \
+		-name '*.daml' -print)
 SDK_VERSION := $(shell yq e '.sdk-version' daml.yaml)
+DPM_HOME ?= $(HOME)/.dpm
 DAML_ROOT := $(shell if [ -z ${DAML_HOME} ]; then echo ~/.daml; else echo ${DAML_HOME}; fi)
 
-DPM_HOME := $(shell if [ -z $${DPM_HOME} ]; then echo $$HOME/.dpm; else echo $${DPM_HOME}; fi)
+DOCS_BUILD_DIR := docs/build
 
 .PHONY: doc-code-json
-doc-code-json: $(DAML_SRC)
+doc-code-json: build
+	@mkdir -p $(DOCS_BUILD_DIR)
 	dpm docs \
-		--output=docs/build/daml-finance.json \
+		--combine \
 		--package-name=daml-finance \
 		--format Json \
-    $(DAML_SRC)
+		--output=$(DOCS_BUILD_DIR)/daml-finance.json \
+		$(DAML_SRC)
 
 .PHONY: doc-code
 doc-code: doc-code-json
 	dpm docs \
-		--output=docs/build/daml-finance-rst \
-		--output-hoogle=docs/build/daml-finance-hoogle.txt \
+		--output=$(DOCS_BUILD_DIR)/daml-finance-rst \
+		--output-hoogle=$(DOCS_BUILD_DIR)/daml-finance-hoogle.txt \
 		--input-format=json \
 		--format=Rst \
 		--exclude-instances=HasField,HasImplementation,HasFromInterface,HasToInterface,HasInterfaceView,HasExercise,HasExerciseGuarded,HasFromAnyChoice,HasToAnyChoice \
@@ -221,9 +227,10 @@ doc-code: doc-code-json
 		--hoogle-template=docs/code-documentation-templates/base-hoogle-template.txt \
 		--base-url=https://docs.daml.com/daml-finance/reference/code-documentation/daml-finance-rst \
 		--input-anchor=$(DAML_ROOT)/sdk/$(SDK_VERSION)/damlc/resources/daml-base-anchors.json \
-		docs/build/daml-finance.json
-
+		$(DOCS_BUILD_DIR)/daml-finance.json
+	@echo "Daml Finance documentation generated successfully"
 
 .PHONY: clean-docs
 clean-docs:
 	./$(SCRIPTS_DIR)/clean-docs.sh
+

README.md

@@ -57,3 +57,20 @@ When developing please adhere to the [style guide](./STYLEGUIDE.md).
 ### Releases
 
 To perform a release of this project, please follow the guide [here](./RELEASE.MD).
+
+## Important Compatibility Notice (Canton Network)
+The `main` branch of this repository currently targets **Daml SDK 3.x** and uses an **unstable Ledger Fragment (LF) version (`2.dev`)**.
+
+As a result:
+
+- Artifacts built from `main` cannot be deployed to the Canton Network / MainNet
+- They are not compatible with any production Canton deployment
+- This setup is intended for development, experimentation, and forward-looking SDK work only
+
+The use of `LF 2.dev` is required for ongoing development on Daml 3, but is not supported on Canton MainNet, which only accepts stable LF versions.
+
+### What should I use instead?
+
+- For production Canton deployments, use a released version of Daml Finance that targets a stable LF version
+
+This notice will be updated once Daml 3 and its corresponding LF version are fully supported on Canton MainNet.

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: 3.4.9
+sdk-version: 3.4.10
 # 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,7 +16,7 @@ sdk-version: 3.4.9
 # 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: 3.4.9
+daml-version: 3.4.10
 # To use a custom daml, you must update the sdk-version across the project to that of the tar you have (likely 0.0.0)
 # daml-version above will be ignored
 # and uncomment the below tar path to point to your release tar.
@@ -26,7 +26,7 @@ daml-version: 3.4.9
 # NOTE: This must be an absolute path to the release tarball.
 # daml-tar-path: <daml>/sdk/bazel-bin/release/sdk-release-tarball-ce.tar.gz
 name: daml-finance
-source: src/test/daml
+source: 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
@@ -39,11 +39,10 @@ dependencies:
   - daml-script
 data-dependencies:
   - .lib/daml-ctl/v4.0.0/daml-ctl-4.0.0.dar
-  - .lib/splice/splice-api-token-holding-v1-1.0.0.dar
-  - .lib/splice/splice-api-token-metadata-v1-1.0.0.dar
+  - lib/splice-api-token-holding-v1-1.0.0.dar
+  - lib/splice-api-token-metadata-v1-1.0.0.dar
 
 build-options:
-  - --include=src/main/daml
   - --target=2.dev
   - -Wno-upgrade-interfaces
   - -Wno-upgrade-exceptions