feat: upgrade ts wrapper to testnet

Fuelet · May 22, 2024 · c6919e4 · c6919e4
1 parent a9bd70f
commit c6919e4
Show file tree

Hide file tree

Showing 8 changed files with 464 additions and 657 deletions.
diff --git a/packages/flutter_fuels/example/lib/main.dart b/packages/flutter_fuels/example/lib/main.dart
@@ -4,9 +4,9 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:flutter_fuels/flutter_fuels.dart';
 
-const _betaApiUrl = 'https://beta-5.fuel.network';
+const _betaApiUrl = 'https://testnet.fuel.network';
 const _ethAssetId =
-    '0x0000000000000000000000000000000000000000000000000000000000000000';
+    '0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07';
 
 void main() {
   runApp(const MyApp());
@@ -210,8 +210,7 @@ class _MyAppState extends State<MyApp> {
     if (_testTxRequest != null && _currentWallet != null) {
       final txId = await _currentWallet!
           .sendTransaction(transactionRequestHexOrJson: _testTxRequest!);
-      txLink =
-          'https://fuel-explorer.vercel.app/tx/$txId';
+      txLink = 'https://fuel-explorer.vercel.app/tx/$txId';
     } else {
       txLink = 'cannot send the tx yet';
     }

diff --git a/packages/flutter_fuels/lib/js/wallet.js b/packages/flutter_fuels/lib/js/wallet.js
diff --git a/packages/flutter_fuels/lib/js/wallet.js.LICENSE.txt b/packages/flutter_fuels/lib/js/wallet.js.LICENSE.txt
@@ -12,8 +12,6 @@
  * @license  MIT
  */
 
-/*! MIT License. Copyright 2015-2022 Richard Moore <me@ricmoo.com>. See LICENSE.txt. */
-
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
 /*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) */

diff --git a/packages/flutter_fuels/lib/wallet/platform_impl/js_interop/js_fuels_wallet.dart b/packages/flutter_fuels/lib/wallet/platform_impl/js_interop/js_fuels_wallet.dart
@@ -4,24 +4,20 @@ library js_fuels_wallet;
 import 'package:js/js.dart';
 
 @JS('generateNewWallet')
-external Object generateNewWallet(String networkUrl);
+external Object generateNewWallet();
 
 @JS('newWalletFromMnemonic')
-external Object newWalletFromMnemonic(String networkUrl, String mnemonic);
+external Object newWalletFromMnemonic(String mnemonic);
 
 @JS('newWalletFromMnemonicAndPath')
 external Object newWalletFromMnemonicAndPath(
-    String networkUrl, String mnemonic, String path);
+    String mnemonic, String path);
 
 @JS('newWalletFromPrivateKey')
-external Object newWalletFromPrivateKey(String networkUrl, String privateKey);
+external Object newWalletFromPrivateKey(String privateKey);
 
 @JS('signMessage')
-external Object signMessage(
-  String privateKey,
-  String networkUrl,
-  String message,
-);
+external Object signMessage(String networkUrl, String message);
 
 @JS('sendTransaction')
 external Object sendTransaction(

diff --git a/packages/flutter_fuels/lib/wallet/platform_impl/web_wallet.dart b/packages/flutter_fuels/lib/wallet/platform_impl/web_wallet.dart
@@ -14,8 +14,7 @@ class FuelWalletImpl extends BaseWallet {
   @override
   Future<DartWalletUnlocked> generateNewWallet(
       {required String networkUrl}) async {
-    final newWallet = await promiseToFuture(
-        js_wallet.generateNewWallet(_enrichNetworkUrl(networkUrl)));
+    final newWallet = await promiseToFuture(js_wallet.generateNewWallet());
     final jsWallet = JsWallet.fromJsObject(newWallet, networkUrl);
     return WebWalletUnlocked(jsWallet);
   }
@@ -25,8 +24,8 @@ class FuelWalletImpl extends BaseWallet {
     required String networkUrl,
     required String mnemonic,
   }) async {
-    final newWallet = await promiseToFuture(js_wallet.newWalletFromMnemonic(
-        _enrichNetworkUrl(networkUrl), mnemonic));
+    final newWallet =
+        await promiseToFuture(js_wallet.newWalletFromMnemonic(mnemonic));
     final jsWallet = JsWallet.fromJsObject(newWallet, networkUrl);
     return WebWalletUnlocked(jsWallet);
   }
@@ -37,8 +36,7 @@ class FuelWalletImpl extends BaseWallet {
       required String mnemonic,
       required String derivationPath}) async {
     final newWallet = await promiseToFuture(
-        js_wallet.newWalletFromMnemonicAndPath(
-            _enrichNetworkUrl(networkUrl), mnemonic, derivationPath));
+        js_wallet.newWalletFromMnemonicAndPath(mnemonic, derivationPath));
     final jsWallet = JsWallet.fromJsObject(newWallet, networkUrl);
     return WebWalletUnlocked(jsWallet);
   }
@@ -48,8 +46,8 @@ class FuelWalletImpl extends BaseWallet {
     required String networkUrl,
     required String privateKey,
   }) async {
-    final newWallet = await promiseToFuture(js_wallet.newWalletFromPrivateKey(
-        _enrichNetworkUrl(networkUrl), addHexPrefix(privateKey)));
+    final newWallet = await promiseToFuture(
+        js_wallet.newWalletFromPrivateKey(addHexPrefix(privateKey)));
     final jsWallet = JsWallet.fromJsObject(newWallet, networkUrl);
     return WebWalletUnlocked(jsWallet);
   }
@@ -151,8 +149,7 @@ class WebWalletUnlocked extends DartWalletUnlocked {
 
   @override
   Future<String> signMessage({required String message}) {
-    return promiseToFuture(
-        js_wallet.signMessage(_wallet.privateKey, _wallet.networkUrl, message));
+    return promiseToFuture(js_wallet.signMessage(_wallet.privateKey, message));
   }
 
   @override