Skip to content

Commit b293008

Browse files
authored
Merge pull request #21 from zorro11639/release/v1.2.6
Release/v1.2.6
2 parents 04774d8 + 936cfc6 commit b293008

27 files changed

+733
-292
lines changed

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ This repository contains wallet adapters and components for Tron DApps. With out
2929
| [FoxWallet](https://foxwallet.com/) | Android | >= 5.3.1 |
3030
| | IOS | >= 5.3.1 |
3131
| |Browser Extension | Not Support |
32+
| [Bybit](https://bybit.com/web3) | Android | >= 4.51.1 |
33+
| | IOS | >= 4.51.1 |
34+
| |Browser Extension | >= 3.16.3 |
3235
| [Ledger](https://www.ledger.com/) | - | All versions |
3336
| [WalletConnect](https://walletconnect.org) | - | >= v2.0 |
3437

@@ -186,6 +189,7 @@ tronwallet-adapter
186189
| | ├─imtoken # adapter for imToken Wallet
187190
| | ├─gatewallet # adapter for gate.io Wallet
188191
| | ├─foxwallet # adapter for FoxWallet
192+
| | ├─bybit # adapter for Bybit Wallet
189193
| ├─react
190194
| | ├─react-hooks # react hooks to manage wallet state
191195
| | ├─react-ui # react ui components to select/connect wallets
@@ -220,6 +224,7 @@ You can use the `@tronweb3/tronwallet-adapters` package, or add the individual w
220224
| [imtoken](https://token.im/) | Adapter for imToken Wallet App(IOS and Android) | [`@tronweb3/tronwallet-adapter-imtoken`](https://www.npmjs.com/package/@tronweb3/tronwallet-adapter-imtoken) |
221225
| [gatewallet](https://www.gate.io/web3) | Adapter for gate.io Wallet App(IOS and Android) | [`@tronweb3/tronwallet-adapter-gatewallet`](https://www.npmjs.com/package/@tronweb3/tronwallet-adapter-gatewallet) |
222226
| [foxwallet](https://foxwallet.com/) | Adapter for Fox Wallet App(IOS and Android) | [`@tronweb3/tronwallet-adapter-foxwallet`](https://www.npmjs.com/package/@tronweb3/tronwallet-adapter-foxwallet) |
227+
| [bybit](https://www.bybit.com/en/web3/home) | Adapter for Bybit Wallet App(IOS and Android) and Extension | [`@tronweb3/tronwallet-adapter-bybit`](https://www.npmjs.com/package/@tronweb3/tronwallet-adapter-bybit) |
223228

224229
### React Components
225230

@@ -245,6 +250,7 @@ This package contains all wallet adapters for Tron including:
245250
- [imToken Wallet](https://token.im/).
246251
- [gate.io Wallet](https://www.gate.io/web3)
247252
- [Fox Wallet](https://foxwallet.com/)
253+
- [Bybit Wallet](https://www.bybit.com/web3)
248254

249255
Code example:
250256

demos/dev-demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@
6060
"@ledgerhq/hw-transport": "6.27.1",
6161
"@ledgerhq/hw-transport-webhid": "6.27.1"
6262
}
63-
}
63+
}

demos/dev-demo/src/AdapterBasicTest.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ import {
1212
TokenPocketAdapter,
1313
TronLinkAdapter,
1414
WalletConnectAdapter,
15-
FoxWalletAdapter
15+
FoxWalletAdapter,
16+
BybitWalletAdapter
1617
} from '@tronweb3/tronwallet-adapters';
1718
import { memo, useCallback, useEffect, useMemo, useState } from 'react';
1819
import { tronWeb } from './tronweb';
@@ -29,6 +30,7 @@ export const AdapterBasicTest = memo(function AdapterBasicTest() {
2930
new GateWalletAdapter(),
3031
new ImTokenAdapter(),
3132
new FoxWalletAdapter(),
33+
new BybitWalletAdapter(),
3234
new LedgerAdapter(),
3335
new WalletConnectAdapter(walletconnectConfig),
3436
],

demos/react-ui/vite-app/package.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@
1414
"@emotion/styled": "^11.10.4",
1515
"@mui/material": "^5.10.10",
1616
"@noble/secp256k1": "1.7.1",
17-
"@tronweb3/tronwallet-abstract-adapter": "^1.1.0",
18-
"@tronweb3/tronwallet-adapter-ledger": "^1.1.1",
19-
"@tronweb3/tronwallet-adapter-react-hooks": "^1.0.0",
20-
"@tronweb3/tronwallet-adapter-react-ui": "^1.1.0",
21-
"@tronweb3/tronwallet-adapter-tronlink": "^1.1.9",
22-
"@tronweb3/tronwallet-adapter-walletconnect": "^2.0.0",
23-
"@tronweb3/tronwallet-adapters": "^1.2.4",
24-
"@tronweb3/tronwallet-adapter-foxwallet": "^1.0.0",
17+
"@tronweb3/tronwallet-abstract-adapter": "latest",
18+
"@tronweb3/tronwallet-adapter-ledger": "latest",
19+
"@tronweb3/tronwallet-adapter-react-hooks": "latest",
20+
"@tronweb3/tronwallet-adapter-react-ui": "latest",
21+
"@tronweb3/tronwallet-adapter-tronlink": "latest",
22+
"@tronweb3/tronwallet-adapter-walletconnect": "latest",
23+
"@tronweb3/tronwallet-adapters": "latest",
2524
"buffer": "^6.0.3",
2625
"events": "^3.3.0",
2726
"react": "^18.2.0",

demos/react-ui/vite-app/src/App.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
} from '@tronweb3/tronwallet-adapter-react-ui';
1212
import toast from 'react-hot-toast';
1313
import { Table, TableBody, TableCell, TableContainer, TableHead, TableRow, TextField, Alert } from '@mui/material';
14-
import { TronLinkAdapter, TokenPocketAdapter, BitKeepAdapter, OkxWalletAdapter, GateWalletAdapter } from '@tronweb3/tronwallet-adapters';
14+
import { TronLinkAdapter, TokenPocketAdapter, BitKeepAdapter, OkxWalletAdapter, GateWalletAdapter, BybitWalletAdapter } from '@tronweb3/tronwallet-adapters';
1515
import { WalletConnectAdapter } from '@tronweb3/tronwallet-adapter-walletconnect';
1616
import { LedgerAdapter } from '@tronweb3/tronwallet-adapter-ledger';
1717
import { tronWeb } from './tronweb';
@@ -86,7 +86,8 @@ export function App() {
8686
const bitKeep = new BitKeepAdapter();
8787
const okxWalletAdapter = new OkxWalletAdapter();
8888
const gateAdapter = new GateWalletAdapter();
89-
return [tronLink1, walletConnect1, ledger, tokenPocket, bitKeep, okxWalletAdapter, gateAdapter];
89+
const bybitAdapter = new BybitWalletAdapter();
90+
return [tronLink1, walletConnect1, ledger, tokenPocket, bitKeep, okxWalletAdapter, gateAdapter, bybitAdapter];
9091
}, []);
9192
function onConnect() {
9293
console.log('onConnect');

demos/vue-ui/vite-app/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
},
1111
"dependencies": {
1212
"@noble/secp256k1": "^1.7.1",
13-
"@tronweb3/tronwallet-abstract-adapter": "^1.1.6",
14-
"@tronweb3/tronwallet-adapter-tronlink": "^1.1.9",
15-
"@tronweb3/tronwallet-adapter-vue-hooks": "^1.0.0",
16-
"@tronweb3/tronwallet-adapter-vue-ui": "^1.0.0",
17-
"@tronweb3/tronwallet-adapter-walletconnect": "^2.0.0",
18-
"@tronweb3/tronwallet-adapters": "^1.2.2",
13+
"@tronweb3/tronwallet-abstract-adapter": "latest",
14+
"@tronweb3/tronwallet-adapter-tronlink": "latest",
15+
"@tronweb3/tronwallet-adapter-vue-hooks": "latest",
16+
"@tronweb3/tronwallet-adapter-vue-ui": "latest",
17+
"@tronweb3/tronwallet-adapter-walletconnect": "latest",
18+
"@tronweb3/tronwallet-adapters": "latest",
1919
"element-plus": "^2.4.3",
2020
"tronweb": "5.3.2",
2121
"vue": "^3.3.8"

demos/vue-ui/vite-app/src/App.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
TokenPocketAdapter,
1111
TronLinkAdapter,
1212
WalletConnectAdapter,
13+
BybitWalletAdapter,
1314
} from '@tronweb3/tronwallet-adapters';
1415
import { WalletModalProvider } from '@tronweb3/tronwallet-adapter-vue-ui';
1516
const tronLink = new TronLinkAdapter();
@@ -51,8 +52,8 @@ const ledger = new LedgerAdapter({
5152
const tokenPocket = new TokenPocketAdapter();
5253
const bitKeep = new BitKeepAdapter();
5354
const okxWalletAdapter = new OkxWalletAdapter();
54-
55-
const adapters = [tronLink, walletConnect, ledger, tokenPocket, bitKeep, okxWalletAdapter];
55+
const bybit = new BybitWalletAdapter();
56+
const adapters = [tronLink, walletConnect, ledger, tokenPocket, bitKeep, okxWalletAdapter, bybit];
5657
5758
function onAdapterChanged(adapter: Adapter) {
5859
console.log('[wallet hooks] onAdapterChanged: ', adapter?.name);

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tronwallet-adapter",
33
"description": "wallet adapters for TRON blockchain",
4-
"version": "1.2.5",
4+
"version": "1.2.6",
55
"main": "index.js",
66
"sideEffects": false,
77
"private": true,

packages/adapters/adapters/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ As `@tronweb3/tronwallet-adapters` exports adapter of each wallet , you can use
1818
| [`@tronweb3/tronwallet-adapter-imtoken`](https://npmjs.com/package/@tronweb3/tronwallet-adapter-imtoken) | adapter for [imToken](https://token.im/) | [View](https://github.com/web3-geek/tronwallet-adapter/tree/main/packages/adapters/imtoken) |
1919
| [`@tronweb3/tronwallet-adapter-gatewallet`](https://npmjs.com/package/@tronweb3/tronwallet-adapter-gatewallet) | adapter for [gate.io](https://www.gate.io/web3) | [View](https://github.com/web3-geek/tronwallet-adapter/tree/main/packages/adapters/gatewallet) |
2020
| [`@tronweb3/tronwallet-adapter-foxwallet`](https://npmjs.com/package/@tronweb3/tronwallet-adapter-foxwallet) | adapter for [FoxWallet](https://foxwallet.com/) | [View](https://github.com/web3-geek/tronwallet-adapter/tree/main/packages/adapters/foxwallet) |
21+
| [`@tronweb3/tronwallet-adapter-bybit`](https://npmjs.com/package/@tronweb3/tronwallet-adapter-bybit) | adapter for [Bybit Wallet](https://www.bybit.com/en/web3/home) | [View](https://github.com/web3-geek/tronwallet-adapter/tree/main/packages/adapters/bybit) |
2122

2223

2324
## Usage
@@ -341,3 +342,4 @@ Other adapters `Constructor` config api can be found in their source code `READM
341342
- [ImTokenAdapter](https://github.com/web3-geek/tronwallet-adapter/tree/main/packages/adapters/imtoken)
342343
- [GateWalletAdapter](https://github.com/web3-geek/tronwallet-adapter/tree/main/packages/adapters/gatewallet)
343344
- [FoxWalletAdapter](https://github.com/web3-geek/tronwallet-adapter/tree/main/packages/adapters/foxwallet)
345+
- [BybitWalletAdapter](https://github.com/web3-geek/tronwallet-adapter/tree/main/packages/adapters/bybit)

packages/adapters/adapters/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tronweb3/tronwallet-adapters",
3-
"version": "1.2.5",
3+
"version": "1.2.6",
44
"description": "Wallet adapters to help developers interact with Tron wallets using consistent API.",
55
"keywords": [
66
"TRON",
@@ -50,7 +50,8 @@
5050
"@tronweb3/tronwallet-adapter-tronlink": "workspace:^",
5151
"@tronweb3/tronwallet-adapter-walletconnect": "workspace:^",
5252
"@tronweb3/tronwallet-adapter-gatewallet": "workspace:^",
53-
"@tronweb3/tronwallet-adapter-foxwallet": "workspace:^"
53+
"@tronweb3/tronwallet-adapter-foxwallet": "workspace:^",
54+
"@tronweb3/tronwallet-adapter-bybit": "workspace:^"
5455
},
5556
"devDependencies": {
5657
"@vitest/browser": "^2.0.4",

0 commit comments

Comments
 (0)