diff --git a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/Context.ts b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/Context.ts index f9bf2c7b2..cffccc044 100644 --- a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/Context.ts +++ b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/Context.ts @@ -21,11 +21,7 @@ export class Context { public cache: KeyPairCacheManager private timeUsed: Profiler - constructor( - logger: Logger, - db: MySql2Database, - cache: KeyPairCacheManager - ) { + constructor(logger: Logger, db: MySql2Database, cache: KeyPairCacheManager) { this.logger = logger this.db = db this.cache = cache diff --git a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/database.ts b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/database.ts index 69f2bc669..1dccb7609 100644 --- a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/database.ts +++ b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/database.ts @@ -54,10 +54,8 @@ export async function loadCommunities(db: MySql2Database): Promise '2000-01-01'`), - ) + and(isNotNull(communitiesTable.communityUuid), sql`${usersTable.createdAt} > '2000-01-01'`), + ) .orderBy(asc(communitiesTable.id)) .groupBy(communitiesTable.communityUuid) diff --git a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/RemoteTransactionsSync.role.ts b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/RemoteTransactionsSync.role.ts index ea43e5a2b..8638bad25 100644 --- a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/RemoteTransactionsSync.role.ts +++ b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/RemoteTransactionsSync.role.ts @@ -125,7 +125,7 @@ export class RemoteTransactionsSyncRole extends AbstractSyncRole publicKey: MemoryBlockPtr, ): AccountBalances { this.accountBalances.clear() - + // try to use same coins from this community let lastBalance = this.getLastBalanceForUser( publicKey, @@ -133,11 +133,10 @@ export class RemoteTransactionsSyncRole extends AbstractSyncRole coinCommunityId, ) if ( - coinCommunityId != communityContext.communityId && - ( - lastBalance.getBalance().equal(GradidoUnit.zero()) || + coinCommunityId !== communityContext.communityId && + (lastBalance.getBalance().equal(GradidoUnit.zero()) || lastBalance.getBalance().calculateDecay(lastBalance.getDate(), item.balanceDate).lt(amount)) - ) { + ) { // don't work, so we use or own coins lastBalance = this.getLastBalanceForUser( publicKey, @@ -146,8 +145,12 @@ export class RemoteTransactionsSyncRole extends AbstractSyncRole ) } if ( - lastBalance.getBalance().calculateDecay(lastBalance.getDate(), item.balanceDate).add(amount).lt(GradidoUnit.zero()) - && communityContext.foreign + lastBalance + .getBalance() + .calculateDecay(lastBalance.getDate(), item.balanceDate) + .add(amount) + .lt(GradidoUnit.zero()) && + communityContext.foreign ) { this.accountBalances.add(new AccountBalance(publicKey, GradidoUnit.zero(), coinCommunityId)) return this.accountBalances @@ -156,7 +159,7 @@ export class RemoteTransactionsSyncRole extends AbstractSyncRole try { lastBalance.updateLegacyDecay(amount, item.balanceDate) } catch (e) { - if (e instanceof NegativeBalanceError) { + if (e instanceof NegativeBalanceError) { this.logLastBalanceChangingTransactions(publicKey, communityContext.blockchain, 1) throw e } diff --git a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/UsersSync.role.ts b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/UsersSync.role.ts index 2e5ae511a..ec716e547 100644 --- a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/UsersSync.role.ts +++ b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/UsersSync.role.ts @@ -51,7 +51,7 @@ export class UsersSyncRole extends AbstractSyncRole { gt(usersTable.id, lastIndex.id), ), ), - isNotNull(usersTable.communityUuid) + isNotNull(usersTable.communityUuid), ), ) .orderBy(asc(usersTable.createdAt), asc(usersTable.id))