Merge pull request #5657 from EdgeApp/william/fix-typechain

Fix typechain code generation

Author: swansontec

.gitignore

@@ -44,8 +44,8 @@ coverage/
 /maestro/env.js
 testerConfig.json
 
-# Temporary compiled contract files during `typechain` generation
-src/plugins/.contracts/*
+# Files generated using `typechain`
+/src/plugins/contracts/
 
 # ----------------------------------------------------------------------
 # Everything below comes from React Native.

package.json

@@ -44,15 +44,14 @@
     "maestro": "node -r sucrase/register ./scripts/runMaestro.ts test",
     "maestro:ios": "node -r sucrase/register ./scripts/runMaestro.ts test --include-tags all,ios maestro",
     "maestro:android": "node -r sucrase/register ./scripts/runMaestro.ts test --include-tags all,android maestro",
-    "precommit": "npm run localize && npm run typechain:precommit && lint-staged && tsc && npm test",
+    "precommit": "npm run localize && lint-staged && tsc && npm test",
     "prepare.ios": "(cd ios; pod repo update; pod install)",
     "prepare": "husky install && ./scripts/prepare.sh",
     "server": "node ./loggingServer.js",
     "start.plugins": "webpack serve",
     "start": "react-native start",
     "test": "TZ=America/Los_Angeles jest",
-    "typechain": "typechain --target ethers-v5 --out-dir ./src/plugins/.contracts/ './src/plugins/abis/*.json' && rm -rf './src/plugins/contracts/' && mv './src/plugins/.contracts/' './src/plugins/contracts/'",
-    "typechain:precommit": "npm run typechain && git add ./src/plugins/contracts",
+    "typechain": "rm -rf './src/plugins/contracts/' && typechain --target ethers-v5 --out-dir ./src/plugins/contracts/ './src/plugins/abis/*.json'",
     "theme": "node -r sucrase/register ./scripts/themeServer.ts",
     "updateVersion": "node -r sucrase/register scripts/updateVersion.ts",
     "updot": "EDGE_MODE=development updot",

patches/typechain+8.3.2.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/typechain/dist/codegen/createBarrelFiles.js b/node_modules/typechain/dist/codegen/createBarrelFiles.js
+index 4bf574d..40dc55a 100644
+--- a/node_modules/typechain/dist/codegen/createBarrelFiles.js
++++ b/node_modules/typechain/dist/codegen/createBarrelFiles.js
+@@ -46,7 +46,7 @@ function createBarrelFiles(paths, { typeOnly, postfix = '', moduleSuffix = '' })
+             if (moduleSuffix) {
+                 return `export * as ${namespaceIdentifier} from './${p}/index${moduleSuffix}';`;
+             }
+-            return `export * as ${namespaceIdentifier} from './${p}';`;
++            return `import * as ${namespaceIdentifier} from './${p}';\nexport { ${namespaceIdentifier} };`;
+         })
+             .join('\n');
+         const contracts = (fileReexports[path] || []).sort();

scripts/prepare.sh

@@ -13,7 +13,7 @@ node -r sucrase/register ./scripts/configure.ts
 ## Fix broken packages:
 yarn patch-package
 
-# Fix Android dependency import statments: 
+# Fix Android dependency import statments:
 # Old native Android dependencies use outdated package names for their imports
 # that were later renamed by Google.
 npx jetify
@@ -33,6 +33,9 @@ fi
 node ./node_modules/.bin/rollup -c
 node -r sucrase/register ./scripts/stringifyBridge.ts
 
+# Create contract type definitions:
+yarn typechain
+
 # Bundle currency, swap, & rate plugins:
 core_assets="./android/app/src/main/assets/edge-core"
 if [ -d "$core_assets" ]; then