Merge remote-tracking branch 'origin/main' into add-entity-utilities

Makefile

@@ -8,19 +8,20 @@ include ./packages/policy-engine-shared/Makefile
 include ./packages/transaction-request-intent/Makefile
 include ./packages/signature/Makefile
 
-# For more terminal color codes, head over to https://opensource.com/article/19/9/linux-terminal-colors
+# For more terminal color codes, head over to
+# https://opensource.com/article/19/9/linux-terminal-colors
 TERM_NO_COLOR := \033[0m
 TERM_GREEN := \033[0;32m
 
-# == Install ==
+# === Install ===
 
 install:
 	npm install
 
 install/ci:
 	npm ci
 
-# == Setup ==
+# === Setup ===
 
 setup:
 	make install
@@ -32,15 +33,15 @@ setup:
 	@echo ""
 	@echo "${TERM_GREEN}Run 'make armory/start/dev' or/and 'make policy-engine/start/dev' to get them running.${TERM_NO_COLOR}"
 
-# == Docker ==
+# === Docker ===
 
 docker/stop:
 	docker-compose stop
 
 docker/up:
 	docker-compose up --detach
 
-# == Code format ==
+# === Code format ===
 
 format:
 	npx nx format:write --all
@@ -55,3 +56,23 @@ lint:
 
 lint/check:
 	npx nx run-many --target lint
+
+# === Testing ===
+
+test/type:
+	npx nx run-many --target test:type --all
+
+test/unit:
+	npx nx run-many --target test:unit --all
+
+test/integration:
+	npx nx run-many --target test:integration --all
+
+test/e2e:
+	npx nx run-many --target test:e2e --all
+
+test:
+	make test/type
+	make test/unit
+	make test/integration
+	make test/e2e

README.md

@@ -37,6 +37,23 @@ make docker/up
 make docker/stop
 ```
 
+## Testing
+
+To run tests across all existing projects, you can use the following commands:
+
+```bash
+# Run all tests
+make test
+
+make test/type
+make test/unit
+make test/integration
+make test/e2e
+```
+
+These commands utilize the NX CLI's run-many feature to execute the specified
+targets (test or test:type) across all projects in the monorepo. 
+
 ## Formatting
 
 We use [Prettier](https://prettier.io/) and [ESLint](https://eslint.org/) to

apps/armory/Makefile

@@ -113,6 +113,7 @@ armory/test/e2e/watch:
 	make armory/test/e2e ARGS=--watch
 
 armory/test:
+	make armory/test/type
 	make armory/test/unit
 	make armory/test/integration
 	make armory/test/e2e

apps/armory/src/__test__/fixture/price.fixture.ts

@@ -1,4 +1,4 @@
-import { AssetType, Namespace, Prices, assetIdSchema } from '@narval/policy-engine-shared'
+import { AssetId, AssetType, Namespace, Prices } from '@narval/policy-engine-shared'
 import { sample } from 'lodash'
 import { times } from 'lodash/fp'
 import { z } from 'zod'
@@ -15,15 +15,15 @@ export const fiatIdSchema = z.custom<`fiat:${string}`>((value) => {
 
 export const priceSchema = z.record(fiatIdSchema, z.number().min(0))
 
-export const pricesSchema = z.record(assetIdSchema, priceSchema)
+export const pricesSchema = z.record(AssetId, priceSchema)
 
 const fiatIdGenerator = Generator({
   schema: fiatIdSchema,
   output: () => FIAT_ID_USD
 })
 
 const assetIdGenerator = Generator({
-  schema: assetIdSchema,
+  schema: AssetId,
   output: () =>
     sample([
       ...Array.from(CHAINS.values()).map(({ coin }) => coin.id),

apps/armory/src/data-feed/core/service/historical-transfer-feed.service.ts

@@ -2,14 +2,30 @@ import { Feed, HistoricalTransfer, JwtString } from '@narval/policy-engine-share
 import { Alg, Payload, SigningAlg, hash, hexToBase64Url, privateKeyToJwk, signJwt } from '@narval/signature'
 import { Injectable } from '@nestjs/common'
 import { ConfigService } from '@nestjs/config'
-import { mapValues, omit } from 'lodash/fp'
+import { omit } from 'lodash/fp'
 import { privateKeyToAccount } from 'viem/accounts'
 import { Config } from '../../../armory.config'
 import { DataFeed } from '../../../data-feed/core/type/data-feed.type'
 import { AuthorizationRequest } from '../../../orchestration/core/type/domain.type'
+import { FiatId, Price } from '../../../shared/core/type/price.type'
 import { Transfer } from '../../../shared/core/type/transfer-tracking.type'
 import { TransferTrackingService } from '../../../transfer-tracking/core/service/transfer-tracking.service'
 
+const buildHistoricalTranferRates = (rates: Price): Record<string, string> => {
+  return Object.keys(rates).reduce(
+    (acc, currency) => {
+      const price = rates[currency as FiatId]
+
+      if (price) {
+        acc[currency] = price.toString()
+      }
+
+      return acc
+    },
+    {} as Record<string, string>
+  )
+}
+
 @Injectable()
 export class HistoricalTransferFeedService implements DataFeed<HistoricalTransfer[]> {
   static SOURCE_ID = 'armory/historical-transfer-feed'
@@ -74,7 +90,7 @@ export class HistoricalTransferFeedService implements DataFeed<HistoricalTransfe
       ...omit('orgId', transfer),
       amount: transfer.amount.toString(),
       timestamp: transfer.createdAt.getTime(),
-      rates: mapValues((value) => value.toString(), transfer.rates)
+      rates: buildHistoricalTranferRates(transfer.rates)
     }))
   }
 }

apps/armory/src/orchestration/core/service/authorization-request.service.ts

@@ -152,10 +152,12 @@ export class AuthorizationRequestService {
           to: intent.to,
           token: intent.token,
           chainId: authzRequest.request.transactionRequest.chainId,
-          initiatedBy: authzRequest.authentication, // TODO: Get real initiator? -- this used to reference publicKey but should actually pull data out of a decoded JWT
+          // TODO: (@mattschoch) Get real initiator? -- this used to reference publicKey but
+          // should actually pull data out of a decoded JWT
+          initiatedBy: authzRequest.authentication,
           createdAt: new Date(),
           amount: BigInt(intent.amount),
-          rates: transferPrices[intent.token]
+          rates: transferPrices[intent.token] || {}
         }
 
         await this.transferTrackingService.track(transfer)

apps/armory/src/shared/core/type/price.type.ts

@@ -4,6 +4,6 @@ export type FiatId = `fiat:${string}`
 
 // Not sure about using a plain number wouldn't result in precision loss with
 // crypto-to-crypto rates.
-export type Price = Record<FiatId, number>
+export type Price = Record<FiatId, number | undefined>
 
-export type Prices = Record<AssetId, Price>
+export type Prices = Record<AssetId, Price | undefined>

apps/armory/src/transfer-tracking/core/service/__test__/e2e/transfer-tracking.service.spec.ts

@@ -60,7 +60,7 @@ describe(TransferTrackingService.name, () => {
       expect(first(models)).toEqual({
         ...transfer,
         amount: transfer.amount.toString(),
-        rates: mapValues((value) => value.toString(), transfer.rates)
+        rates: mapValues((value) => value?.toString(), transfer.rates)
       })
     })
 

apps/policy-engine/Makefile

@@ -115,6 +115,7 @@ policy-engine/test/e2e/watch:
 	make policy-engine/test/e2e ARGS=--watch
 
 policy-engine/test:
+	make policy-engine/test/type
 	make policy-engine/test/unit
 	make policy-engine/test/integration
 	make policy-engine/test/e2e

apps/policy-engine/README.md

@@ -23,6 +23,9 @@ make policy-engine/start/dev
 ## Testing
 
 ```bash
+# Run all tests
+make policy-engine/test
+
 make policy-engine/test/type
 make policy-engine/test/unit
 make policy-engine/test/integration