clients/multi: revert connect

LayerTwo-Labs · Jan 29, 2025 · 085a1a4 · 085a1a4
1 parent afd3899
commit 085a1a4
Show file tree

Hide file tree

Showing 99 changed files with 3,056 additions and 3,477 deletions.
diff --git a/clients/bitwindow/analysis_options.yaml b/clients/bitwindow/analysis_options.yaml
@@ -26,5 +26,10 @@ linter:
 
 analyzer:
     exclude:
-        - "**/lib/gen**"
+        - "**/*.g.dart"
+        - "**/*.pb.dart"
+        - "**/*.pbenum.dart"
+        - "**/*.pbserver.dart"
+        - "**/*.pbjson.dart"
+        - "**/*.pbgrpc.dart"
         - '**/build/**'
diff --git a/clients/bitwindow/lib/main.dart b/clients/bitwindow/lib/main.dart
@@ -7,10 +7,6 @@ import 'package:bitwindow/providers/news_provider.dart';
 import 'package:bitwindow/providers/sidechain_provider.dart';
 import 'package:bitwindow/providers/transactions_provider.dart';
 import 'package:bitwindow/routing/router.dart';
-import 'package:connectrpc/http2.dart';
-import 'package:connectrpc/protobuf.dart' as protobuf;
-import 'package:connectrpc/protocol/connect.dart' as connect;
-import 'package:connectrpc/protocol/grpc.dart' as grpc;
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:logger/logger.dart';
@@ -127,15 +123,9 @@ Future<void> initDependencies(Logger log, File logFile) async {
 
   var serverLogFile = [logFile.parent.path, 'debug.log'].join(Platform.pathSeparator);
   log.i('logging server logs to: $serverLogFile');
-  final baseUrl = 'http://${Environment.bitwindowdHost.value}:${Environment.bitwindowdPort.value}';
-  final httpClient = createHttpClient();
-  final connectTransport = connect.Transport(
-    baseUrl: baseUrl,
-    codec: const protobuf.ProtoCodec(),
-    httpClient: httpClient,
-  );
   final bitwindow = await BitwindowRPCLive.create(
-    transport: connectTransport,
+    host: env(Environment.bitwindowdHost),
+    port: env(Environment.bitwindowdPort),
     binary: BitWindow(),
     logPath: serverLogFile,
   );
@@ -145,23 +135,10 @@ Future<void> initDependencies(Logger log, File logFile) async {
 
   final enforerBinary = Enforcer();
   final enforcer = await EnforcerLive.create(
-    transport: grpc.Transport(
-      baseUrl: 'http://127.0.0.1:${enforerBinary.port}',
-      codec: const protobuf.ProtoCodec(),
-      httpClient: httpClient,
-      statusParser: const protobuf.StatusParser(),
-    ),
     binary: enforerBinary,
     logPath: serverLogFile,
   );
 
-  final mainchainRPC = await MainchainRPCLive.create(
-    ParentChain(),
-  );
-  GetIt.I.registerLazySingleton<MainchainRPC>(
-    () => mainchainRPC,
-  );
-
   GetIt.I.registerLazySingleton<EnforcerRPC>(
     () => enforcer,
   );

diff --git a/clients/bitwindow/lib/pages/overview_page.dart b/clients/bitwindow/lib/pages/overview_page.dart
@@ -4,8 +4,8 @@ import 'package:bitwindow/widgets/error_container.dart';
 import 'package:fixnum/fixnum.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
-import 'package:sail_ui/gen/bitcoind/v1/bitcoind.pb.dart';
-import 'package:sail_ui/gen/misc/v1/misc.pb.dart';
+import 'package:sail_ui/gen/bitcoind/v1/bitcoind.pbgrpc.dart';
+import 'package:sail_ui/gen/misc/v1/misc.pbgrpc.dart';
 import 'package:sail_ui/providers/balance_provider.dart';
 import 'package:sail_ui/rpcs/bitwindow_api.dart';
 import 'package:sail_ui/sail_ui.dart';

diff --git a/clients/bitwindow/lib/pages/root_page.dart b/clients/bitwindow/lib/pages/root_page.dart
@@ -5,7 +5,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:bitwindow/routing/router.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
-import 'package:sail_ui/gen/bitcoind/v1/bitcoind.pb.dart';
+import 'package:sail_ui/gen/bitcoind/v1/bitcoind.pbgrpc.dart';
 import 'package:sail_ui/providers/balance_provider.dart';
 import 'package:sail_ui/rpcs/bitwindow_api.dart';
 import 'package:sail_ui/sail_ui.dart';

diff --git a/clients/bitwindow/lib/pages/sidechain_activation_management_page.dart b/clients/bitwindow/lib/pages/sidechain_activation_management_page.dart
@@ -4,7 +4,7 @@ import 'package:bitwindow/providers/sidechain_provider.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
-import 'package:sail_ui/gen/drivechain/v1/drivechain.pb.dart';
+import 'package:sail_ui/gen/drivechain/v1/drivechain.pbgrpc.dart';
 import 'package:sail_ui/sail_ui.dart';
 import 'package:stacked/stacked.dart';
 

diff --git a/clients/bitwindow/lib/pages/sidechains_page.dart b/clients/bitwindow/lib/pages/sidechains_page.dart
@@ -9,7 +9,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:get_it/get_it.dart';
-import 'package:sail_ui/gen/wallet/v1/wallet.pb.dart';
+import 'package:sail_ui/gen/wallet/v1/wallet.pbgrpc.dart';
 import 'package:sail_ui/rpcs/bitwindow_api.dart';
 import 'package:sail_ui/sail_ui.dart';
 import 'package:stacked/stacked.dart';

diff --git a/clients/bitwindow/lib/pages/wallet_page.dart b/clients/bitwindow/lib/pages/wallet_page.dart
@@ -7,8 +7,8 @@ import 'package:flutter/services.dart';
 import 'package:get_it/get_it.dart';
 import 'package:logger/logger.dart';
 import 'package:qr_flutter/qr_flutter.dart';
-import 'package:sail_ui/gen/bitcoind/v1/bitcoind.pb.dart';
-import 'package:sail_ui/gen/wallet/v1/wallet.pb.dart';
+import 'package:sail_ui/gen/bitcoind/v1/bitcoind.pbgrpc.dart';
+import 'package:sail_ui/gen/wallet/v1/wallet.pbgrpc.dart';
 import 'package:sail_ui/providers/balance_provider.dart';
 import 'package:sail_ui/rpcs/bitwindow_api.dart';
 import 'package:sail_ui/sail_ui.dart';

diff --git a/clients/bitwindow/lib/providers/news_provider.dart b/clients/bitwindow/lib/providers/news_provider.dart
@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:fixnum/fixnum.dart';
 import 'package:flutter/foundation.dart';
 import 'package:get_it/get_it.dart';
-import 'package:sail_ui/gen/misc/v1/misc.pb.dart';
+import 'package:sail_ui/gen/misc/v1/misc.pbgrpc.dart';
 import 'package:sail_ui/providers/blockchain_provider.dart';
 import 'package:sail_ui/rpcs/bitwindow_api.dart';
 

diff --git a/clients/bitwindow/lib/providers/sidechain_provider.dart b/clients/bitwindow/lib/providers/sidechain_provider.dart
@@ -2,8 +2,8 @@ import 'dart:async';
 
 import 'package:flutter/foundation.dart';
 import 'package:get_it/get_it.dart';
-import 'package:sail_ui/gen/drivechain/v1/drivechain.pb.dart';
-import 'package:sail_ui/gen/wallet/v1/wallet.pb.dart';
+import 'package:sail_ui/gen/drivechain/v1/drivechain.pbgrpc.dart';
+import 'package:sail_ui/gen/wallet/v1/wallet.pbgrpc.dart';
 import 'package:sail_ui/providers/blockchain_provider.dart';
 import 'package:sail_ui/rpcs/bitwindow_api.dart';
 

diff --git a/clients/bitwindow/lib/providers/transactions_provider.dart b/clients/bitwindow/lib/providers/transactions_provider.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:flutter/foundation.dart';
 import 'package:get_it/get_it.dart';
-import 'package:sail_ui/gen/wallet/v1/wallet.pb.dart';
+import 'package:sail_ui/gen/wallet/v1/wallet.pbgrpc.dart';
 import 'package:sail_ui/providers/balance_provider.dart';
 import 'package:sail_ui/providers/blockchain_provider.dart';
 import 'package:sail_ui/rpcs/bitwindow_api.dart';

diff --git a/clients/bitwindow/pubspec.lock b/clients/bitwindow/pubspec.lock
@@ -182,14 +182,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.19.0"
-  connectrpc:
-    dependency: "direct main"
-    description:
-      name: connectrpc
-      sha256: "39d61194f48657b0f8a8c62b987cff47d80c9e08e0c249356abba7b46234c225"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.0"
   console:
     dependency: transitive
     description:
@@ -414,6 +406,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.2.1"
+  google_identity_services_web:
+    dependency: transitive
+    description:
+      name: google_identity_services_web
+      sha256: "55580f436822d64c8ff9a77e37d61f5fb1e6c7ec9d632a43ee324e2a05c3c6c9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.3"
+  googleapis_auth:
+    dependency: transitive
+    description:
+      name: googleapis_auth
+      sha256: befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.6.0"
   graphs:
     dependency: transitive
     description:
@@ -422,6 +430,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.2"
+  grpc:
+    dependency: "direct main"
+    description:
+      name: grpc
+      sha256: "5b99b7a420937d4361ece68b798c9af8e04b5bc128a7859f2a4be87427694813"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.1"
   http:
     dependency: transitive
     description:

diff --git a/clients/bitwindow/pubspec.yaml b/clients/bitwindow/pubspec.yaml
@@ -6,7 +6,7 @@ publish_to: "none"
 version: 0.0.1
 
 environment:
-  sdk: ">=3.4.1 <4.0.0"
+  sdk: '>=3.4.1 <4.0.0'
 
 dependencies:
   flutter:
@@ -21,6 +21,7 @@ dependencies:
   stacked: ^3.4.3
   qr_flutter: ^4.1.0
   cupertino_icons: ^1.0.8
+  grpc: ^4.0.1
   path_provider: ^2.1.5
   sail_ui:
     path: ../sail_ui
@@ -38,7 +39,6 @@ dependencies:
   flutter_markdown: ^0.7.5
   path: ^1.9.0
   url_launcher: ^6.3.1
-  connectrpc: ^0.1.0
 
 dev_dependencies:
   flutter_test:
@@ -107,10 +107,11 @@ flutter:
           style: italic
           weight: 600
 
+
 # Windows release stuff.
 # This currently relies on having a self-signed certificate
 # locally available, which must be changed before this is
-# properly deployed (either published to the MS store or
+# properly deployed (either published to the MS store or 
 # as an installer on a website somewhere).
 # https://pub.dev/packages/msix
 msix_config:
@@ -123,6 +124,6 @@ msix_config:
   logo_path: windows/runner/resources/app_icon.ico
   capabilities: internetClient,internetClientServer
   os_min_version: 10.0.17763.0
-  store_certificate: false # Use a test certificate instead of store certificate
+  store_certificate: false  # Use a test certificate instead of store certificate
   install_certificate: false # Don't install certificate during CI builds
-  store: false # Not publishing to Microsoft Store
+  store: false  # Not publishing to Microsoft Store
diff --git a/clients/bitwindow/test/mocks/api_mock.dart b/clients/bitwindow/test/mocks/api_mock.dart
@@ -1,9 +1,9 @@
 import 'package:sail_ui/classes/node_connection_settings.dart';
 import 'package:sail_ui/classes/rpc_connection.dart';
-import 'package:sail_ui/gen/bitcoind/v1/bitcoind.pb.dart';
-import 'package:sail_ui/gen/drivechain/v1/drivechain.pb.dart';
-import 'package:sail_ui/gen/misc/v1/misc.pb.dart';
-import 'package:sail_ui/gen/wallet/v1/wallet.pb.dart';
+import 'package:sail_ui/gen/bitcoind/v1/bitcoind.pbgrpc.dart';
+import 'package:sail_ui/gen/drivechain/v1/drivechain.pbgrpc.dart';
+import 'package:sail_ui/gen/misc/v1/misc.pbgrpc.dart';
+import 'package:sail_ui/gen/wallet/v1/wallet.pbgrpc.dart';
 import 'package:sail_ui/rpcs/bitwindow_api.dart';
 
 class MockAPI extends BitwindowRPC {