Merge pull request #138 from bnb-chain/wenty/sdk

refactor: Refactor sdk
bnb-chain · Nov 18, 2024 · 1925e4e · 1925e4e
2 parents 3a0ff73 + d05066d
commit 1925e4e
Show file tree

Hide file tree

Showing 121 changed files with 4,387 additions and 6,861 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,17 +3,17 @@
     "*.json": "jsonc"
   },
   "files.exclude": {
-    // "**/.git": true,
+    "**/.git": true,
     "**/.svn": true,
     "**/.hg": true,
     "**/CVS": true,
     "**/.DS_Store": true,
-    // "**/node_modules": true,
-    // "**/.next": true,
+    "**/node_modules": true,
+    "**/.next": true,
     "**/*.log": true,
-    // "**/dist": true,
-    // "**/.rush": true,
-    // "**/temp": true,
+    "**/dist": true,
+    "**/.rush": true,
+    "**/temp": true,
     "**/tsconfig.tsbuildinfo": true
   },
   "[typescript]": {

diff --git a/apps/canonical-bridge-ui/core/components/ThemeProvider/index.tsx b/apps/canonical-bridge-ui/core/components/ThemeProvider/index.tsx
@@ -24,6 +24,9 @@ export const ThemeProvider = ({ children }: ThemeProviderProps) => {
       global: ({ colorMode }: { colorMode: ColorMode }) => ({
         body: {
           bg: theme.colors[colorMode].background[3],
+          '.transfer-widget': {
+            bg: 'white',
+          },
         },
       }),
     },

diff --git a/apps/canonical-bridge-ui/pages/mainnet/index.tsx b/apps/canonical-bridge-ui/pages/mainnet/index.tsx
@@ -31,7 +31,7 @@ export const bridgeConfig: ICanonicalBridgeConfig = {
   },
   http: {
     refetchingInterval: 30 * 1000, // 30s
-    apiTimeOut: 60 * 1000, // 60s
+    apiTimeOut: 10 * 1000, // 60s
     deBridgeAccessToken: '',
     serverEndpoint: env.SERVER_ENDPOINT,
   },

diff --git a/apps/canonical-bridge-ui/token-config/mainnet/useTransferConfig.ts b/apps/canonical-bridge-ui/token-config/mainnet/useTransferConfig.ts
@@ -28,7 +28,7 @@ export function useTransferConfig() {
         defaultSelectedInfo: {
           fromChainId: 1,
           toChainId: 56,
-          tokenSymbol: 'USDT', // USDT
+          tokenAddress: '0xdac17f958d2ee523a2206206994597c13d831ec7', // USDT
           amount: '',
         },
         order: {

diff --git a/apps/canonical-bridge-ui/token-config/testnet/useTestnetTransferConfig.ts b/apps/canonical-bridge-ui/token-config/testnet/useTestnetTransferConfig.ts
@@ -12,7 +12,7 @@ export function useTestnetTransferConfig() {
         defaultSelectedInfo: {
           fromChainId: 97,
           toChainId: 3448148188,
-          tokenSymbol: 'USDT', // USDT
+          tokenAddress: '0x337610d27c682E347C9cD60BD4b3b107C9d34dDd', // USDT
           amount: '',
         },
         order: {

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/packages/canonical-bridge-sdk/CHANGELOG.md b/packages/canonical-bridge-sdk/CHANGELOG.md
diff --git a/packages/canonical-bridge-sdk/package.json b/packages/canonical-bridge-sdk/package.json
@@ -30,9 +30,11 @@
   },
   "peerDependencies": {
     "axios": "^0",
-    "viem": "^2"
+    "viem": "^2",
+    "@solana/web3.js": "^1"
   },
   "devDependencies": {
+    "@solana/web3.js": "~1.95.4",
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "@vitejs/plugin-react": "^4.2.0",
@@ -43,6 +45,7 @@
     "typescript": "^5",
     "viem": "~2.21.14",
     "vite": "^4.5.0",
-    "vite-plugin-dts": "^3.6.3"
+    "vite-plugin-dts": "^3.6.3",
+    "@types/node": "~22.9.0"
   }
 }
diff --git a/...cal-bridge-sdk/src/core/abi/erc20Token.ts → ...anonical-bridge-sdk/src/abi/erc20Token.ts b/...cal-bridge-sdk/src/core/abi/erc20Token.ts → ...anonical-bridge-sdk/src/abi/erc20Token.ts
diff --git a/packages/canonical-bridge-sdk/src/abi/exports.ts b/packages/canonical-bridge-sdk/src/abi/exports.ts
@@ -0,0 +1 @@
+export * from './erc20Token';
diff --git a/packages/canonical-bridge-sdk/src/adapters/base/exports.ts b/packages/canonical-bridge-sdk/src/adapters/base/exports.ts
@@ -0,0 +1,2 @@
+export * from './index';
+export * from './types';