Merge pull request #416 from radixdlt/release/grape

Release/grape

Directory.Packages.props

@@ -22,7 +22,7 @@
     <PackageVersion Include="prometheus-net" Version="8.0.1" />
     <PackageVersion Include="prometheus-net.AspNetCore" Version="8.0.1" />
     <PackageVersion Include="prometheus-net.AspNetCore.HealthChecks" Version="8.0.1" />
-    <PackageVersion Include="RadixDlt.RadixEngineToolkit" Version="0.12.0-fig.1-commit-e24bdbc" />
+    <PackageVersion Include="RadixDlt.RadixEngineToolkit" Version="0.12.0-grape.1-commit-4e62252" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <!-- build time dependencies -->
     <PackageVersion Include="coverlet.collector" Version="6.0.0" />

apps/DataAggregator/Dockerfile

@@ -1,13 +1,14 @@
 # This dockerfile should be build with the context at the root of the repo, eg, from the repo root:
 # docker build -f apps/DataAggregator/Dockerfile .
 
-FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
+# We use 7.0-bookworm-slim for Debian 12 with glibc 2.36+, to get at least glibc 2.33 for the engine toolkit
+FROM mcr.microsoft.com/dotnet/aspnet:7.0-bookworm-slim AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 EXPOSE 1235
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0-bookworm-slim AS build
 WORKDIR /src
 COPY . .
 RUN dotnet restore "apps/DataAggregator/DataAggregator.csproj"

apps/DatabaseMigrations/Dockerfile

@@ -1,10 +1,11 @@
 # This dockerfile should be build with the context at the root of the repo, eg, from the repo root:
 # docker build -f apps/DatabaseMigrations/Dockerfile .
 
-FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
+# We use 7.0-bookworm-slim for Debian 12 with glibc 2.36+, to get at least glibc 2.33 for the engine toolkit
+FROM mcr.microsoft.com/dotnet/aspnet:7.0-bookworm-slim AS base
 WORKDIR /app
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0-bookworm-slim AS build
 WORKDIR /src
 COPY . .
 RUN dotnet restore "apps/DatabaseMigrations/DatabaseMigrations.csproj"

apps/GatewayApi/Dockerfile

@@ -1,13 +1,14 @@
 # This dockerfile should be build with the context at the root of the repo, eg, from the repo root:
 # docker build -f apps/GatewayAPI/Dockerfile .
 
-FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
+# We use 7.0-bookworm-slim for Debian 12 with glibc 2.36+, to get at least glibc 2.33 for the engine toolkit
+FROM mcr.microsoft.com/dotnet/aspnet:7.0-bookworm-slim AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 EXPOSE 1235
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0-bookworm-slim AS build
 WORKDIR /src
 COPY . .
 RUN dotnet restore "apps/GatewayApi/GatewayApi.csproj"

deployment/ci.env

@@ -1,4 +1,4 @@
 # Git commit version of most recent Node compatible with this Network Gateway (only used in CI/CD environments)
-FULLNODE_COMMIT=ae36def40807f0ad2741123f00aeae072d04f336
-FULLNODE_VERSION=sha-ae36def
+FULLNODE_COMMIT=606392924f336f2c88ddee3e4b997292704bee1c
+FULLNODE_VERSION=sha-6063929
 POSTGRES_VERSION=14.3.0

sdk/typescript/README.md

@@ -37,15 +37,15 @@ Low level APIs are generated automatically based on OpenAPI spec. You can get a
 ### Using generated APIs through `innerClient`
 
 ```typescript
-async function getTransactionStatus(transactionIntentHashHex: string) {
+async function getTransactionStatus(transactionIntentHash: string) {
   let response = await gatewayApi.transaction.innerClient.transactionStatus({
     transactionStatusRequest: {
-      intent_hash_hex: transactionIntentHashHex,
+      intent_hash: transactionIntentHash,
     },
   })
   return response.status
 }
-console.log(await getTransactionStatus('266cdfe0a28a761909d04761cdbfe33555ee5fdcf1db37fcf71c9a644b53e60b'))
+console.log(await getTransactionStatus('txid_tdx_21_18g0pfaxkprvz3c5tee8aydhujmm74yeul7v824fvaye2n7fvlzfqvpn2kz'))
 ```
 
 ### Using generated APIs manually
@@ -76,7 +76,7 @@ High Level APIs will grow over time as we start encountering repeating patterns
 - `getEntityMetadata(entity: string, cursor?: string)` - get paged metadata about given entity
 - `getValidators(cursor?: string)` - get paged validators
 - `getAllValidators()` - get all validators
