From 0d9890bc8555c3c1a0d45b706eb37d7db158f15e Mon Sep 17 00:00:00 2001
From: Bernardo Garces Chapero <bernardo.chapero@consensys.net>
Date: Thu, 31 Aug 2023 19:00:38 +0100
Subject: [PATCH] chain filtering

---
 src/adapters/index.ts            |  2 +-
 src/scripts/newAdapterCommand.ts | 60 +++++++++++++++++++++-----------
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/src/adapters/index.ts b/src/adapters/index.ts
index 74bc23e6d..0a102dee7 100644
--- a/src/adapters/index.ts
+++ b/src/adapters/index.ts
@@ -57,7 +57,7 @@ export const supportedProtocols: Record<
         new ExampleProductAdapter({
           metadata: {},
           chainId: Chain.Ethereum,
-          provider: provider,
+          provider,
         }),
     ],
   },
diff --git a/src/scripts/newAdapterCommand.ts b/src/scripts/newAdapterCommand.ts
index 07802962c..0da0072cd 100644
--- a/src/scripts/newAdapterCommand.ts
+++ b/src/scripts/newAdapterCommand.ts
@@ -1,14 +1,16 @@
 import { Command } from 'commander'
 import { promises as fs } from 'fs'
+import { partition } from 'lodash'
 import * as path from 'path'
 import { parse, visit, types, print } from 'recast'
-import { adapterTemplate } from './templates/adapter'
+import { Chain } from '../core/constants/chains'
 import { camelCase, kebabCase, pascalCase } from '../core/utils/caseConversion'
-import { partition } from 'lodash'
+import { filterMap } from '../core/utils/filters'
+import { adapterTemplate } from './templates/adapter'
+import { writeCodeFile } from './writeCodeFile'
 
 import n = types.namedTypes
 import b = types.builders
-import { writeCodeFile } from './writeCodeFile'
 
 export function newAdapterCommand(program: Command) {
   program
@@ -21,10 +23,21 @@ export function newAdapterCommand(program: Command) {
       'Ethereum',
     )
     .showHelpAfterError()
-    .action(async (protocol: string, product: string, chains: string) => {
-      // TODO: Validate that chains exist
+    .action(async (protocol: string, product: string, chainsInput: string) => {
+      const chains = filterMap(chainsInput.split(','), (chainInput) => {
+        const chain = Object.keys(Chain).find((chainKey) => {
+          return chainKey.toLowerCase() === chainInput.toLowerCase()
+        })
+
+        if (!chain) {
+          console.warn(`Cannot find corresponding chain for ${chainInput}`)
+        }
+
+        return chain
+      }) as (keyof typeof Chain)[]
+
       await buildAdapterFromTemplate(protocol, product)
-      await exportAdapter(protocol, product, chains.split(','))
+      await exportAdapter(protocol, product, chains)
     })
 }
 
@@ -69,7 +82,7 @@ async function buildAdapterFromTemplate(protocol: string, product: string) {
 async function exportAdapter(
   protocol: string,
   product: string,
-  chains: string[],
+  chains: (keyof typeof Chain)[],
 ) {
   const adaptersFile = path.resolve('./src/adapters/index.ts')
   const contents = await fs.readFile(adaptersFile, 'utf-8')
@@ -171,7 +184,7 @@ function addAdapterEntries(
   supportedProtocolsDeclaratorNode: n.VariableDeclarator,
   protocol: string,
   product: string,
-  chains: string[],
+  chains: (keyof typeof Chain)[],
 ) {
   const supportedProtocolsObjectNode = supportedProtocolsDeclaratorNode.init
   if (!n.ObjectExpression.check(supportedProtocolsObjectNode)) {
@@ -296,23 +309,30 @@ function buildChainEntry(chain: string) {
   new <ProductName>Adapter({
     metadata: {},
     chainId: Chain.<ChainName>,
-    provider: provider,
+    provider,
   }),
 */
 function buildAdapterEntry(chain: string, product: string) {
   const params = [b.identifier('provider')]
+
+  const metadataProperty = b.objectProperty(
+    b.identifier('metadata'),
+    b.objectExpression([]),
+  )
+
+  const chainIdProperty = b.objectProperty(
+    b.identifier('chainId'),
+    b.memberExpression(b.identifier('Chain'), b.identifier(pascalCase(chain))),
+  )
+
+  const providerProperty = b.objectProperty(
+    b.identifier('provider'),
+    b.identifier('provider'),
+  )
+  providerProperty.shorthand = true
+
   const body = b.newExpression(b.identifier(`${pascalCase(product)}Adapter`), [
-    b.objectExpression([
-      b.objectProperty(b.identifier('metadata'), b.objectExpression([])),
-      b.objectProperty(
-        b.identifier('chainId'),
-        b.memberExpression(
-          b.identifier('Chain'),
-          b.identifier(pascalCase(chain)),
-        ),
-      ),
-      b.objectProperty(b.identifier('provider'), b.identifier('provider')),
-    ]),
+    b.objectExpression([metadataProperty, chainIdProperty, providerProperty]),
   ])
 
   return b.arrowFunctionExpression(params, body)