Skip to content

Commit cae0407

Browse files
ghgoodreaughgoodreau
committed
update computeFee
1 parent ca9c3d4 commit cae0407

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

‎packages/bridge-controller/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1414
### Changed
1515

1616
- Update Snap methods to use new unified interface for non-EVM chains ([#6454](https://github.com/MetaMask/core/pull/6454))
17-
- Replace `getFeeForTransaction` with `ClientRequest:computeFee` method
17+
- Replace `getFeeForTransaction` with `computeFee` method (handled via onClientRequest)
1818
- Update fee format to return native units (e.g., SOL) instead of smallest units (e.g., Lamports)
1919
- Add support for Tron chain alongside existing Bitcoin and Solana support
2020
- Export `signAndSendTransactionRequest` utility function

‎packages/bridge-controller/src/__snapshots__/bridge-controller.test.ts.snap‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ Array [
563563
"request": Object {
564564
"id": "test-uuid-1234",
565565
"jsonrpc": "2.0",
566-
"method": "ClientRequest:computeFee",
566+
"method": "computeFee",
567567
"params": Object {
568568
"accountId": "account1",
569569
"scope": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
@@ -581,7 +581,7 @@ Array [
581581
"request": Object {
582582
"id": "test-uuid-1234",
583583
"jsonrpc": "2.0",
584-
"method": "ClientRequest:computeFee",
584+
"method": "computeFee",
585585
"params": Object {
586586
"accountId": "account1",
587587
"scope": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
@@ -625,7 +625,7 @@ Array [
625625
"request": Object {
626626
"id": "test-uuid-1234",
627627
"jsonrpc": "2.0",
628-
"method": "ClientRequest:computeFee",
628+
"method": "computeFee",
629629
"params": Object {
630630
"accountId": "account1",
631631
"scope": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
@@ -643,7 +643,7 @@ Array [
643643
"request": Object {
644644
"id": "test-uuid-1234",
645645
"jsonrpc": "2.0",
646-
"method": "ClientRequest:computeFee",
646+
"method": "computeFee",
647647
"params": Object {
648648
"accountId": "account1",
649649
"scope": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
@@ -687,7 +687,7 @@ Array [
687687
"request": Object {
688688
"id": "test-uuid-1234",
689689
"jsonrpc": "2.0",
690-
"method": "ClientRequest:computeFee",
690+
"method": "computeFee",
691691
"params": Object {
692692
"accountId": "account1",
693693
"scope": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
@@ -705,7 +705,7 @@ Array [
705705
"request": Object {
706706
"id": "test-uuid-1234",
707707
"jsonrpc": "2.0",
708-
"method": "ClientRequest:computeFee",
708+
"method": "computeFee",
709709
"params": Object {
710710
"accountId": "account1",
711711
"scope": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
@@ -749,7 +749,7 @@ Array [
749749
"request": Object {
750750
"id": "test-uuid-1234",
751751
"jsonrpc": "2.0",
752-
"method": "ClientRequest:computeFee",
752+
"method": "computeFee",
753753
"params": Object {
754754
"accountId": "account1",
755755
"scope": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
@@ -767,7 +767,7 @@ Array [
767767
"request": Object {
768768
"id": "test-uuid-1234",
769769
"jsonrpc": "2.0",
770-
"method": "ClientRequest:computeFee",
770+
"method": "computeFee",
771771
"params": Object {
772772
"accountId": "account1",
773773
"scope": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
@@ -1042,7 +1042,7 @@ Array [
10421042
"request": Object {
10431043
"id": "test-uuid-1234",
10441044
"jsonrpc": "2.0",
1045-
"method": "ClientRequest:computeFee",
1045+
"method": "computeFee",
10461046
"params": Object {
10471047
"accountId": "account1",
10481048
"scope": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
@@ -1060,7 +1060,7 @@ Array [
10601060
"request": Object {
10611061
"id": "test-uuid-1234",
10621062
"jsonrpc": "2.0",
1063-
"method": "ClientRequest:computeFee",
1063+
"method": "computeFee",
10641064
"params": Object {
10651065
"accountId": "account1",
10661066
"scope": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",

‎packages/bridge-controller/src/bridge-controller.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ describe('BridgeController', function () {
593593
(params as { handler: string })?.handler ===
594594
'onClientRequest' &&
595595
(params as { request?: { method: string } })?.request
596-
?.method === 'ClientRequest:computeFee'
596+
?.method === 'computeFee'
597597
) {
598598
return setTimeout(() => {
599599
resolve([
@@ -1703,7 +1703,7 @@ describe('BridgeController', function () {
17031703
(params as { handler: string })?.handler ===
17041704
'onClientRequest' &&
17051705
(params as { request?: { method: string } })?.request
1706-
?.method === 'ClientRequest:computeFee'
1706+
?.method === 'computeFee'
17071707
) {
17081708
return setTimeout(() => {
17091709
resolve([
@@ -1866,7 +1866,7 @@ describe('BridgeController', function () {
18661866
if (
18671867
(params as { handler: string })?.handler === 'onClientRequest' &&
18681868
(params as { request?: { method: string } })?.request?.method ===
1869-
'ClientRequest:computeFee'
1869+
'computeFee'
18701870
) {
18711871
return setTimeout(() => {
18721872
resolve([

‎packages/bridge-controller/src/utils/snaps.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ describe('Snaps Utils', () => {
5454
expect(result.handler).toBe('onClientRequest');
5555
expect(result.request.id).toBe('test-uuid-1234');
5656
expect(result.request.jsonrpc).toBe('2.0');
57-
expect(result.request.method).toBe('ClientRequest:computeFee');
57+
expect(result.request.method).toBe('computeFee');
5858
expect(result.request.params.transaction).toBe(transaction);
5959
expect(result.request.params.accountId).toBe(accountId);
6060
expect(result.request.params.scope).toBe(scope);
@@ -97,7 +97,7 @@ describe('Snaps Utils', () => {
9797
expect(result.request.id).toBe('test-uuid-1234');
9898
expect(result.request.jsonrpc).toBe('2.0');
9999
expect(result.request.method).toBe(
100-
'ClientRequest:signAndSendTransaction',
100+
'signAndSendTransaction',
101101
);
102102
expect(result.request.params.transaction).toBe(transaction);
103103
expect(result.request.params.scope).toBe(scope);
@@ -129,7 +129,7 @@ describe('Snaps Utils', () => {
129129
expect(result.request.id).toBe('test-uuid-1234');
130130
expect(result.request.jsonrpc).toBe('2.0');
131131
expect(result.request.method).toBe(
132-
'ClientRequest:signAndSendTransaction',
132+
'signAndSendTransaction',
133133
);
134134
expect(result.request.params.transaction).toBe(transaction);
135135
expect(result.request.params.scope).toBe(scope);

‎packages/bridge-controller/src/utils/snaps.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export const computeFeeRequest = (
4646
request: {
4747
id: uuid(),
4848
jsonrpc: '2.0',
49-
method: 'ClientRequest:computeFee',
49+
method: 'computeFee',
5050
params: {
5151
transaction,
5252
accountId,
@@ -81,7 +81,7 @@ export const signAndSendTransactionRequest = (
8181
request: {
8282
id: uuid(),
8383
jsonrpc: '2.0',
84-
method: 'ClientRequest:signAndSendTransaction',
84+
method: 'signAndSendTransaction',
8585
params: {
8686
transaction,
8787
scope,

0 commit comments

Comments
 (0)