From 411c35d8737d5794fa50e104a6d4173b3b913162 Mon Sep 17 00:00:00 2001
From: Gerardo Nardelli <gerardo.nardelli@altoros.com>
Date: Thu, 22 Aug 2019 16:16:54 -0300
Subject: [PATCH] Fix amb packSignatures method in Oracle

---
 oracle/src/events/processAMBCollectedSignatures/index.js | 2 +-
 oracle/src/utils/message.js                              | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/oracle/src/events/processAMBCollectedSignatures/index.js b/oracle/src/events/processAMBCollectedSignatures/index.js
index dc96746a..29a9b7d3 100644
--- a/oracle/src/events/processAMBCollectedSignatures/index.js
+++ b/oracle/src/events/processAMBCollectedSignatures/index.js
@@ -98,7 +98,7 @@ function processCollectedSignaturesBuilder(config) {
               throw e
             }
           }
-          const data = await foreignBridge.methods.executeSignatures(message, v, r, s).encodeABI()
+          const data = await foreignBridge.methods.executeSignatures(message, signatures).encodeABI()
           const gasPriceOptions = generateGasPriceOptions({ dataType, gasPrice, gasPriceSpeed })
           txToSend.push({
             data,
diff --git a/oracle/src/utils/message.js b/oracle/src/utils/message.js
index 0a8b700b..d20359b1 100644
--- a/oracle/src/utils/message.js
+++ b/oracle/src/utils/message.js
@@ -68,7 +68,8 @@ function signatureToVRSAMB(rawSignature) {
 }
 
 function packSignatures(array) {
-  const length = Web3Utils.toHex(array.length)
+  const length = strip0x(Web3Utils.toHex(array.length))
+  const msgLength = length.length === 1 ? `0${length}` : length
   let v = ''
   let r = ''
   let s = ''
@@ -77,8 +78,7 @@ function packSignatures(array) {
     r = r.concat(e.r)
     s = s.concat(e.s)
   })
-
-  return `${length}${v}${r}${s}`
+  return `0x${msgLength}${v}${r}${s}`
 }
 
 module.exports = {