Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
"react-dom": "18.0.0",
"react-i18next": "^11.16.2",
"ts-results": "3.3.0",
"web3-core": "1.5.2",
"web3-core-method": "1.5.2"
"web3-core": "1.7.1",
"web3-core-method": "1.7.1"
},
"devDependencies": {
"@commitlint/cli": "^16.2.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
"use-subscription": "^1.6.0",
"uuid": "^8.3.2",
"wallet.ts": "^1.0.1",
"web3-core-helpers": "1.5.2",
"web3-utils": "^1.5.3",
"web3-core-helpers": "1.7.1",
"web3-utils": "1.7.1",
"zod": "^3.14.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/injected-script/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"build": "rollup -c"
},
"dependencies": {
"web3-core-helpers": "1.5.2"
"web3-core-helpers": "1.7.1"
}
}
10 changes: 5 additions & 5 deletions packages/mask/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@
"uuid": "^8.3.2",
"wallet.ts": "^1.0.1",
"web-ext-types": "^3.1.0",
"web3": "1.5.2",
"web3-core-helpers": "1.5.2",
"web3-eth-abi": "1.5.2",
"web3-eth-contract": "1.5.2",
"web3-utils": "1.5.2",
"web3": "1.7.1",
"web3-core-helpers": "1.7.1",
"web3-eth-abi": "1.7.1",
"web3-eth-contract": "1.7.1",
"web3-utils": "1.7.1",
"webextension-polyfill": "^0.9.0",
"z-schema": "^5.0.2",
"zod": "3.14.3"
Expand Down
37 changes: 0 additions & 37 deletions packages/mask/src/plugins/Wallet/services/transaction/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,6 @@ import {
} from '@masknet/web3-shared-evm'
import { unreachable } from '@dimensiondev/kit'

export function toReceipt(status: true | string, transaction: Transaction): TransactionReceipt {
return {
status: ['1', '0x1', true].includes(status),
transactionHash: transaction.hash,
transactionIndex: transaction.transactionIndex ?? 0,
blockHash: transaction.blockHash ?? '',
blockNumber: transaction.blockNumber ?? 0,
from: transaction.from,
to: transaction.to ?? '',
cumulativeGasUsed: 0,
gasUsed: 0,
logs: [],
logsBloom: '',
}
}

export function toPayload(transaction: Transaction): JsonRpcPayload {
return {
jsonrpc: '2.0',
Expand Down Expand Up @@ -56,11 +40,6 @@ export function getPayloadFrom(payload: JsonRpcPayload) {
return config?.from as string | undefined
}

export function getPayloadTo(payload: JsonRpcPayload) {
const config = getPayloadConfig(payload)
return config?.to as string | undefined
}

export function getPayloadId(payload: JsonRpcPayload) {
const config = getPayloadConfig(payload)
if (!config) return ''
Expand All @@ -86,22 +65,6 @@ export function getReceiptStatus(receipt: TransactionReceipt | null) {
return TransactionStatusType.NOT_DEPEND
}

export function getTransactionHash(state?: TransactionState) {
if (!state) return ''
switch (state?.type) {
case TransactionStateType.HASH:
return state.hash
case TransactionStateType.RECEIPT:
return state.receipt.transactionHash
case TransactionStateType.CONFIRMED:
return state.receipt.transactionHash
case TransactionStateType.FAILED:
return state.receipt?.transactionHash ?? ''
default:
return ''
}
}

export function getTransactionState(receipt: TransactionReceipt): TransactionState {
if (receipt.blockNumber) {
const status = getReceiptStatus(receipt)
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/Wallet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
"@masknet/web3-shared-evm": "workspace:*",
"bignumber.js": "^9.0.2",
"react-use": "^17.3.2",
"web3-core-helpers": "1.5.2"
"web3-core-helpers": "1.7.1"
}
}
2 changes: 1 addition & 1 deletion packages/web3-contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"devDependencies": {
"bn.js": "^4.12.0",
"promievent": "^0.1.5",
"web3-eth-contract": "1.5.2"
"web3-eth-contract": "1.7.1"
}
}
6 changes: 3 additions & 3 deletions packages/web3-shared/evm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"use-subscription": "^1.6.0",
"uuid": "^8.3.2",
"wallet.ts": "^1.0.1",
"web3": "1.5.2",
"web3-core-helpers": "1.5.2",
"web3-utils": "1.5.2"
"web3": "1.7.1",
"web3-core-helpers": "1.7.1",
"web3-utils": "1.7.1"
},
"devDependencies": {
"@types/use-subscription": "^1.0.0"
Expand Down
Loading