Skip to content

fix auto version bump script #1663

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

Open
mholtzman wants to merge 10 commits into
base: canary
Choose a base branch
from
Open

fix auto version bump script #1663

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9fd1408
Typed state (#1648)
mholtzman Aug 31, 2023
e279e8d
fix access to fee market
mholtzman Sep 1, 2023
f6678f1
Workspaces (#1657)
floating Sep 7, 2023
8b60e9a
resolutions for workspace pr
floating Sep 7, 2023
7dc5571
developing workspace ux (#1660)
floating Sep 11, 2023
a066d8d
continue workspace layout (#1661)
floating Sep 13, 2023
a894123
workspace overlays (#1662)
floating Sep 14, 2023
36a3b77
fix address display
mholtzman Sep 14, 2023
db7fb7a
fix auto version bump script
mholtzman Sep 14, 2023
93942b9
use correct shell for script
mholtzman Sep 14, 2023
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
Prev Previous commit
Next Next commit
fix access to fee market
  • Loading branch information
@mholtzman
mholtzman committed Sep 1, 2023
commit e279e8d7f4d05788a485c5c6cbf73889488b488e
4 changes: 3 additions & 1 deletion app/tray/Account/Requests/TransactionRequest/TxFee/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ class TxFee extends React.Component {
const serializedTransaction = utils.serializeTransaction(tx)

// Get current Ethereum gas price
const ethBaseFee = this.store('main.networksMeta.ethereum', 1, 'gas.fees.nextBaseFee')
const feeMarket = this.store('main.networksMeta.ethereum', 1, 'gas.fees') || {}
const { nextBaseFee: ethBaseFee } = feeMarket

const l1DataFee = calculateOptimismL1DataFee(serializedTransaction, ethBaseFee)

// Compute the L2 execution fee
Expand Down
9 changes: 5 additions & 4 deletions resources/Components/Monitor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,15 +189,16 @@ class ChainSummaryComponent extends Component {
}))
}

feeEstimatesUSD({ chainId, displayFeeMarket, gasPrice }) {
feeEstimatesUSD({ chainId, gasPrice }) {
const type = 'ethereum'
const currentSymbol = this.store('main.networksMeta', type, chainId, 'nativeCurrency', 'symbol') || 'ETH'
const feeMarket = this.store('main.networksMeta', type, chainId, 'gas.fees')

if (!displayFeeMarket) {
if (!feeMarket) {
return this.txEstimates(type, chainId, gasPrice, null, currentSymbol)
}

const { nextBaseFee, maxPriorityFeePerGas } = this.store('main.networksMeta', type, chainId, 'gas.fees')
const { nextBaseFee, maxPriorityFeePerGas } = feeMarket
const calculatedFees = {
actualBaseFee: roundGwei(weiToGwei(hexToInt(nextBaseFee))),
priorityFee: levelDisplay(maxPriorityFeePerGas)
Expand Down Expand Up @@ -278,7 +279,7 @@ class ChainSummaryComponent extends Component {
</ClusterRow>
)}
<ClusterRow>
{this.feeEstimatesUSD({ chainId, displayFeeMarket, gasPrice }).map((estimate, i) => {
{this.feeEstimatesUSD({ chainId, gasPrice }).map((estimate, i) => {
return (
<ClusterValue key={i}>
<div className='gasEstimate'>
Expand Down