Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Refactor sdk #136

Merged
merged 17 commits into from
Nov 15, 2024
Merged

refactor: Refactor sdk #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
45dfa33
feat: Update cBridge native token parameters
Halibao-Lala Nov 4, 2024
e709acd
Merge branch 'feat/update-switch-network' into example
aiden-cao Nov 4, 2024
bdcb989
Merge pull request #91 from bnb-chain/meson/otherChains
Halibao-Lala Nov 5, 2024
7f66c92
Merge branch 'example' into wenty/token
wenty22 Nov 5, 2024
8705dda
Merge pull request #93 from bnb-chain/wenty/token
wenty22 Nov 5, 2024
3174fb6
Merge pull request #94 from bnb-chain/meson/otherChains
Halibao-Lala Nov 5, 2024
4e36f13
feat: Add native token into token list
Halibao-Lala Nov 5, 2024
3f3d449
Merge pull request #95 from bnb-chain/meson/otherChains
Halibao-Lala Nov 5, 2024
3954b8c
chore: Retrieve ETH fees by WETH token info
Halibao-Lala Nov 6, 2024
287f766
Merge branch 'example' into cbridge/native
Halibao-Lala Nov 6, 2024
ff76308
Merge branch 'cbridge/native' into wenty/sdk
wenty22 Nov 11, 2024
b049845
Merge branch 'wenty/solana' into wenty/sdk
wenty22 Nov 11, 2024
778fb75
refactor: Refactor sdk
wenty22 Nov 13, 2024
030d8c3
refactor: Refactor sdk
wenty22 Nov 13, 2024
c90711e
refactor: Refactor sdk
wenty22 Nov 14, 2024
f85b474
Merge branch 'main' into wenty/sdk
wenty22 Nov 14, 2024
d05066d
refactor: Refactor sdk
wenty22 Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]": {
Expand Down
3 changes: 3 additions & 0 deletions apps/canonical-bridge-ui/core/components/ThemeProvider/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ export const ThemeProvider = ({ children }: ThemeProviderProps) => {
global: ({ colorMode }: { colorMode: ColorMode }) => ({
body: {
bg: theme.colors[colorMode].background[3],
'.transfer-widget': {
bg: 'white',
},
},
}),
},
Expand Down
2 changes: 1 addition & 1 deletion apps/canonical-bridge-ui/pages/mainnet/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down
2 changes: 1 addition & 1 deletion apps/canonical-bridge-ui/token-config/mainnet/useTransferConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export function useTransferConfig() {
defaultSelectedInfo: {
fromChainId: 1,
toChainId: 56,
tokenSymbol: 'USDT', // USDT
tokenAddress: '0xdac17f958d2ee523a2206206994597c13d831ec7', // USDT
amount: '',
},
order: {
Expand Down
2 changes: 1 addition & 1 deletion apps/canonical-bridge-ui/token-config/testnet/useTestnetTransferConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export function useTestnetTransferConfig() {
defaultSelectedInfo: {
fromChainId: 97,
toChainId: 3448148188,
tokenSymbol: 'USDT', // USDT
tokenAddress: '0x337610d27c682E347C9cD60BD4b3b107C9d34dDd', // USDT
amount: '',
},
order: {
Expand Down
85 changes: 49 additions & 36 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

103 changes: 0 additions & 103 deletions packages/canonical-bridge-sdk/CHANGELOG.md
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions packages/canonical-bridge-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
0 ...cal-bridge-sdk/src/core/abi/erc20Token.ts → ...anonical-bridge-sdk/src/abi/erc20Token.ts
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions packages/canonical-bridge-sdk/src/abi/exports.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './erc20Token';
2 changes: 2 additions & 0 deletions packages/canonical-bridge-sdk/src/adapters/base/exports.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from './index';
export * from './types';
Loading