From b71f7944149e9b75258da00586dd16f2ed15b31e Mon Sep 17 00:00:00 2001 From: "fateme.r" Date: Mon, 23 Dec 2024 18:04:40 +0330 Subject: [PATCH 1/2] Use extended-typeorm to prevent db transaction conflicts --- .changeset/rich-yaks-flash.md | 5 +++++ config/dataSource.ts | 2 +- package-lock.json | 1 + package.json | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .changeset/rich-yaks-flash.md diff --git a/.changeset/rich-yaks-flash.md b/.changeset/rich-yaks-flash.md new file mode 100644 index 0000000..b66e690 --- /dev/null +++ b/.changeset/rich-yaks-flash.md @@ -0,0 +1,5 @@ +--- +'@rosen-bridge/watcher': patch +--- + +Use extended-typeorm to prevent db transaction conflicts diff --git a/config/dataSource.ts b/config/dataSource.ts index 2894d8d..7247fef 100644 --- a/config/dataSource.ts +++ b/config/dataSource.ts @@ -18,7 +18,7 @@ import { PermitEntity, CollateralEntity, } from '@rosen-bridge/watcher-data-extractor'; -import { DataSource } from 'typeorm'; +import { DataSource } from '@rosen-bridge/extended-typeorm'; import { getConfig } from '../src/config/config'; import { ObservationStatusEntity } from '../src/database/entities/observationStatusEntity'; diff --git a/package-lock.json b/package-lock.json index 036afe4..cee69bb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,7 @@ "@rosen-bridge/discord-notification": "^0.1.3", "@rosen-bridge/evm-observation-extractor": "3.1.2", "@rosen-bridge/evm-rpc-scanner": "^2.0.0", + "@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/package.json b/package.json index abe5d8e..ecca3e6 100644 --- a/package.json +++ b/package.json @@ -84,6 +84,7 @@ "@rosen-bridge/discord-notification": "^0.1.3", "@rosen-bridge/evm-observation-extractor": "3.1.2", "@rosen-bridge/evm-rpc-scanner": "^2.0.0", + "@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", From 4de7a02cf91c1a61243a7a94eccfad2c36429ff3 Mon Sep 17 00:00:00 2001 From: Essmaeil Mohammadi Date: Tue, 24 Dec 2024 08:10:33 +0000 Subject: [PATCH 2/2] Use full package name in changeset --- .changeset/rich-yaks-flash.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/rich-yaks-flash.md b/.changeset/rich-yaks-flash.md index b66e690..2b8e202 100644 --- a/.changeset/rich-yaks-flash.md +++ b/.changeset/rich-yaks-flash.md @@ -2,4 +2,4 @@ '@rosen-bridge/watcher': patch --- -Use extended-typeorm to prevent db transaction conflicts +Use @rosen-bridge/extended-typeorm to prevent db transaction conflicts