Skip to content

Commit

Permalink
Rename Baker/baking to Validator/validating
Browse files Browse the repository at this point in the history
  • Loading branch information
@Radiokot
Radiokot committed Feb 27, 2024
1 parent fc9efa4 commit 66ea365
Show file tree
Hide file tree
Showing 21 changed files with 145 additions and 159 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@

### Changed
- Suggest running a recovery when facing account or identity creation errors
- Baker/baking renamed to Validator/validating

[Unreleased]: https://github.com/Concordium/cryptox-android/compare/0.6.1-qa.5...HEAD
8 changes: 4 additions & 4 deletions app/src/main/assets/baker_intro_flow_en_1.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@

<body>
<p>
A baker is a node that participates in the network by baking (creating) new blocks that are
added to the chain. Each baker has a set of cryptographic keys called baker keys that the node
needs to bake blocks. You generate the baker keys in the Mobile Wallet when you add a baker
account. Once the baker node has been restarted with the baker keys, it will start baking two
A validator is a node that participates in the network by validating (creating) new blocks that are
added to the chain. Each validator has a set of cryptographic keys called validator keys that the node
needs to bake blocks. You generate the validator keys in the Mobile Wallet when you add a validator
account. Once the validator node has been restarted with the validator keys, it will start validating two
epochs after the transaction has been approved.
</p>
</body>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/assets/baker_intro_flow_en_2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@

<body>
<p>
To become a baker you must run a node on the Concordium blockchain. Make sure that you have a
To become a validator you must run a node on the Concordium blockchain. Make sure that you have a
setup where the node can operate around the clock. You can run the node yourself or use a
third-party provider. Make sure your account in the Concordium Wallet for Mobile has the
required amount of CCD to become a baker.
required amount of CCD to become a validator.
</p>
</body>

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/assets/baker_intro_flow_en_3.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

<body>
<p>
You have the option when adding a baker to open a baker pool or not. A baker pool allows others
who want to earn rewards to do so without the need to run a node or become a baker themselves.
To do this they delegate an amount to your baker pool which then increases your total stake and
You have the option when adding a validator to open a validator pool or not. A validator pool allows others
who want to earn rewards to do so without the need to run a node or become a validator themselves.
To do this they delegate an amount to your validator pool which then increases your total stake and
your chances of winning the lottery to bake a block. At each pay day the rewards will be
distributed to you and your delegators. You can also choose not to open a pool, in which case
only your own stake applies toward the lottery. You can always open or close a pool later.
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/assets/baker_remove_intro_flow_en_1.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@

<body>
<p>
If you no longer wish to bake on an account, you can stop baking. There is a cool-down period,
during which the staked amount for the baker will continue to bake and earn rewards. After the
If you no longer wish to bake on an account, you can stop validating. There is a cool-down period,
during which the staked amount for the validator will continue to bake and earn rewards. After the
cool-down, the full stake amount will be unlocked on your public balance.
</p>
<p>
If your pool has any delegators, they will be automatically moved to passive delegation, if they
don’t decide to do something else.
</p>
<p>
If you deregister the baker, remember that this does not shut down your node. You must shut down
If you deregister the validator, remember that this does not shut down your node. You must shut down
the node in a separate action if you no longer wish to run a node on the Concordium blockchain.
</p>
</body>

</html>
</html>
6 changes: 3 additions & 3 deletions app/src/main/assets/baker_update_intro_flow_en_1.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

<body>
<p>
When you have registered a baker, you can make the following updates:
When you have registered a validator, you can make the following updates:
<ul>
<li>Update baker stake</li>
<li>Update validator stake</li>
<li>Update pool settings</li>
<li>Update baker keys</li>
<li>Update validator keys</li>
</ul>
This guide explains each of the different types of update. If you are already familiar with them,
you can skip the guide below.
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/assets/baker_update_intro_flow_en_2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<body>
<p>
When updating your baker stake you can choose to increase or decrease your stake. If you
When updating your validator stake you can choose to increase or decrease your stake. If you
increase your stake, this is most often effective from the next pay day. If the transaction
occurs too close to the next pay day, the update will be effective from the following pay day.
</p>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/assets/baker_update_intro_flow_en_3.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<p>
Pool status:
<ul style="margin-top: 0;">
<li>Open pool: open a pool for a previously closed baker</li>
<li>Open pool: open a pool for a previously closed validator</li>
<li>Closed for new: close the pool to new delegators. Existing delegators are not affected.</li>
<li>Close pool: close a pool for all delegators.</li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/assets/baker_update_intro_flow_en_4.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
continue in the pool, and the pool continues to earn rewards if it bakes.
</p>
<p>
After the cool-down, the delegators are removed and the pool will be closed. The baker will keep
baking with your own stake afterwards.
After the cool-down, the delegators are removed and the pool will be closed. The validator will keep
validating with your own stake afterwards.
</p>
<p>
Changes to the metadata URL take effect from the next pay unless the transaction is made too
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/assets/baker_update_intro_flow_en_5.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

