Просмотр исходного кода

wallet: enable zmq backend network access

darkfi 2 лет назад
Родитель
Сommit
794a32f8b6
3 измененных файлов с 15 добавлено и 3 удалено
  1. 9 0
      bin/darkwallet/Cargo.toml
  2. 4 1
      bin/darkwallet/Makefile
  3. 2 2
      bin/darkwallet/src/net.rs

+ 9 - 0
bin/darkwallet/Cargo.toml

@@ -60,3 +60,12 @@ workspace = true
 
 [workspace.lints.clippy]
 
+[package.metadata.android]
+package_name = "darkfi.darkwallet"
+label = "DarkWallet"
+
+[[package.metadata.android.permission]]
+name = "android.permission.INTERNET"
+[[package.metadata.android.permission]]
+name = "android.permission.ACCESS_NETWORK_STATE"
+

+ 4 - 1
bin/darkwallet/Makefile

@@ -3,8 +3,11 @@ default:
 
 android:
 	docker run -v $(shell pwd):/root/dw -v /tmp/miniquad:/tmp/miniquad -w /root/dw -t apk cargo quad-apk build
-	adb uninstall rust.darkwallet
+	adb uninstall darkfi.darkwallet
 	adb install target/android-artifacts/debug/apk/darkwallet.apk
+	reset
+	adb logcat -c
+	adb logcat -s darkfi
 
 clean:
 	docker run -v $(shell pwd):/root/dw -w /root/dw -t apk rm -fr target/

+ 2 - 2
bin/darkwallet/src/net.rs

@@ -68,10 +68,10 @@ pub struct ZeroMQAdapter {
 impl ZeroMQAdapter {
     pub async fn new(scene_graph: SceneGraphPtr2, ex: Arc<smol::Executor<'static>>) -> Arc<Self> {
         let mut zmq_rep = zeromq::RepSocket::new();
-        zmq_rep.bind("tcp://127.0.0.1:9484").await.unwrap();
+        zmq_rep.bind("tcp://0.0.0.0:9484").await.unwrap();
 
         let mut zmq_pub = zeromq::PubSocket::new();
-        zmq_pub.bind("tcp://127.0.0.1:9485").await.unwrap();
+        zmq_pub.bind("tcp://0.0.0.0:9485").await.unwrap();
 
         Arc::new(Self {
             scene_graph,