Skip to content

Commit 398e23d

Browse files
MrX-SNXMrX-SNX
committed
ref: resolved merge conflict
2 parents 1a088a0 + 7243aaf commit 398e23d

File tree

32 files changed

+644
-55
lines changed

32 files changed

+644
-55
lines changed

‎.circleci/config.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,12 @@ jobs:
454454
working_directory: ~/web3-onboard-monorepo/packages/particle-network
455455
steps:
456456
- node-build-steps
457+
build-finoaconnect:
458+
docker:
459+
- image: cimg/node:18.0.0
460+
working_directory: ~/web3-onboard-monorepo/packages/finoaconnect
461+
steps:
462+
- node-build-steps
457463
build-wagmi:
458464
docker:
459465
- image: cimg/node:18.0.0
@@ -472,6 +478,12 @@ jobs:
472478
working_directory: ~/web3-onboard-monorepo/packages/bloom
473479
steps:
474480
- node-build-steps
481+
build-keplr:
482+
docker:
483+
- image: cimg/node:18.0.0
484+
working_directory: ~/web3-onboard-monorepo/packages/keplr
485+
steps:
486+
- node-build-steps
475487

476488
# Build staging/Alpha releases
477489
build-staging-core:
@@ -780,6 +792,18 @@ jobs:
780792
working_directory: ~/web3-onboard-monorepo/packages/bloom
781793
steps:
782794
- node-staging-build-steps
795+
build-staging-finoaconnect:
796+
docker:
797+
- image: cimg/node:18.0.0
798+
working_directory: ~/web3-onboard-monorepo/packages/finoaconnect
799+
steps:
800+
- node-staging-build-steps
801+
build-staging-keplr:
802+
docker:
803+
- image: cimg/node:18.0.0
804+
working_directory: ~/web3-onboard-monorepo/packages/keplr
805+
steps:
806+
- node-staging-build-steps
783807

