diff --git a/canton/community/bindings-java/src/main/java/com/daml/ledger/javaapi/data/ContractMetadata.java b/canton/community/bindings-java/src/main/java/com/daml/ledger/javaapi/data/ContractMetadata.java deleted file mode 100644 index 934c2af56b..0000000000 --- a/canton/community/bindings-java/src/main/java/com/daml/ledger/javaapi/data/ContractMetadata.java +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright (c) 2023 Digital Asset (Switzerland) GmbH and/or its affiliates. -// Proprietary code. All rights reserved. - -package com.daml.ledger.javaapi.data; - -import com.daml.ledger.api.v1.ContractMetadataOuterClass; -import com.google.protobuf.ByteString; -import java.time.Instant; -import java.util.Objects; -import org.checkerframework.checker.nullness.qual.NonNull; - -public final class ContractMetadata { - - // Note that we can't use a `com.daml.ledger.javaapi.data.Timestamp` here because - // it only supports milliseconds-precision and we require lossless conversions through - // from/toProto. - public final Instant createdAt; - public final ByteString driverMetadata; - public final ByteString contractKeyHash; - - public static ContractMetadata Empty() { - return new ContractMetadata(Instant.EPOCH, ByteString.EMPTY, ByteString.EMPTY); - } - - public ContractMetadata( - @NonNull Instant createdAt, - @NonNull ByteString contractKeyHash, - @NonNull ByteString driverMetadata) { - this.createdAt = createdAt; - this.contractKeyHash = contractKeyHash; - this.driverMetadata = driverMetadata; - } - - @NonNull - public static ContractMetadata fromProto(ContractMetadataOuterClass.ContractMetadata metadata) { - return new ContractMetadata( - Instant.ofEpochSecond( - metadata.getCreatedAt().getSeconds(), metadata.getCreatedAt().getNanos()), - metadata.getContractKeyHash(), - metadata.getDriverMetadata()); - } - - public ContractMetadataOuterClass.ContractMetadata toProto() { - return ContractMetadataOuterClass.ContractMetadata.newBuilder() - .setCreatedAt( - com.google.protobuf.Timestamp.newBuilder() - .setSeconds(this.createdAt.getEpochSecond()) - .setNanos(this.createdAt.getNano()) - .build()) - .setContractKeyHash(this.contractKeyHash) - .setDriverMetadata(this.driverMetadata) - .build(); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - ContractMetadata that = (ContractMetadata) o; - return Objects.equals(createdAt, that.createdAt) - && Objects.equals(contractKeyHash, that.contractKeyHash) - && Objects.equals(driverMetadata, that.driverMetadata); - } - - @Override - public int hashCode() { - return Objects.hash(createdAt, contractKeyHash, driverMetadata); - } - - @Override - public String toString() { - return "ContractMetadata{" - + "createdAt='" - + createdAt - + '\'' - + ", contractKeyHash='" - + contractKeyHash - + '\'' - + ", driverMetadata='" - + driverMetadata - + '\'' - + '}'; - } -} diff --git a/canton/community/ledger-api/src/main/protobuf/com/daml/ledger/api/v1/admin/metering_report_service.proto b/canton/community/ledger-api/src/main/protobuf/com/daml/ledger/api/v1/admin/metering_report_service.proto index 5e408999f3..017b00de83 100644 --- a/canton/community/ledger-api/src/main/protobuf/com/daml/ledger/api/v1/admin/metering_report_service.proto +++ b/canton/community/ledger-api/src/main/protobuf/com/daml/ledger/api/v1/admin/metering_report_service.proto @@ -52,7 +52,7 @@ message GetMeteringReportResponse { google.protobuf.Timestamp report_generation_time = 3; // The metering report json. For a JSON Schema definition of the JSon see: - // https://github.com/digital-asset/daml/blob/main/canton/metering-report-schema.json + // https://github.com/digital-asset/daml/blob/main/ledger-api/grpc-definitions/metering-report-schema.json google.protobuf.Struct metering_report_json = 4; } diff --git a/test-common/canton/BUILD.bazel b/test-common/canton/BUILD.bazel index 5aa0c89f54..38f29c5ec3 100644 --- a/test-common/canton/BUILD.bazel +++ b/test-common/canton/BUILD.bazel @@ -23,9 +23,9 @@ if [ "{local}" = "true" ]; then exit 0 fi -CANTON_ENTERPRISE_VERSION=2.8.0-snapshot.20231201.11605.0.vdef89654 -CANTON_ENTERPRISE_SHA=0702607cca1362d2c7e2bfaaad0302a07e523b883bbaba2cff411050c9f3f654 -CANTON_ENTERPRISE_URL=https://digitalasset.jfrog.io/artifactory/assembly/daml/canton-backup/2.8.0-snapshot.20231201.11605.0.vdef89654/0702607cca1362d2c7e2bfaaad0302a07e523b883bbaba2cff411050c9f3f654/canton-enterprise-2.8.0-snapshot.20231201.11605.0.vdef89654.tar.gz +CANTON_ENTERPRISE_VERSION=2.8.0-snapshot.20231204.11608.0.v7e37cf1d +CANTON_ENTERPRISE_SHA=bf8789448dee6da814683205886746ab08403efcb7969379c6e8fcfc9899ea5b +CANTON_ENTERPRISE_URL=https://digitalasset.jfrog.io/artifactory/assembly/daml/canton-backup/2.8.0-snapshot.20231204.11608.0.v7e37cf1d/bf8789448dee6da814683205886746ab08403efcb7969379c6e8fcfc9899ea5b/canton-enterprise-2.8.0-snapshot.20231204.11608.0.v7e37cf1d.tar.gz url=$$CANTON_ENTERPRISE_URL