digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-08-16 08:10:52 +03:00
Code Issues Projects Releases Wiki Activity

rename master to main (#8245)

Browse Source 
As we strive for more inclusiveness, we are becoming less comfortable
with historically-charged terms being used in our everyday work.

This is targeted for merge on Dec 26, _after_ the necessary
corresponding changes at both the GitHub and Azure Pipelines levels.

CHANGELOG_BEGIN

- DAML Connect development is now conducted from the `main` branch,
  rather than the `master` one. If you had any dependency on the
  digital-asset/daml repository, you will need to update this parameter.

CHANGELOG_END
This commit is contained in:
Gary Verhaegen 2020-12-27 14:19:07 +01:00 committed by GitHub
parent c33140cf88
commit 93f449d245
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
44 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/pull_request_template.md vendored
View File

@ -1,6 +1,6 @@
### Pull Request Checklist
- [ ] Read and understand the [contribution guidelines](https://github.com/digital-asset/daml/blob/master/CONTRIBUTING.md)
- [ ] Read and understand the [contribution guidelines](https://github.com/digital-asset/daml/blob/main/CONTRIBUTING.md)
- [ ] Include appropriate tests
- [ ] Set a descriptive title and thorough description
- [ ] Add a reference to the [issue this PR will solve](https://github.com/digital-asset/daml/issues), if appropriate

2
BAZEL-haskell.md
View File

@ -259,6 +259,6 @@ may take some time if the required artifacts are not built or cached already.
## Further reading:
- ["Bazel User Guide"](https://github.com/digital-asset/daml/blob/master/BAZEL.md) (DAML specific)
- ["Bazel User Guide"](https://github.com/digital-asset/daml/blob/main/BAZEL.md) (DAML specific)
- ["A Users's Guide to Bazel"](https://docs.bazel.build/versions/master/guide.html) (official documentation)
- [`rules_haskell` documentation](https://api.haskell.build/index.html) (core Haskell rules, Haddock support, Linting, Defining toolchains, Support for protocol buffers, Interop with `cc_*` rules, Workspace rules)

16
BAZEL.md
View File

@ -240,14 +240,14 @@ additional_languages:
Click "Next" once you are ready. You will be able to modify the project view
file whenever you like, so don't worry too much.
The first import of the project might fail due to a resolution error of the
The first import of the project might fail due to a resolution error of the
`bazel` binary. In order to solve this, configure the Bazel plugin settings
with the location of the `bazel` binary,
by setting _Preferences_ → _Bazel Settings_ → _Bazel binary location_
with the location of the `bazel` binary,
by setting _Preferences_ → _Bazel Settings_ → _Bazel binary location_
to `./dev-env/bin/bazel`.
Now, re-trigger a sync of the workspace (IntelliJ Action:
Now, re-trigger a sync of the workspace (IntelliJ Action:
_Sync project with BUILD files_). This process will take a while.
[intellij_project_view]: https://ij.bazel.build/docs/project-views.html
@ -328,8 +328,8 @@ or "OK" to add the run configuration.
#### Attaching sources to scala library
If you do not have the Scala library sources linked (you only see the decompiled
sources), you can attach it manually by selecting the `Choose sources...`
button on the yellow bar at the top, and selecting `scala-library...-src.jar`.
sources), you can attach it manually by selecting the `Choose sources...`
button on the yellow bar at the top, and selecting `scala-library...-src.jar`.
### Known Issues
@ -753,7 +753,7 @@ More comprehensive documentation on the `bazel` command can be found
If your work goes beyond simply adding targets to existing
`BUILD.bazel` files and involves things like defining toolchains and
external dependencies, then [this
document](https://github.com/digital-asset/daml/blob/master/BAZEL-haskell.md)
document](https://github.com/digital-asset/daml/blob/main/BAZEL-haskell.md)
is for you!
## Scala in Bazel

8
CONTRIBUTING.md
View File

@ -29,7 +29,7 @@ For Git commit messages, our principle is that `git log --pretty=oneline` should
* Read this document (contribution guidelines).
* Does your PR include appropriate tests?
* Make sure your PR title and description makes it easy for other developers to understand what the contained commits do. The title should say what the changes do. The description should expand on what it does (if not obvious from the title alone), and say why it is being done.
* If your PR corresponds to an issue, add “Fixes #XX” to your pull request description. This will auto-close the corresponding issue when the commit is merged into master and tie the PR to the issue.
* If your PR corresponds to an issue, add “Fixes #XX” to your pull request description. This will auto-close the corresponding issue when the commit is merged into main and tie the PR to the issue.
* the squashed commit for the PR **MUST** include in its body a section between the ``CHANGELOG_BEGIN`` and ``CHANGELOG_END`` tags. This section **MAY** include a list of _user-facing_ changes [Follow these guidelines on how to write a good changelog entry](#writing-a-good-changelog-entry).
The following is an example of a well-formed commit, including the description (first line) and a body that includes changelog additions:
@ -45,7 +45,7 @@ The following is an example of a well-formed commit, including the description (
CHANGELOG_END
If you want to amend an existing changelog entry part of a PR already merged on master, do so by adding a ``WARNING`` to your changelog additions:
If you want to amend an existing changelog entry part of a PR already merged on main, do so by adding a ``WARNING`` to your changelog additions:
CHANGELOG_BEGIN
@ -65,9 +65,9 @@ If the PR contains no _user-facing_ change, the section **MUST** be there but ca
CHANGELOG_BEGIN
CHANGELOG_END
If you want to verify the changelog entries as described by a range of Git revisions, you can use the `unreleased.sh` script. In most cases, to see the entries added as part of commits added since branching off of `master`, you can run:
If you want to verify the changelog entries as described by a range of Git revisions, you can use the `unreleased.sh` script. In most cases, to see the entries added as part of commits added since branching off of `main`, you can run:
./unreleased.sh master..
./unreleased.sh main..
## Writing a good changelog entry

4
README.md
View File

@ -1,8 +1,8 @@
[![DAML logo](daml-logo.png)](https://www.daml.com)
[![Download](https://img.shields.io/github/release/digital-asset/daml.svg?label=Download)](https://docs.daml.com/getting-started/installation.html)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/digital-asset/daml/blob/master/LICENSE)
[![Build](https://dev.azure.com/digitalasset/daml/_apis/build/status/digital-asset.daml?branchName=master&label=Build)](https://dev.azure.com/digitalasset/daml/_build/latest?definitionId=4&branchName=master)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/digital-asset/daml/blob/main/LICENSE)
[![Build](https://dev.azure.com/digitalasset/daml/_apis/build/status/digital-asset.daml?branchName=main&label=Build)](https://dev.azure.com/digitalasset/daml/_build/latest?definitionId=4&branchName=main)
Copyright 2020 Digital Asset (Switzerland) GmbH and/or its affiliates. All Rights Reserved.
SPDX-License-Identifier: Apache-2.0

6
azure-cron.yml
View File

@ -6,7 +6,7 @@
# Do not run on PRs
pr: none
# Do not run on merge to master
# Do not run on merge to main
trigger: none
# Do run on a schedule (hourly)
@ -24,7 +24,7 @@ trigger: none
# displayName: hourly cron
# branches:
# include:
# - master
# - main
# always: true
jobs:
@ -54,7 +54,7 @@ jobs:
-H 'Content-type: application/json' \
--data "{\"text\":\"<!here> *FAILED* Daily Docs: <https://dev.azure.com/digitalasset/daml/_build/results?buildId=$(Build.BuildId)|$MESSAGE>\n\"}" \
$(Slack.team-daml)
condition: and(failed(), eq(variables['Build.SourceBranchName'], 'master'))
condition: and(failed(), eq(variables['Build.SourceBranchName'], 'main'))
- template: ci/tell-slack-failed.yml
- job: docker_image

22
azure-pipelines.yml
View File

@ -10,15 +10,15 @@ trigger:
batch: false
branches:
include:
- master
- main
- release/*
# Enable PR triggers that target the master branch
# Enable PR triggers that target the main branch
pr:
autoCancel: true # cancel previous builds on push
branches:
include:
- master
- main
- release/*
jobs:
@ -31,11 +31,11 @@ jobs:
set -euo pipefail
if [ "$(Build.Reason)" == "PullRequest" ]; then
echo "##vso[task.setvariable variable=branch;isOutput=true]$(git rev-parse HEAD^2)"
echo "##vso[task.setvariable variable=master;isOutput=true]$(git rev-parse HEAD^1)"
echo "##vso[task.setvariable variable=main;isOutput=true]$(git rev-parse HEAD^1)"
echo "##vso[task.setvariable variable=fork_point;isOutput=true]$(git merge-base $(git rev-parse HEAD^1) $(git rev-parse HEAD^2))"
else
echo "##vso[task.setvariable variable=branch;isOutput=true]$(git rev-parse HEAD)"
echo "##vso[task.setvariable variable=master;isOutput=true]$(git rev-parse HEAD^1)"
echo "##vso[task.setvariable variable=main;isOutput=true]$(git rev-parse HEAD^1)"
echo "##vso[task.setvariable variable=fork_point;isOutput=true]$(git rev-parse HEAD^1)"
fi
name: out
@ -409,7 +409,7 @@ jobs:
dependsOn: [ "check_for_release", "Linux", "macOS", "Windows" ]
condition: and(succeeded(),
eq(dependencies.check_for_release.outputs['out.is_release'], 'true'),
eq(variables['Build.SourceBranchName'], 'master'))
eq(variables['Build.SourceBranchName'], 'main'))
pool:
vmImage: "Ubuntu-16.04"
variables:
@ -572,7 +572,7 @@ jobs:
curl -XPOST \
-i \
-H 'Content-Type: application/json' \
--data "{\"text\":\"<@${pr_handler}> Release \`$(release_tag)\` is ready for testing. See <https://github.com/digital-asset/daml/blob/master/release/RELEASE.md|release instructions>. (<https://dev.azure.com/digitalasset/daml/_build/results?buildId=$(Build.BuildId)|build>, <https://github.com/digital-asset/daml/commit/$(trigger_sha)|trigger commit>, <https://github.com/digital-asset/daml/commit/$(release_sha)|target commit>)\"}" \
--data "{\"text\":\"<@${pr_handler}> Release \`$(release_tag)\` is ready for testing. See <https://github.com/digital-asset/daml/blob/main/release/RELEASE.md|release instructions>. (<https://dev.azure.com/digitalasset/daml/_build/results?buildId=$(Build.BuildId)|build>, <https://github.com/digital-asset/daml/commit/$(trigger_sha)|trigger commit>, <https://github.com/digital-asset/daml/commit/$(release_sha)|target commit>)\"}" \
$(Slack.team-daml)
- template: ci/tell-slack-failed.yml
parameters:
@ -619,7 +619,7 @@ jobs:
done
trap "git checkout $(branch_sha)" EXIT
git checkout origin/master
git checkout origin/main
cp .bazelrc compatibility/
compatibility/update-versions.sh
git add compatibility/versions.bzl compatibility/maven_install.json
@ -700,7 +700,7 @@ jobs:
compatibility_windows.status: $[ dependencies.compatibility_windows.result ]
branch_sha: $[ dependencies.git_sha.outputs['out.branch'] ]
master_sha: $[ dependencies.git_sha.outputs['out.master'] ]
main_sha: $[ dependencies.git_sha.outputs['out.main'] ]
fork_sha: $[ dependencies.git_sha.outputs['out.fork_point'] ]
# Using expression syntax so we get an empty string if not set, rather
@ -758,7 +758,7 @@ jobs:
"branch": "$(Build.SourceBranch)",
"merge_commit": "$(Build.SourceVersion)",
"branch_commit": "$(branch_sha)",
"master_commit": "$(master_sha)",
"main_commit": "$(main_sha)",
"fork_point_commit": "$(fork_sha)",
"commit_message": $(echo -n "$COMMIT_MSG" | jq -sR),
"is_fork": "$(System.PullRequest.IsFork)",
@ -851,7 +851,7 @@ jobs:
;;
*)
# Should not be reached, but who knows?
msg="has completed with status $(status). See <https://github.com/digital-asset/daml/blob/master/release/RELEASE.md|RELEASE.md> for what to do next."
msg="has completed with status $(status). See <https://github.com/digital-asset/daml/blob/main/release/RELEASE.md|RELEASE.md> for what to do next."
;;
esac
tell_slack "<@${PR_HANDLER}> <https://dev.azure.com/digitalasset/daml/_build/results?buildId=$(Build.BuildId)|Build $(Build.BuildId)> for release PR <https://github.com/digital-asset/daml/pull/${PR}|#${PR}> $msg"

2
bazel_tools/pom_template.xml
View File

@ -32,7 +32,7 @@
<scm>
<connection>scm:git:git://github.com/digital-asset/daml.git</connection>
<developerConnection>scm:git:ssh://github.com:digital-asset/daml.git</developerConnection>
<url>https://github.com/digital-asset/daml/tree/master</url>
<url>https://github.com/digital-asset/daml/tree/main</url>
</scm>
<dependencies>

2
ci/bash-lib.yml
View File

@ -43,7 +43,7 @@ steps:
git push origin $branch:$branch
jq -n --arg title "$title" \
--arg branch "$branch" \
'{"title": $title, "head": $branch, "base": "master"}' \
'{"title": $title, "head": $branch, "base": "main"}' \
| curl -H "Content-Type: application/json" \
-H "$(get_gh_auth_header)" \
--fail \

16
ci/build-unix.yml
View File

@ -67,7 +67,7 @@ steps:
name: publish_npm_mvn
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
eq(variables['Build.SourceBranchName'], 'master'),
eq(variables['Build.SourceBranchName'], 'main'),
eq('${{parameters.name}}', 'linux'))
- bash: |
set -euo pipefail
@ -107,21 +107,21 @@ steps:
name: publish
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
eq(variables['Build.SourceBranchName'], 'master'))
eq(variables['Build.SourceBranchName'], 'main'))
- task: PublishPipelineArtifact@0
inputs:
targetPath: $(Build.StagingDirectory)/$(publish.tarball)
artifactName: $(publish.tarball)
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
eq(variables['Build.SourceBranchName'], 'master'))
eq(variables['Build.SourceBranchName'], 'main'))
- task: PublishPipelineArtifact@0
inputs:
targetPath: $(Build.StagingDirectory)/$(publish.protos-zip)
artifactName: $(publish.protos-zip)
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
eq(variables['Build.SourceBranchName'], 'master'),
eq(variables['Build.SourceBranchName'], 'main'),
eq('${{parameters.name}}', 'linux'))
- task: PublishPipelineArtifact@0
inputs:
@ -129,7 +129,7 @@ steps:
artifactName: $(publish.daml-on-sql)
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
eq(variables['Build.SourceBranchName'], 'master'),
eq(variables['Build.SourceBranchName'], 'main'),
eq('${{parameters.name}}', 'linux'))
- task: PublishPipelineArtifact@0
inputs:
@ -137,7 +137,7 @@ steps:
artifactName: $(publish.json-api)
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
eq(variables['Build.SourceBranchName'], 'master'),
eq(variables['Build.SourceBranchName'], 'main'),
eq('${{parameters.name}}', 'linux'))
- task: PublishPipelineArtifact@0
inputs:
@ -145,7 +145,7 @@ steps:
artifactName: $(publish.trigger-runner)
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
eq(variables['Build.SourceBranchName'], 'master'),
eq(variables['Build.SourceBranchName'], 'main'),
eq('${{parameters.name}}', 'linux'))
- task: PublishPipelineArtifact@0
inputs:
@ -153,5 +153,5 @@ steps:
artifactName: $(publish.script-runner)
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
eq(variables['Build.SourceBranchName'], 'master'),
eq(variables['Build.SourceBranchName'], 'main'),
eq('${{parameters.name}}', 'linux'))

6
ci/build-windows.yml
View File

@ -51,18 +51,18 @@ steps:
DAML_SDK_RELEASE_VERSION: ${{parameters.release_tag}}
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
eq(variables['Build.SourceBranchName'], 'master'))
eq(variables['Build.SourceBranchName'], 'main'))
- task: PublishPipelineArtifact@0
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
eq(variables['Build.SourceBranchName'], 'master'))
eq(variables['Build.SourceBranchName'], 'main'))
inputs:
targetPath: $(Build.StagingDirectory)/$(publish.installer)
artifactName: $(publish.installer)
- task: PublishPipelineArtifact@0
condition: and(succeeded(),
eq(${{parameters.is_release}}, 'true'),
eq(variables['Build.SourceBranchName'], 'master'))
eq(variables['Build.SourceBranchName'], 'main'))
inputs:
targetPath: $(Build.StagingDirectory)/$(publish.tarball)
artifactName: $(publish.tarball)

2
ci/check-changelog.sh
View File

@ -67,6 +67,6 @@ to your commit message.
return 1
}
BASE=${1:-origin/master}
BASE=${1:-origin/main}
has_a_changelog $BASE || is_dependabot_pr $BASE

4
ci/cron/daily-compat.yml
View File

@ -4,7 +4,7 @@
# Do not run on PRs
pr: none
# Do not run on merge to master
# Do not run on merge to main
trigger: none
# Do run on a schedule (daily)
@ -19,7 +19,7 @@ schedules:
displayName: daily checks and reporting
branches:
include:
- master
- main
always: true
jobs:

4
ci/cron/tuesday.yml
View File

@ -9,7 +9,7 @@ schedules:
displayName: Tuesday
branches:
include:
- master
- main
always: true
jobs:
@ -30,4 +30,4 @@ jobs:
RELEASE_MANAGER=$(head -1 release/rotation | awk '{print $1}')
tell_slack "Hi <@$RELEASE_MANAGER>! According to the <https://github.com/digital-asset/daml/blob/master/release/rotation|rotation>, you are in charge of the release tomorrow. Please make sure you plan accordingly, or find a replacement."
tell_slack "Hi <@$RELEASE_MANAGER>! According to the <https://github.com/digital-asset/daml/blob/main/release/rotation|rotation>, you are in charge of the release tomorrow. Please make sure you plan accordingly, or find a replacement."

4
ci/cron/wednesday.yml
View File

@ -9,7 +9,7 @@ schedules:
displayName: weekly snapshot
branches:
include:
- master
- main
always: true
jobs:
@ -56,7 +56,7 @@ jobs:
--arg branch "$branch" \
--arg title "$title" \
--arg body "$(printf "$body")" \
'{"title": $title, "head": $branch, "base": "master", "body": $body}' \
'{"title": $title, "head": $branch, "base": "main", "body": $body}' \
| curl -H "Content-Type: application/json" \
-H "$AUTH" \
--silent \

2
ci/daily_tell_slack.yml
View File

@ -20,7 +20,7 @@ steps:
MESSAGE="${{ parameters['success-message'] }}"
fi
PAYLOAD="{\"text\":$MESSAGE}"
if [ "$(Build.SourceBranchName)" = "master" ]; then
if [ "$(Build.SourceBranchName)" = "main" ]; then
curl -XPOST \
-i \
-H 'Content-type: application/json' \

2
ci/tell-slack-failed.yml
View File

@ -24,5 +24,5 @@ steps:
--data "{\"text\":\"$WARNING\n\"}" \
$(Slack.team-daml)
condition: and(failed(),
or(eq(variables['Build.SourceBranchName'], 'master'),
or(eq(variables['Build.SourceBranchName'], 'main'),
startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))

2
compiler/daml-extension/package.json
View File

@ -4,7 +4,7 @@
"description": "DAML editing and analysis tools",
"version": "__VERSION__",
"publisher": "DigitalAssetHoldingsLLC",
"repository": "https://github.com/digital-asset/daml/tree/master/compiler/daml-extension",
"repository": "https://github.com/digital-asset/daml/tree/main/compiler/daml-extension",
"icon": "images/daml-studio.png",
"engines": {
"vscode": "^1.39.0"

2
compiler/daml-lf-tools/src/DA/Daml/LF/TypeChecker/NameCollision.hs
View File

@ -95,7 +95,7 @@ nameCollisionForbidden a b = not (nameCollisionPermitted a b)
-- constructed lower case in order to have case-insensitivity.
--
-- This corresponds to the following section of the LF spec:
-- https://github.com/digital-asset/daml/blob/master/daml-lf/spec/daml-lf-1.rst#fully-resolved-name
-- https://github.com/digital-asset/daml/blob/main/daml-lf/spec/daml-lf-1.rst#fully-resolved-name
newtype FRName = FRName [T.Text]
deriving (Eq, Ord)

2
compiler/damlc/daml-lf-conversion/src/DA/Daml/LFConversion.hs
View File

@ -8,7 +8,7 @@
-- | Useful references:
--
-- * DAML-LF AST: https://github.com/digital-asset/daml/blob/master/compiler/daml-lf-ast/src/DA/Daml/LF/Ast/Base.hs
-- * DAML-LF AST: https://github.com/digital-asset/daml/blob/main/compiler/daml-lf-ast/src/DA/Daml/LF/Ast/Base.hs
-- * GHC Syntax: https://hackage.haskell.org/package/ghc-8.4.1/docs/CoreSyn.html#t:Expr
--
-- The conversion works element by element, in a fairly direct way, apart from the exceptions

2
daml-lf/archive/README.md
View File

@ -20,7 +20,7 @@ supported by the DAML-LF archive. Currently we have two major versions:
* `DAML-LF-0`, which is the deprecated legacy DAML core;
* `DAML-LF-1`, which is the first version of DAML-LF as specified by
<https://github.com/digital-asset/daml/blob/master/daml-lf/spec/daml-lf-1.rst>.
<https://github.com/digital-asset/daml/blob/main/daml-lf/spec/daml-lf-1.rst>.
## Snapshot versions

2
daml-lf/archive/src/main/protobuf/com/daml/daml_lf_dev/daml_lf_1.proto
View File

@ -3,7 +3,7 @@
// .proto representation of the first version of the DAML-LF language,
// as specified by
// <https://github.com/digital-asset/daml/blob/master/daml-lf/spec/daml-lf-1.rst>.
// <https://github.com/digital-asset/daml/blob/main/daml-lf/spec/daml-lf-1.rst>.
//
// A few notes:
//

4
dev-env/git-hooks/pre-push
View File

@ -13,14 +13,14 @@
# <local ref> <local sha1> <remote ref> <remote sha1>
#
protected_branches=('master')
protected_branches=('main')
IFS=' '
while read local_ref local_sha remote_ref remote_sha
do
for protected_branch in "${protected_branches[@]}"; do
if [[ $remote_ref == "refs/heads/$protected_branch" ]]; then
echo -en "\033[31mYou're about to push master, that is verboten!\033[0m"
echo -en "\033[31mYou're about to push main, that is verboten!\033[0m"
echo
exit 1 # push will not execute
fi

8
docs/source/app-dev/bindings-scala/index.rst
View File

@ -37,7 +37,7 @@ Getting started
===============
If this is your first experience with the Scala bindings library, we recommend that you start by looking at the
`quickstart-scala example <https://github.com/digital-asset/daml/tree/master/language-support/scala/examples/quickstart-scala>`_.
`quickstart-scala example <https://github.com/digital-asset/daml/tree/main/language-support/scala/examples/quickstart-scala>`_.
To use the Scala bindings, set up the following dependencies in your project:
@ -94,7 +94,7 @@ Example code
In this section we will demonstrate how to use the Scala bindings library.
This section refers to the IOU DAML example from the :doc:`Quickstart guide </app-dev/bindings-java/quickstart>` and
`quickstart-scala example <https://github.com/digital-asset/daml/tree/master/language-support/scala/examples/quickstart-scala>`_ that we already mentioned above.
`quickstart-scala example <https://github.com/digital-asset/daml/tree/main/language-support/scala/examples/quickstart-scala>`_ that we already mentioned above.
Please keep in mind that **quickstart-scala example** compiles with ``-Xsource:2.13`` **scalac** option, this is to activate the fix for a Scala bug that forced users to add extra imports for implicits that should not be needed.
@ -125,7 +125,7 @@ To send a :ref:`com.daml.ledger.api.v1.CreateCommand` (keep in mind the followin
:start-after: // <doc-ref:submit-iou-create-command>
:end-before: // </doc-ref:submit-iou-create-command>
For more details on how to submit a command, please refer to the implementation of `com.daml.quickstart.iou.ClientUtil#submitCommand <https://github.com/digital-asset/daml/blob/master/language-support/scala/examples/quickstart-scala/application/src/main/scala/com/digitalasset/quickstart/iou/ClientUtil.scala>`_.
For more details on how to submit a command, please refer to the implementation of `com.daml.quickstart.iou.ClientUtil#submitCommand <https://github.com/digital-asset/daml/blob/main/language-support/scala/examples/quickstart-scala/application/src/main/scala/com/digitalasset/quickstart/iou/ClientUtil.scala>`_.
Receive a transaction, exercise a choice and send an ExerciseCommand
---------------------------------------------------------------------
@ -148,7 +148,7 @@ To exercise ``IouTransfer_Accept`` choice on the ``IouTransfer`` contract that y
:start-after: // <doc-ref:submit-iou-transfer-accept-exercise-command>
:end-before: // </doc-ref:submit-iou-transfer-accept-exercise-command>
Fore more details on how to subscribe to receive events for a particular party, please refer to the implementation of `com.daml.quickstart.iou.IouMain#newOwnerAcceptsAllTransfers <https://github.com/digital-asset/daml/blob/master/language-support/scala/examples/quickstart-scala/application/src/main/scala/com/digitalasset/quickstart/iou/IouMain.scala>`_.
Fore more details on how to subscribe to receive events for a particular party, please refer to the implementation of `com.daml.quickstart.iou.IouMain#newOwnerAcceptsAllTransfers <https://github.com/digital-asset/daml/blob/main/language-support/scala/examples/quickstart-scala/application/src/main/scala/com/digitalasset/quickstart/iou/IouMain.scala>`_.
.. _scala-bindings-authorization:

4
docs/source/app-dev/bindings-ts/daml2js.rst
View File

@ -8,7 +8,7 @@ The command ``daml codegen js`` generates JavaScript (and TypeScript) that can b
Inputs to the command are DAR files. Outputs are JavaScript packages with TypeScript typings containing metadata and types for all DAML packages included in the DAR files.
The generated packages use the library `@daml/types <https://github.com/digital-asset/daml/tree/master/language-support/ts/daml-types>`_.
The generated packages use the library `@daml/types <https://github.com/digital-asset/daml/tree/main/language-support/ts/daml-types>`_.
Usage
-----
@ -257,7 +257,7 @@ Each template results in the generation of a companion object. Here, is a schema
The exact details of these companion objects are not important - think of them as representing "metadata".
What **is** important is the use of the companion objects when creating contracts and exercising choices using the `@daml/ledger <https://github.com/digital-asset/daml/tree/master/language-support/ts/daml-ledger>`_ package. The following code snippet demonstrates their usage.
What **is** important is the use of the companion objects when creating contracts and exercising choices using the `@daml/ledger <https://github.com/digital-asset/daml/tree/main/language-support/ts/daml-ledger>`_ package. The following code snippet demonstrates their usage.
.. code-block:: typescript
:linenos:

8
docs/source/app-dev/bindings-x-lang/index.rst
View File

@ -9,7 +9,7 @@ This page gets you started with creating custom bindings for a DAML Ledger.
Bindings for a language consist of two main components:
- Ledger API
Client "stubs" for the programming language, -- the remote API that allows sending ledger commands and receiving ledger transactions. You have to generate **Ledger API** from `the gRPC protobuf definitions in the daml repository on GitHub <https://github.com/digital-asset/daml/tree/master/ledger-api/grpc-definitions>`_. **Ledger API** is documented on this page: :doc:`/app-dev/grpc/index`. The `gRPC <https://grpc.io/docs/>`_ tutorial explains how to generate client "stubs".
Client "stubs" for the programming language, -- the remote API that allows sending ledger commands and receiving ledger transactions. You have to generate **Ledger API** from `the gRPC protobuf definitions in the daml repository on GitHub <https://github.com/digital-asset/daml/tree/main/ledger-api/grpc-definitions>`_. **Ledger API** is documented on this page: :doc:`/app-dev/grpc/index`. The `gRPC <https://grpc.io/docs/>`_ tutorial explains how to generate client "stubs".
- Codegen
A code generator is a program that generates classes representing DAML contract templates in the language. These classes incorporate all boilerplate code for constructing: :ref:`com.daml.ledger.api.v1.CreateCommand` and :ref:`com.daml.ledger.api.v1.ExerciseCommand` corresponding for each DAML contract template.
@ -88,16 +88,16 @@ The above examples should help you get started. If you are creating custom bindi
Links
=====
- A Scala example that demonstrates how to manually construct ledger commands: https://github.com/digital-asset/daml/tree/master/language-support/scala/examples/iou-no-codegen
- A Scala example that demonstrates how to manually construct ledger commands: https://github.com/digital-asset/daml/tree/main/language-support/scala/examples/iou-no-codegen
- A Scala codegen example: https://github.com/digital-asset/daml/tree/master/language-support/scala/examples/quickstart-scala
- A Scala codegen example: https://github.com/digital-asset/daml/tree/main/language-support/scala/examples/quickstart-scala
- gRPC documentation: https://grpc.io/docs/
- Documentation for Protobuf "well known types": https://developers.google.com/protocol-buffers/docs/reference/google.protobuf
- DAML Ledger API gRPC Protobuf definitions
- current master: https://github.com/digital-asset/daml/tree/master/ledger-api/grpc-definitions
- current main: https://github.com/digital-asset/daml/tree/main/ledger-api/grpc-definitions
- for specific versions: https://github.com/digital-asset/daml/releases
- Required gRPC Protobuf definitions:

2
docs/source/app-dev/daml-lf-translation.rst
View File

@ -66,7 +66,7 @@ DAML-LF has three kinds of data declarations:
:ref:`Data type declarations in DAML <daml-ref-data-constructors>` (starting with the ``data`` keyword) are translated to record, variant or enum types. It’s sometimes not obvious what they will be translated to, so this section lists many examples of data types in DAML and their translations in DAML-LF.
.. In the tables below, the left column uses DAML 1.2 syntax and the right column uses the notation from the `DAML-LF specification <https://github.com/digital-asset/daml/blob/master/daml-lf/spec/daml-lf-1.rst>`_.
.. In the tables below, the left column uses DAML 1.2 syntax and the right column uses the notation from the `DAML-LF specification <https://github.com/digital-asset/daml/blob/main/daml-lf/spec/daml-lf-1.rst>`_.
Record declarations
===================

2
docs/source/app-dev/grpc/index.rst
View File

@ -13,7 +13,7 @@ If you're not familiar with gRPC and protobuf, we strongly recommend following t
Getting started
***************
You can get the protobufs from a `GitHub release <protobufs_>`_, or from the ``daml`` repository `here <https://github.com/digital-asset/daml/tree/master/ledger-api/grpc-definitions>`__.
You can get the protobufs from a `GitHub release <protobufs_>`_, or from the ``daml`` repository `here <https://github.com/digital-asset/daml/tree/main/ledger-api/grpc-definitions>`__.
Protobuf reference documentation
********************************

32
docs/source/daml-integration-kit/index.rst
View File

@ -15,7 +15,7 @@ The DAML integration kit is currently an :doc:`Early Access Feature in Labs stat
A DAML Ledger is a server serving the
:doc:`Ledger API </app-dev/grpc/index>` as per the semantics defined in
the :doc:`/concepts/ledger-model/index` and the
`DAML-LF specification <https://github.com/digital-asset/daml/blob/master/daml-lf/spec/daml-lf-1.rst>`_.
`DAML-LF specification <https://github.com/digital-asset/daml/blob/main/daml-lf/spec/daml-lf-1.rst>`_.
The DAML integration kit helps third-party ledger developers to
implement a DAML Ledger on top of their distributed ledger or database of
@ -236,25 +236,25 @@ As explained in :ref:`integration-kit_writing_code`,
this section is best read jointly with the code in
`digital-asset/daml-on-x-example <https://github.com/digital-asset/daml-on-x-example>`__.
``participant-state.jar`` (`source code <https://github.com/digital-asset/daml/blob/master/ledger/participant-state/src/main/scala/com/daml/ledger/participant/state/v1/package.scala>`__)
``participant-state.jar`` (`source code <https://github.com/digital-asset/daml/blob/main/ledger/participant-state/src/main/scala/com/daml/ledger/participant/state/v1/package.scala>`__)
Contains interfaces abstracting over the state of
a participant node relevant for a DAML Ledger API server.
These are the
interfaces whose implementation is specific to a particular `X` ledger. These
interfaces are optimized for ease of implementation.
``participant-state-kvutils.jar`` (`source code <https://github.com/digital-asset/daml/tree/master/ledger/participant-state/kvutils/src/main/scala/com/daml/ledger/participant/state/kvutils>`__)
``participant-state-kvutils.jar`` (`source code <https://github.com/digital-asset/daml/tree/main/ledger/participant-state/kvutils/src/main/scala/com/daml/ledger/participant/state/kvutils>`__)
These utilities provide methods to succintly implement interfaces from
``participant-state.jar`` on top of a key-value state storage.
See documentation in
`package.scala <https://github.com/digital-asset/daml/blob/master/ledger/participant-state/kvutils/src/main/scala/com/daml/ledger/participant/state/kvutils/package.scala>`__
`package.scala <https://github.com/digital-asset/daml/blob/main/ledger/participant-state/kvutils/src/main/scala/com/daml/ledger/participant/state/kvutils/package.scala>`__
``ledger-api-server.jar`` (`source code for API server <https://github.com/digital-asset/daml/blob/master/ledger/participant-integration-api/src/main/scala/platform/apiserver/StandaloneApiServer.scala>`__, `source code for indexer <https://github.com/digital-asset/daml/blob/master/ledger/sandbox/src/main/scala/com/daml/platform/indexer/StandaloneIndexerServer.scala>`__)
``ledger-api-server.jar`` (`source code for API server <https://github.com/digital-asset/daml/blob/main/ledger/participant-integration-api/src/main/scala/platform/apiserver/StandaloneApiServer.scala>`__, `source code for indexer <https://github.com/digital-asset/daml/blob/main/ledger/sandbox/src/main/scala/com/daml/platform/indexer/StandaloneIndexerServer.scala>`__)
Contains code that implements a DAML Ledger API server and the SQL-backed indexer
given implementations of the interfaces in ``participant-state.jar``.
``daml-engine.jar`` (`source code <https://github.com/digital-asset/daml/blob/master/daml-lf/engine/src/main/scala/com/digitalasset/daml/lf/engine/Engine.scala>`__)
``daml-engine.jar`` (`source code <https://github.com/digital-asset/daml/blob/main/daml-lf/engine/src/main/scala/com/digitalasset/daml/lf/engine/Engine.scala>`__)
Contains code for serializing and deserializing DAML
transactions and for validating them.
@ -298,10 +298,10 @@ of their qualified names where unambiguous):
creates the contained instances and wires them up to provide the Ledger API
backed by the ``<X> services``. You need to implement this for your DAML on
`X` ledger.
``WriteService`` (`source code <https://github.com/digital-asset/daml/blob/master/ledger/participant-state/src/main/scala/com/daml/ledger/participant/state/v1/WriteService.scala>`_)
``WriteService`` (`source code <https://github.com/digital-asset/daml/blob/main/ledger/participant-state/src/main/scala/com/daml/ledger/participant/state/v1/WriteService.scala>`_)
is an interface abstracting over the mechanism to submit
DAML transactions to the underlying `X` ledger via a participant node.
``ReadService`` (`source code <https://github.com/digital-asset/daml/blob/master/ledger/participant-state/src/main/scala/com/daml/ledger/participant/state/v1/ReadService.scala>`__)
``ReadService`` (`source code <https://github.com/digital-asset/daml/blob/main/ledger/participant-state/src/main/scala/com/daml/ledger/participant/state/v1/ReadService.scala>`__)
is an interface abstracting over the ability to subscribe to
changes of the `X` ledger visible to a particular participant node.
The changes are exposed as a stream that is resumable from any particular
@ -313,10 +313,10 @@ of their qualified names where unambiguous):
is a class implementing the ``ReadService`` and the
``WriteService`` on top of the ``<X> services``. You need to implement this
for your DAML on `X` ledger.
``StandaloneIndexerServer`` (`source code <https://github.com/digital-asset/daml/blob/master/ledger/participant-integration-api/src/main/scala/platform/indexer/StandaloneIndexerServer.scala>`__)
``StandaloneIndexerServer`` (`source code <https://github.com/digital-asset/daml/blob/main/ledger/participant-integration-api/src/main/scala/platform/indexer/StandaloneIndexerServer.scala>`__)
is a standalone service that subscribe to ledger changes using ``ReadService`` and inserts
the data into a SQL backend ("index") for the purpose of serving the data over the Ledger API.
``StandaloneIndexServer`` (`source code <https://github.com/digital-asset/daml/blob/master/ledger/participant-integration-api/src/main/scala/platform/apiserver/StandaloneApiServer.scala>`__)
``StandaloneIndexServer`` (`source code <https://github.com/digital-asset/daml/blob/main/ledger/participant-integration-api/src/main/scala/platform/apiserver/StandaloneApiServer.scala>`__)
is a class containing all the code to implement the
Ledger API on top of an ledger backend. It serves the data from a SQL database populated by the ``StandaloneIndexerServer``.
@ -344,20 +344,20 @@ Authorization
To implement authorization on your ledger,
do the following modifications to your code:
- Implement the ``com.daml.ledger.api.auth.AuthService`` (`source code <https://github.com/digital-asset/daml/blob/master/ledger/ledger-api-auth/src/main/scala/com/digitalasset/ledger/api/auth/AuthService.scala>`__) interface.
- Implement the ``com.daml.ledger.api.auth.AuthService`` (`source code <https://github.com/digital-asset/daml/blob/main/ledger/ledger-api-auth/src/main/scala/com/digitalasset/ledger/api/auth/AuthService.scala>`__) interface.
An AuthService receives all HTTP headers attached to a gRPC ledger API request
and returns a set of ``Claims`` (`source code <https://github.com/digital-asset/daml/blob/master/ledger/ledger-api-auth/src/main/scala/com/digitalasset/ledger/api/auth/Claims.scala>`__), which describe the authorization of the request.
- Instantiate a ``com.daml.ledger.api.auth.interceptor.AuthorizationInterceptor`` (`source code <https://github.com/digital-asset/daml/blob/master/ledger/ledger-api-auth/src/main/scala/com/digitalasset/ledger/api/auth/interceptor/AuthorizationInterceptor.scala>`__),
and returns a set of ``Claims`` (`source code <https://github.com/digital-asset/daml/blob/main/ledger/ledger-api-auth/src/main/scala/com/digitalasset/ledger/api/auth/Claims.scala>`__), which describe the authorization of the request.
- Instantiate a ``com.daml.ledger.api.auth.interceptor.AuthorizationInterceptor`` (`source code <https://github.com/digital-asset/daml/blob/main/ledger/ledger-api-auth/src/main/scala/com/digitalasset/ledger/api/auth/interceptor/AuthorizationInterceptor.scala>`__),
and pass it an instance of your AuthService implementation.
This interceptor will be responsible for storing the decoded Claims in a place where ledger API services can access them.
- When starting the ``com.daml.platform.apiserver.LedgerApiServer`` (`source code <https://github.com/digital-asset/daml/blob/master/ledger/participant-integration-api/src/main/scala/platform/apiserver/LedgerApiServer.scala>`__),
- When starting the ``com.daml.platform.apiserver.LedgerApiServer`` (`source code <https://github.com/digital-asset/daml/blob/main/ledger/participant-integration-api/src/main/scala/platform/apiserver/LedgerApiServer.scala>`__),
add the above AuthorizationInterceptor to the list of interceptors (see ``interceptors`` parameter of ``LedgerApiServer.create``).
For reference, you can have a look at how authorization is implemented in the sandbox:
- The ``com.daml.ledger.api.auth.AuthServiceJWT`` class (`source code <https://github.com/digital-asset/daml/blob/master/ledger/ledger-api-auth/src/main/scala/com/digitalasset/ledger/api/auth/AuthServiceJWT.scala>`__)
- The ``com.daml.ledger.api.auth.AuthServiceJWT`` class (`source code <https://github.com/digital-asset/daml/blob/main/ledger/ledger-api-auth/src/main/scala/com/digitalasset/ledger/api/auth/AuthServiceJWT.scala>`__)
reads a `JWT <https://jwt.io/>`__ token from HTTP headers.
- The ``com.daml.ledger.api.auth.AuthServiceJWTPayload`` class (`source code <https://github.com/digital-asset/daml/blob/master/ledger/ledger-api-auth/src/main/scala/com/digitalasset/ledger/api/auth/AuthServiceJWTPayload.scala>`__)
- The ``com.daml.ledger.api.auth.AuthServiceJWTPayload`` class (`source code <https://github.com/digital-asset/daml/blob/main/ledger/ledger-api-auth/src/main/scala/com/digitalasset/ledger/api/auth/AuthServiceJWTPayload.scala>`__)
defines the format of the token payload.
- The token signature algorithm and the corresponding public key is specified as a sandbox command line parameter.

2
docs/source/daml/intro/0_Intro.rst
View File

@ -8,7 +8,7 @@ DAML is a smart contract language designed to build composable applications on a
In this introduction, you will learn about the structure of a DAML Ledger, and how to write DAML applications that run on any DAML Ledger implementation, by building an asset-holding and -trading application. You will gain an overview over most important language features, how they relate to the :ref:`da-ledgers` and how to use DAML Connect's developer tools to write, test, compile, package and ship your application.
This introduction is structured such that each section presents a new self-contained application with more functionality than that from the previous section. You can find the DAML code for each section `here <https://github.com/digital-asset/daml/tree/master/docs/source/daml/intro/daml>`_ or download them using the DAML assistant. For example, to load the sources for section 1 into a folder called ``1_Token``, run ``daml new 1_Token --template daml-intro-1``.
This introduction is structured such that each section presents a new self-contained application with more functionality than that from the previous section. You can find the DAML code for each section `here <https://github.com/digital-asset/daml/tree/main/docs/source/daml/intro/daml>`_ or download them using the DAML assistant. For example, to load the sources for section 1 into a folder called ``1_Token``, run ``daml new 1_Token --template daml-intro-1``.
Prerequisites:

2
docs/source/daml/intro/8_Dependencies.rst
View File

@ -40,7 +40,7 @@ You'll get a whole lot of output. Under the header "DAR archive contains the fol
#. ``*.hi`` and ``*.hie`` files for each ``*.daml`` file
#. Some meta-inf and config files
The first file is something like ``7Composing-1.0.0-887056cbb313b94ab9a6caf34f7fe4fbfe19cb0c861e50d1594c665567ab7625.dalf`` which is the actual compiled package for the project. ``*.dalf`` files contain DAML-LF, which is DAML's intermediate language. The file contents are a binary encoded protobuf message from the `daml-lf schema <https://github.com/digital-asset/daml/tree/master/daml-lf/archive>`_. DAML-LF is evaluated on the Ledger by the DAML Engine, which is a JVM component that is part of tools like the IDE's Script runner, the Sandbox, or proper production ledgers. If DAML-LF is to DAML what Java Bytecode is to Java, the DAML Engine is to DAML what the JVM is to Java.
The first file is something like ``7Composing-1.0.0-887056cbb313b94ab9a6caf34f7fe4fbfe19cb0c861e50d1594c665567ab7625.dalf`` which is the actual compiled package for the project. ``*.dalf`` files contain DAML-LF, which is DAML's intermediate language. The file contents are a binary encoded protobuf message from the `daml-lf schema <https://github.com/digital-asset/daml/tree/main/daml-lf/archive>`_. DAML-LF is evaluated on the Ledger by the DAML Engine, which is a JVM component that is part of tools like the IDE's Script runner, the Sandbox, or proper production ledgers. If DAML-LF is to DAML what Java Bytecode is to Java, the DAML Engine is to DAML what the JVM is to Java.
Hashes and Identifiers
----------------------

2
docs/source/support/overview.rst
View File

@ -31,7 +31,7 @@ DAML Networks
DAML Drivers
............
At the bottom of every DAML Application is a DAML network, a distributed, or possibly centralized persistence infrastructure together with DAML drivers. DAML drivers enable the persistence infrastructure to act as a consensus, messaging, and in some cases persistence layer for DAML Applications. Most DAML drivers will have a public API, but there are no *uniform* public APIs on DAML drivers. This does not harm application portability since applications only interact with DAML networks through the Participant Node. A good example of a public API of a DAML driver is the command line interface of `DAML for Postgres <https://github.com/digital-asset/daml/blob/master/ledger/daml-on-sql/README.rst>`_. It's a public interface, but specific to the Postgres driver.
At the bottom of every DAML Application is a DAML network, a distributed, or possibly centralized persistence infrastructure together with DAML drivers. DAML drivers enable the persistence infrastructure to act as a consensus, messaging, and in some cases persistence layer for DAML Applications. Most DAML drivers will have a public API, but there are no *uniform* public APIs on DAML drivers. This does not harm application portability since applications only interact with DAML networks through the Participant Node. A good example of a public API of a DAML driver is the command line interface of `DAML for Postgres <https://github.com/digital-asset/daml/blob/main/ledger/daml-on-sql/README.rst>`_. It's a public interface, but specific to the Postgres driver.
Integration Components
......................

2
docs/source/support/releases.rst
View File

@ -56,7 +56,7 @@ Once a month Digital Asset publishes a community update to accompany the announc
Process
-------
Weekly snapshot and monthly stable releases follow a regular process and schedule. The process is documented `in the DAML repository <https://github.com/digital-asset/daml/blob/master/release/RELEASE.md>`_ so only the schedule for monthly releases is covered here.
Weekly snapshot and monthly stable releases follow a regular process and schedule. The process is documented `in the DAML repository <https://github.com/digital-asset/daml/blob/main/release/RELEASE.md>`_ so only the schedule for monthly releases is covered here.
Selecting a Release Candidate

2
docs/source/support/support.rst
View File

@ -15,7 +15,7 @@ Have questions or feedback? You're in the right place.
If you want to give feedback, you can make a topic in the ``General`` category `on our forum <https://discuss.daml.com>`_.
When you're in the community Forum or on Stack Overflow, please keep to our `Code of Conduct <https://github.com/digital-asset/daml/blob/master/CODE_OF_CONDUCT.md>`__.
When you're in the community Forum or on Stack Overflow, please keep to our `Code of Conduct <https://github.com/digital-asset/daml/blob/main/CODE_OF_CONDUCT.md>`__.
Support expectations
--------------------

2
fmt.sh
View File

@ -60,7 +60,7 @@ USAGE
;;
--diff)
shift
merge_base="$(git merge-base origin/master HEAD)"
merge_base="$(git merge-base origin/main HEAD)"
scalafmt_args+=('--mode=diff' "--diff-branch=${merge_base}")
hlint_diff=true
;;

2
infra/macos/1-create-box/README.md
View File

@ -171,7 +171,7 @@ git checkout 0ef5e055659230e2fb2ae9b0928f70dc27c1c136
```
where, again, this is the commit I tested with, so I am providing it for
maximum reproducibility, but I have no reason to mistrust the master branch.
maximum reproducibility, but I have no reason to mistrust the `master` branch.
Finally, run:
```bash

2
infra/vsts_agent_linux_startup.sh
View File

@ -163,7 +163,7 @@ NIX_CONF
systemctl restart nix-daemon
# Warm up local caches by building dev-env and current daml master
# Warm up local caches by building dev-env and current daml main
# This is allowed to fail, as we still want to have CI machines
# around, even when their caches are only warmed up halfway
su --login vsts <<'CACHE_WARMUP'

2
language-support/hs/bindings/examples/nim/demo.md
View File

@ -13,7 +13,7 @@ Notes on the format of this file:
$ bazel build language-support/hs/bindings/examples/nim/...
$ daml install latest --activate
## 1. Look at [Nim.daml](https://github.com/digital-asset/daml/blob/master/language-support/hs/bindings/examples/nim/daml/Nim.daml)
## 1. Look at [Nim.daml](https://github.com/digital-asset/daml/blob/main/language-support/hs/bindings/examples/nim/daml/Nim.daml)
`Nim.daml` models the operation of the game room and the rules of Nim:

2
language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/components/LedgerViewFlowableSpec.scala
View File

@ -31,7 +31,7 @@ class LedgerViewFlowableSpec extends AnyFlatSpec with Matchers {
// the emitted element with a proper failure.
// The test should also never be result in a false negative, which
// means that even is the element is emitted after the timeout, the
// test would still be green and cause no red masters.
// test would still be green and cause no red mains.
ledgerViewFlowable
.timeout(10, TimeUnit.MILLISECONDS)
.blockingFirst()

6
language-support/ts/codegen/README.md
View File

@ -12,7 +12,7 @@ all DALFs in that DAR. The output will be written into the directory `DIR`
you specify via the `-o` option.
Currently, the generated interfaces are tailored towards the
[`ledger.ts`](https://github.com/digital-asset/davl/blob/master/ui/src/ledger/ledger.ts)
[`ledger.ts`](https://github.com/digital-asset/davl/blob/main/ui/src/ledger/ledger.ts)
module of DAVL.
## How to develop daml2js
@ -70,7 +70,7 @@ bazel run //language-support/ts/codegen:daml2js -- -o ~/tmp/davl/daml2js ~/proje
## What `daml2js` generates
The DAML SDK documentation contains [a page](https://github.com/digital-asset/daml/tree/master/docs/source/daml2js) on `daml2js`. It is recommended that you start with this. The remainder of this section contains additional detail (mostly about serialization code). The code that `daml2js` generates uses the [@daml/types](https://github.com/digital-asset/daml/tree/master/language-support/ts/daml-types) and [@mojotech/json-type-validation](https://github.com/mojotech/json-type-validation) libraries. All TypeScript modules generated by `daml2js` begin with the following fragment:
The DAML SDK documentation contains [a page](https://github.com/digital-asset/daml/tree/main/docs/source/daml2js) on `daml2js`. It is recommended that you start with this. The remainder of this section contains additional detail (mostly about serialization code). The code that `daml2js` generates uses the [@daml/types](https://github.com/digital-asset/daml/tree/main/language-support/ts/daml-types) and [@mojotech/json-type-validation](https://github.com/mojotech/json-type-validation) libraries. All TypeScript modules generated by `daml2js` begin with the following fragment:
```typescript
import * as jtv from '@mojotech/json-type-validation';
import * as daml from '@daml/types';
@ -81,7 +81,7 @@ import * as daml from '@daml/types';
#### Types
See the [SDK docs](https://github.com/digital-asset/daml/tree/master/docs/source/daml2js).
See the [SDK docs](https://github.com/digital-asset/daml/tree/main/docs/source/daml2js).
#### Interfaces

4
language-support/ts/daml-ledger/README.md
View File

@ -143,8 +143,8 @@ token with admin access.
## Source
https://github.com/digital-asset/daml/tree/master/language-support/ts/daml-ledger
https://github.com/digital-asset/daml/tree/main/language-support/ts/daml-ledger
## License
[Apache-2.0](https://github.com/digital-asset/daml/blob/master/LICENSE)
[Apache-2.0](https://github.com/digital-asset/daml/blob/main/LICENSE)

2
release.sh
View File

@ -93,7 +93,7 @@ fi
commit_belongs_to_release_branch() {
git branch --all --format='%(refname:short)' --contains="$1" \
| grep -q -E '^origin/(master$|release/)'
| grep -q -E '^origin/(main$|release/)'
}
new_snapshot () {

6
release/RELEASE.md
View File

@ -3,7 +3,7 @@
For snapshot releases, skip the steps marked **[STABLE]**. For stable releases,
skip the steps marked **[SNAPSHOT]**.
Valid commits for a release should come from either the `master` branch or one
Valid commits for a release should come from either the `main` branch or one
of the support `release/a.b.x` branches (e.g. `release/1.0.x` branch is for
patches we backport to the 1.0 release branch).
@ -22,7 +22,7 @@ patches we backport to the 1.0 release branch).
(`#team-daml`) if you're not sure.
If you are manually creating the PR for an out-of-schedule snapshot, start
from latest master and run
from latest `main` and run
```
./release.sh snapshot <sha> <prefix>
```
@ -43,7 +43,7 @@ patches we backport to the 1.0 release branch).
of this writing (2020-08-13), @bame-da, @gerolf-da, @cocreature or
@hurryabit.
1. Merge the PR and wait for the corresponding `master` build to finish. You
1. Merge the PR and wait for the corresponding `main` build to finish. You
will be notified on `#team-daml`.
1. On Windows, install the new SDK using the installer on

2
templates/create-daml-app/README.md.template
View File

@ -1,7 +1,7 @@
[![DAML logo](https://daml.com/static/images/logo.png)](https://www.daml.com)
[![Download](https://img.shields.io/github/release/digital-asset/daml.svg?label=Download)](https://docs.daml.com/getting-started/installation.html)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/digital-asset/daml/blob/master/LICENSE)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/digital-asset/daml/blob/main/LICENSE)
# Welcome to _Create DAML App_