Address feedback

1 files changed, 2 insertions, 11 deletions

diff --git a/packages/utils/src/abi_decoder.ts b/packages/utils/src/abi_decoder.ts
index c78bfa343..d2d8364ca 100644
--- a/packages/utils/src/abi_decoder.ts
+++ b/packages/utils/src/abi_decoder.ts
@@ -12,21 +12,12 @@ import {
 import * as ethers from 'ethers';
 import * as _ from 'lodash';
 
+import { addressUtils } from './address_utils';
 import { BigNumber } from './configured_bignumber';
 
 export class AbiDecoder {
     private _savedABIs: AbiDefinition[] = [];
     private _methodIds: { [signatureHash: string]: EventAbi } = {};
-    private static _padZeros(address: string): string {
-        let formatted = address;
-        if (_.startsWith(formatted, '0x')) {
-            formatted = formatted.slice(2);
-        }
-
-        const addressLength = 40;
-        formatted = _.padStart(formatted, addressLength, '0');
-        return `0x${formatted}`;
-    }
     constructor(abiArrays: AbiDefinition[][]) {
         _.forEach(abiArrays, this.addABI.bind(this));
     }
@@ -56,7 +47,7 @@ export class AbiDecoder {
             }
             if (param.type === SolidityTypes.Address) {
                 const baseHex = 16;
-                value = AbiDecoder._padZeros(new BigNumber(value).toString(baseHex));
+                value = addressUtils.padZeros(new BigNumber(value).toString(baseHex));
             } else if (param.type === SolidityTypes.Uint256 || param.type === SolidityTypes.Uint) {
                 value = new BigNumber(value);
             } else if (param.type === SolidityTypes.Uint8) {