github-such-software/hash-wallet
1
0
Fork 1
mirror of https://github.com/Such-Software/hash-wallet.git synced 2026-10-17 05:41:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Error while approving transactions via walletconnect for ARB (#2878)

Browse Source 
* fix: Error while approving transactions via walletconnect for ARB

* fix: Error while approving transactions via walletconnect for ARB
This commit is contained in:
David Adegoke
2026-02-09 15:58:55 +01:00
committed by GitHub
parent e450187feb
commit 143ce84504
2 changed files with 67 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/screens/wallet_connect/services/chain_service/eth/evm_chain_service.dart
+61 -31
View File
@@ -1,7 +1,6 @@
import 'dart:convert';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/reactions/wallet_connect.dart';
import 'package:cw_core/utils/proxy_wrapper.dart';
import 'package:eth_sig_util/eth_sig_util.dart';
import 'package:eth_sig_util/util/utils.dart';
@@ -17,6 +16,8 @@ import 'package:cake_wallet/src/screens/wallet_connect/utils/eth_utils.dart';
import 'package:cake_wallet/src/screens/wallet_connect/utils/method_utils.dart';
import 'package:cake_wallet/store/app_store.dart';
import 'package:cake_wallet/.secrets.g.dart' as secrets;
import 'package:cake_wallet/evm/evm.dart';
import 'package:cake_wallet/reactions/wallet_connect.dart';
class EvmChainServiceImpl {
Map<String, dynamic Function(String, dynamic)> get sessionRequestHandlers => {
@@ -38,11 +39,7 @@ class EvmChainServiceImpl {
required this.bottomSheetService,
required this.walletKit,
Web3Client? web3Client,
}) : ethClient = web3Client ??
Web3Client(
_getNodeUriForChain(reference, appStore),
ProxyWrapper().getHttpIOClient(),
) {
}) : ethClient = web3Client ?? _createWeb3Client(reference, appStore) {
for (final event in EventsConstants.allEvents) {
walletKit.registerEventEmitter(
chainId: getChainId(),
@@ -77,17 +74,16 @@ class EvmChainServiceImpl {
String getChainId() => reference.chain();
static String _getNodeUriForChain(EVMChainId reference, AppStore appStore) {
final walletType = appStore.wallet!.type;
static Web3Client _createWeb3Client(EVMChainId reference, AppStore appStore) {
if (appStore.wallet != null && isEVMCompatibleChain(appStore.wallet!.type)) {
final walletClient = evm?.getWeb3Client(appStore.wallet!);
if (isEVMCompatibleChain(walletType)) {
final chainId = reference.chainId;
return appStore.settingsStore.getCurrentNode(walletType, chainId: chainId).uri.toString();
if (walletClient != null) return walletClient;
}
// For old wallet types, use the wallet type directly
return appStore.settingsStore.getCurrentNode(walletType).uri.toString();
final node = appStore.settingsStore.getCurrentNode(appStore.wallet!.type);
return Web3Client(node.uri.toString(), ProxyWrapper().getHttpIOClient());
}
Future<void> personalSign(String topic, dynamic parameters) async {
@@ -423,25 +419,59 @@ class EvmChainServiceImpl {
}) async {
Transaction transaction = transactionJson.toTransaction();
final gasPrice = await ethClient.getGasPrice();
try {
final gasLimit = await ethClient.estimateGas(
sender: transaction.from,
to: transaction.to,
value: transaction.value,
data: transaction.data,
gasPrice: gasPrice,
);
transaction = transaction.copyWith(
gasPrice: gasPrice,
maxGas: gasLimit.toInt(),
);
} on RPCError catch (e) {
return JsonRpcError(code: e.errorCode, message: e.message);
if (transactionJson.containsKey('gas') && transaction.maxGas == null) {
final gasHex = transactionJson['gas'].toString();
try {
final gasValue = int.parse(
gasHex.replaceFirst('0x', '').replaceFirst('0X', ''),
radix: 16,
);
transaction = transaction.copyWith(maxGas: gasValue);
} catch (e) {
debugPrint('Failed to parse gas value: $gasHex, error: $e');
}
}
final gweiGasPrice = (transaction.gasPrice?.getInWei ?? BigInt.zero) / BigInt.from(1000000000);
// we need to check if dApp provides the gas values and if not, we need to estimate them
final hasGasLimit = transaction.maxGas != null && transaction.maxGas! > 0;
final hasGasPrice = transaction.gasPrice != null;
final hasMaxFeePerGas = transaction.maxFeePerGas != null;
final hasMaxPriorityFeePerGas = transaction.maxPriorityFeePerGas != null;
final needsGasEstimation = !hasGasLimit || (!hasGasPrice && !hasMaxFeePerGas);
if (needsGasEstimation) {
try {
final gasPrice = hasGasPrice ? transaction.gasPrice! : await ethClient.getGasPrice();
if (!hasGasLimit) {
final gasLimit = await ethClient.estimateGas(
sender: transaction.from,
to: transaction.to,
value: transaction.value,
data: transaction.data,
gasPrice: gasPrice,
);
if (hasMaxFeePerGas || hasMaxPriorityFeePerGas) {
transaction = transaction.copyWith(maxGas: gasLimit.toInt());
} else {
transaction = transaction.copyWith(
gasPrice: hasGasPrice ? transaction.gasPrice : gasPrice,
maxGas: gasLimit.toInt(),
);
}
} else if (!hasGasPrice && !hasMaxFeePerGas) {
transaction = transaction.copyWith(gasPrice: gasPrice);
}
} on RPCError catch (e) {
return JsonRpcError(code: e.errorCode, message: e.message);
}
}
final gweiGasPrice =
(transaction.gasPrice?.getInWei ?? transaction.maxFeePerGas?.getInWei ?? BigInt.zero) /
BigInt.from(1000000000);
final amount = (transaction.value?.getInWei ?? BigInt.zero) / BigInt.from(1e18);
lib/src/screens/wallet_connect/widgets/bottom_sheet/bottom_sheet_listener_widget.dart
+6 -7
View File
@@ -42,16 +42,15 @@ class BottomSheetListenerState extends State<BottomSheetListener> {
backgroundColor: Color.fromARGB(0, 0, 0, 0),
isScrollControlled: true,
constraints: BoxConstraints(maxHeight: MediaQuery.of(context).size.height * 0.9),
builder: (context) {
builder: (BuildContext bottomSheetContext) {
if (item.closeAfter > 0) {
Future.delayed(Duration(seconds: item.closeAfter), () {
try {
if (!mounted) return;
if (Navigator.canPop(context)) {
Navigator.pop(context);
}
} catch (e, s) {
debugPrint('[$runtimeType] close $e $s');
final navigator = Navigator.maybeOf(bottomSheetContext, rootNavigator: false);
navigator?.maybePop();
} catch (e) {
// the context is invalid as the bottom sheet was already closed,
// this is expected and can be safely ignored
}
});
}