From 6abcae289e2e1bb599eb4ce75cfcd6644f9b09fc Mon Sep 17 00:00:00 2001 From: iosh Date: Thu, 26 Sep 2024 10:35:50 +0800 Subject: [PATCH 1/3] feat: add cfx_getFeeBurnt rpc --- packages/background/package.json | 1 + .../background/src/index.integration.test.js | 8 ++++++++ packages/background/src/rpc-engine-opts.js | 2 ++ packages/rpcs/cfx_getFeeBurnt/README.md | 1 + packages/rpcs/cfx_getFeeBurnt/doc.js | 4 ++++ packages/rpcs/cfx_getFeeBurnt/index.js | 16 ++++++++++++++++ packages/rpcs/cfx_getFeeBurnt/package.json | 9 +++++++++ yarn.lock | 9 +++++++++ 8 files changed, 50 insertions(+) create mode 100644 packages/rpcs/cfx_getFeeBurnt/README.md create mode 100644 packages/rpcs/cfx_getFeeBurnt/doc.js create mode 100644 packages/rpcs/cfx_getFeeBurnt/index.js create mode 100644 packages/rpcs/cfx_getFeeBurnt/package.json diff --git a/packages/background/package.json b/packages/background/package.json index 1175f105d..591cf9e6f 100644 --- a/packages/background/package.json +++ b/packages/background/package.json @@ -31,6 +31,7 @@ "@fluent-wallet/cfx_get-code": "workspace:packages/rpcs/cfx_getCode", "@fluent-wallet/cfx_get-collateral-for-storage": "workspace:packages/rpcs/cfx_getCollateralForStorage", "@fluent-wallet/cfx_get-confirmation-risk-by-hash": "workspace:packages/rpcs/cfx_getConfirmationRiskByHash", + "@fluent-wallet/cfx_get-fee-burnt": "workspace:packages/rpcs/cfx_getFeeBurnt", "@fluent-wallet/cfx_get-interest-rate": "workspace:*", "@fluent-wallet/cfx_get-logs": "workspace:packages/rpcs/cfx_getLogs", "@fluent-wallet/cfx_get-max-gas-limit": "workspace:*", diff --git a/packages/background/src/index.integration.test.js b/packages/background/src/index.integration.test.js index 8b22c1470..99bfe1178 100644 --- a/packages/background/src/index.integration.test.js +++ b/packages/background/src/index.integration.test.js @@ -160,6 +160,14 @@ describe('integration test', () => { }) describe('rpcs', () => { + describe('cfx_getFeeBurnt', async () => { + test('cfx_getFeeBurnt', async () => { + const result = await request({method: 'cfx_getFeeBurnt'}) + console.log(result) + expect(result.result.startsWith('0x')).toBeTruthy() + }) + }) + describe('cfx_maxPriorityFeePerGas', async () => { test('cfx_maxPriorityFeePerGas', async () => { const result = await request({method: 'cfx_maxPriorityFeePerGas'}) diff --git a/packages/background/src/rpc-engine-opts.js b/packages/background/src/rpc-engine-opts.js index 91a58419a..39a06c05c 100644 --- a/packages/background/src/rpc-engine-opts.js +++ b/packages/background/src/rpc-engine-opts.js @@ -93,6 +93,7 @@ import * as cfxSignTransaction from '@fluent-wallet/cfx_sign-transaction' import * as cfxTypedSignV4 from '@fluent-wallet/cfx_sign-typed-data_v4' import * as cfxMaxPriorityFeePerGas from '@fluent-wallet/cfx_max-priority-fee-per-gas' import * as cfxFeeHistory from '@fluent-wallet/cfx_fee-history' +import * as cfxGetFeeBurnt from '@fluent-wallet/cfx_get-fee-burnt' import * as ethAccounts from '@fluent-wallet/eth_accounts' import * as ethBlockNumber from '@fluent-wallet/eth_block-number' import * as ethCall from '@fluent-wallet/eth_call' @@ -324,6 +325,7 @@ export const rpcEngineOpts = { cfxGetMaxGasLimit, cfxMaxPriorityFeePerGas, cfxFeeHistory, + cfxGetFeeBurnt, // eth ethGetCode, diff --git a/packages/rpcs/cfx_getFeeBurnt/README.md b/packages/rpcs/cfx_getFeeBurnt/README.md new file mode 100644 index 000000000..d566ccd1b --- /dev/null +++ b/packages/rpcs/cfx_getFeeBurnt/README.md @@ -0,0 +1 @@ +# @fluent-wallet/cfx_get-fee-burnt diff --git a/packages/rpcs/cfx_getFeeBurnt/doc.js b/packages/rpcs/cfx_getFeeBurnt/doc.js new file mode 100644 index 000000000..52fdf31e8 --- /dev/null +++ b/packages/rpcs/cfx_getFeeBurnt/doc.js @@ -0,0 +1,4 @@ +export default { + metadata: {standard: true}, + en: 'No doc available', +} diff --git a/packages/rpcs/cfx_getFeeBurnt/index.js b/packages/rpcs/cfx_getFeeBurnt/index.js new file mode 100644 index 000000000..53deb09bf --- /dev/null +++ b/packages/rpcs/cfx_getFeeBurnt/index.js @@ -0,0 +1,16 @@ +import {optParam} from '@fluent-wallet/spec' + +export const NAME = 'cfx_getFeeBurnt' + +export const schemas = { + input: optParam, +} + +export const permissions = { + external: ['popup', 'inpage'], + locked: true, +} + +export function main({f}) { + return f() +} diff --git a/packages/rpcs/cfx_getFeeBurnt/package.json b/packages/rpcs/cfx_getFeeBurnt/package.json new file mode 100644 index 000000000..6ac739c52 --- /dev/null +++ b/packages/rpcs/cfx_getFeeBurnt/package.json @@ -0,0 +1,9 @@ +{ + "name": "@fluent-wallet/cfx_get-fee-burnt", + "type": "module", + "main": "index.js", + "version": "0.0.0", + "dependencies": { + "@fluent-wallet/spec": "workspace:packages/spec" + } +} diff --git a/yarn.lock b/yarn.lock index ed7e05e47..3965b963a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3900,6 +3900,14 @@ __metadata: languageName: unknown linkType: soft +"@fluent-wallet/cfx_get-fee-burnt@workspace:packages/rpcs/cfx_getFeeBurnt": + version: 0.0.0-use.local + resolution: "@fluent-wallet/cfx_get-fee-burnt@workspace:packages/rpcs/cfx_getFeeBurnt" + dependencies: + "@fluent-wallet/spec": "workspace:packages/spec" + languageName: unknown + linkType: soft + "@fluent-wallet/cfx_get-interest-rate@workspace:*, @fluent-wallet/cfx_get-interest-rate@workspace:packages/rpcs/cfx_getInterestRate": version: 0.0.0-use.local resolution: "@fluent-wallet/cfx_get-interest-rate@workspace:packages/rpcs/cfx_getInterestRate" @@ -17909,6 +17917,7 @@ __metadata: "@fluent-wallet/cfx_get-code": "workspace:packages/rpcs/cfx_getCode" "@fluent-wallet/cfx_get-collateral-for-storage": "workspace:packages/rpcs/cfx_getCollateralForStorage" "@fluent-wallet/cfx_get-confirmation-risk-by-hash": "workspace:packages/rpcs/cfx_getConfirmationRiskByHash" + "@fluent-wallet/cfx_get-fee-burnt": "workspace:packages/rpcs/cfx_getFeeBurnt" "@fluent-wallet/cfx_get-interest-rate": "workspace:*" "@fluent-wallet/cfx_get-logs": "workspace:packages/rpcs/cfx_getLogs" "@fluent-wallet/cfx_get-max-gas-limit": "workspace:*" From 24d26eaea8a9cfa73407dd80b500a02676c906ed Mon Sep 17 00:00:00 2001 From: iosh Date: Thu, 26 Sep 2024 10:37:50 +0800 Subject: [PATCH 2/3] chore: remove consolog --- packages/background/src/index.integration.test.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/background/src/index.integration.test.js b/packages/background/src/index.integration.test.js index 99bfe1178..f243fb735 100644 --- a/packages/background/src/index.integration.test.js +++ b/packages/background/src/index.integration.test.js @@ -163,7 +163,6 @@ describe('integration test', () => { describe('cfx_getFeeBurnt', async () => { test('cfx_getFeeBurnt', async () => { const result = await request({method: 'cfx_getFeeBurnt'}) - console.log(result) expect(result.result.startsWith('0x')).toBeTruthy() }) }) From 5660ab176ac8afbef8257f2a2e7e451149e074b9 Mon Sep 17 00:00:00 2001 From: iosh Date: Thu, 26 Sep 2024 10:39:00 +0800 Subject: [PATCH 3/3] chore: add version change --- .yarn/versions/f3a29056.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .yarn/versions/f3a29056.yml diff --git a/.yarn/versions/f3a29056.yml b/.yarn/versions/f3a29056.yml new file mode 100644 index 000000000..d838be8ff --- /dev/null +++ b/.yarn/versions/f3a29056.yml @@ -0,0 +1,6 @@ +releases: + "@fluent-wallet/cfx_get-fee-burnt": patch + +declined: + - helios + - helios-background