Skip to content
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.

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

Epic: Merge prep [#480] #493

Merged
merged 30 commits into from
Jun 8, 2022
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
e33094d
landing page merge prep copy changes
wackerow May 25, 2022
fc0b6bc
Update FAQ for merge prep
wackerow May 25, 2022
d77f549
additional FAQ updates
wackerow May 25, 2022
832522e
additional merge related FAQs
wackerow May 25, 2022
288240a
faq copy addition
wackerow May 25, 2022
8322a47
Checklist update, EL client assets
wackerow May 26, 2022
916c47f
Update pageContent.tsx
wackerow May 26, 2022
68a467a
add discord and ports to Client object
wackerow May 26, 2022
fa8e71b
add EL+CL callout to select-client
wackerow May 26, 2022
82823ae
shanghai note
wackerow May 26, 2022
07ada38
add link to Shanghai planning
wackerow May 26, 2022
db818e3
Create MergeReadiness
wackerow May 26, 2022
4894362
add /merge-readiness path
wackerow May 26, 2022
97caeb5
Update MergeReadiness
wackerow May 26, 2022
76db41d
Add link to AppBar
wackerow May 27, 2022
c0b4de0
Add and implement MergeNotification
wackerow May 27, 2022
68fe60f
Add ClientMergeNotification
wackerow May 27, 2022
a441020
add EL client pages
wackerow May 27, 2022
d0167e3
Add EL clients to AppBar
wackerow May 27, 2022
76833d9
Update MergeReadiness
wackerow May 27, 2022
5a2bddb
Add header ids
wackerow May 27, 2022
08f780d
alphabetical client ordering
wackerow May 27, 2022
edc4aa3
Add further reading
wackerow May 27, 2022
8bed089
copy clarification
wackerow May 27, 2022
5280a6b
copy patches
wackerow May 28, 2022
f6fdb2b
add Ropsten resources
wackerow May 31, 2022
c759ff3
bug fix
wackerow Jun 1, 2022
016df11
Adds Engine API section and JWT reqs
wackerow Jun 1, 2022
376a044
Add checklist navigation
wackerow Jun 1, 2022
689571d
Add additional resource links
wackerow Jun 3, 2022
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
Update pageContent.tsx
copy updates
  • Loading branch information
wackerow committed May 26, 2022
commit 916c47f98e0034a9288f0a7721d64aaf3426fe08
88 changes: 40 additions & 48 deletions src/intl/compiled/en.json
Original file line number Diff line number Diff line change
@@ -625,12 +625,6 @@
"value": "Geth on Goerli documentation"
}
],
"3XK21U": [
{
"type": 0,
"value": "We'll help you create a signing key for every validator you want to run. Because there are no withdrawals until The Merge, you will not create your withdrawal keys now. When it is possible to withdraw your funds, you can derive your withdrawal keys from your mnemonic."
}
],
"3tR/V9": [
{
"type": 0,
@@ -1145,28 +1139,6 @@
"value": "If you need help, check out the Python documentation."
}
],
"AEp7+F": [
{
"type": 0,
"value": "Importantly, as a validator you'll need to post "
},
{
"type": 1,
"value": "TICKER_NAME"
},
{
"type": 0,
"value": " as collateral - in other words, have some funds at stake. The only way to become a validator is to make a one-way "
},
{
"type": 1,
"value": "TICKER_NAME"
},
{
"type": 0,
"value": " transaction to the deposit contract on the current Ethereum chain."
}
],
"AJD+66": [
{
"type": 0,
@@ -2709,6 +2681,28 @@
"value": "Key management"
}
],
"QgOvR0": [
{
"type": 0,
"value": "Importantly, as a validator you'll need to post "
},
{
"type": 1,
"value": "TICKER_NAME"
},
{
"type": 0,
"value": " as collateral—in other words, have some funds at stake. The only way to become a validator is to make a one-way "
},
{
"type": 1,
"value": "TICKER_NAME"
},
{
"type": 0,
"value": " transaction to the deposit contract on the current Ethereum chain."
}
],
"QlsDcr": [
{
"type": 0,
@@ -2803,12 +2797,6 @@
"value": "How many validators would you like to run?"
}
],
"RkbwNZ": [
{
"type": 0,
"value": "Withdrawing your deposit won't be possible until mainnet merges with the Beacon Chain."
}
],
"Rr2lI/": [
{
"type": 0,
@@ -3207,6 +3195,12 @@
"value": "Japanese"
}
],
"W6w5Wb": [
{
"type": 0,
"value": "Transfers between validators and withdrawals aren't possible yet. Withdrawal functionality is currently a top priority, and is planned to be rolled out in the next network upgrade, known as the Shanghai upgrade."
}
],
"W8nHSd": [
{
"type": 0,
@@ -3849,6 +3843,12 @@
"value": "What are withdrawal credentials?"
}
],
"cyNFM3": [
{
"type": 0,
"value": "Withdrawing your deposit will not be possible until the Shanghai upgrade planned for after the Merge."
}
],
"cyR7Kh": [
{
"type": 0,
@@ -4289,20 +4289,6 @@
"value": "Your stake"
}
],
"h8ZHus": [
{
"type": 0,
"value": "Transfers between validators aren't possible yet. You will have to wait until mainnet merges with the Beacon Chain (around two years) before you can withdraw or transfer your "
},
{
"type": 1,
"value": "TICKER_NAME"
},
{
"type": 0,
"value": "."
}
],
"hFzE1M": [
{
"type": 0,
@@ -6075,6 +6061,12 @@
"value": "Node security"
}
],
"zkT9Jx": [
{
"type": 0,
"value": "We'll help you create a signing key for every validator you want to run. Because there are no withdrawals until the Shanghai upgrade planned to follow the Merge, you will not create your withdrawal keys now. When it is possible to withdraw your funds, you can derive your withdrawal keys from your mnemonic."
}
],
"zmMF+G": [
{
"type": 0,
24 changes: 12 additions & 12 deletions src/intl/en.json
Original file line number Diff line number Diff line change
@@ -227,9 +227,6 @@
"3URRZK": {
"message": "Geth on Goerli documentation"
},
"3XK21U": {
"message": "We'll help you create a signing key for every validator you want to run. Because there are no withdrawals until The Merge, you will not create your withdrawal keys now. When it is possible to withdraw your funds, you can derive your withdrawal keys from your mnemonic."
},
"3tR/V9": {
"message": "Section 2 - During setup"
},
@@ -424,9 +421,6 @@
"AC669U": {
"message": "If you need help, check out the Python documentation."
},
"AEp7+F": {
"message": "Importantly, as a validator you'll need to post {TICKER_NAME} as collateral - in other words, have some funds at stake. The only way to become a validator is to make a one-way {TICKER_NAME} transaction to the deposit contract on the current Ethereum chain."
},
"AJD+66": {
"message": "The Ethereum staking deposit contract requires a minimum of {minTopupValue} {TICKER_NAME} to be sent at one time to be accepted."
},
@@ -1055,6 +1049,9 @@
"QWDxrk": {
"message": "Key management"
},
"QgOvR0": {
"message": "Importantly, as a validator you'll need to post {TICKER_NAME} as collateral—in other words, have some funds at stake. The only way to become a validator is to make a one-way {TICKER_NAME} transaction to the deposit contract on the current Ethereum chain."
},
"QlsDcr": {
"message": "Action"
},
@@ -1094,9 +1091,6 @@
"Rg5ySE": {
"message": "How many validators would you like to run?"
},
"RkbwNZ": {
"message": "Withdrawing your deposit won't be possible until mainnet merges with the Beacon Chain."
},
"Rr2lI/": {
"message": "You are responsible for this transaction!"
},
@@ -1254,6 +1248,9 @@
"W3t7Ob": {
"message": "Japanese"
},
"W6w5Wb": {
"message": "Transfers between validators and withdrawals aren't possible yet. Withdrawal functionality is currently a top priority, and is planned to be rolled out in the next network upgrade, known as the Shanghai upgrade."
},
"W8nHSd": {
"message": "FAQ"
},
@@ -1499,6 +1496,9 @@
"cpxfOR": {
"message": "What are withdrawal credentials?"
},
"cyNFM3": {
"message": "Withdrawing your deposit will not be possible until the Shanghai upgrade planned for after the Merge."
},
"cyR7Kh": {
"message": "Back"
},
@@ -1658,9 +1658,6 @@
"h8MTUo": {
"message": "Your stake"
},
"h8ZHus": {
"message": "Transfers between validators aren't possible yet. You will have to wait until mainnet merges with the Beacon Chain (around two years) before you can withdraw or transfer your {TICKER_NAME}."
},
"hFzE1M": {
"message": "Rewards are given for actions that help the network reach consensus."
},
@@ -2361,6 +2358,9 @@
"zicXn7": {
"message": "Node security"
},
"zkT9Jx": {
"message": "We'll help you create a signing key for every validator you want to run. Because there are no withdrawals until the Shanghai upgrade planned to follow the Merge, you will not create your withdrawal keys now. When it is possible to withdraw your funds, you can derive your withdrawal keys from your mnemonic."
},
"zmMF+G": {
"description": "This phrase is a sentence ",
"message": "Staking Launchpad for {TESTNET_LAUNCHPAD_NAME} testnet"
20 changes: 5 additions & 15 deletions src/pages/Acknowledgements/pageContent.tsx
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ export const pageContent = {
<Text size="medium" className="my10">
<FormattedMessage
defaultMessage="Importantly, as a validator you'll need to post {TICKER_NAME} as
collateral - in other words, have some funds at stake. The only way to become a
collateralin other words, have some funds at stake. The only way to become a
validator is to make a one-way {TICKER_NAME} transaction to the deposit contract
on the current Ethereum chain."
values={{ TICKER_NAME }}
@@ -75,10 +75,7 @@ export const pageContent = {
<FormattedMessage defaultMessage="This is a non-reversible transaction." />
</Text>
<Text size="medium" className="my20">
<FormattedMessage
defaultMessage="Withdrawing your deposit won't be possible until mainnet merges
with the Beacon Chain."
/>
<FormattedMessage defaultMessage="Withdrawing your deposit will not be possible until the Shanghai upgrade planned for after the Merge." />
</Text>
<Link
to="https://ethereum.org/en/upgrades/merge/"
@@ -166,13 +163,11 @@ export const pageContent = {
/>
</Text>
<Text size="medium" className="mt20">
<FormattedMessage defaultMessage="We'll help you create a signing key for every validator you want to run. Because there are no withdrawals until The Merge, you will not create your withdrawal keys now. When it is possible to withdraw your funds, you can derive your withdrawal keys from your mnemonic." />
<FormattedMessage defaultMessage="We'll help you create a signing key for every validator you want to run. Because there are no withdrawals until the Shanghai upgrade planned to follow the Merge, you will not create your withdrawal keys now. When it is possible to withdraw your funds, you can derive your withdrawal keys from your mnemonic." />
</Text>
<Text size="medium" className="mt20">
<FormattedMessage
defaultMessage="Your mnemonic is the backup for your signing keys and will be the ONLY way to
withdraw your {TICKER_NAME} when the time comes and no one can help you recover your mnemonic if
you lose it."
defaultMessage="Your mnemonic is the backup for your signing keys and will be the ONLY way to withdraw your {TICKER_NAME} when the time comes and no one can help you recover your mnemonic if you lose it."
values={{ TICKER_NAME }}
/>
</Text>
@@ -199,12 +194,7 @@ export const pageContent = {
content: (
<>
<Text size="medium" className="my10">
<FormattedMessage
defaultMessage={`Transfers between validators aren't possible yet. You will have to
wait until mainnet merges with the Beacon Chain (around two years) before you can
withdraw or transfer your {TICKER_NAME}.`}
values={{ TICKER_NAME }}
/>
<FormattedMessage defaultMessage="Transfers between validators and withdrawals aren't possible yet. Withdrawal functionality is currently a top priority, and is planned to be rolled out in the next network upgrade, known as the Shanghai upgrade." />
</Text>
<Link
to="https://ethereum.org/en/upgrades/merge"