Skip to content

Commit cb9bb6a

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'dev' into feat/sidePanel
2 parents 9426622 + c4dffbb commit cb9bb6a

File tree

18 files changed

+30
-26
lines changed

18 files changed

+30
-26
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "helios",
33
"private": true,
4-
"version": "2.8.1",
4+
"version": "2.8.0",
55
"workspaces": [
66
"websites/*",
77
"packages/doc-ui/*",

‎packages/background/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "helios-background",
3-
"version": "0.0.31",
3+
"version": "0.0.33",
44
"type": "module",
55
"main": "src/index.js",
66
"private": true,

‎packages/background/src/rpc-engine-opts.js

-2
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ import * as ethMaxPriorityFeePerGas from '@fluent-wallet/eth_max-priority-fee-pe
114114
import * as ethEstimate1559Fee from '@fluent-wallet/eth_estimate-1559-fee'
115115

116116
import {
117-
IS_CI,
118117
IS_DEV_MODE,
119118
IS_PROD_MODE,
120119
IS_TEST_MODE,
@@ -190,7 +189,6 @@ export const rpcEngineOpts = {
190189
isProd: IS_PROD_MODE,
191190
isDev: IS_DEV_MODE,
192191
isTest: IS_TEST_MODE,
193-
isCI: IS_CI,
194192
methods: [
195193
walletMetadataForPopup,
196194
walletDbQuery,

‎packages/browser-extension/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "browser-extension",
3-
"version": "0.0.31",
3+
"version": "0.0.33",
44
"main": "index.js",
55
"author": "yqrashawn <namy.19@gmail.com>",
66
"license": "MIT",

‎packages/conflux-tx-error/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "module",
44
"main": "index.js",
55
"packageManager": "yarn@3.1.0",
6-
"version": "1.0.0",
6+
"version": "1.0.1",
77
"dependencies": {
88
"@fluent-wallet/json-rpc-error": "workspace:packages/json-rpc-error"
99
}

‎packages/ethereum-tx-error/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "module",
44
"main": "index.js",
55
"packageManager": "yarn@3.1.0",
6-
"version": "1.0.3",
6+
"version": "1.0.4",
77
"dependencies": {
88
"@fluent-wallet/json-rpc-error": "workspace:packages/json-rpc-error"
99
}

‎packages/inner-utils/env.js

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ export const MODE = import.meta.env
44
export const IS_TEST_MODE = MODE === 'test'
55
export const IS_DEV_MODE = MODE === 'development'
66
export const IS_PROD_MODE = MODE === 'production'
7-
export const IS_CI = process.env.CI === 'true'
87

98
export const PACKAGE_VERSION = process.env.PACKAGE_VERSION
109
// this version is use by view, it include the version suffix e.g v1.0.0.rc-1

‎packages/json-rpc-error/index.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,11 @@ export const guessErrorType = err => {
132132
if (err.code === ERROR.INVALID_PARAMS.code) return InvalidParams
133133
if (err.code === ERROR.INTERNAL.code) return Internal
134134
if (err.code === ERROR.SERVER.code) return Server
135-
if (err.code === ERROR.USER_REJECTED) return UserRejected
135+
if (err.code === ERROR.USER_REJECTED.code) return UserRejected
136136
if (err.code === ERROR.UNAUTHORIZED.code) return Unauthorized
137-
if (err.code === ERROR.UNSUPPORTED_METHOD) return UnsupportedMethod
138-
if (err.code === ERROR.DISCONNECTED) return Disconnected
139-
if (err.code === ERROR.CHAIN_DISCON) return ChainDisconnected
137+
if (err.code === ERROR.UNSUPPORTED_METHOD.code) return UnsupportedMethod
138+
if (err.code === ERROR.DISCONNECTED.code) return Disconnected
139+
if (err.code === ERROR.CHAIN_DISCONNECTED.code) return ChainDisconnected
140140
}
141141

142142
return Internal

‎packages/json-rpc-error/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@fluent-wallet/json-rpc-error",
33
"type": "module",
44
"main": "index.js",
5-
"version": "1.1.2",
5+
"version": "1.1.3",
66
"dependencies": {
77
"@fluent-wallet/errors": "workspace:packages/errors"
88
}

‎packages/popup/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"private": true,
33
"name": "helios-popup",
44
"type": "module",
5-
"version": "0.1.14",
5+
"version": "0.1.15",
66
"main": "index.js",
77
"author": "yqrashawn <namy.19@gmail.com>",
88
"license": "MIT",

‎packages/rpc-engine/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const request = (s, req = {}) => {
2929
}
3030

3131
const defRpcEngineFactory = (db, options = {methods: []}) => {
32-
const {methods, isProd = true, isDev, isTest, isCI} = options
32+
const {methods, isProd = true, isDev, isTest} = options
3333
const rpcStore = new Object() // to store rpc defination
3434

3535
methods.forEach(rpc => {
@@ -92,7 +92,7 @@ const defRpcEngineFactory = (db, options = {methods: []}) => {
9292
const processSpec = ({ins, fn, outs}) => ({
9393
ins: {
9494
...ins,
95-
MODE: {const: {isProd, isDev, isTest, isCI}},
95+
MODE: {const: {isProd, isDev, isTest}},
9696
db: {const: db},
9797
rpcStore: {const: rpcStore},
9898
sendNewRpcRequest: {const: () => sendNewRpcRequest},

‎packages/rpc-engine/middlewares/call-rpc.js

+11-4
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,17 @@ export default defMiddleware(
6464
)
6565
) {
6666
// allow some inpage rpc methods to request the unlock ui
67-
await req.rpcs.wallet_requestUnlockUI().catch(err => {
68-
err.rpcData = req
69-
throw err
70-
})
67+
await req.rpcs
68+
.wallet_requestUnlockUI(
69+
{
70+
errorFallThrough: true,
71+
},
72+
undefined,
73+
)
74+
.catch(err => {
75+
err.rpcData = req
76+
throw err
77+
})
7178
} else {
7279
// reject others
7380
const err = req.Err.Unauthorized()

‎packages/rpc-engine/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@fluent-wallet/rpc-engine",
33
"type": "module",
44
"main": "index.js",
5-
"version": "2.0.9",
5+
"version": "2.0.11",
66
"dependencies": {
77
"@fluent-wallet/associative": "workspace:packages/associative",
88
"@fluent-wallet/cache-rpc": "workspace:packages/cache-rpc",

‎packages/rpcs/cfx_signTransaction/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ export const main = async args => {
139139
if (!fromAddr) throw InvalidParams(`Invalid from address ${newTx.from}`)
140140

141141
/**
142-
* ledger app check, v1.x is is not support 1559 transaction
142+
* ledger app check, v1.x is not support 1559 transaction
143143
* so we need check this app version
144144
*/
145145
let isV1LedgerAPP = false

‎packages/rpcs/wallet_handleUnfinishedCFXTx/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "module",
44
"main": "index.js",
55
"packageManager": "yarn@3.1.0",
6-
"version": "1.0.14",
6+
"version": "1.0.15",
77
"dependencies": {
88
"@ethersproject/bignumber": "5.6.2",
99
"@fluent-wallet/compose": "workspace:*",

‎packages/rpcs/wallet_handleUnfinishedETHTx/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "module",
44
"main": "index.js",
55
"packageManager": "yarn@3.1.0",
6-
"version": "1.0.15",
6+
"version": "1.0.16",
77
"dependencies": {
88
"@ethersproject/bignumber": "5.6.2",
99
"@fluent-wallet/compose": "workspace:*",

‎packages/rpcs/wallet_sendTransaction/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "module",
44
"main": "index.js",
55
"packageManager": "yarn@3.1.0",
6-
"version": "3.0.7",
6+
"version": "3.0.8",
77
"dependencies": {
88
"@ethersproject/bignumber": "5.6.2",
99
"@fluent-wallet/cfx_send-transaction": "workspace:*",

‎packages/rpcs/wallet_sendTransactionWithAction/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "module",
44
"main": "index.js",
55
"packageManager": "yarn@3.2.0",
6-
"version": "1.0.7",
6+
"version": "1.0.8",
77
"dependencies": {
88
"@fluent-wallet/spec": "1.0.8",
99
"@fluent-wallet/wallet_send-transaction": "workspace:*"

0 commit comments

Comments
 (0)