From b1f6df574943803ced30f6157b99be617a1cc2ed Mon Sep 17 00:00:00 2001
From: Hom Yan <yanzhihong23@qq.com>
Date: Tue, 15 Mar 2022 17:21:02 +0800
Subject: [PATCH 1/2] chore: move web3-kit to web3-shared-base

---
 packages/mask/.webpack/config.ts                         | 1 -
 packages/plugins/FileService/package.json                | 1 -
 packages/plugins/FileService/src/helpers.ts              | 2 +-
 packages/plugins/FileService/tsconfig.json               | 2 --
 packages/web3-kit/package.json                           | 6 ------
 packages/web3-kit/src/index.ts                           | 2 --
 packages/web3-kit/tsconfig.json                          | 9 ---------
 .../base}/src/helpers/constants.ts                       | 2 +-
 .../{web3-kit => web3-shared/base}/src/helpers/index.ts  | 1 +
 .../base}/src/helpers/lookupTable.ts                     | 0
 .../src => web3-shared/base/src/helpers}/types.ts        | 0
 packages/web3-shared/base/src/index.ts                   | 1 +
 packages/web3-shared/flow/constants/index.ts             | 2 +-
 packages/web3-shared/flow/package.json                   | 2 +-
 packages/web3-shared/flow/pipes/index.ts                 | 2 +-
 packages/web3-shared/flow/tsconfig.json                  | 2 +-
 packages/web3-shared/solana/constants/index.ts           | 2 +-
 packages/web3-shared/solana/package.json                 | 2 +-
 packages/web3-shared/solana/pipes/index.ts               | 2 +-
 packages/web3-shared/solana/tsconfig.json                | 2 +-
 pnpm-lock.yaml                                           | 9 ---------
 tsconfig.json                                            | 1 -
 22 files changed, 12 insertions(+), 41 deletions(-)
 delete mode 100644 packages/web3-kit/package.json
 delete mode 100644 packages/web3-kit/src/index.ts
 delete mode 100644 packages/web3-kit/tsconfig.json
 rename packages/{web3-kit => web3-shared/base}/src/helpers/constants.ts (98%)
 rename packages/{web3-kit => web3-shared/base}/src/helpers/index.ts (70%)
 rename packages/{web3-kit => web3-shared/base}/src/helpers/lookupTable.ts (100%)
 rename packages/{web3-kit/src => web3-shared/base/src/helpers}/types.ts (100%)

diff --git a/packages/mask/.webpack/config.ts b/packages/mask/.webpack/config.ts
index 06cd05ebae0d..4dd1cf69efc4 100644
--- a/packages/mask/.webpack/config.ts
+++ b/packages/mask/.webpack/config.ts
@@ -72,7 +72,6 @@ export function createConfiguration(rawFlags: BuildFlags): Configuration {
                     '@masknet/shared-base': join(__dirname, '../../shared-base/src/'),
                     '@masknet/theme': join(__dirname, '../../theme/src/'),
                     '@masknet/icons': join(__dirname, '../../icons/index.ts'),
-                    '@masknet/web3-kit': join(__dirname, '../../web3-kit/src/'),
                     '@masknet/web3-providers': join(__dirname, '../../web3-providers/src'),
                     '@masknet/web3-shared-base': join(__dirname, '../../web3-shared/base/src'),
                     '@masknet/web3-shared-evm': join(__dirname, '../../web3-shared/evm/'),
diff --git a/packages/plugins/FileService/package.json b/packages/plugins/FileService/package.json
index 3521a1cf0b60..f12f9c29fd77 100644
--- a/packages/plugins/FileService/package.json
+++ b/packages/plugins/FileService/package.json
@@ -14,7 +14,6 @@
     "@masknet/theme": "workspace:*",
     "@masknet/typed-message": "workspace:*",
     "@msgpack/msgpack": "^2.7.2",
-    "@masknet/web3-kit": "workspace:*",
     "arweave": "^1.10.3",
     "ipfs-http-client": "^54.0.2",
     "urlcat": "^2.0.4",
diff --git a/packages/plugins/FileService/src/helpers.ts b/packages/plugins/FileService/src/helpers.ts
index 010644730ee6..a25764ffbb1f 100644
--- a/packages/plugins/FileService/src/helpers.ts
+++ b/packages/plugins/FileService/src/helpers.ts
@@ -6,7 +6,7 @@ import schemaV2 from './schema-v2.json'
 import type { Result } from 'ts-results'
 import { isNil } from 'lodash-unified'
 import { encodeArrayBuffer, encodeText } from '@dimensiondev/kit'
-import { createLookupTableResolver } from '@masknet/web3-kit'
+import { createLookupTableResolver } from '@masknet/web3-shared-base'
 
 const reader_v1 = createTypedMessageMetadataReader<FileInfoV1>(META_KEY_1, schemaV1)
 const reader_v2 = createTypedMessageMetadataReader<FileInfo>(META_KEY_2, schemaV2)
diff --git a/packages/plugins/FileService/tsconfig.json b/packages/plugins/FileService/tsconfig.json
index 13e20419cc5b..3b57a27d76c7 100644
--- a/packages/plugins/FileService/tsconfig.json
+++ b/packages/plugins/FileService/tsconfig.json
@@ -12,9 +12,7 @@
     { "path": "../../shared-base" },
     { "path": "../../typed-message/base" },
     { "path": "../../shared" },
-    { "path": "../../web3-kit" },
     { "path": "../../icons" },
-    { "path": "../../web3-kit" },
     { "path": "../Wallet" }
   ]
 }
