Merge pull request #55 from kaleido-io/protocolid

Alter formatting of blockchain event IDs to match FireFly core
hyperledger · Feb 1, 2022 · 2ae612a · 2ae612a
2 parents b343d6f + 2ed4150
commit 2ae612a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/tokens/tokens.service.ts b/src/tokens/tokens.service.ts
@@ -407,10 +407,17 @@ class TokenListener implements EventListener {
       return undefined;
     }
 
+    // This intentionally matches the formatting of protocol IDs for blockchain events in FireFly core
+    const blockNumber = event.blockNumber ?? '0';
     const txIndex = BigInt(event.transactionIndex).toString(10);
-    let transferId = [event.blockNumber, txIndex, event.logIndex].join('.');
+    const logIndex = event.logIndex ?? '0';
+    let transferId = [
+      blockNumber.padStart(12, '0'),
+      txIndex.padStart(6, '0'),
+      logIndex.padStart(6, '0'),
+    ].join('/');
     if (eventIndex !== undefined) {
-      transferId += `.${eventIndex}`;
+      transferId += '/' + eventIndex.toString(10).padStart(6, '0');
     }
 
     const commonData = <TokenTransferEvent>{

diff --git a/test/app.e2e-spec.ts b/test/app.e2e-spec.ts
@@ -532,7 +532,7 @@ describe('AppController (e2e)', () => {
         expect(message).toEqual(<WebSocketMessage>{
           event: 'token-mint',
           data: <TokenMintEvent>{
-            id: '1.0.1',
+            id: '000000000001/000000/000001',
             poolId: 'F1',
             to: 'A',
             amount: '5',
@@ -620,7 +620,7 @@ describe('AppController (e2e)', () => {
         expect(message).toEqual(<WebSocketMessage>{
           event: 'token-burn',
           data: <TokenBurnEvent>{
-            id: '1.0.1',
+            id: '000000000001/000000/000001',
             poolId: 'N1',
             tokenIndex: '1',
             from: 'A',
@@ -699,7 +699,7 @@ describe('AppController (e2e)', () => {
         expect(message).toEqual(<WebSocketMessage>{
           event: 'token-transfer',
           data: <TokenTransferEvent>{
-            id: '1.0.1',
+            id: '000000000001/000000/000001',
             poolId: 'N1',
             tokenIndex: '1',
             from: 'A',
@@ -828,7 +828,7 @@ describe('AppController (e2e)', () => {
         expect(message).toEqual(<WebSocketMessage>{
           event: 'token-transfer',
           data: <TokenTransferEvent>{
-            id: '1.0.1.0',
+            id: '000000000001/000000/000001/000000',
             poolId: 'N1',
             tokenIndex: '1',
             from: 'A',
@@ -862,7 +862,7 @@ describe('AppController (e2e)', () => {
         expect(message).toEqual(<WebSocketMessage>{
           event: 'token-transfer',
           data: <TokenTransferEvent>{
-            id: '1.0.1.1',
+            id: '000000000001/000000/000001/000001',
             poolId: 'N1',
             tokenIndex: '2',
             from: 'A',