<body>
<p>
If you believe your baker keys have been compromised or lost, you can generate and submit a new
If you believe your validator keys have been compromised or lost, you can generate and submit a new
set of keys. It is important to remember to restart your node with the new set of keys after
registering them on the chain. As the update takes effect on chain from the next pay day, it is
preferable to restart the node with the new keys as close to the next pay day as possible to
prevent the baker from having down time.</p>
prevent the validator from having down time.</p>
</body>

</html>
2 changes: 1 addition & 1 deletion app/src/main/assets/delegation_intro_flow_en_1.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<body>
<p>
Delegation allows users on the Concordium blockchain to earn rewards without the need to become
a baker or run a node.
a validator or run a node.
</p>
<p>
By delegating some of your funds to a pool, you can earn rewards.
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/assets/delegation_intro_flow_en_2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
</ul>
</p>
<p>
A baker pool is managed by an individual baker running a node, so the rewards depend on that
baker’s performance.
A validator pool is managed by an individual validator running a node, so the rewards depend on that
validator’s performance.
</p>
<p>
Since passive delegation doesn’t go to a specific pool, it mitigates the risk of a single baker
Since passive delegation doesn’t go to a specific pool, it mitigates the risk of a single validator
performing badly, however, rewards are lower.
</p>
<p>
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/assets/delegation_intro_flow_en_3.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@

<body>
<p>
A baker pool is managed by an individual baker.
A validator pool is managed by an individual validator.
</p>
<p>
Running a pool allows a baker to attract more stake and thus increase chances of being selected
Running a pool allows a validator to attract more stake and thus increase chances of being selected
to bake a block.
</p>
<p>
Bakers also earn a commission from the delegators upon baking a block.
Validators also earn a commission from the delegators upon validating a block.
</p>
<p>
Delegating to a baker pool is usually more profitable than passive delegation, but there is also
a risk of losing out on rewards if the baker is not running properly. It is therefore a good
idea to keep an eye on the baker’s performance.
Delegating to a validator pool is usually more profitable than passive delegation, but there is also
a risk of losing out on rewards if the validator is not running properly. It is therefore a good
idea to keep an eye on the validator’s performance.
</p>
<p>
You can read more about how to investigate a baker’s performance on our <b><a
You can read more about how to investigate a validator’s performance on our <b><a
href="https://developer.concordium.software/en/mainnet/net/concepts/concepts-delegation.html">documentation
website</a></b>.
</p>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/assets/delegation_intro_flow_en_4.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
alternative.
</p>
<p>
This staking strategy is not associated with a specific baker, so there is no risk of poor baker
This staking strategy is not associated with a specific validator, so there is no risk of poor validator
health.
</p>
<p>
The trade-off when choosing passive delegation is that the return on your stake will be less
than what you may receive, when delegating to a specific baker pool.
than what you may receive, when delegating to a specific validator pool.
</p>
</body>

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/assets/delegation_intro_flow_en_5.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

