Skip to content

Commit 2441254

Browse files
authored
Merge branch 'dev' into all-contributors/add-nuclearfalcon
2 parents f846a6d + 0e5cfb0 commit 2441254

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9755,6 +9755,15 @@
97559755
"ideas",
97569756
"doc"
97579757
]
9758+
},
9759+
{
9760+
"login": "theSamPadilla",
9761+
"name": "Sam Padilla",
9762+
"avatar_url": "https://avatars.githubusercontent.com/u/35386211?v=4",
9763+
"profile": "https://github.com/theSamPadilla",
9764+
"contributions": [
9765+
"doc"
9766+
]
97589767
}
97599768
],
97609769
"contributorsPerLine": 7,

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,6 +1531,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
15311531
<td align="center"><a href="https://soheil.vercel.app/"><img src="https://avatars.githubusercontent.com/u/22212139?v=4?s=100" width="100px;" alt="Soheil"/><br /><sub><b>Soheil</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=soheil555" title="Code">💻</a></td>
15321532
<td align="center"><a href="http://linktr.ee/metadiver"><img src="https://avatars.githubusercontent.com/u/75746881?v=4?s=100" width="100px;" alt="metadiver.eth"/><br /><sub><b>metadiver.eth</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=metadiver" title="Code">💻</a></td>
15331533
<td align="center"><a href="https://github.com/nuclearfalcon"><img src="https://avatars.githubusercontent.com/u/12568736?v=4?s=100" width="100px;" alt="Jacob"/><br /><sub><b>Jacob</b></sub></a><br /><a href="#ideas-nuclearfalcon" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=nuclearfalcon" title="Documentation">📖</a></td>
1534+
<td align="center"><a href="https://github.com/theSamPadilla"><img src="https://avatars.githubusercontent.com/u/35386211?v=4?s=100" width="100px;" alt="Sam Padilla"/><br /><sub><b>Sam Padilla</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=theSamPadilla" title="Documentation">📖</a></td>
15341535
</tr>
15351536
</tbody>
15361537
</table>

src/content/developers/docs/gas/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ The base fee is calculated by a formula that compares the size of the previous b
6969
| 7 | 30M | 12.5% | 180.2 gwei |
7070
| 8 | 30M | 12.5% | 202.7 gwei |
7171

72-
Relative to the pre-London gas auction market, this transaction-fee-mechanism change causes fee prediction to be more reliable. Following the table above - to create a transaction on block number 9, a wallet will let the user know with certainty that the **maximum base fee** to be added to the next block is `current base fee * 112.5%` or `202.8 gwei * 112.5% = 228.1 gwei`.
72+
Relative to the pre-London gas auction market, this transaction-fee-mechanism change causes fee prediction to be more reliable. Following the table above - to create a transaction on block number 9, a wallet will let the user know with certainty that the **maximum base fee** to be added to the next block is `current base fee * 112.5%` or `202.7 gwei * 112.5% = 228.1 gwei`.
7373

7474
It's also important to note it is unlikely we will see extended spikes of full blocks because of the speed at which the base fee increases proceeding a full block.
7575

src/content/nft/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ summaryPoint3: Powered by smart contracts on the Ethereum blockchain.
1414

1515
NFTs are currently taking the digital art and collectibles world by storm. Digital artists are seeing their lives change thanks to huge sales to a new crypto-audience. And celebrities are joining in as they spot a new opportunity to connect with fans. But digital art is only one way to use NFTs. Really they can be used to represent ownership of any unique asset, like a deed for an item in the digital or physical realm.
1616

17-
If Andy Warhol had been born in the late 90s, he probably would have minted Campbell's Soup as an NFT. It's only a matter of time before Kanye puts a run of Yeezys on Ethereum. And one day owning your car might be proved with an NFT.
17+
If Andy Warhol had been born in the late 90s, he probably would have minted Campbell's Soup as an NFT. It's only a matter of time before Nike puts a run of Jordans on Ethereum. And one day owning your car might be proved with an NFT.
1818

1919
## What's an NFT? {#what-are-nfts}
2020

0 commit comments

Comments
 (0)