-- `getNonFungibleIds(address:string, cursor?: string)` - get paged non fungible ids for given address
+- `getNonFungibleIds(address:string, ledgerState, cursor?: string)` - get paged non fungible ids for given address
 - `getAllNonFungibleIds(address: string)` - get all non fungible ids for given address
 - `getNonFungibleData(address: string, ids: string | string[])` - get non fungible data
 

sdk/typescript/lib/generated/.openapi-generator/FILES

@@ -235,12 +235,12 @@ models/StreamTransactionsRequestAllOf.ts
 models/StreamTransactionsRequestEventFilterItem.ts
 models/StreamTransactionsResponse.ts
 models/StreamTransactionsResponseAllOf.ts
-models/TransactionCommittedDetailsOptIns.ts
 models/TransactionCommittedDetailsRequest.ts
 models/TransactionCommittedDetailsRequestAllOf.ts
 models/TransactionCommittedDetailsResponse.ts
 models/TransactionCommittedDetailsResponseAllOf.ts
 models/TransactionConstructionResponse.ts
+models/TransactionDetailsOptIns.ts
 models/TransactionNotFoundError.ts
 models/TransactionNotFoundErrorAllOf.ts
 models/TransactionPreviewRequest.ts

sdk/typescript/lib/generated/models/CommittedTransactionInfo.ts

@@ -63,17 +63,17 @@ export interface CommittedTransactionInfo {
      */
     transaction_status: TransactionStatus;
     /**
-     * Hex-encoded SHA-256 hash.
+     * Bech32m-encoded hash.
      * @type {string}
      * @memberof CommittedTransactionInfo
      */
-    payload_hash_hex?: string;
+    payload_hash?: string;
     /**
-     * Hex-encoded SHA-256 hash.
+     * Bech32m-encoded hash.
      * @type {string}
      * @memberof CommittedTransactionInfo
      */
-    intent_hash_hex?: string;
+    intent_hash?: string;
     /**
      * String-encoded decimal representing the amount of a related fungible resource.
      * @type {string}
@@ -111,11 +111,11 @@ export interface CommittedTransactionInfo {
      */
     receipt?: TransactionReceipt;
     /**
-     * Hex-encoded binary blob.
-     * @type {string}
+     * defined in core api specs.
+     * @type {object}
      * @memberof CommittedTransactionInfo
      */
-    message_hex?: string;
+    message?: object;
 }
 
 /**
@@ -147,15 +147,15 @@ export function CommittedTransactionInfoFromJSONTyped(json: any, ignoreDiscrimin
         'round': json['round'],
         'round_timestamp': json['round_timestamp'],
         'transaction_status': TransactionStatusFromJSON(json['transaction_status']),
-        'payload_hash_hex': !exists(json, 'payload_hash_hex') ? undefined : json['payload_hash_hex'],
-        'intent_hash_hex': !exists(json, 'intent_hash_hex') ? undefined : json['intent_hash_hex'],
+        'payload_hash': !exists(json, 'payload_hash') ? undefined : json['payload_hash'],
+        'intent_hash': !exists(json, 'intent_hash') ? undefined : json['intent_hash'],
         'fee_paid': !exists(json, 'fee_paid') ? undefined : json['fee_paid'],
         'affected_global_entities': !exists(json, 'affected_global_entities') ? undefined : json['affected_global_entities'],
         'confirmed_at': !exists(json, 'confirmed_at') ? undefined : (json['confirmed_at'] === null ? null : new Date(json['confirmed_at'])),
         'error_message': !exists(json, 'error_message') ? undefined : json['error_message'],
         'raw_hex': !exists(json, 'raw_hex') ? undefined : json['raw_hex'],
         'receipt': !exists(json, 'receipt') ? undefined : TransactionReceiptFromJSON(json['receipt']),
-        'message_hex': !exists(json, 'message_hex') ? undefined : json['message_hex'],
+        'message': !exists(json, 'message') ? undefined : json['message'],
     };
 }
 
@@ -173,15 +173,15 @@ export function CommittedTransactionInfoToJSON(value?: CommittedTransactionInfo
         'round': value.round,
         'round_timestamp': value.round_timestamp,
         'transaction_status': TransactionStatusToJSON(value.transaction_status),
-        'payload_hash_hex': value.payload_hash_hex,
-        'intent_hash_hex': value.intent_hash_hex,
+        'payload_hash': value.payload_hash,
+        'intent_hash': value.intent_hash,
         'fee_paid': value.fee_paid,
         'affected_global_entities': value.affected_global_entities,
         'confirmed_at': value.confirmed_at === undefined ? undefined : (value.confirmed_at === null ? null : value.confirmed_at.toISOString()),
         'error_message': value.error_message,
         'raw_hex': value.raw_hex,
         'receipt': TransactionReceiptToJSON(value.receipt),
-        'message_hex': value.message_hex,
+        'message': value.message,
     };
 }
 

sdk/typescript/lib/generated/models/StreamTransactionsRequest.ts

@@ -25,12 +25,12 @@ import {
     StreamTransactionsRequestEventFilterItemFromJSONTyped,
     StreamTransactionsRequestEventFilterItemToJSON,
 } from './StreamTransactionsRequestEventFilterItem';
-import type { TransactionCommittedDetailsOptIns } from './TransactionCommittedDetailsOptIns';
+import type { TransactionDetailsOptIns } from './TransactionDetailsOptIns';
 import {
-    TransactionCommittedDetailsOptInsFromJSON,
-    TransactionCommittedDetailsOptInsFromJSONTyped,
-    TransactionCommittedDetailsOptInsToJSON,
-} from './TransactionCommittedDetailsOptIns';
+    TransactionDetailsOptInsFromJSON,
+    TransactionDetailsOptInsFromJSONTyped,
+    TransactionDetailsOptInsToJSON,
+} from './TransactionDetailsOptIns';
 
 /**
  * 
@@ -106,10 +106,10 @@ export interface StreamTransactionsRequest {
     order?: StreamTransactionsRequestOrderEnum;
     /**
      * 
-     * @type {TransactionCommittedDetailsOptIns}
+     * @type {TransactionDetailsOptIns}
      * @memberof StreamTransactionsRequest
      */