<body>
<p>
Whether you choose an individual baking pool or passive delegation, rewards are paid out at what
Whether you choose an individual validating pool or passive delegation, rewards are paid out at what
is called the pay day. Rewards are distributed to everyone in the pool proportional to their
stake, and a commission is paid to the baker by all delegators.
stake, and a commission is paid to the validator by all delegators.
</p>
<p>
If you make updates to your delegation at a later point, most of these will also take effect
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/assets/delegation_remove_flow_en_2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
Only the delegation amount is locked during the cool-down period.
</p>
<p>
This means that you can still change restake status and target baker pool during the cool-down.
This means that you can still change restake status and target validator pool during the cool-down.
</p>
</body>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/assets/delegation_update_flow_en_2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<body>
<p>
If you increase your delegation amount, change your target baker pool, or change whether you
If you increase your delegation amount, change your target validator pool, or change whether you
want to restake your rewards or not, these changes will take effect from the next pay day.
</p>
<p>
Expand Down
32 changes: 11 additions & 21 deletions app/src/main/res/drawable/ic_baker.xml
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="14dp"
android:height="14dp"
android:viewportWidth="14"
android:viewportHeight="14">
<group>
<clip-path
android:pathData="M0,0h14v14h-14z"/>
<path
android:pathData="M4.5443,6.5728C4.9913,6.4998 5.4384,6.4283 5.8849,6.3526C5.9856,6.3356 6.0547,6.3629 6.1219,6.4439C6.3716,6.7442 6.5687,7.0854 6.7046,7.4528C6.7727,7.6361 6.8106,7.8321 6.8489,8.0251C6.9495,8.5373 6.901,9.057 6.9175,9.5735C6.921,9.6481 6.9386,9.7213 6.9693,9.7892C7.0119,9.8849 7.0845,9.8971 7.1806,9.8569C7.3713,9.7772 7.4455,9.6132 7.4768,9.429C7.5034,9.2768 7.5143,9.1221 7.5092,8.9676C7.4956,8.6136 7.4757,8.2595 7.4421,7.9068C7.4069,7.5282 7.3147,7.1614 7.1137,6.8353C7.0131,6.6729 6.893,6.5236 6.7821,6.368C6.7672,6.347 6.7554,6.3236 6.7333,6.2863C6.9346,6.2863 7.1174,6.279 7.3002,6.2882C7.5283,6.2993 7.7559,6.3231 7.9836,6.3434C8.0946,6.3532 8.2056,6.3653 8.3158,6.3817C8.3449,6.3887 8.3709,6.4049 8.3901,6.4279C8.625,6.6932 8.8007,6.9978 8.9396,7.3229C9.0476,7.576 9.1122,7.8418 9.1501,8.116C9.2013,8.4853 9.2118,8.8549 9.2029,9.2264C9.1997,9.3643 9.2029,9.5027 9.2118,9.6406C9.2162,9.6955 9.2304,9.7492 9.2538,9.799C9.2838,9.8651 9.3792,9.8995 9.4448,9.8707C9.6041,9.8004 9.7058,9.6813 9.7467,9.5071C9.8214,9.1865 9.7835,8.8622 9.7747,8.5402C9.7675,8.2651 9.7451,7.9907 9.7076,7.7181C9.6528,7.32 9.5017,6.9558 9.2756,6.6244C9.2613,6.6038 9.2496,6.5814 9.2232,6.537C9.3192,6.5562 9.391,6.5643 9.4581,6.5848C9.8089,6.6915 10.164,6.7871 10.5075,6.9141C10.8261,7.0336 11.138,7.1705 11.4418,7.3242C12.1243,7.6659 12.7247,8.1204 13.2216,8.7076C13.5004,9.0335 13.7177,9.4083 13.8628,9.8134C13.9162,9.9617 13.952,10.1159 13.9696,10.2727C13.9957,10.5037 14.0052,10.7364 13.998,10.9689C13.9919,11.1246 13.9391,11.2782 13.9076,11.4329C13.8433,11.7475 13.713,12.0377 13.5681,12.3195C13.2707,12.8977 12.8849,13.3978 12.3041,13.7159C12.104,13.8253 11.8963,13.9151 11.6687,13.9436C11.4768,13.9675 11.2829,13.9975 11.0911,13.9978C8.3403,14.0012 5.5896,14.0016 2.8388,13.9992C2.2118,13.9992 1.6696,13.7737 1.2066,13.3461C0.8346,13.0026 0.5676,12.5857 0.3648,12.1264C0.2643,11.8965 0.1772,11.6609 0.1038,11.4207C0.059,11.2762 0.0491,11.1203 0.027,10.9692C0.0141,10.8806 -0.0014,10.7909 -0,10.7023C0.0035,10.4871 0.0389,10.2764 0.0897,10.0663C0.2355,9.4636 0.558,8.9652 0.9691,8.518C1.3197,8.1367 1.7253,7.8263 2.1637,7.5563C2.5604,7.312 2.9799,7.1077 3.4163,6.9465C3.5605,6.8933 3.7046,6.8399 3.849,6.7874C3.9072,6.7664 3.9451,6.7882 3.981,6.8396C4.169,7.1017 4.3235,7.3868 4.4409,7.6879C4.4901,7.8167 4.5196,7.9537 4.5525,8.0884C4.69,8.6525 4.6426,9.228 4.6543,9.7993C4.657,9.8743 4.6703,9.9484 4.6937,10.0196C4.7211,10.1055 4.8267,10.1421 4.9143,10.1056C5.0604,10.045 5.1491,9.9327 5.1865,9.7812C5.2472,9.5414 5.2636,9.2922 5.2348,9.0464C5.2148,8.8848 5.2278,8.7194 5.2147,8.5566C5.1888,8.2383 5.1746,7.9165 5.0823,7.6092C4.9844,7.2786 4.8204,6.9718 4.6005,6.7078C4.5752,6.6742 4.5517,6.6392 4.5302,6.6031L4.5443,6.5728Z"
android:fillColor="@color/theme_black"/>
<path
android:pathData="M6.2128,3.5251C6.2071,3.2124 6.3083,2.9129 6.5483,2.664C6.6791,2.5285 6.737,2.3579 6.7519,2.169C6.7769,1.8551 6.6557,1.581 6.5356,1.3051C6.4499,1.1089 6.3583,0.9148 6.2945,0.7115C6.2364,0.5336 6.2423,0.3407 6.3113,0.1669C6.3636,0.0349 6.534,-0.0025 6.6105,0.116C6.6916,0.2392 6.7596,0.3707 6.8135,0.5082C6.899,0.7344 6.9732,0.9656 7.0391,1.1983C7.1161,1.4694 7.2251,1.7343 7.2139,2.0264C7.2003,2.3764 7.1308,2.6984 6.8864,2.9713C6.6895,3.1915 6.667,3.4665 6.7425,3.7434C6.796,3.9399 6.8794,4.128 6.9393,4.3228C6.9956,4.5059 7.0142,4.689 6.917,4.8711C6.8442,5.0078 6.6251,5.0114 6.5698,4.876C6.5005,4.7066 6.421,4.5422 6.3596,4.3704C6.2829,4.1552 6.207,3.8258 6.2128,3.5251Z"
android:fillColor="@color/theme_black"/>
<path
android:pathData="M9.2778,1.941C9.2877,2.1799 9.2737,2.3901 9.1759,2.5795C9.1088,2.7096 9.0161,2.8266 8.9324,2.9478C8.8011,3.1383 8.7583,3.3443 8.7982,3.5745C8.8361,3.7934 8.9267,3.9919 8.9995,4.1978C9.0654,4.3824 9.1105,4.5752 9.0101,4.7663C8.9708,4.8411 8.9234,4.9018 8.8256,4.906C8.7249,4.9096 8.6691,4.8589 8.6288,4.7734C8.4415,4.3749 8.3001,3.9616 8.2892,3.5176C8.2816,3.2103 8.3408,2.9152 8.5594,2.6747C8.6553,2.5691 8.7472,2.458 8.7866,2.3137C8.8252,2.1721 8.8505,2.0323 8.8274,1.8827C8.7815,1.5846 8.6496,1.3198 8.5268,1.0511C8.4145,0.805 8.3103,0.5572 8.344,0.2766C8.3501,0.2179 8.3635,0.1602 8.3838,0.1049C8.4269,-0.0059 8.6297,-0.0418 8.6949,0.0591C8.7804,0.19 8.8511,0.3302 8.9056,0.477C9.0027,0.7443 9.0839,1.0176 9.1667,1.2902C9.2357,1.5111 9.3143,1.7308 9.2778,1.941Z"
android:fillColor="@color/theme_black"/>
<path
android:pathData="M4.0679,3.5217C4.0622,3.2088 4.1635,2.9095 4.4034,2.6604C4.5344,2.5249 4.5921,2.3545 4.6072,2.1656C4.6322,1.8515 4.5107,1.5776 4.3908,1.3017C4.3056,1.1058 4.2142,0.911 4.1503,0.7078C4.0923,0.5299 4.0982,0.337 4.1671,0.1631C4.2194,0.031 4.3898,-0.0063 4.4663,0.1123C4.5472,0.2354 4.6151,0.3667 4.6689,0.5041C4.7546,0.7301 4.8288,0.9615 4.8947,1.1941C4.9717,1.4651 5.0807,1.7301 5.0693,2.0223C5.0557,2.3723 4.9864,2.6943 4.7419,2.9672C4.5451,3.1874 4.5226,3.4624 4.5979,3.7394C4.6515,3.9359 4.7348,4.1237 4.7949,4.3187C4.8512,4.5017 4.8697,4.6848 4.7726,4.8671C4.6996,5.0036 4.4807,5.0072 4.4252,4.872C4.3561,4.7026 4.2764,4.5379 4.215,4.3661C4.1382,4.1517 4.0622,3.8224 4.0679,3.5217Z"
android:fillColor="@color/theme_black"/>
</group>
<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
android:viewportWidth="66"
android:viewportHeight="19"
android:width="66dp"
android:height="19dp">
<path
android:pathData="M10 0H56A9.5 9.5 0 0 1 65.5 9.5V9.5A9.5 9.5 0 0 1 56 19H10A9.5 9.5 0 0 1 0.5 9.5V9.5A9.5 9.5 0 0 1 10 0Z"
android:fillColor="#189E46" />
<path
android:pathData="M15.54 6H16.84L13.79 13H12.51L9.45 6H10.86L13.19 11.4L15.54 6ZM19.0983 7.6C20.6383 7.6 21.5283 8.33 21.5283 9.87V13H20.3483V12.35C20.0483 12.81 19.4683 13.07 18.6683 13.07C17.4483 13.07 16.6783 12.4 16.6783 11.47C16.6783 10.58 17.2783 9.88 18.8983 9.88H20.2783V9.8C20.2783 9.07 19.8383 8.64 18.9483 8.64C18.3483 8.64 17.7283 8.84 17.3283 9.17L16.8383 8.26C17.4083 7.82 18.2383 7.6 19.0983 7.6ZM18.9283 12.16C19.5383 12.16 20.0683 11.88 20.2783 11.33V10.71H18.9883C18.1383 10.71 17.9083 11.03 17.9083 11.42C17.9083 11.87 18.2883 12.16 18.9283 12.16ZM23.1325 13V5.58H24.3825V13H23.1325ZM26.6531 6.78C26.1931 6.78 25.8531 6.45 25.8531 6.03C25.8531 5.61 26.1931 5.28 26.6531 5.28C27.1131 5.28 27.4531 5.59 27.4531 6C27.4531 6.44 27.1231 6.78 26.6531 6.78ZM26.0231 13V7.66H27.2731V13H26.0231ZM32.8938 5.58H34.1438V13H32.9438V12.31C32.5238 12.82 31.9038 13.07 31.1738 13.07C29.6238 13.07 28.4738 11.99 28.4738 10.33C28.4738 8.67 29.6238 7.6 31.1738 7.6C31.8638 7.6 32.4738 7.83 32.8938 8.32V5.58ZM31.3238 12C32.2238 12 32.9138 11.35 32.9138 10.33C32.9138 9.31 32.2238 8.66 31.3238 8.66C30.4238 8.66 29.7338 9.31 29.7338 10.33C29.7338 11.35 30.4238 12 31.3238 12ZM37.819 7.6C39.359 7.6 40.249 8.33 40.249 9.87V13H39.069V12.35C38.769 12.81 38.189 13.07 37.389 13.07C36.169 13.07 35.399 12.4 35.399 11.47C35.399 10.58 35.999 9.88 37.619 9.88H38.999V9.8C38.999 9.07 38.559 8.64 37.669 8.64C37.069 8.64 36.449 8.84 36.049 9.17L35.559 8.26C36.129 7.82 36.959 7.6 37.819 7.6ZM37.649 12.16C38.259 12.16 38.789 11.88 38.999 11.33V10.71H37.709C36.859 10.71 36.629 11.03 36.629 11.42C36.629 11.87 37.009 12.16 37.649 12.16ZM44.7132 11.82L45.0632 12.71C44.7632 12.95 44.3132 13.07 43.8632 13.07C42.6932 13.07 42.0232 12.45 42.0232 11.27V8.7H41.1432V7.7H42.0232V6.48H43.2732V7.7H44.7032V8.7H43.2732V11.24C43.2732 11.76 43.5332 12.04 44.0132 12.04C44.2732 12.04 44.5232 11.97 44.7132 11.82ZM48.3157 13.07C46.6757 13.07 45.4757 11.93 45.4757 10.33C45.4757 8.73 46.6757 7.6 48.3157 7.6C49.9757 7.6 51.1657 8.73 51.1657 10.33C51.1657 11.93 49.9757 13.07 48.3157 13.07ZM48.3157 12C49.2257 12 49.9057 11.35 49.9057 10.33C49.9057 9.31 49.2257 8.66 48.3157 8.66C47.4157 8.66 46.7357 9.31 46.7357 10.33C46.7357 11.35 47.4157 12 48.3157 12ZM53.551 8.44C53.911 7.88 54.561 7.6 55.451 7.6V8.79C55.341 8.77 55.251 8.76 55.161 8.76C54.211 8.76 53.611 9.32 53.611 10.41V13H52.361V7.66H53.551V8.44Z"
android:fillColor="#FFFFFF" />
</vector>
Loading

0 comments on commit 66ea365

Please sign in to comment.