Merge branch 'extended-typeorm' into 'dev'

Use extended-typeorm to prevent db transaction conflicts See merge request ergo/rosen-bridge/guard-service!430
rosen-bridge · Dec 24, 2024 · 568f63e · 568f63e
2 parents f6da091 + 6aea616
commit 568f63e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/.changeset/loud-bags-reflect.md b/.changeset/loud-bags-reflect.md
@@ -0,0 +1,5 @@
+---
+'guard-service': patch
+---
+
+Use @rosen-bridge/extended-typeorm to prevent db transaction conflicts
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -46,6 +46,7 @@
     "@rosen-bridge/discord-notification": "^0.1.3",
     "@rosen-bridge/evm-address-tx-extractor": "^1.0.4",
     "@rosen-bridge/evm-rpc-scanner": "^1.0.4",
+    "@rosen-bridge/extended-typeorm": "^0.0.3",
     "@rosen-bridge/health-check": "^6.0.4",
     "@rosen-bridge/log-level-check": "^1.0.4",
     "@rosen-bridge/minimum-fee": "^2.2.2",

diff --git a/src/db/dataSource.ts b/src/db/dataSource.ts
@@ -1,4 +1,4 @@
-import { DataSource } from 'typeorm';
+import { DataSource } from '@rosen-bridge/extended-typeorm';
 import Configs from '../configs/Configs';
 
 import {