Skip to content

Commit f08232c

Browse files
committed
Merge branch 'circleci-project-setup' into feat/imkey-new-user
2 parents 648d889 + 62f4d06 commit f08232c

File tree

2 files changed

+60
-47
lines changed

2 files changed

+60
-47
lines changed

.circleci/config.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
version: 2.1
2+
executors:
3+
my-custom-executor:
4+
docker:
5+
- image: cimg/base:stable
6+
auth:
7+
# ensure you have first added these secrets
8+
# visit app.circleci.com/settings/project/github/Dargon789/Rabby/environment-variables
9+
username: $DOCKER_HUB_USER
10+
password: $DOCKER_HUB_PASSWORD
11+
jobs:
12+
my-job-name:
13+
14+
executor: my-custom-executor
15+
steps:
16+
- checkout
17+
- run: |
18+
# echo Hello, World!
19+
20+
workflows:
21+
my-custom-workflow:
22+
jobs:
23+
- my-job-name

package.json

Lines changed: 37 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
{
22
"name": "rabby",
3-
"version": "0.93.67",
3+
"version": "0.93.12",
44
"description": "A browser plugin for DeFi users",
55
"scripts": {
66
"clean": "node build/clean.js",
77
"make-theme": "node ./scripts/make-theme.js",
8-
"build:dev:default": "cross-env NODE_OPTIONS='--max-old-space-size=8192' TAILWIND_MODE=watch npm run clean && npm run make-theme && webpack --progress --env config=dev",
9-
"build:dev:turbo": "cross-env NODE_OPTIONS='--max-old-space-size=24576' TAILWIND_MODE=watch npm run clean && npm run make-theme && NODE_OPTIONS='--max-old-space-size=24576' webpack --progress --env config=dev",
8+
"build:dev:default": "npm run clean && npm run make-theme && cross-env TAILWIND_MODE=watch webpack --progress --env config=dev",
109
"build:pro:default": "npm run clean && npm run make-theme && webpack --progress --env config=pro",
1110
"build:debug:default": "npm run clean && npm run make-theme && webpack --progress --env config=debug",
1211
"build:dev:mv2": "cross-env MANIFEST_TYPE=firefox-mv2 npm run build:dev:default",
1312
"build:pro:mv2": "cross-env MANIFEST_TYPE=firefox-mv2 npm run build:pro:default",
1413
"build:debug:mv2": "cross-env MANIFEST_TYPE=firefox-mv2 npm run build:debug:default",
1514
"build:dev": "cross-env MANIFEST_TYPE=chrome-mv3 npm run build:dev:default",
16-
"build:turbodev": "cross-env MANIFEST_TYPE=chrome-mv3 npm run build:dev:turbo",
17-
"dev": "cross-env FORK_TS_CHECKER=enable MANIFEST_TYPE=chrome-mv3 TAILWIND_MODE=build npm run build:dev:default",
1815
"build:pro": "cross-env MANIFEST_TYPE=chrome-mv3 npm run build:pro:default",
1916
"build:debug": "cross-env MANIFEST_TYPE=chrome-mv3 npm run build:debug:default",
2017
"build:sourcemap": "npm run clean && npm run make-theme && webpack --progress --env config=sourcemap",
@@ -33,89 +30,86 @@
3330
"@dnd-kit/utilities": "3.0.2",
3431
"@eth-optimism/contracts": "0.5.32",
3532
"@eth-optimism/contracts-ts": "0.17.2",
36-
"@ethereumjs/common": "4.4.0",
37-
"@ethereumjs/rlp": "5.0.2",
38-
"@ethereumjs/tx": "5.4.0",
39-
"@ethereumjs/util": "9.1.0",
40-
"@ethereumjs/wallet": "2.0.4",
33+
"@ethereumjs/common": "2.5.0",
34+
"@ethereumjs/tx": "3.3.2",
35+
"@ethereumjs/util": "9.0.3",
36+
"@ethereumjs/wallet": "2.0.3",
37+
"@gnosis.pm/safe-core-sdk": "1.1.1",
38+
"@gnosis.pm/safe-core-sdk-types": "0.1.1",
4139
"@imkey/web3-provider": "1.3.10",
4240
"@keystonehq/hw-app-eth": "0.4.4",
4341
"@keystonehq/hw-transport-webusb": "0.3.2",
44-
"@keystonehq/metamask-airgapped-keyring": "0.15.1",
42+
"@keystonehq/metamask-airgapped-keyring": "0.2.5-alpha.2.1",
4543
"@ledgerhq/devices": "8.4.4",
46-
"@ledgerhq/hw-app-eth": "6.42.8",
47-
"@ledgerhq/hw-transport-webhid": "6.30.0",
48-
"@metamask/abi-utils": "3.0.0",
49-
"@metamask/browser-passworder": "6.0.0",
44+
"@ledgerhq/hw-app-eth": "6.39.0",
45+
"@ledgerhq/hw-transport-webhid": "6.29.4",
46+
"@metamask/browser-passworder": "4.1.0",
5047
"@metamask/eth-block-tracker": "10.0.0",
5148
"@metamask/eth-json-rpc-filters": "9.0.0",
52-
"@metamask/eth-sig-util": "7.0.1",
53-
"@metamask/metamask-eth-abis": "3.1.1",
49+
"@metamask/eth-sig-util": "5.1.0",
5450
"@metamask/obs-store": "6.0.2",
5551
"@metamask/post-message-stream": "8.1.0",
5652
"@ngraveio/bc-ur": "1.1.6",
57-
"@onekeyfe/hd-core": "1.1.0",
58-
"@onekeyfe/hd-web-sdk": "1.1.0",
59-
"@opensea/seaport-js": "4.0.5",
53+
"@onekeyfe/hd-core": "0.3.48",
54+
"@onekeyfe/hd-web-sdk": "0.3.27",
6055
"@rabby-wallet/eth-coinbase-keyring": "0.0.0-beta.8",
56+
"@rabby-wallet/eth-gnosis-keyring": "0.0.1",
6157
"@rabby-wallet/eth-hd-keyring": "4.3.2",
62-
"@rabby-wallet/eth-lattice-keyring": "1.2.4",
63-
"@rabby-wallet/eth-simple-keyring": "5.1.0",
64-
"@rabby-wallet/eth-trezor-keyring": "2.6.4",
65-
"@rabby-wallet/eth-walletconnect-keyring": "2.1.7",
58+
"@rabby-wallet/eth-lattice-keyring": "1.2.2",
59+
"@rabby-wallet/eth-simple-keyring": "5.0.1",
60+
"@rabby-wallet/eth-trezor-keyring": "2.6.1",
61+
"@rabby-wallet/eth-walletconnect-keyring": "2.1.5",
6662
"@rabby-wallet/eth-watch-keyring": "1.0.0",
67-
"@rabby-wallet/gnosis-sdk": "1.4.5",
68-
"@rabby-wallet/hyperliquid-sdk": "1.1.1",
69-
"@rabby-wallet/page-provider": "0.4.10",
70-
"@rabby-wallet/rabby-action": "0.1.14",
71-
"@rabby-wallet/rabby-api": "0.9.50",
72-
"@rabby-wallet/rabby-security-engine": "2.0.11",
73-
"@rabby-wallet/rabby-swap": "0.0.71",
63+
"@rabby-wallet/gnosis-sdk": "1.3.10",
64+
"@rabby-wallet/page-provider": "0.4.7",
65+
"@rabby-wallet/rabby-action": "0.1.8",
66+
"@rabby-wallet/rabby-api": "0.9.9",
67+
"@rabby-wallet/rabby-security-engine": "2.0.7",
68+
"@rabby-wallet/rabby-swap": "0.0.46",
7469
"@rabby-wallet/widgets": "1.0.9",
7570
"@rematch/core": "2.2.0",
7671
"@rematch/select": "3.1.2",
7772
"@safe-global/protocol-kit": "5.0.3",
78-
"@safe-global/sdk-starter-kit": "1.1.1",
79-
"@safe-global/types-kit": "1.0.2",
73+
"@safe-global/sdk-starter-kit": "2.0.0",
8074
"@scure/bip39": "1.2.1",
8175
"@sentry/browser": "6.7.2",
8276
"@sentry/react": "6.7.2",
8377
"@sentry/tracing": "6.19.7",
8478
"@spruceid/siwe-parser": "2.0.2",
85-
"@trezor/connect-webextension": "9.6.4",
79+
"@trezor/connect-webextension": "9.3.0",
8680
"@types/bignumber.js": "5.0.0",
8781
"@types/lodash": "4.14.172",
8882
"@types/react-window": "1.8.5",
8983
"@types/styled-components": "5.1.25",
9084
"@types/w3c-web-hid": "1.0.3",
85+
"@vespaiach/axios-fetch-adapter": "0.3.1",
9186
"@zxing/browser": "0.0.10",
9287
"@zxing/library": "0.8.0",
9388
"ahooks": "3.7.8",
9489
"antd": "4.15.3",
9590
"bignumber.js": "9.0.1",
96-
"bitbox-api": "0.10.0",
91+
"bitbox-api": "0.3.2",
9792
"browserify-zlib": "0.2.0",
9893
"buffer": "6.0.3",
9994
"clipboard": "2.0.8",
10095
"clsx": "1.1.1",
10196
"crypto-browserify": "3.12.0",
10297
"dayjs": "1.10.7",
10398
"eth-rpc-errors": "4.0.3",
104-
"ethers": "5.8.0",
99+
"eth-sig-util": "3.0.1",
100+
"ethereumjs-util": "7.1.2",
101+
"ethers": "5.4.2",
105102
"events": "3.3.0",
106-
"fflate": "0.8.2",
107103
"hdkey": "0.8.0",
108104
"https-browserify": "1.0.0",
109105
"human-standard-token-abi": "2.0.0",
110106
"immer": "9.0.21",
111107
"interval-promise": "1.4.0",
112108
"koa-compose": "4.1.0",
113-
"lightweight-charts": "5.0.8",
114109
"lodash": "4.17.21",
115110
"loglevel": "1.7.1",
116111
"lottie-react": "2.4.0",
117112
"lru-cache": "6.0.0",
118-
"multiformats": "13.3.2",
119113
"nanoid": "3.3.6",
120114
"obs-store": "4.0.3",
121115
"p-queue": "7.3.0",
@@ -147,8 +141,9 @@
147141
"ts-toolbelt": "9.6.0",
148142
"url": "0.11.3",
149143
"uuid": "9.0.0",
150-
"viem": "2.23.15",
144+
"viem": "2.17.3",
151145
"web3-eth-abi": "1.7.0",
146+
"web3-utils": "1.7.0",
152147
"webextension-polyfill": "0.7.0"
153148
},
154149
"devDependencies": {
@@ -189,7 +184,6 @@
189184
"eslint-plugin-react-hooks": "4.6.0",
190185
"eslint-webpack-plugin": "2.5.4",
191186
"file-loader": "6.2.0",
192-
"fork-ts-checker-webpack-plugin": "9.0.2",
193187
"fs-extra": "10.0.0",
194188
"fs-readdir-recursive": "1.1.0",
195189
"gulp": "4.0.2",
@@ -205,7 +199,7 @@
205199
"postcss": "8.4.31",
206200
"postcss-custom-properties": "11.0.0",
207201
"postcss-import": "14.0.1",
208-
"postcss-loader": "5.3.0",
202+
"postcss-loader": "5.2.0",
209203
"postcss-nested": "5.0.5",
210204
"prettier": "2.2.1",
211205
"react-i18next": "13.0.3",
@@ -231,11 +225,7 @@
231225
},
232226
"resolutions": {
233227
"@debank/common": "^0.3.0",
234-
"blake2b": "https://github.com/RabbyHub/mirror-blake2b#55b93cc51a50b0af6b81bb44fcdf88e95c7e6b36",
235-
"@rabby-wallet/eth-simple-keyring": "5.1.0"
236-
},
237-
"engines": {
238-
"node": ">=22"
228+
"blake2b": "https://github.com/RabbyHub/mirror-blake2b#55b93cc51a50b0af6b81bb44fcdf88e95c7e6b36"
239229
},
240230
"keywords": [],
241231
"author": "",

0 commit comments

Comments
 (0)