feat(ACI): expose events decoding through Contract ACI stamp (#971)

* feat(ACI)L: Fid order of events when decoding
TODO: Check with core about order thingy from EVENTS docs

* fix(Test): Fix contract test

* fix(Test): Fix event parsing tests

* chore(build): Update node version to 5.5.4

Author: nduchak

.env

@@ -1,2 +1,2 @@
-NODE_TAG=v5.5.3
+NODE_TAG=v5.5.4
 COMPILER_TAG=v4.2.0

es/contract/aci/transformation.js

@@ -36,27 +36,31 @@ export function decodeEvents (events, options = { schema: [] }) {
   return events.map(l => {
     const [eName, ...eParams] = l.topics
     const hexHash = toBytes(eName, true).toString('hex')
-    const { schema, isHasNonIndexed } = options.schema
+    const { schema } = options.schema
       .reduce(
         (acc, el) => {
           if (hash(el.name).toString('hex') === hexHash) {
             l.name = el.name
             return {
-              schema: el.types.filter(e => e !== SOPHIA_TYPES.string),
-              isHasNonIndexed: el.types.includes(SOPHIA_TYPES.string),
+              schema: el.types,
               name: el.name
             }
           }
           return acc
         },
-        { schema: [], isHasNonIndexed: true }
+        { schema: [] }
       )
+    const { decoded } = schema.reduce((acc, el) => {
+      if (el === SOPHIA_TYPES.string) {
+        return { decoded: [...acc.decoded, transformEvent(l.data, el)], params: acc.params }
+      }
+      const [event, ...tail] = acc.params
+      return { decoded: [...acc.decoded, transformEvent(event, el)], params: tail }
+    }, { decoded: [], params: eParams })
+
     return {
       ...l,
-      decoded: [
-        ...isHasNonIndexed ? [decode(l.data).toString('utf-8')] : [],
-        ...eParams.map((event, i) => transformEvent(event, schema[i]))
-      ]
+      decoded
     }
   })
 }
@@ -77,6 +81,8 @@ export function transformEvent (event, type) {
       return toBytes(event, true).toString('hex')
     case SOPHIA_TYPES.address:
       return addressFromDecimal(event).split('_')[1]
+    case SOPHIA_TYPES.string:
+      return decode(event).toString('utf-8')
     default:
       return toBytes(event, true)
   }

test/integration/contract.js

@@ -63,7 +63,7 @@ contract StateContract =
   record state = { value: string, key: number, testOption: option(string) }
   record yesEr = { t: number}
   
-  datatype event = TheFirstEvent(int) | AnotherEvent(string, address) | AnotherEvent2(string, bool, int)
+  datatype event = TheFirstEvent(int) | AnotherEvent(string, address) | AnotherEvent2(bool, string, int)
   datatype dateUnit = Year | Month | Day
   datatype one_or_both('a, 'b) = Left('a) | Right('b) | Both('a, 'b)
 
@@ -111,7 +111,7 @@ contract StateContract =
   stateful entrypoint emitEvents() : unit =
     Chain.event(TheFirstEvent(42))
     Chain.event(AnotherEvent("This is not indexed", Contract.address))
-    Chain.event(AnotherEvent2("This is not indexed", true, 1))
+    Chain.event(AnotherEvent2(true, "This is not indexed", 1))
 `
 const aensDelegationContract = `
 contract DelegateTest =
@@ -547,7 +547,7 @@ describe('Contract', function () {
         decodedEventsWithoutACI = decodeEvents(log, { schema: events })
       })
       const events = [
-        { name: 'AnotherEvent2', types: [SOPHIA_TYPES.string, SOPHIA_TYPES.bool, SOPHIA_TYPES.int] },
+        { name: 'AnotherEvent2', types: [SOPHIA_TYPES.bool, SOPHIA_TYPES.string, SOPHIA_TYPES.int] },
         { name: 'AnotherEvent', types: [SOPHIA_TYPES.string, SOPHIA_TYPES.address] },
         { name: 'TheFirstEvent', types: [SOPHIA_TYPES.int] }
       ]