fix: append recivers broken (#5075)

* fix: append recivers broken * fix: lockfile
DimensionDev · Dec 7, 2021 · 7bf678f · 7bf678f
1 parent be4e4cd
commit 7bf678f
Show file tree

Hide file tree

Showing 10 changed files with 145 additions and 172 deletions.
diff --git a/packages/mask/.webpack/config.ts b/packages/mask/.webpack/config.ts
@@ -275,7 +275,7 @@ export function createConfiguration(rawFlags: BuildFlags): Configuration {
     } else {
         entries.background = normalizeEntryDescription(join(__dirname, '../src/background-service.ts'))
         plugins.push(new WebExtensionPlugin({ background: { entry: 'background', manifest: 2 } }))
-        plugins.push(addHTMLEntry({ chunks: ['background'], filename: 'background.html' }))
+        plugins.push(addHTMLEntry({ chunks: ['background'], filename: 'background.html', secp256k1: true }))
     }
     for (const entry in entries) {
         withReactDevTools(entries[entry])
@@ -297,10 +297,13 @@ export function createConfiguration(rawFlags: BuildFlags): Configuration {
         }
     }
 }
-function addHTMLEntry(options: HTMLPlugin.Options = {}) {
+function addHTMLEntry(options: HTMLPlugin.Options & { secp256k1?: boolean } = {}) {
     let templateContent = readFileSync(join(__dirname, './template.html'), 'utf8')
-    if (options.chunks?.includes('background')) {
-        templateContent.replace(`<!-- background -->`, '<script src="/polyfill/secp256k1.js"></script>')
+    if (options.secp256k1) {
+        templateContent = templateContent.replace(
+            `<!-- secp256k1 -->`,
+            '<script src="/polyfill/secp256k1.js"></script>',
+        )
     }
     return new HTMLPlugin({
         templateContent,

diff --git a/packages/mask/.webpack/template.html b/packages/mask/.webpack/template.html
@@ -5,9 +5,8 @@
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
         <script src="/patches.js"></script>
-        <!-- background -->
+        <!-- secp256k1 -->
         <script src="/polyfill/ecmascript.js"></script>
-        <script src="/polyfill/esnext.js"></script>
         <script src="/polyfill/intl.js"></script>
         <script src="/polyfill/dom.js"></script>
         <script src="/polyfill/browser-polyfill.js"></script>

diff --git a/packages/mask/background/database/utils/openDB.ts b/packages/mask/background/database/utils/openDB.ts
@@ -31,7 +31,8 @@ export function createDBAccess<DBSchema>(opener: () => Promise<IDBPDatabase<DBSc
         if (db) {
             try {
                 // try if the db still open
-                db.transaction([], 'readonly', {})
+                const t = db.transaction([db.objectStoreNames[0]], 'readonly', {})
+                t.commit()
                 return db
             } catch {
                 clean()

diff --git a/packages/mask/package.json b/packages/mask/package.json
@@ -121,7 +121,6 @@
     "web3-eth-abi": "1.5.2",
     "web3-eth-contract": "1.5.2",
     "web3-utils": "1.5.2",
-    "webcrypto-liner": "1.2.4",
     "webextension-polyfill": "^0.8.0",
     "z-schema": "^5.0.2",
     "zod": "3.11.6"

diff --git a/packages/mask/src/modules/CryptoAlgorithm/EllipticBackend/methods.ts b/packages/mask/src/modules/CryptoAlgorithm/EllipticBackend/methods.ts
@@ -10,7 +10,6 @@ import {
     MnemonicGenerationInformation,
 } from '../../../utils/mnemonic-code'
 import type { MnemonicWordDetail } from '../interfaces/interface.blockchain'
-import 'webcrypto-liner'
 
 const ECDH = getKeyParameter('ecdh')[0]
 const ECDSA = getKeyParameter('ecdsa')[0]

diff --git a/packages/polyfills/builder.mjs b/packages/polyfills/builder.mjs
@@ -20,7 +20,7 @@ let polyfillVersion = '__'
     const lockfile = await readFile(lockfilePath)
     const hash = createHash('sha256')
     hash.update(lockfile)
-    polyfillVersion = 'v1' + hash.digest('hex')
+    polyfillVersion = 'v2' + hash.digest('hex')
 }
 
 const versionFilePath = fileURLToPath(new URL('./dist/version.txt', import.meta.url))
@@ -57,8 +57,7 @@ const liner = await readFile(require.resolve('webcrypto-liner/build/webcrypto-li
 await writeFile(
     fileURLToPath(new URL(`./dist/secp256k1.js`, import.meta.url)),
     `${elliptic};
-${liner};
-delete globalThis.elliptic;`,
+${liner};`,
 )
 
 await appendNull(new URL('./dist/dom.js', import.meta.url))

diff --git a/packages/polyfills/elliptic.js b/packages/polyfills/elliptic.js
@@ -1,3 +1,4 @@
 import elliptic from 'elliptic'
-// @ts-ignore
+import { Buffer } from './node_modules/buffer/index'
 globalThis.elliptic = elliptic
+globalThis.Buffer = Buffer
diff --git a/packages/polyfills/package.json b/packages/polyfills/package.json
@@ -16,6 +16,7 @@
     "build": "node ./builder.mjs"
   },
   "dependencies": {
+    "buffer": "^6.0.3",
     "clipboard-polyfill": "^3.0.3",
     "core-js": "^3.19.1",
     "elliptic": "^6.5.4",

diff --git a/packages/polyfills/rollup.config.js b/packages/polyfills/rollup.config.js
@@ -56,6 +56,6 @@ function plugins() {
             exclude: ['node_modules/**'],
             transforms: ['typescript'],
         }),
-        terser(),
+        terser({ mangle: false }),
     ]
 }