Merge pull request #38 from EOSIO/develop

Release 3.1.0
EOSIO · Jan 3, 2019 · 733cf15 · 733cf15
2 parents c7e74f9 + b0985ff
commit 733cf15
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "demux-eos",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "description": "Demux-js Action Reader implementations for EOSIO blockchains",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/src/MongoBlock.test.ts b/src/MongoBlock.test.ts
@@ -29,6 +29,7 @@ describe("MongoBlock", () => {
               to: "bob",
             },
             name: "transfer",
+            notifiedAccounts: ["bill", "bob"],
             transactionId: "051620080b3212292f56a836c6b2f294291f6e6793dc0f12ce6a886f83d97f83",
           },
           type: "eosio.token::transfer",
@@ -50,6 +51,7 @@ describe("MongoBlock", () => {
               to: "bob",
             },
             name: "transfer",
+            notifiedAccounts: ["bill", "bob"],
             transactionId: "051620080b3212292f56a836c6b2f294291f6e6793dc0f12ce6a886f83d97f83",
           },
           type: "eosio.token::transfer",

diff --git a/src/MongoBlock.ts b/src/MongoBlock.ts
@@ -19,11 +19,17 @@ export class MongoBlock implements Block {
     const eosActions = []
     let currentTx = ""
     let actionIndex = 0
+    let currentActionDigest = ""
     for (const rawAction of rawActions) {
-      if (rawAction.trx_id != currentTx) {
+      if (rawAction.trx_id !== currentTx) {
         currentTx = rawAction.trx_id
         actionIndex = 0
       }
+      if (rawAction.receipt.act_digest === currentActionDigest) {
+        eosActions[eosActions.length - 1].payload.notifiedAccounts.push(rawAction.receipt.receiver)
+        continue
+      }
+      currentActionDigest = rawAction.receipt.act_digest
       eosActions.push({
         type: `${rawAction.act.account}::${rawAction.act.name}`,
         payload: {
@@ -33,7 +39,8 @@ export class MongoBlock implements Block {
           data: rawAction.act.data,
           name: rawAction.act.name,
           transactionId: rawAction.trx_id,
-        }
+          notifiedAccounts: [rawAction.receipt.receiver],
+        },
       })
       actionIndex += 1
     }

diff --git a/src/interfaces.ts b/src/interfaces.ts
@@ -12,6 +12,7 @@ export interface EosPayload {
   data: any
   name: string
   transactionId: string
+  notifiedAccounts?: string[]
 }
 
 export interface EosAction extends Action {

diff --git a/src/testHelpers/mongoObjectMocks.ts b/src/testHelpers/mongoObjectMocks.ts
@@ -39,7 +39,10 @@ export const mongoBlockState = {
 export const mongoRawActions = [
   {
     _id: "5c0fb6d93ffbf3000d484e23",
-    receipt: {},
+    receipt: {
+      receiver: "bill",
+      act_digest: "aaaa",
+    },
     act: {
       account: "eosio.token",
       name: "transfer",
@@ -59,7 +62,56 @@ export const mongoRawActions = [
   },
   {
     _id: "5c0fb6d93ffbf3000d484e24",
-    receipt: {},
+    receipt: {
+      receiver: "bob",
+      act_digest: "aaaa",
+    },
+    act: {
+      account: "eosio.token",
+      name: "transfer",
+      authorization: [{ actor: "bill", permission: "active" }],
+      data: { from: "bill", to: "bob", quantity: "1.0000 EOS", memo: "m" },
+    },
+    elapsed: 6,
+    console: "",
+    trx_id: "051620080b3212292f56a836c6b2f294291f6e6793dc0f12ce6a886f83d97f83",
+    block_num: 3,
+    block_time: "2018-06-09T11:56:30.000",
+    producer_block_id: "0001796719f9556dca4dce19f7d83e3c390d76783193d59123706b7741686bac",
+    account_ram_deltas: [],
+    except: null,
+    trx_status: "executed",
+    createdAt: "2018-12-11T13:08:41.509Z",
+  },
+  {
+    _id: "5c0fb6d93ffbf3000d484e25",
+    receipt: {
+      receiver: "bill",
+      act_digest: "bbbb",
+    },
+    act: {
+      account: "eosio.token",
+      name: "transfer",
+      authorization: [{ actor: "bill", permission: "active" }],
+      data: { from: "bill", to: "bob", quantity: "1.0000 EOS", memo: "m" },
+    },
+    elapsed: 6,
+    console: "",
+    trx_id: "051620080b3212292f56a836c6b2f294291f6e6793dc0f12ce6a886f83d97f83",
+    block_num: 3,
+    block_time: "2018-06-09T11:56:30.000",
+    producer_block_id: "0001796719f9556dca4dce19f7d83e3c390d76783193d59123706b7741686bac",
+    account_ram_deltas: [],
+    except: null,
+    trx_status: "executed",
+    createdAt: "2018-12-11T13:08:41.509Z",
+  },
+  {
+    _id: "5c0fb6d93ffbf3000d484e26",
+    receipt: {
+      receiver: "bob",
+      act_digest: "bbbb",
+    },
     act: {
       account: "eosio.token",
       name: "transfer",