merge PR 492 from 1.0

src/arc.ts

@@ -77,8 +77,8 @@ export class Arc extends GraphNodeObserver {
 
   public get isInfuraProvider(): boolean {
     return typeof this._web3Provider === 'string' &&
-           (this._web3Provider.includes('infura.io') ||
-            this._web3Provider.includes('xdai'))
+      (this._web3Provider.includes('infura.io') ||
+        this._web3Provider.includes('xdai'))
   }
 
   /**
@@ -214,6 +214,7 @@ export class Arc extends GraphNodeObserver {
           name
           version
           address
+          alias
         }
       }
     `
@@ -391,10 +392,11 @@ export class Arc extends GraphNodeObserver {
     throw Error(`No contract with name ${name}  and version ${version} is known`)
   }
 
-  public getABI(opts: { address?: Address
-      abiName?: string
-      version?: string
-    }): any[] {
+  public getABI(opts: {
+    address?: Address
+    abiName?: string
+    version?: string
+  }): any[] {
     if (Object.values(opts).filter((value) => value !== undefined).length === 0) {
       throw Error('getABI needs at least one parameter passed')
     }
@@ -607,4 +609,5 @@ export interface IContractInfo {
   version: string
   address: Address
   name: string
+  alias: string
 }

test/arc.spec.ts

@@ -205,12 +205,12 @@ describe('Arc ', () => {
 
   it('arc.plugin() should work', async () => {
     const arc = await newArc()
-    const nonUniquePlugin = await arc.plugin({where: { name: 'GenericScheme' }})
-    const uniquePlugin = await arc.plugin({where: { address: getTestScheme('GenericScheme') }}, true)
+    const nonUniquePlugin = await arc.plugin({ where: { name: 'GenericScheme' } })
+    const uniquePlugin = await arc.plugin({ where: { address: getTestScheme('GenericScheme') } }, true)
 
     expect(nonUniquePlugin).toBeInstanceOf(Plugin)
     expect(uniquePlugin).toBeInstanceOf(Plugin)
-    await expect(arc.plugin({where: { name: 'ContributionReward' }}, true)).rejects.toThrow()
+    await expect(arc.plugin({ where: { name: 'ContributionReward' } }, true)).rejects.toThrow()
   })
 
   it('arc.plugins() should work', async () => {
@@ -229,7 +229,7 @@ describe('Arc ', () => {
   it('arc.getABI works', async () => {
     const arc = await newArc()
     await arc.fetchContractInfos()
-    const abi = arc.getABI({abiName: 'Redeemer', version: REDEEMER_CONTRACT_VERSIONS[0]})
+    const abi = arc.getABI({ abiName: 'Redeemer', version: REDEEMER_CONTRACT_VERSIONS[0] })
     expect(abi[0].name).toEqual('redeem')
   })
 
@@ -308,3 +308,12 @@ describe('Arc ', () => {
       .toEqual(await signer.getAddress())
   })
 })
+
+it('plugin contractInfo should contain alias', async () => {
+  const arc = await newArc()
+  const pluginId = '0x86072cbff48da3c1f01824a6761a03f105bcc697'
+
+  const contractInfo = arc.getContractInfo(pluginId)
+
+  expect(contractInfo.alias).toEqual("ContributionRewardExt")
+})

test/utils.ts

@@ -75,7 +75,7 @@ export function getTestAddresses(version: string = LATEST_ARC_VERSION): ITestAdd
 }
 
 export function sleep(ms: number) {
-  return new Promise( (resolve) => setTimeout(resolve, ms) )
+  return new Promise((resolve) => setTimeout(resolve, ms))
 }
 
 export function getTestScheme(name: PluginName): Address {
@@ -271,16 +271,17 @@ export async function firstResult(observable: Observable<any>) {
   return observable.pipe(first()).toPromise()
 }
 
-export function getContractAddressesFromMigration(environment: 'private'|'rinkeby'|'mainnet'): IContractInfo[] {
+export function getContractAddressesFromMigration(environment: 'private' | 'rinkeby' | 'mainnet'): IContractInfo[] {
   const migration = require('@daostack/migration-experimental/migration.json')[environment]
   const contracts: IContractInfo[] = []
   for (const version of Object.keys(migration.package)) {
     for (const name of Object.keys(migration.package[version])) {
       contracts.push({
         address: migration.package[version][name].toLowerCase(),
         id: migration.package[version][name],
+        alias: migration.package[version][name],
         name,
-        version
+        version,
       })
     }
   }