-    opt_ins?: TransactionCommittedDetailsOptIns;
+    opt_ins?: TransactionDetailsOptIns;
 }
 
 
@@ -163,7 +163,7 @@ export function StreamTransactionsRequestFromJSONTyped(json: any, ignoreDiscrimi
         'affected_global_entities_filter': !exists(json, 'affected_global_entities_filter') ? undefined : json['affected_global_entities_filter'],
         'events_filter': !exists(json, 'events_filter') ? undefined : ((json['events_filter'] as Array<any>).map(StreamTransactionsRequestEventFilterItemFromJSON)),
         'order': !exists(json, 'order') ? undefined : json['order'],
-        'opt_ins': !exists(json, 'opt_ins') ? undefined : TransactionCommittedDetailsOptInsFromJSON(json['opt_ins']),
+        'opt_ins': !exists(json, 'opt_ins') ? undefined : TransactionDetailsOptInsFromJSON(json['opt_ins']),
     };
 }
 
@@ -187,7 +187,7 @@ export function StreamTransactionsRequestToJSON(value?: StreamTransactionsReques
         'affected_global_entities_filter': value.affected_global_entities_filter,
         'events_filter': value.events_filter === undefined ? undefined : ((value.events_filter as Array<any>).map(StreamTransactionsRequestEventFilterItemToJSON)),
         'order': value.order,
-        'opt_ins': TransactionCommittedDetailsOptInsToJSON(value.opt_ins),
+        'opt_ins': TransactionDetailsOptInsToJSON(value.opt_ins),
     };
 }
 

sdk/typescript/lib/generated/models/StreamTransactionsRequestAllOf.ts

@@ -25,12 +25,12 @@ import {
     StreamTransactionsRequestEventFilterItemFromJSONTyped,
     StreamTransactionsRequestEventFilterItemToJSON,
 } from './StreamTransactionsRequestEventFilterItem';
-import type { TransactionCommittedDetailsOptIns } from './TransactionCommittedDetailsOptIns';
+import type { TransactionDetailsOptIns } from './TransactionDetailsOptIns';
 import {
-    TransactionCommittedDetailsOptInsFromJSON,
-    TransactionCommittedDetailsOptInsFromJSONTyped,
-    TransactionCommittedDetailsOptInsToJSON,
-} from './TransactionCommittedDetailsOptIns';
+    TransactionDetailsOptInsFromJSON,
+    TransactionDetailsOptInsFromJSONTyped,
+    TransactionDetailsOptInsToJSON,
+} from './TransactionDetailsOptIns';
 
 /**
  * 
@@ -88,10 +88,10 @@ export interface StreamTransactionsRequestAllOf {
     order?: StreamTransactionsRequestAllOfOrderEnum;
     /**
      * 
-     * @type {TransactionCommittedDetailsOptIns}
+     * @type {TransactionDetailsOptIns}
      * @memberof StreamTransactionsRequestAllOf
      */
-    opt_ins?: TransactionCommittedDetailsOptIns;
+    opt_ins?: TransactionDetailsOptIns;
 }
 
 
