From 3da4e67751d70829b219112a5acca71604263e5b Mon Sep 17 00:00:00 2001 From: Catenocrypt Date: Sun, 12 Apr 2020 23:35:30 +0200 Subject: [PATCH 1/5] Add Merging Fee FAQ. --- assets/add_new_asset.md | 1 + assets/merging-fee.md | 63 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 assets/merging-fee.md diff --git a/assets/add_new_asset.md b/assets/add_new_asset.md index c062f960..6d335b43 100644 --- a/assets/add_new_asset.md +++ b/assets/add_new_asset.md @@ -33,6 +33,7 @@ Token repository [https://github.com/trustwallet/assets](https://github.com/trus 1. Prepare image [requirements](#image-requirements) 2. Get familiar with [folder strcture](#repository-structure), will give you understanding where asset image should be placed 3. [Add asset guide](#how-to-add-asset) +4. Pay a [Pull Reqest Fee](assets/merging-fee.md) ## Image Requirements - file extension: `png`. Uppercase `PNG` considered invalid. diff --git a/assets/merging-fee.md b/assets/merging-fee.md new file mode 100644 index 00000000..d601610d --- /dev/null +++ b/assets/merging-fee.md @@ -0,0 +1,63 @@ +# Merge Fee -- FAQ + +**Someone is asking for cypto payment for merging my Pull Request. Is this a scam?** + +Always be cautious when someone asks you for payment. +Check that there is a description about it under Trust Wallet Developers' doucmentation (this page). +Check that the app is under the *trustwallet* github account, or that its owner belong to the trustwallet group. +So no, this is not a scam. + +**Why?** + +Trust Wallet supports an insane number of tokens and coins. +We are committed to support tokens used by our users. +But supporting so many assets has a significant costs, in terms of running the infrastructure, ensuring continuous integrations, +handling a huge number of requests to the assets info, etc. A lot of spam/scam coins also find us. + +We have introduced this crypto contribution in order to filter down requests, so we have more time to handle genuine ones. + +**How dare you ask for money in the case of an Open Source project?** + +We believe in the power of open source software, and important parts of Trust Wallet are open source to contribute to the community +(wallet-core, blockatlas). +But Trust Wallet is a branded product, and running its backend infrastructure, support, marketing, etc. +has costs (done by a non-volunteer based team). + +The `assets` repository is open source, you are free to use it, and free to create your own version (fork). But we choose to ask for a contribution for requests to include/change information in the Trust Wallet product. See also *Why* question. + +**What is Trust Wallet Token TWT?** + +TWT is a token used in the +[Referral Program](https://community.trustwallet.com/t/invite-a-friend-earn-trust-wallet-token-twt/4125). +Currently it is only possible to obtain it through referrals. But if you are a token with serious user base, obtaining referral for 10 new users should not be a problem. + +**When is my payment evaluated?** + +Payment is handled by [`merge-fee-bot`](https://github.com/settings/apps/merge-fee-bot), a GitHub app by us. +Currently payment is checked only when there is some action on the PR, such as a comment. +So after your transfer, create a comment about it. The payment should be detected within seconds. +(Technical background: being notified when the payment happens is not a problem, but interacting with a PR +when there is no action on it is difficult for the GitHup app.) + +**What happens after I pay? Is merging automatic?** + +When the `merge-fee-bot` detects payment, it automatically places an Accept review on the PR. +This is a precondition for merge. +But merging is not automatic, it is done by the maintainers. + +**I just need to make an urgent fix / just change existing info / etc. -- Can you do it without a payment?** + +In justified cases, we may waive the payment requirement. +Make sure to communicate the justification clearly in the PR. + +**I have forgot to set a memo in my transfer** + +We warned you not to forget! +But if you did, don't worry -- write down this fact in a comment in the PR, together with the TX hash, and we will check manually. + +**If you decide not to merge my PR, do I get my payment back?** + +It depends on the situation. +If the PR has to be repeated for some techical reason, the payment can be reused for the second PR. +If rejection is due to some mutually agreed reason, we send the payment back. + From fded84e47497f858462bc977761c175a3bb567b7 Mon Sep 17 00:00:00 2001 From: Mykola Date: Mon, 13 Apr 2020 15:12:10 -0700 Subject: [PATCH 2/5] Fix typos --- assets/merging-fee.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/assets/merging-fee.md b/assets/merging-fee.md index d601610d..17ae7e89 100644 --- a/assets/merging-fee.md +++ b/assets/merging-fee.md @@ -10,34 +10,34 @@ So no, this is not a scam. **Why?** Trust Wallet supports an insane number of tokens and coins. -We are committed to support tokens used by our users. -But supporting so many assets has a significant costs, in terms of running the infrastructure, ensuring continuous integrations, -handling a huge number of requests to the assets info, etc. A lot of spam/scam coins also find us. +We are committed to supporting the tokens used by our users. +But supporting so many assets has a high cost, in terms of running the infrastructure, ensuring continuous integrations, +handling a massive number of requests to the assets info, etc. A lot of spam/scam coins also find us. We have introduced this crypto contribution in order to filter down requests, so we have more time to handle genuine ones. **How dare you ask for money in the case of an Open Source project?** -We believe in the power of open source software, and important parts of Trust Wallet are open source to contribute to the community -(wallet-core, blockatlas). -But Trust Wallet is a branded product, and running its backend infrastructure, support, marketing, etc. -has costs (done by a non-volunteer based team). +We believe in the power of open-source software, and essential parts of Trust Wallet are open source to contribute to the community +([Wallet-Core](https://developer.trustwallet.com/wallet-core), [Blockatlas](https://developer.trustwallet.com/blockatlas)). +But Trust Wallet is a branded product and running its backend infrastructure, support, marketing, etc. +Has costs (done by a non-volunteer based team). -The `assets` repository is open source, you are free to use it, and free to create your own version (fork). But we choose to ask for a contribution for requests to include/change information in the Trust Wallet product. See also *Why* question. +The `assets` repository is open source. You are free to use it and free to create your version (fork). But we choose to ask for a contribution for requests to include/change the information in the Trust Wallet product. See also *Why* question. **What is Trust Wallet Token TWT?** TWT is a token used in the [Referral Program](https://community.trustwallet.com/t/invite-a-friend-earn-trust-wallet-token-twt/4125). -Currently it is only possible to obtain it through referrals. But if you are a token with serious user base, obtaining referral for 10 new users should not be a problem. +Currently, it is only possible to obtain it through referrals. But if you are a token with a serious user base, getting a referral for ten new users should not be a problem. **When is my payment evaluated?** Payment is handled by [`merge-fee-bot`](https://github.com/settings/apps/merge-fee-bot), a GitHub app by us. -Currently payment is checked only when there is some action on the PR, such as a comment. +Currently, payment is checked only when there is some action on the PR, such as a comment. So after your transfer, create a comment about it. The payment should be detected within seconds. (Technical background: being notified when the payment happens is not a problem, but interacting with a PR -when there is no action on it is difficult for the GitHup app.) +when there is no action on it is difficult for the GitHub app.) **What happens after I pay? Is merging automatic?** @@ -58,6 +58,6 @@ But if you did, don't worry -- write down this fact in a comment in the PR, toge **If you decide not to merge my PR, do I get my payment back?** It depends on the situation. -If the PR has to be repeated for some techical reason, the payment can be reused for the second PR. -If rejection is due to some mutually agreed reason, we send the payment back. +If the PR has to be repeated for some technical reason, the payment can be reused for the second PR. +If the rejection is due to some mutually agreed reason, we send the payment back. From 917651b7816556c74e13d4621f34a5d8ec0e71b8 Mon Sep 17 00:00:00 2001 From: Catenocrypt Date: Tue, 14 Apr 2020 08:42:47 +0200 Subject: [PATCH 3/5] Some changes, PR comments. --- assets/merging-fee.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/assets/merging-fee.md b/assets/merging-fee.md index 17ae7e89..4d4110de 100644 --- a/assets/merging-fee.md +++ b/assets/merging-fee.md @@ -1,4 +1,4 @@ -# Merge Fee -- FAQ +# Pull Request Fee -- FAQ **Someone is asking for cypto payment for merging my Pull Request. Is this a scam?** @@ -14,9 +14,16 @@ We are committed to supporting the tokens used by our users. But supporting so many assets has a high cost, in terms of running the infrastructure, ensuring continuous integrations, handling a massive number of requests to the assets info, etc. A lot of spam/scam coins also find us. -We have introduced this crypto contribution in order to filter down requests, so we have more time to handle genuine ones. +We have introduced this crypto contribution in order to filter requests, so we have more time to handle genuine ones. -**How dare you ask for money in the case of an Open Source project?** +We were partly insipred by [Token Curated Registry](https://medium.com/@tokencuratedregistry/a-simple-overview-of-token-curated-registries-84e2b7b19a06). + +**What do I have to pay attention to?** + +* Double check the [contribution guidelines](assets/add_new_asset.md), to minimize the risk of your PR being rejected. +* Make sure to set the correct memo on your transfer. + +**How does a Fee fit with Open Source?** We believe in the power of open-source software, and essential parts of Trust Wallet are open source to contribute to the community ([Wallet-Core](https://developer.trustwallet.com/wallet-core), [Blockatlas](https://developer.trustwallet.com/blockatlas)). @@ -43,21 +50,14 @@ when there is no action on it is difficult for the GitHub app.) When the `merge-fee-bot` detects payment, it automatically places an Accept review on the PR. This is a precondition for merge. -But merging is not automatic, it is done by the maintainers. - -**I just need to make an urgent fix / just change existing info / etc. -- Can you do it without a payment?** - -In justified cases, we may waive the payment requirement. -Make sure to communicate the justification clearly in the PR. +But merging is currently not automatic, it is done by the maintainers. **I have forgot to set a memo in my transfer** -We warned you not to forget! -But if you did, don't worry -- write down this fact in a comment in the PR, together with the TX hash, and we will check manually. +You know crypto, how transactions are final and irreversible. We warned, provided QR code with memo, sorry. +Pay again with correct memo. **If you decide not to merge my PR, do I get my payment back?** -It depends on the situation. -If the PR has to be repeated for some technical reason, the payment can be reused for the second PR. -If the rejection is due to some mutually agreed reason, we send the payment back. - +If a PR is rejected, it must have a reason. Double check the contribution guide before paying. +The fee is for processing a pull request, not necessarily merging it. From f5a954212415be4fb608a9412e362bdef2dd64eb Mon Sep 17 00:00:00 2001 From: Catenocrypt Date: Tue, 14 Apr 2020 08:56:09 +0200 Subject: [PATCH 4/5] Remove to pr-fee.md. --- assets/{merging-fee.md => pr-fee.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename assets/{merging-fee.md => pr-fee.md} (100%) diff --git a/assets/merging-fee.md b/assets/pr-fee.md similarity index 100% rename from assets/merging-fee.md rename to assets/pr-fee.md From 14b0f4429948b0c0d2ddb23ff3024fc6156fc879 Mon Sep 17 00:00:00 2001 From: Catenocrypt Date: Tue, 14 Apr 2020 08:56:48 +0200 Subject: [PATCH 5/5] Fix links. --- SUMMARY.md | 1 + assets/add_new_asset.md | 4 ++-- assets/pr-fee.md | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/SUMMARY.md b/SUMMARY.md index 65d938b3..372431e4 100644 --- a/SUMMARY.md +++ b/SUMMARY.md @@ -21,6 +21,7 @@ * [DApp](wallet-connect/dapp.md) * [Assets](assets/add_new_asset.md) * [DApps](assets/add-dapp.md) + * [Pull Request Fee](assets/pr-fee.md) * [Deep Linking](deeplinking/deeplinking.md) * [Staking](platform/staking.md) * [Roadmap](roadmap/roadmap.md) diff --git a/assets/add_new_asset.md b/assets/add_new_asset.md index 6d335b43..bbf2eddb 100644 --- a/assets/add_new_asset.md +++ b/assets/add_new_asset.md @@ -20,7 +20,7 @@ Token repository [https://github.com/trustwallet/assets](https://github.com/trus 4. [coins](https://github.com/satoshilabs/slips/blob/master/slip-0044.md) integrated in [Wallet Core](https://developer.trustwallet.com/wallet-core) -5. DApp images available in `Browser` section in Trust Wallet and at https://dapps.trustwallet.com and bookmarks icons. [read requirments](/assets/dapps) +5. DApp images available in `Browser` section in Trust Wallet and at https://dapps.trustwallet.com and bookmarks icons. [read requirments](assets/add-dapp.md) 6. Staking validators info available on [Trust Wallet Staking Platform](https://github.com/trustwallet/developer/blob/master/platform/staking.md) @@ -33,7 +33,7 @@ Token repository [https://github.com/trustwallet/assets](https://github.com/trus 1. Prepare image [requirements](#image-requirements) 2. Get familiar with [folder strcture](#repository-structure), will give you understanding where asset image should be placed 3. [Add asset guide](#how-to-add-asset) -4. Pay a [Pull Reqest Fee](assets/merging-fee.md) +4. Pay a [Pull Reqest Fee](assets/pr-fee.md) ## Image Requirements - file extension: `png`. Uppercase `PNG` considered invalid. diff --git a/assets/pr-fee.md b/assets/pr-fee.md index 4d4110de..12011772 100644 --- a/assets/pr-fee.md +++ b/assets/pr-fee.md @@ -1,6 +1,6 @@ # Pull Request Fee -- FAQ -**Someone is asking for cypto payment for merging my Pull Request. Is this a scam?** +**Someone is asking for cypto payment for processing my Pull Request. Is this a scam?** Always be cautious when someone asks you for payment. Check that there is a description about it under Trust Wallet Developers' doucmentation (this page). @@ -20,7 +20,7 @@ We were partly insipred by [Token Curated Registry](https://medium.com/@tokencur **What do I have to pay attention to?** -* Double check the [contribution guidelines](assets/add_new_asset.md), to minimize the risk of your PR being rejected. +* Double check the [contribution guidelines](/add_new_asset), to minimize the risk of your PR being rejected. * Make sure to set the correct memo on your transfer. **How does a Fee fit with Open Source?**