Merge pull request #66 from airswap/fixes-and-upgrade

Upgrades latest metadata package, fixes for metadata, better prompts
airswap · Feb 28, 2020 · f5d3581 · f5d3581
2 parents 3930f01 + 1a8b745
commit f5d3581
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 33 deletions.
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
   "bugs": "https://github.com/airswap/airswap-cli/issues",
   "dependencies": {
     "@airswap/indexer": "3.6.8",
-    "@airswap/metadata": "0.1.4",
+    "@airswap/metadata": "0.1.5",
     "@airswap/order-utils": "0.3.20",
     "@airswap/swap": "5.4.7",
     "@airswap/tokens": "0.1.4",

diff --git a/src/commands/indexer/get.ts b/src/commands/indexer/get.ts
@@ -22,15 +22,16 @@ export default class IntentGet extends Command {
 
       const indexerAddress = indexerDeploys[chainId]
       this.log(chalk.white(`Indexer ${indexerAddress}\n`))
+      this.log("As a taker, I intend to:\n")
 
       const { side, first, second, signerToken, senderToken }: any = await getSideAndTokens(metadata)
 
       const indexerContract = new ethers.Contract(indexerAddress, Indexer.abi, provider)
       const index = indexerContract.indexes(signerToken.address, senderToken.address, protocol)
 
       if (index === constants.ADDRESS_ZERO) {
-        this.log(chalk.yellow(`Pair ${signerToken.symbol}/${senderToken.symbol} does not exist`))
-        this.log(`Create this pair with ${chalk.bold('indexer:new')}\n`)
+        this.log(chalk.yellow(`${signerToken.symbol}/${senderToken.symbol} does not exist`))
+        this.log(`Create this index with ${chalk.bold('indexer:new')}\n`)
       } else {
         const result = await indexerContract.getLocators(
           signerToken.address,
@@ -49,7 +50,7 @@ export default class IntentGet extends Command {
 
           this.log(
             chalk.underline.bold(
-              `\nTop peers ${verb} ${first.name} for ${second.name} (${constants.protocolNames[protocol]})\n`,
+              `\nTop peers ${verb} ${first.symbol} for ${second.symbol} (${constants.protocolNames[protocol]})\n`,
             ),
           )
 

diff --git a/src/commands/indexer/new.ts b/src/commands/indexer/new.ts
@@ -29,8 +29,8 @@ export default class IntentNew extends Command {
 
       indexerContract.indexes(signerToken.address, senderToken.address, protocol).then(async (index: any) => {
         if (index !== constants.ADDRESS_ZERO) {
-          this.log(`${chalk.yellow('Pair already exists')}`)
-          this.log(`Set intent on this pair with ${chalk.bold('indexer:set')}\n`)
+          this.log(`${chalk.yellow('Index already exists')}`)
+          this.log(`Set intent on this index with ${chalk.bold('indexer:set')}\n`)
         } else {
           if (
             await confirm(

diff --git a/src/commands/indexer/set.ts b/src/commands/indexer/set.ts
@@ -24,16 +24,17 @@ export default class IntentSet extends Command {
       const indexerAddress = indexerDeploys[chainId]
       const indexerContract = new ethers.Contract(indexerAddress, Indexer.abi, wallet)
       this.log(chalk.white(`Indexer ${indexerAddress}\n`))
+      this.log("As a maker, I intend to:\n")
 
       const { signerToken, senderToken }: any = await getSideAndTokens(metadata, true)
 
       const values: any = await get({
         locator: {
-          description: 'locator',
+          description: 'locator (url)',
           type: 'Locator',
         },
         stakeAmount: {
-          description: 'stakeAmount',
+          description: 'amount to stake',
           type: 'Number',
         },
       })
@@ -45,8 +46,8 @@ export default class IntentSet extends Command {
 
       indexerContract.indexes(signerToken.address, senderToken.address, protocol).then(async (index: any) => {
         if (index === constants.ADDRESS_ZERO) {
-          this.log(chalk.yellow(`Pair ${signerToken.symbol}/${senderToken.symbol} does not exist`))
-          this.log(`Create this pair with ${chalk.bold('indexer:new')}\n`)
+          this.log(chalk.yellow(`${signerToken.symbol}/${senderToken.symbol} does not exist`))
+          this.log(`Create this index with ${chalk.bold('indexer:new')}\n`)
         } else {
           const existingEntry = await new ethers.Contract(index, Index.abi, wallet).getLocator(wallet.address)
           if (existingEntry !== constants.LOCATOR_ZERO) {

diff --git a/src/commands/indexer/unset.ts b/src/commands/indexer/unset.ts
@@ -23,13 +23,15 @@ export default class IntentUnset extends Command {
       const indexerAddress = indexerDeploys[chainId]
       const indexerContract = new ethers.Contract(indexerAddress, Indexer.abi, wallet)
       this.log(chalk.white(`Indexer ${indexerAddress}\n`))
+      this.log("As a maker, I no longer intend to:\n")
+
       const { signerToken, senderToken }: any = await getSideAndTokens(metadata, true)
       this.log()
 
       const index = await indexerContract.indexes(signerToken.address, senderToken.address, protocol)
       if (index === constants.ADDRESS_ZERO) {
-        this.log(chalk.yellow(`Pair ${signerToken.symbol}/${senderToken.symbol} does not exist`))
-        this.log(`Create this pair with ${chalk.bold('indexer:new')}\n`)
+        this.log(chalk.yellow(`${signerToken.symbol}/${senderToken.symbol} does not exist`))
+        this.log(`Create this index with ${chalk.bold('indexer:new')}\n`)
       } else {
         const existingEntry = await new ethers.Contract(index, Index.abi, wallet).getLocator(wallet.address)
         if (existingEntry === constants.LOCATOR_ZERO) {

diff --git a/src/commands/quote/max.ts b/src/commands/quote/max.ts
@@ -30,11 +30,11 @@ export default class QuoteMax extends Command {
       const params: any = {}
 
       if (side === 'buy') {
-        params.signerToken = first.addr
-        params.senderToken = second.addr
+        params.signerToken = first.address
+        params.senderToken = second.address
       } else {
-        params.signerToken = second.addr
-        params.senderToken = first.addr
+        params.signerToken = second.address
+        params.senderToken = first.address
       }
 
       this.log()
@@ -63,9 +63,9 @@ export default class QuoteMax extends Command {
             verb = 'Selling'
           }
           this.log(
-            `\n${verb} up to ${chalk.bold(maxAmount)} ${chalk.bold(first.name)} for ${chalk.bold(maxFor)} ${chalk.bold(
-              second.name,
-            )}\n`,
+            `\n${verb} up to ${chalk.bold(maxAmount)} ${chalk.bold(first.symbol)} for ${chalk.bold(
+              maxFor,
+            )} ${chalk.bold(second.symbol)}\n`,
           )
         }
       })

diff --git a/src/commands/weth/deposit.ts b/src/commands/weth/deposit.ts
@@ -18,7 +18,7 @@ export default class IntentUnset extends Command {
 
       const WETH = metadata.bySymbol['WETH']
       const balance = await wallet.provider.getBalance(wallet.address)
-      const balanceDecimal = utils.getDecimalValue(balance.toString(), WETH.addr, metadata)
+      const balanceDecimal = utils.getDecimalValue(balance.toString(), WETH.address, metadata)
       this.log(`ETH available to deposit: ${chalk.bold(balanceDecimal.toFixed())}`)
       this.log(chalk.gray('Some ETH must be saved to execute the transaction.\n'))
 
@@ -28,7 +28,7 @@ export default class IntentUnset extends Command {
           type: 'Number',
         },
       })
-      const atomicAmount = utils.getAtomicValue(amount, WETH.addr, metadata)
+      const atomicAmount = utils.getAtomicValue(amount, WETH.address, metadata)
 
       if (atomicAmount.eq(0)) {
         cancelled('Amount must be greater than zero.')
@@ -47,7 +47,7 @@ export default class IntentUnset extends Command {
             chainId,
           )
         ) {
-          new ethers.Contract(WETH.addr, WETH9.abi, wallet)
+          new ethers.Contract(WETH.address, WETH9.abi, wallet)
             .deposit({ value: ethers.utils.bigNumberify(atomicAmount.toFixed()), gasPrice })
             .then(utils.handleTransaction)
             .catch(utils.handleError)

diff --git a/src/commands/weth/withdraw.ts b/src/commands/weth/withdraw.ts
@@ -17,9 +17,9 @@ export default class IntentUnset extends Command {
       utils.displayDescription(this, IntentUnset.description, chainId)
 
       const WETH = metadata.bySymbol['WETH']
-      const tokenContract = new ethers.Contract(WETH.addr, WETH9.abi, wallet)
+      const tokenContract = new ethers.Contract(WETH.address, WETH9.abi, wallet)
       const tokenBalance = await tokenContract.balanceOf(wallet.address)
-      const balanceDecimal = utils.getDecimalValue(tokenBalance.toString(), WETH.addr, metadata)
+      const balanceDecimal = utils.getDecimalValue(tokenBalance.toString(), WETH.address, metadata)
       this.log(`WETH available to withdraw: ${chalk.bold(balanceDecimal.toFixed())}\n`)
 
       const { amount }: any = await get({
@@ -28,7 +28,7 @@ export default class IntentUnset extends Command {
           type: 'Number',
         },
       })
-      const atomicAmount = utils.getAtomicValue(amount, WETH.addr, metadata)
+      const atomicAmount = utils.getAtomicValue(amount, WETH.address, metadata)
 
       if (atomicAmount.eq(0)) {
         cancelled('Amount must be greater than zero.')
@@ -47,7 +47,7 @@ export default class IntentUnset extends Command {
             chainId,
           )
         ) {
-          new ethers.Contract(WETH.addr, WETH9.abi, wallet)
+          new ethers.Contract(WETH.address, WETH9.abi, wallet)
             .withdraw(ethers.utils.bigNumberify(atomicAmount.toFixed()), { gasPrice })
             .then(utils.handleTransaction)
             .catch(utils.handleError)

diff --git a/src/lib/prompt.ts b/src/lib/prompt.ts
@@ -228,7 +228,7 @@ export function getData(metadata: any, params: any) {
   const data = [[chalk.bold('Param'), chalk.bold('Value')]]
   for (const key in params) {
     if (patterns.Address.test(params[key]) && params[key] in metadata.byAddress) {
-      data.push([key, `${params[key]} (${chalk.cyan(metadata.byAddress[params[key]].name)})`])
+      data.push([key, `${params[key]} (${chalk.cyan(metadata.byAddress[params[key]].symbol)})`])
     } else {
       data.push([key, params[key]])
     }

diff --git a/src/lib/requests.ts b/src/lib/requests.ts
@@ -162,12 +162,12 @@ export async function getRequest(wallet: any, metadata: any, kind: string) {
   }
 
   if (side === 'buy') {
-    const signerAmountAtomic = utils.getAtomicValue(amount, first.addr, metadata)
+    const signerAmountAtomic = utils.getAtomicValue(amount, first.address, metadata)
     Object.assign(params, {
       signerAmount: signerAmountAtomic.integerValue(BigNumber.ROUND_FLOOR).toFixed(),
     })
   } else {
-    const senderAmountAtomic = utils.getAtomicValue(amount, first.addr, metadata)
+    const senderAmountAtomic = utils.getAtomicValue(amount, first.address, metadata)
     method = 'getSignerSide' + kind
     Object.assign(params, {
       senderAmount: senderAmountAtomic.integerValue(BigNumber.ROUND_FLOOR).toFixed(),

diff --git a/yarn.lock b/yarn.lock
@@ -16,10 +16,10 @@
   dependencies:
     openzeppelin-solidity "2.4"
 
-"@airswap/[email protected].4":
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/@airswap/metadata/-/metadata-0.1.4.tgz#d11bd2bc9a7f47240963f3b1c6cd59c1f33bbea0"
-  integrity sha512-QNd+fy3fgeIMdKMOg11/vHWmGscrKdBFipN0FzAbqxAQYoVyjrVRYfVTvuRhGWYWqnQU+VGIzUrLAOX1FIEWxw==
+"@airswap/[email protected].5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@airswap/metadata/-/metadata-0.1.5.tgz#ad53acf30262485aa36cb7d2a20743041a2423a0"
+  integrity sha512-qjCiaom2GApVBQp9OUU7H+/rrCkKTfZ1EwSHHU0pc1kEYZ8zEVbEekh+iKCQmvjqmhQDhamPH/uP15up7+oQdw==
   dependencies:
     "@airswap/constants" "0.3.3"
     "@airswap/types" "3.5.9"