Skip to content

Remove chaingetmsg calls to fetch params #675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 13, 2020
Merged

Remove chaingetmsg calls to fetch params #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion components/Wallet/Message/Detail/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const MessageDetail = ({ address, close, message }) => {
useEffect(() => {
const fetchGasUsed = async message => {
try {
const res = await axios.get(`${FILFOX}/message/${message.cid}`)
const res = await axios.get(`${FILFOX}/v0/message/${message.cid}`)
if (res.status === 200) {
const { baseFee, gasLimit, gasFeeCap, gasPremium, receipt } = res.data
const transactionFee = await walletProvider.gasCalcTxFee(
Expand Down
2 changes: 1 addition & 1 deletion constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const IMPORT_SINGLE_KEY = 'IMPORT_SINGLE_KEY'
export const FILSCAN = 'https://api.filscan.io:8700/v0/filscan'
export const FILSCAN_JSONRPC = 'https://api.filscan.io:8700/rpc/v1'
export const FILSCOUT = 'https://filscoutv3api.ipfsunion.cn'
export const FILFOX = 'https://filfox.info/api/v0'
export const FILFOX = 'https://filfox.info/api'

/* NETWORK VARS */
export const MAINNET = 'f'
Expand Down
1 change: 0 additions & 1 deletion lib/useTransactionHistory/formatMessages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ export const formatFilfoxMessages = messages =>
...message,
maxFee: '0',
paidFee: '0',
params: {},
method: message.method.toUpperCase(),
timestamp: message.timestamp.toString()
}
Expand Down
17 changes: 8 additions & 9 deletions lib/useTransactionHistory/getMsgParams.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
import LotusRPCEngine from '@glif/filecoin-rpc-client'
import { SEND, PROPOSE } from '../../constants'
import { SEND, PROPOSE, EXEC } from '../../constants'

const fetchParams = async (cid, deserialize) => {
const deserializeParams = async (params, deserialize, method) => {
try {
const rpc = new LotusRPCEngine({
apiAddress: process.env.LOTUS_NODE_JSONRPC
})
const msg = await rpc.request('ChainGetMessage', { '/': cid })
const deserializedParams = deserialize(msg.Params, 'fil/1/multisig', 2)
const deserializedParams = deserialize(params, 'fil/1/multisig', method)
if (deserializedParams.method !== 0) {
try {
const deserializedInnerParams = deserialize(
Expand All @@ -34,7 +29,11 @@ export default (messages, deserialize) => {
messages.map(async m => {
if (m.method === SEND) return m
if (m.method === PROPOSE) {
const p = await fetchParams(m.cid, deserialize)
const p = await deserializeParams(m.params, deserialize, 2)
return { ...m, params: p }
}
if (m.method === EXEC) {
const p = await deserializeParams(m.params, deserialize, 1)
return { ...m, params: p }
}
return m
Expand Down
2 changes: 1 addition & 1 deletion lib/useTransactionHistory/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default address => {
async (address, page = 0, pageSize = 10) => {
try {
const res = await axios.get(
`${FILFOX}/address/${address}/messages?pageSize=${pageSize}&page=${page}`
`${FILFOX}/v1/address/${address}/messages?pageSize=${pageSize}&page=${page}`
)

if (res.status !== 200) {
Expand Down