diff --git a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/blockchain.ts b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/blockchain.ts index ffff61f1a..fe7dbd62c 100644 --- a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/blockchain.ts +++ b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/blockchain.ts @@ -4,8 +4,10 @@ import { GradidoTransaction, HieroAccountId, InMemoryBlockchain, + InMemoryBlockchainProvider, LedgerAnchor, Profiler, + TransactionEntry, } from 'gradido-blockchain-js' import { NotEnoughGradidoBalanceError } from './errors' @@ -38,6 +40,9 @@ export function addToBlockchain( throw new NotEnoughGradidoBalanceError(needed, exist) } } + // const wekingheim = InMemoryBlockchainProvider.getInstance().getBlockchain('wekingheim') + // const lastTransactionw = wekingheim?.findOne(Filter.LAST_TRANSACTION) + const lastTransaction = blockchain.findOne(Filter.LAST_TRANSACTION) throw new Error(`Transaction ${transaction.toJson(true)} not added: ${error}, last transaction was: ${lastTransaction?.getConfirmedTransaction()?.toJson(true)}`) } diff --git a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/bootstrap.ts b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/bootstrap.ts index c1f5bc1ae..3ffad58c8 100644 --- a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/bootstrap.ts +++ b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/bootstrap.ts @@ -1,5 +1,5 @@ import { randomBytes } from 'node:crypto' -import { Abstract, AccountBalances, GradidoTransactionBuilder, InMemoryBlockchain, InMemoryBlockchainProvider, LedgerAnchor } from 'gradido-blockchain-js' +import { AccountBalances, GradidoTransactionBuilder, InMemoryBlockchainProvider, LedgerAnchor } from 'gradido-blockchain-js' import * as v from 'valibot' import { CONFIG } from '../../config' import { deriveFromSeed } from '../../data/deriveKeyPair' @@ -33,7 +33,7 @@ async function bootstrapCommunities(context: Context): Promise { ): GradidoTransactionBuilder { return this.transactionBuilder .setCreatedAt(item.confirmedAt) + .setRecipientCommunity(communityContext.communityId) .addMemo( new EncryptedMemo( item.memo, @@ -104,7 +105,6 @@ export class CreationsSyncRole extends AbstractSyncRole { new TransferAmount(recipientKeyPair.getPublicKey(), item.amount, communityContext.communityId), item.contributionDate, ) - .setRecipientCommunity(communityContext.communityId) .sign(signerKeyPair) } diff --git a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/DeletedTransactionLinksSync.role.ts b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/DeletedTransactionLinksSync.role.ts index 4eb338d37..7e609ff2c 100644 --- a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/DeletedTransactionLinksSync.role.ts +++ b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/DeletedTransactionLinksSync.role.ts @@ -89,6 +89,7 @@ export class DeletedTransactionLinksSyncRole extends AbstractSyncRole { new AuthenticatedEncryption(recipientKeyPair), ), ) + .setSenderCommunity(communityContext.communityId) .setTransactionTransfer( new TransferAmount(senderKeyPair.getPublicKey(), item.amount, communityContext.communityId), recipientKeyPair.getPublicKey(), ) - .setSenderCommunity(communityContext.communityId) .sign(senderKeyPair) } diff --git a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/RedeemTransactionLinksSync.role.ts b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/RedeemTransactionLinksSync.role.ts index 0134c7b6d..e6d9d0c75 100644 --- a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/RedeemTransactionLinksSync.role.ts +++ b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/RedeemTransactionLinksSync.role.ts @@ -103,6 +103,7 @@ export class RedeemTransactionLinksSyncRole extends AbstractSyncRole new AuthenticatedEncryption(recipientKeyPair), ), ) + .setSenderCommunity(senderCommunityId) + .setRecipientCommunity(recipientCommunityId) .setTransactionTransfer( new TransferAmount(senderKeyPair.getPublicKey(), item.amount, senderCommunityId), recipientKeyPair.getPublicKey(), - ) - .setSenderCommunity(senderCommunityId) - .setRecipientCommunity(recipientCommunityId) + ) .sign(senderKeyPair) } @@ -165,6 +165,9 @@ export class RemoteTransactionsSyncRole extends AbstractSyncRole recipientCommunityContext.communityId ) const outboundTransaction = transactionBuilder.buildOutbound() + console.log(ledgerAnchor.toJson(true)) + console.log(outboundTransaction.toJson(true)) + console.log("outbound coin color: %d", outboundTransaction.getTransactionBody()?.getTransferAmount().getCoinCommunityIdIndex()) try { addToBlockchain( @@ -181,6 +184,8 @@ export class RemoteTransactionsSyncRole extends AbstractSyncRole } transactionBuilder.setParentLedgerAnchor(ledgerAnchor) const inboundTransaction = transactionBuilder.buildInbound() + console.log(inboundTransaction.toJson(true)) + console.log("inbound coin color: %d", inboundTransaction.getTransactionBody()?.getTransferAmount().getCoinCommunityIdIndex()) try { addToBlockchain( inboundTransaction, diff --git a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/TransactionLinkFundingsSync.role.ts b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/TransactionLinkFundingsSync.role.ts index 167de11ae..ddbddd9d4 100644 --- a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/TransactionLinkFundingsSync.role.ts +++ b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/TransactionLinkFundingsSync.role.ts @@ -87,14 +87,14 @@ export class TransactionLinkFundingsSyncRole extends AbstractSyncRole { ): GradidoTransactionBuilder { return this.transactionBuilder .setCreatedAt(item.createdAt) + .setSenderCommunity(communityContext.communityId) .setRegisterAddress( userKeyPair.getPublicKey(), AddressType_COMMUNITY_HUMAN, new Uuidv4Hash(item.gradidoId).getAsMemoryBlock(), accountKeyPair.getPublicKey(), ) - .setSenderCommunity(communityContext.communityId) .sign(communityKeyPair) .sign(accountKeyPair) .sign(userKeyPair) diff --git a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/syncDbWithBlockchain.context.ts b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/syncDbWithBlockchain.context.ts index 024836aa0..833b7d6f8 100644 --- a/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/syncDbWithBlockchain.context.ts +++ b/dlt-connector/src/migrations/db-v2.7.0_to_blockchain-v3.7/interaction/syncDbWithBlockchain/syncDbWithBlockchain.context.ts @@ -24,7 +24,7 @@ export async function syncDbWithBlockchainContext(context: Context, batchSize: n new RedeemTransactionLinksSyncRole(context), new ContributionLinkTransactionSyncRole(context), new DeletedTransactionLinksSyncRole(context), - // new RemoteTransactionsSyncRole(context), + new RemoteTransactionsSyncRole(context), ] let transactionsCount = 0 let transactionsCountSinceLastLog = 0 diff --git a/dlt-connector/src/schemas/typeConverter.schema.test.ts b/dlt-connector/src/schemas/typeConverter.schema.test.ts index 5420de106..a46341599 100644 --- a/dlt-connector/src/schemas/typeConverter.schema.test.ts +++ b/dlt-connector/src/schemas/typeConverter.schema.test.ts @@ -102,6 +102,5 @@ describe('basic.schema', () => { ) expect(confirmedTransaction.getId()).toBe(7) expect(confirmedTransaction.getConfirmedAt().getSeconds()).toBe(1609464130) - expect(confirmedTransaction.getVersionNumber()).toBe('3.5') }) })