feat(ACI): Update due to compiler API changes (#331)

* feat(ACI): Update due to compiler API changes

* feat(ACI): Update ACI to compiler API breaking changes

Add 'tuple' type arguments transformation, add tuple to transformEncodeData

* test Jenkins

* build(Compiler): Add compiler to docker-compose

* test Jenkins

* build(Compiler): Add compiler env to docker

Author: nduchak

.env

@@ -1 +1,2 @@
 TAG=v2.2.0
+COMPILER_TAG=v2.1.0

docker-compose.yml

@@ -4,7 +4,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.ci
-    depends_on: [node]
+    depends_on: [node, compiler]
     entrypoint: docker/wait-for-it.sh node:3013 --
     env_file: [./docker/sdk.env]
     environment:
@@ -28,6 +28,12 @@ services:
       - node_db:/home/aeternity/node/data/mnesia
       - node_keys:/home/aeternity/node/keys
 
+
+  compiler:
+    image: aeternity/aesophia_http:${COMPILER_TAG}
+    hostname: compiler
+    expose: [3080]
+
 volumes:
   node_db:
   node_keys:

docker/sdk.env

@@ -2,4 +2,5 @@ TEST_NODE=node:3013
 TEST_URL=http://node:3013
 TEST_INTERNAL_URL=http://node:3113
 TEST_NETWORK_ID=ae_devnet
+COMPILER_URL=http://compiler:3080
 

es/contract/aci.js

@@ -48,12 +48,13 @@ const SOPHIA_TYPES = [
  */
 function transform (type, value) {
   const { t, generic } = readType(type)
-
   switch (t) {
     case SOPHIA_TYPES.string:
       return `"${value}"`
     case SOPHIA_TYPES.list:
       return `[${value.map(el => transform(generic, el))}]`
+    case SOPHIA_TYPES.tuple:
+      return `(${value.map((el, i) => transform(generic[i], el))})`
     case SOPHIA_TYPES.address:
       return `#${decode(value, 'ak').toString('hex')}`
   }
@@ -63,22 +64,19 @@ function transform (type, value) {
 /**
  * Parse sophia type
  * @param type
+ * @param returnType
  * @return {*}
  */
-function readType (type) {
-  const i = type.indexOf('(')
-
-  if (i === -1) return { t: type }
+function readType (type, returnType = false) {
+  const [t] = Array.isArray(type) ? type : [type]
+  // Base types
+  if (typeof t === 'string') return { t }
 
-  // Tuple
-  if (type[0] === '(') {
-    return { t: SOPHIA_TYPES.tuple, generic: type.slice(1).slice(0, -1).split(',').map(e => e.trim()) }
+  // Map, Tuple, List
+  if (typeof t === 'object') {
+    const [[baseType, generic]] = Object.entries(t)
+    return { t: baseType, generic }
   }
-
-  const baseType = type.split('(')[0]
-  const generic = type.slice(i + 1, type.length - 1)
-
-  return { t: baseType, generic }
 }
 
 /**
@@ -112,29 +110,28 @@ function validate (type, value) {
  */
 function transformDecodedData (aci, result, { skipTransformDecoded = false } = {}) {
   if (skipTransformDecoded) return result
-  const { t, generic } = readType(aci.type)
-
+  const { t, generic } = readType(aci, true)
   switch (t) {
     case SOPHIA_TYPES.bool:
       return !!result.value
     case SOPHIA_TYPES.address:
       return aeEncodeKey(toBytes(result.value, true))
     case SOPHIA_TYPES.map:
-      const [keyT, ...valueT] = generic.split(',')
+      const [keyT, valueT] = generic
       return result.value
         .reduce(
           (acc, { key, val }, i) => {
-            key = transformDecodedData({ type: keyT.toString() }, { value: key.value })
-            val = transformDecodedData({ type: valueT.toString() }, { value: val.value })
+            key = transformDecodedData(keyT, { value: key.value })
+            val = transformDecodedData(valueT, { value: val.value })
             acc[i] = { key, val }
             return acc
           },
           {}
         )
     case SOPHIA_TYPES.list:
-      return result.value.map(({ value }) => transformDecodedData({ type: generic }, { value }))
+      return result.value.map(({ value }) => transformDecodedData(generic, { value }))
     case SOPHIA_TYPES.tuple:
-      return result.value.map(({ value }, i) => { return transformDecodedData({ type: generic[i] }, { value }) })
+      return result.value.map(({ value }, i) => { return transformDecodedData(generic[i], { value }) })
   }
   return result.value
 }
@@ -232,6 +229,22 @@ async function getContractInstance (source, { aci, contractAddress } = {}) {
   return instance
 }
 
+function transformReturnType (returns) {
+  if (typeof returns === 'string') return returns
+  if (typeof returns === 'object') {
+    const [[key, value]] = Object.entries(returns)
+    return `${key !== 'tuple' ? key : ''}(${value
+      .reduce(
+        (acc, el, i) => {
+          if (i !== 0) acc += ','
+          acc += transformReturnType(el)
+          return acc
+        },
+        '')
+    })`
+  }
+}
+
 function call (self) {
   return async function (fn, params = [], options = { skipArgsConvert: false, skipTransformDecoded: false, callStatic: false }) {
     const fnACI = getFunctionACI(this.aci, fn)
@@ -245,10 +258,10 @@ function call (self) {
         options
       })
       : await self.contractCall(this.source, this.deployInfo.address, fn, params, options)
-
+    const returnType = await transformReturnType(fnACI.returns)
     return {
       ...result,
-      decode: async () => transformDecodedData(fnACI, await self.contractDecodeData(fnACI.type, result.result.returnValue), options)
+      decode: async () => transformDecodedData(fnACI.returns, await self.contractDecodeData(returnType, result.result.returnValue), options)
     }
   }
 }
@@ -257,7 +270,6 @@ function deploy (self) {
   return async function (init = [], options = { skipArgsConvert: false }) {
     const fnACI = getFunctionACI(this.aci, 'init')
     if (!this.compiled) await this.compile()
-
     init = !options.skipArgsConvert ? prepareArgsForEncode(fnACI, init) : init
 
     const { owner, transaction, address, createdAt, result } = await self.contractDeploy(this.compiled, this.source, init, options)

test/integration/index.js

@@ -21,7 +21,7 @@ import { BigNumber } from 'bignumber.js'
 
 const url = process.env.TEST_URL || 'http://localhost:3013'
 const internalUrl = process.env.TEST_INTERNAL_URL || 'http://localhost:3113'
-const compilerUrl = 'https://compiler.aepps.com'
+const compilerUrl = process.env.COMPILER_URL || 'http://localhost:3080'
 const networkId = process.env.TEST_NETWORK_ID || 'ae_devnet'
 const account = Crypto.generateKeyPair()