diff --git a/packages/web3-kit/package.json b/packages/web3-kit/package.json
deleted file mode 100644
index 8765238aa53a..000000000000
--- a/packages/web3-kit/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "@masknet/web3-kit",
-  "private": true,
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts"
-}
diff --git a/packages/web3-kit/src/index.ts b/packages/web3-kit/src/index.ts
deleted file mode 100644
index 493732df2b6e..000000000000
--- a/packages/web3-kit/src/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './helpers'
-export * from './types'
diff --git a/packages/web3-kit/tsconfig.json b/packages/web3-kit/tsconfig.json
deleted file mode 100644
index a60b8d557dca..000000000000
--- a/packages/web3-kit/tsconfig.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "./src/",
-    "outDir": "./dist/",
-    "tsBuildInfoFile": "./dist/.tsbuildinfo"
-  },
-  "include": ["./src", "./src/**/*.json"]
-}
diff --git a/packages/web3-kit/src/helpers/constants.ts b/packages/web3-shared/base/src/helpers/constants.ts
similarity index 98%
rename from packages/web3-kit/src/helpers/constants.ts
rename to packages/web3-shared/base/src/helpers/constants.ts
index 1178259f5dc8..018dfcdff6cf 100644
--- a/packages/web3-kit/src/helpers/constants.ts
+++ b/packages/web3-shared/base/src/helpers/constants.ts
@@ -1,5 +1,5 @@
 import { useMemo } from 'react'
-import type { Primitive } from '../types'
+import type { Primitive } from './types'
 
 type ChainId = number
 
diff --git a/packages/web3-kit/src/helpers/index.ts b/packages/web3-shared/base/src/helpers/index.ts
similarity index 70%
rename from packages/web3-kit/src/helpers/index.ts
rename to packages/web3-shared/base/src/helpers/index.ts
index 84ac0192f505..83e58f95e00c 100644
--- a/packages/web3-kit/src/helpers/index.ts
+++ b/packages/web3-shared/base/src/helpers/index.ts
@@ -1,2 +1,3 @@
 export * from './constants'
 export * from './lookupTable'
+export * from './types'
diff --git a/packages/web3-kit/src/helpers/lookupTable.ts b/packages/web3-shared/base/src/helpers/lookupTable.ts
similarity index 100%
rename from packages/web3-kit/src/helpers/lookupTable.ts
rename to packages/web3-shared/base/src/helpers/lookupTable.ts
diff --git a/packages/web3-kit/src/types.ts b/packages/web3-shared/base/src/helpers/types.ts
similarity index 100%
rename from packages/web3-kit/src/types.ts
rename to packages/web3-shared/base/src/helpers/types.ts
diff --git a/packages/web3-shared/base/src/index.ts b/packages/web3-shared/base/src/index.ts
index 043d66c81a42..82652a45b6ce 100644
--- a/packages/web3-shared/base/src/index.ts
+++ b/packages/web3-shared/base/src/index.ts
@@ -1,3 +1,4 @@
 export * from './hooks'
 export * from './utils'
 export * from './proxy'
+export * from './helpers'
diff --git a/packages/web3-shared/flow/constants/index.ts b/packages/web3-shared/flow/constants/index.ts
index ca79555bff04..b2e7d0fc248a 100644
--- a/packages/web3-shared/flow/constants/index.ts
+++ b/packages/web3-shared/flow/constants/index.ts
@@ -1,6 +1,6 @@
 import Auth from '@masknet/web3-constants/flow/auth.json'
 import Token from '@masknet/web3-constants/flow/token.json'