784808
workflows:
785809
version: 2
@@ -1091,3 +1115,15 @@ workflows:
10911115
<<: *deploy_production_filters
10921116
- build-staging-bloom:
10931117
<<: *deploy_staging_filters
1118+
finoaconnect:
1119+
jobs:
1120+
- build-finoaconnect:
1121+
<<: *deploy_production_filters
1122+
- build-staging-finoaconnect:
1123+
<<: *deploy_staging_filters
1124+
keplr:
1125+
jobs:
1126+
- build-keplr:
1127+
<<: *deploy_production_filters
1128+
- build-staging-keplr:
1129+
<<: *deploy_staging_filters

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ For full documentation, check out the README.md for each package or the [docs pa
129129
- [Particle Network](packages/particle-network/README.md)
130130
- [MetaMask](packages/metamask/README.md)
131131
- [Bitget](packages/bitget/README.md)
132+
- [FinoaConnect](packages/finoaconnect/README.md)
132133

133134
**Hardware Wallets**
134135

‎docs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"@safe-global/safe-apps-sdk": "^8.1.0",
5555
"@web3-onboard/bitget": "^2.1.1",
5656
"@web3-onboard/blocto": "^2.1.1",
57-
"@web3-onboard/capsule": "^2.3.0-alpha.1",
57+
"@web3-onboard/capsule": "^2.3.0",
5858
"@web3-onboard/cede-store": "^2.3.1",
5959
"@web3-onboard/coinbase": "^2.3.1",
6060
"@web3-onboard/core": "^2.22.1",
@@ -73,7 +73,7 @@
7373
"@web3-onboard/magic": "^2.2.1",
7474
"@web3-onboard/metamask": "^2.1.1",
7575
"@web3-onboard/mew-wallet": "^2.1.1",
76-
"@web3-onboard/okx": "2.0.0-alpha.1",
76+
"@web3-onboard/okx": "2.0.0",
7777
"@web3-onboard/particle-network": "^2.1.1",
7878
"@web3-onboard/phantom": "^2.1.1",
7979
"@web3-onboard/portis": "^2.2.1",

‎docs/src/lib/services/onboard.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ const intiOnboard = async theme => {
5959
const { default: bloctoModule } = await import('@web3-onboard/blocto')
6060
const { default: venlyModule } = await import('@web3-onboard/venly')
6161
const { default: bitgetModule } = await import('@web3-onboard/bitget')
62+
const { default: finoaConnectModule } = await import('@web3-onboard/finoaconnect')
6263
const { default: capsuleModule, Environment } = await import('@web3-onboard/capsule')
6364
const { default: particleAuthModule } = await import('@web3-onboard/particle-network')
6465
const INFURA_ID = '8b60d52405694345a99bcb82e722e0af'
@@ -113,6 +114,9 @@ const intiOnboard = async theme => {
113114
}
114115
const trezor = trezorModule(trezorOptions)
115116

117+
const finoaConnectOptions = {};
118+
const finoaconnect = finoaConnectModule(finoaConnectOptions);
119+
116120
const uauthOptions = {
117121
clientID: 'a25c3a65-a1f2-46cc-a515-a46fe7acb78c',
118122
redirectUri: 'http://localhost:8080/',
@@ -177,6 +181,7 @@ const intiOnboard = async theme => {
177181
blocto,
178182
particle,
179183
venly,
184+
finoaconnect,
180185
capsule
181186
],
182187
chains: [

‎docs/src/routes/docs/[...4]wallets/[...36]finoaconnect/+page.md

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
---
2+
title: FinoaConnect
3+
---
4+
5+
## Wallet module for connecting FinoaConnect SDK to web3-onboard
6+
7+
## Install
8+
9+
<Tabs values={['yarn', 'npm']}>
10+
<TabPanel value="yarn">
11+
12+
```sh copy
13+
yarn add @web3-onboard/core @web3-onboard/finoaconnect
14+
```
15+
16+
</TabPanel>
17+
<TabPanel value="npm">
18+
19+
```sh copy
20+
npm install @web3-onboard/core @web3-onboard/finoaconnect
21+
```
22+
23+
</TabPanel>
24+
</Tabs>
25+
26+
## Usage
27+
28+
Optional initialization object
29+
```typescript
30+
/** Optional object provided to the initiation of the wallet connector.
31+
* When not included, the wallet connector service connects to FinoaConnect production systems.
32+
* @field {url} URL of the FinoaConnect backend systems to be used
33+
* @field {labelSuffix} arbitrary string label to denote the context of the URL field */
34+
export interface FinoaWalletOption {
35+
url?: string
36+
labelSuffix?: string
37+
}
38+
```
39+
40+
```typescript
41+
import Onboard from '@web3-onboard/core'
42+
import finoaConnectModule from '@web3-onboard/finoaconnect'
43+
44+
// initialize the module with options
45+
const finoaConnect = finoaConnectModule()
46+
47+
const onboard = Onboard({
48+
// ... other Onboard options
49+
wallets: [
50+
finoaConnect
51+
//... other wallets
52+
]
53+
})
54+
55+
const connectedWallets = await onboard.connectWallet()
56+
console.log(connectedWallets)
57+
```

‎docs/src/routes/docs/[...4]wallets/[...38]keplr/+page.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
---
2+
title: Keplr Wallet
3+
---
4+
5+
# {$frontmatter.title}
6+
7+
## Wallet module for connecting Keplr Wallet through Web3 Onboard
8+
9+
### Install
10+
11+
<Tabs values={['yarn', 'npm']}>
12+
<TabPanel value="yarn">
13+
14+
```sh copy
15+
yarn add @web3-onboard/keplr
16+
```
17+
18+
</TabPanel>
19+
<TabPanel value="npm">
20+
21+
```sh copy
22+
npm install @web3-onboard/keplr
23+
```
24+
25+
</TabPanel>
26+
</Tabs>
27+
28+
## Usage
29+
30+
```typescript
31+
import Onboard from '@web3-onboard/core'
32+
import KeplrWallet from '@web3-onboard/keplr'
33+
34+
const keplr = KeplrWallet()
35+
36+
const onboard = Onboard({
37+
// ... other Onboard options
38+
wallets: [
39+
keplr
40+
//... other wallets
41+
]
42+
})
43+
44+
const connectedWallets = await onboard.connectWallet()
45+
console.log(connectedWallets)
46+
```
47+
48+
## Build Environments
49+
50+
For build env configurations and setups please see the Build Env section [here](/docs/modules/core#build-environments)

‎docs/yarn.lock

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2544,6 +2544,20 @@
25442544
resolved "https://registry.yarnpkg.com/@metamask/safe-event-emitter/-/safe-event-emitter-3.1.1.tgz#e89b840a7af8097a8ed4953d8dc8470d1302d3ef"
25452545
integrity sha512-ihb3B0T/wJm1eUuArYP4lCTSEoZsClHhuWyfo/kMX3m/odpqNcPfsz5O2A3NT7dXCAgWPGDQGPqygCpgeniKMw==
25462546

2547+
"@metamask/sdk-communication-layer@0.14.3":
2548+
version "0.14.3"
2549+
resolved "https://registry.yarnpkg.com/@metamask/sdk-communication-layer/-/sdk-communication-layer-0.14.3.tgz#0e7ec8e472641273da5802f3b357687ce12369c3"
2550+
integrity sha512-yjSbj8y7fFbQXv2HBzUX6D9C8BimkCYP6BDV7hdw53W8b/GlYCtXVxUFajQ9tuO1xPTRjR/xt/dkdr2aCi6WGw==
2551+
dependencies:
2552+
bufferutil "^4.0.8"
2553+
cross-fetch "^3.1.5"
2554+
date-fns "^2.29.3"
2555+
eciesjs "^0.3.16"
2556+
eventemitter2 "^6.4.5"
2557+
socket.io-client "^4.5.1"
2558+
utf-8-validate "^6.0.3"
2559+
uuid "^8.3.2"
2560+
25472561
"@metamask/sdk-communication-layer@0.20.2":
25482562
version "0.20.2"
25492563
resolved "https://registry.yarnpkg.com/@metamask/sdk-communication-layer/-/sdk-communication-layer-0.20.2.tgz#7f7fd334b2d26abd1a5a1ec1ffadf823a9589344"

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-onboard-monorepo",
3-
"version": "2.26.2",
3+
"version": "2.27.0",
44
"private": true,
55
"workspaces": {
66
"packages": [

‎packages/capsule/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@web3-onboard/capsule",
3-
"version": "2.3.0-alpha.1",
3+
"version": "2.3.0",
44
"description": "Capsule SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
55
"module": "dist/index.js",
66
"browser": "dist/index.js",

‎packages/demo/package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,26 @@
3232
"@web3-onboard/bitget": "2.1.1",
3333
"@web3-onboard/blocto": "^2.1.1",
3434
"@web3-onboard/bloom": "2.0.0",
35-
"@web3-onboard/capsule": "^2.3.0-alpha.1",
35+
"@web3-onboard/capsule": "^2.3.0",
3636
"@web3-onboard/cede-store": "^2.3.1",
3737
"@web3-onboard/core": "2.22.2",
3838
"@web3-onboard/coinbase": "^2.4.1",
3939
"@web3-onboard/dcent": "^2.2.7",
4040
"@web3-onboard/enkrypt": "^2.1.1",
41+
"@web3-onboard/finoaconnect": "2.0.0",
4142
"@web3-onboard/fortmatic": "^2.1.1",
4243
"@web3-onboard/frame": "^2.1.1",
4344
"@web3-onboard/frontier": "^2.1.1",
4445
"@web3-onboard/gas": "^2.2.1",
4546
"@web3-onboard/gnosis": "^2.3.1",
4647
"@web3-onboard/infinity-wallet": "^2.1.1",
47-
"@web3-onboard/injected-wallets": "^2.11.1",
48+
"@web3-onboard/injected-wallets": "^2.11.2",
4849
"@web3-onboard/keepkey": "^2.3.8",
50+
"@web3-onboard/keplr": "2.0.0",
4951
"@web3-onboard/keystone": "^2.3.8",
5052
"@web3-onboard/ledger": "^2.7.1",
5153
"@web3-onboard/magic": "^2.2.1",
52-
"@web3-onboard/metamask": "^2.1.3-alpha.1",
54+
"@web3-onboard/metamask": "^2.1.3",
5355
"@web3-onboard/mew-wallet": "^2.1.1",
5456
"@web3-onboard/okx": "2.0.0",
5557
"@web3-onboard/particle-network": "^2.1.1",
@@ -59,7 +61,7 @@
5961
"@web3-onboard/sequence": "^2.1.1",
6062
"@web3-onboard/taho": "^2.1.1",
6163
"@web3-onboard/torus": "^2.3.1",
62-
"@web3-onboard/transaction-preview": "^2.1.2-alpha.1",
64+
"@web3-onboard/transaction-preview": "^2.1.2",
6365
"@web3-onboard/trezor": "^2.4.4",
6466
"@web3-onboard/trust": "^2.1.1",
6567
"@web3-onboard/uauth": "^2.2.1",

‎packages/demo/src/App.svelte

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
import bitgetModule from '@web3-onboard/bitget'
3939
import bloomModule from '@web3-onboard/bloom'
4040
import particleAuthModule from '@web3-onboard/particle-network'
41+
import finoaConnectModule from '@web3-onboard/finoaconnect'
42+
import keplrModule from '@web3-onboard/keplr'
4143
import capsuleModule, {
4244
Environment,
4345
OAuthMethod
@@ -227,6 +229,7 @@
227229
fallbackProvider: '' // insert your alchemy / infura url here
228230
// encryptionSecret: '' // encryption secret is optional, but advised to securely store values in browser storage
229231
})
232+
const finoaConnect = finoaConnectModule()
230233
231234
const trezorOptions = {
232235
email: 'test@test.com',
@@ -257,6 +260,7 @@
257260
clientKey: 'cSTLqhvONB5j588Wz6E5WJLMPrHeUlGbymf1DFhO',
258261
appId: 'b1f0239a-edb0-41f9-b0f5-ab780bb02a9e'
259262
})
263+
const keplr = keplrModule()
260264
261265
const dcent = dcentModule()
262266
const bitget = bitgetModule()
@@ -322,7 +326,9 @@
322326
blocto,
323327
venly,
324328
particle,
325-
passport
329+
passport,
330+
finoaConnect,
331+
keplr
326332
],
327333
transactionPreview,
328334
gas,

‎packages/finoaconnect/README.md

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# @web3-onboard/finoaconnect
2+
3+
## Wallet module for connecting FinoaConnect SDK to web3-onboard
4+
5+
#### Install
6+
7+
`npm i @web3-onboard/core @web3-onboard/finoaconnect`
8+
9+
## Usage
10+
11+
Optional initialization object
12+
```typescript
13+
/** Optional object provided to the initiation of the wallet connector.
14+
* When not included, the wallet connector service connects to FinoaConnect production systems.
15+
* @field {url} URL of the FinoaConnect backend systems to be used
16+
* @field {labelSuffix} arbitrary string label to denote the context of the URL field */
17+
export interface FinoaWalletOption {
18+
url?: string
19+
labelSuffix?: string
20+
}
21+
```
22+
23+
```typescript
24+
import Onboard from '@web3-onboard/core';
25+
import finoaConnectModule from '@web3-onboard/finoaconnect';
26+
27+
const onboard = Onboard({
28+
// ... other Onboard options
29+
wallets: [
30+
finoaConnectModule()
31+
//... other wallets
32+
]
33+
})
34+
35+
// alternatively to connect to a localised development environment
36+
const onboard = Onboard({
37+
// ... other Onboard options
38+
wallets: [
39+
finoaConnectModule([
40+
{
41+
labelSuffix: 'localhost',
42+
url: 'http://localhost:8080',
43+
}
44+
])
45+
//... other wallets
46+
]
47+
})
48+
49+
const connectedWallets = await onboard.connectWallet()
50+
console.log(connectedWallets)
51+
```

0 commit comments

Comments
 (0)