@@ -142,7 +142,7 @@ export function StreamTransactionsRequestAllOfFromJSONTyped(json: any, ignoreDis
         'affected_global_entities_filter': !exists(json, 'affected_global_entities_filter') ? undefined : json['affected_global_entities_filter'],
         'events_filter': !exists(json, 'events_filter') ? undefined : ((json['events_filter'] as Array<any>).map(StreamTransactionsRequestEventFilterItemFromJSON)),
         'order': !exists(json, 'order') ? undefined : json['order'],
-        'opt_ins': !exists(json, 'opt_ins') ? undefined : TransactionCommittedDetailsOptInsFromJSON(json['opt_ins']),
+        'opt_ins': !exists(json, 'opt_ins') ? undefined : TransactionDetailsOptInsFromJSON(json['opt_ins']),
     };
 }
 
@@ -163,7 +163,7 @@ export function StreamTransactionsRequestAllOfToJSON(value?: StreamTransactionsR
         'affected_global_entities_filter': value.affected_global_entities_filter,
         'events_filter': value.events_filter === undefined ? undefined : ((value.events_filter as Array<any>).map(StreamTransactionsRequestEventFilterItemToJSON)),
         'order': value.order,
-        'opt_ins': TransactionCommittedDetailsOptInsToJSON(value.opt_ins),
+        'opt_ins': TransactionDetailsOptInsToJSON(value.opt_ins),
     };
 }
 

sdk/typescript/lib/generated/models/TransactionCommittedDetailsRequest.ts

@@ -19,12 +19,12 @@ import {
     LedgerStateSelectorFromJSONTyped,
     LedgerStateSelectorToJSON,
 } from './LedgerStateSelector';
-import type { TransactionCommittedDetailsOptIns } from './TransactionCommittedDetailsOptIns';
+import type { TransactionDetailsOptIns } from './TransactionDetailsOptIns';
 import {
-    TransactionCommittedDetailsOptInsFromJSON,
-    TransactionCommittedDetailsOptInsFromJSONTyped,
-    TransactionCommittedDetailsOptInsToJSON,
-} from './TransactionCommittedDetailsOptIns';
+    TransactionDetailsOptInsFromJSON,
+    TransactionDetailsOptInsFromJSONTyped,
+    TransactionDetailsOptInsToJSON,
+} from './TransactionDetailsOptIns';
 
 /**
  * 
@@ -39,25 +39,25 @@ export interface TransactionCommittedDetailsRequest {
      */
     at_ledger_state?: LedgerStateSelector | null;
     /**
-     * Hex-encoded SHA-256 hash.
+     * Bech32m-encoded hash.
      * @type {string}
      * @memberof TransactionCommittedDetailsRequest
      */
-    intent_hash_hex: string;
+    intent_hash: string;
     /**
      * 
-     * @type {TransactionCommittedDetailsOptIns}
+     * @type {TransactionDetailsOptIns}
      * @memberof TransactionCommittedDetailsRequest
      */
-    opt_ins?: TransactionCommittedDetailsOptIns;
+    opt_ins?: TransactionDetailsOptIns;
 }
 
 /**
  * Check if a given object implements the TransactionCommittedDetailsRequest interface.
  */
 export function instanceOfTransactionCommittedDetailsRequest(value: object): boolean {
     let isInstance = true;
-    isInstance = isInstance && "intent_hash_hex" in value;
+    isInstance = isInstance && "intent_hash" in value;
 
     return isInstance;
 }
@@ -73,8 +73,8 @@ export function TransactionCommittedDetailsRequestFromJSONTyped(json: any, ignor
     return {
 
         'at_ledger_state': !exists(json, 'at_ledger_state') ? undefined : LedgerStateSelectorFromJSON(json['at_ledger_state']),
-        'intent_hash_hex': json['intent_hash_hex'],
-        'opt_ins': !exists(json, 'opt_ins') ? undefined : TransactionCommittedDetailsOptInsFromJSON(json['opt_ins']),
+        'intent_hash': json['intent_hash'],
+        'opt_ins': !exists(json, 'opt_ins') ? undefined : TransactionDetailsOptInsFromJSON(json['opt_ins']),
     };
 }
 
@@ -88,8 +88,8 @@ export function TransactionCommittedDetailsRequestToJSON(value?: TransactionComm
     return {
 
         'at_ledger_state': LedgerStateSelectorToJSON(value.at_ledger_state),
-        'intent_hash_hex': value.intent_hash_hex,
-        'opt_ins': TransactionCommittedDetailsOptInsToJSON(value.opt_ins),
+        'intent_hash': value.intent_hash,
+        'opt_ins': TransactionDetailsOptInsToJSON(value.opt_ins),
     };
 }