status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#14059] Show effective gas price

This commit is contained in:
Roman Volosovskyi 2022-09-27 20:53:37 +02:00
parent ca144fbe1b
commit 30e7ad585a
No known key found for this signature in database
GPG Key ID: 0238A4B5ECEE70DE
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/status_im/ethereum/transactions/core.cljs
View File

@ -69,7 +69,7 @@
[chain-tokens [chain-tokens
{:keys [address blockNumber timestamp from txStatus txHash gasPrice {:keys [address blockNumber timestamp from txStatus txHash gasPrice
gasUsed contract value gasLimit input nonce to type id gasUsed contract value gasLimit input nonce to type id
maxFeePerGas maxPriorityFeePerGas]}] maxFeePerGas maxPriorityFeePerGas effectiveGasPrice]}]
(let [erc20? (= type "erc20") (let [erc20? (= type "erc20")
failed? (= txStatus "0x0")] failed? (= txStatus "0x0")]
(merge {:address (eip55/address->checksum address) (merge {:address (eip55/address->checksum address)
@ -77,7 +77,9 @@
:block (str (decode/uint blockNumber)) :block (str (decode/uint blockNumber))
:timestamp (* (decode/uint timestamp) 1000) :timestamp (* (decode/uint timestamp) 1000)
:gas-used (str (decode/uint gasUsed)) :gas-used (str (decode/uint gasUsed))
:gas-price (str (decode/uint gasPrice)) :gas-price (str (if effectiveGasPrice
(decode/uint effectiveGasPrice)
(decode/uint gasPrice)))
:fee-cap (str (decode/uint maxFeePerGas)) :fee-cap (str (decode/uint maxFeePerGas))
:tip-cap (str (decode/uint maxPriorityFeePerGas)) :tip-cap (str (decode/uint maxPriorityFeePerGas))
:gas-limit (str (decode/uint gasLimit)) :gas-limit (str (decode/uint gasLimit))

6
status-go-version.json
View File

@ -3,7 +3,7 @@
"_comment": "Instead use: scripts/update-status-go.sh <rev>", "_comment": "Instead use: scripts/update-status-go.sh <rev>",
"owner": "status-im", "owner": "status-im",
"repo": "status-go", "repo": "status-go",
"version": "v0.110.1", "version": "v0.110.3",
"commit-sha1": "a182f3e699f290776a1f1b3df8e2341c67b3f814", "commit-sha1": "506921509e477445a95e1961a2557ef584d7caec",
"src-sha256": "1hrqmm4db4vbgwjmvqzbilza6fwgb2hns1bsx4vzdpvjqfy3akrv" "src-sha256": "1xmngbfl67n031rxhhbs7m14gzmfhgr1d34szclf1a6qxb9kw946"
} }