-import { hookTransform, transform } from '@masknet/web3-kit'
+import { hookTransform, transform } from '@masknet/web3-shared-base'
 import { ChainId } from '../types'
 
 export const getAuthConstants = transform(ChainId, Auth)
diff --git a/packages/web3-shared/flow/package.json b/packages/web3-shared/flow/package.json
index b1770b8fef2e..3ab43bf3ecb9 100644
--- a/packages/web3-shared/flow/package.json
+++ b/packages/web3-shared/flow/package.json
@@ -6,7 +6,7 @@
   "dependencies": {
     "@blocto/fcl": "^0.0.78-alpha.8",
     "@masknet/web3-constants": "workspace:*",
-    "@masknet/web3-kit": "workspace:*",
+    "@masknet/web3-shared-base": "workspace:*",
     "@onflow/types": "^0.0.5",
     "react-use": "^17.3.2",
     "urlcat": "^2.0.4"
diff --git a/packages/web3-shared/flow/pipes/index.ts b/packages/web3-shared/flow/pipes/index.ts
index 5eb3267b70db..38c62af509cb 100644
--- a/packages/web3-shared/flow/pipes/index.ts
+++ b/packages/web3-shared/flow/pipes/index.ts
@@ -1,5 +1,5 @@
 import urlcat from 'urlcat'
-import { createLookupTableResolver } from '@masknet/web3-kit'
+import { createLookupTableResolver } from '@masknet/web3-shared-base'
 import { ChainId, ProviderType } from '../types'
 
 export const resolveChainName = createLookupTableResolver<ChainId, string>(
diff --git a/packages/web3-shared/flow/tsconfig.json b/packages/web3-shared/flow/tsconfig.json
index 4df8fbc1cc60..b5b903e4be17 100644
--- a/packages/web3-shared/flow/tsconfig.json
+++ b/packages/web3-shared/flow/tsconfig.json
@@ -6,5 +6,5 @@
     "tsBuildInfoFile": "../dist/flow.tsbuildinfo"
   },
   "include": ["./", "./**/*.json"],
-  "references": [{ "path": "../../web3-kit" }]
+  "references": [{ "path": "../../web3-shared/base" }]
 }
diff --git a/packages/web3-shared/solana/constants/index.ts b/packages/web3-shared/solana/constants/index.ts
index 292cae20cbf9..8275467bad6a 100644
--- a/packages/web3-shared/solana/constants/index.ts
+++ b/packages/web3-shared/solana/constants/index.ts
@@ -1,5 +1,5 @@
 import Token from '@masknet/web3-constants/solana/token.json'
-import { hookTransform, transform } from '@masknet/web3-kit'
+import { hookTransform, transform } from '@masknet/web3-shared-base'
 import { ChainId } from '../types'
 
 export const getTokenConstants = transform(ChainId, Token)
diff --git a/packages/web3-shared/solana/package.json b/packages/web3-shared/solana/package.json
index 28436a6d93e4..8449f3aa1d30 100644
--- a/packages/web3-shared/solana/package.json
+++ b/packages/web3-shared/solana/package.json
@@ -5,7 +5,7 @@
   "types": "./dist/index.d.ts",
   "dependencies": {
     "@masknet/web3-constants": "workspace:*",
-    "@masknet/web3-kit": "workspace:*",
+    "@masknet/web3-shared-base": "workspace:*",
     "react-use": "^17.3.2",
     "urlcat": "^2.0.4"
   }
diff --git a/packages/web3-shared/solana/pipes/index.ts b/packages/web3-shared/solana/pipes/index.ts
index 2fb0ac4464ac..10fec7a7d9bb 100644
--- a/packages/web3-shared/solana/pipes/index.ts
+++ b/packages/web3-shared/solana/pipes/index.ts
@@ -1,5 +1,5 @@
 import urlcat from 'urlcat'
-import { createLookupTableResolver } from '@masknet/web3-kit'
+import { createLookupTableResolver } from '@masknet/web3-shared-base'
 import { ChainId, ProviderType } from '../types'
 
 export const resolveChainName = createLookupTableResolver<ChainId, string>(
diff --git a/packages/web3-shared/solana/tsconfig.json b/packages/web3-shared/solana/tsconfig.json
index 9c09406d2dfe..c3938c229245 100644
--- a/packages/web3-shared/solana/tsconfig.json
+++ b/packages/web3-shared/solana/tsconfig.json
@@ -6,5 +6,5 @@
     "tsBuildInfoFile": "../dist/solana.tsbuildinfo"
   },
   "include": ["./", "./**/*.json"],
