Merge branch 'develop' into fix-bitcoin-fee-rate

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,24 @@
+---
+name: Bug Report
+about: Create a report to help us improve
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+
+**Describe the Bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior.
+
+**Expected Behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment (please complete the following information):**
+- OS
+- Version used

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature Request
+about: Suggest an idea for this project
+title: ''
+labels: 'feature'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is.
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Motivation and Context**
+Please describe the motivation behind this request and the context in which it applies.

.github/ISSUE_TEMPLATE/task.md

@@ -0,0 +1,14 @@
+---
+name: Task
+about: For any other issue that doesn't fit the other categories. General code change.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the Issue**
+A clear and concise description of what the issue is.
+
+**Expected Outcome**
+A description of what outcome you are seeking.

changelog.md

@@ -16,12 +16,17 @@
 * [1692](https://github.com/zeta-chain/node/pull/1692) - fix get params query for emissions module
 * [1707](https://github.com/zeta-chain/node/issues/1707) - fix bitcoin fee rate estimation
 * [1712](https://github.com/zeta-chain/node/issues/1712) - increase EVM outtx inclusion timeout to 20 minutes
+* [1733](https://github.com/zeta-chain/node/pull/1733)) - remove the unnecessary 2x multiplier in the convertGasToZeta RPC
 * [1721](https://github.com/zeta-chain/node/issues/1721) - zetaclient should provide bitcoin_chain_id when querying TSS address
 
 ### Tests
 
 * [1584](https://github.com/zeta-chain/node/pull/1584) - allow to run E2E tests on any networks
 
+### Chores
+
+* [1729](https://github.com/zeta-chain/node/pull/1729) - add issue templates
+
 ## Version: v12.2.4
 
 ### Fixes

x/crosschain/keeper/grpc_query_zeta_conversion_rate.go

@@ -25,7 +25,7 @@ func (k Keeper) ConvertGasToZeta(context context.Context, request *types.QueryCo
 		return nil, status.Error(codes.InvalidArgument, "invalid request: param chain")
 	}
 	gasLimit := math.NewUintFromString(request.GasLimit)
-	outTxGasFee := medianGasPrice.Mul(gasLimit).MulUint64(2) //FIXME: parameterize this to sync with where this fee is charged
+	outTxGasFee := medianGasPrice.Mul(gasLimit)
 	zrc20, err := k.fungibleKeeper.QuerySystemContractGasCoinZRC20(ctx, big.NewInt(chain.ChainId))
 	if err != nil {
 		return nil, status.Error(codes.NotFound, "zrc20 not found")