-  "references": [{ "path": "../../web3-kit" }]
+  "references": [{ "path": "../../web3-shared/base" }]
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ac58c06ccf23..6f7c98e8bac9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -693,7 +693,6 @@ importers:
       '@masknet/shared-base': workspace:*
       '@masknet/theme': workspace:*
       '@masknet/typed-message': workspace:*
-      '@masknet/web3-kit': workspace:*
       '@msgpack/msgpack': ^2.7.2
       arweave: ^1.10.3
       date-fns: ^2.28.0
@@ -712,7 +711,6 @@ importers:
       '@masknet/shared-base': link:../../shared-base
       '@masknet/theme': link:../../theme
       '@masknet/typed-message': link:../../typed-message
-      '@masknet/web3-kit': link:../../web3-kit
       '@msgpack/msgpack': 2.7.2
       arweave: 1.10.13
       date-fns: 2.28.0
@@ -1131,9 +1129,6 @@ importers:
       promievent: 0.1.5
       web3-eth-contract: 1.5.2
 
-  packages/web3-kit:
-    specifiers: {}
-
   packages/web3-providers:
     specifiers:
       '@masknet/plugin-infra': workspace:*
@@ -1238,14 +1233,12 @@ importers:
     specifiers:
       '@blocto/fcl': ^0.0.78-alpha.8
       '@masknet/web3-constants': workspace:*
-      '@masknet/web3-kit': workspace:*
       '@onflow/types': ^0.0.5
       react-use: ^17.3.2
       urlcat: ^2.0.4
     dependencies:
       '@blocto/fcl': 0.0.78-alpha.8
       '@masknet/web3-constants': link:../../web3-constants
-      '@masknet/web3-kit': link:../../web3-kit
       '@onflow/types': 0.0.5
       react-use: 17.3.2_bc22c48adf1a4e34a005159413cd72b5
       urlcat: 2.0.4
@@ -1253,12 +1246,10 @@ importers:
   packages/web3-shared/solana:
     specifiers:
       '@masknet/web3-constants': workspace:*
-      '@masknet/web3-kit': workspace:*
       react-use: ^17.3.2
       urlcat: ^2.0.4
     dependencies:
       '@masknet/web3-constants': link:../../web3-constants
-      '@masknet/web3-kit': link:../../web3-kit
       react-use: 17.3.2_bc22c48adf1a4e34a005159413cd72b5
       urlcat: 2.0.4
 
diff --git a/tsconfig.json b/tsconfig.json
index 8c1c3d37347c..8d940fd96612 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -79,7 +79,6 @@
       "@masknet/theme": ["./packages/theme/src"],
       // @masknet/web3-constants is not listed. It is not a TS project (only contains JSON files).
       // @masknet/web3-contracts is not listed. It is not a TS project (only contains generated JSON and .d.ts files).
-      "@masknet/web3-kit": ["./packages/web3-kit/src"],
       "@masknet/web3-providers": ["./packages/web3-providers/src"],
       "@masknet/web3-shared-base": ["./packages/web3-shared/base/src"],
       "@masknet/web3-shared-evm": ["./packages/web3-shared/evm/src"],

From 08ccc6b91daab4f77a6dd258a5b5df31ab7fecc2 Mon Sep 17 00:00:00 2001
From: Hom Yan <yanzhihong23@qq.com>
Date: Tue, 15 Mar 2022 17:27:16 +0800
Subject: [PATCH 2/2] fix: lock file

---
 pnpm-lock.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6f7c98e8bac9..83dabc3c15ae 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1233,12 +1233,14 @@ importers:
     specifiers:
       '@blocto/fcl': ^0.0.78-alpha.8
       '@masknet/web3-constants': workspace:*
+      '@masknet/web3-shared-base': workspace:*
       '@onflow/types': ^0.0.5
       react-use: ^17.3.2
       urlcat: ^2.0.4
     dependencies:
       '@blocto/fcl': 0.0.78-alpha.8
       '@masknet/web3-constants': link:../../web3-constants
+      '@masknet/web3-shared-base': link:../base
       '@onflow/types': 0.0.5
       react-use: 17.3.2_bc22c48adf1a4e34a005159413cd72b5
       urlcat: 2.0.4
@@ -1246,10 +1248,12 @@ importers:
   packages/web3-shared/solana:
     specifiers:
       '@masknet/web3-constants': workspace:*
+      '@masknet/web3-shared-base': workspace:*
       react-use: ^17.3.2
       urlcat: ^2.0.4
     dependencies:
       '@masknet/web3-constants': link:../../web3-constants
+      '@masknet/web3-shared-base': link:../base
       react-use: 17.3.2_bc22c48adf1a4e34a005159413cd72b5
       urlcat: 2.0.4