Change the mainnet neutrino. connect address,Add the targetConf parameter to the interface of the closeChannel,Optimize some functions.

healergyl · healergyl · commit 95ed4023162d · 2023-06-12T19:12:22.000+08:00
diff --git a/app/src/main/java/com/omni/wallet/common/StartParams.java b/app/src/main/java/com/omni/wallet/common/StartParams.java
@@ -64,7 +64,7 @@ private StartParams(NetworkType networkType){
                         "--spay-url=110.40.210.253:58332 "+
                         "--neutrino.feeurl=https://nodes.lightning.computer/fees/v1/btc-fee-estimates.json " +
                         "--nobootstrap" +
-                        " --neutrino.addpeer=bb1.breez.technology" +
+                        " --neutrino.connect=110.40.210.253" +
                         " --omnicoreproxy.rpchost=" + OMNI_HOST_ADDRESS_PORT +
                         " --alias=";
                 break;
diff --git a/app/src/main/java/com/omni/wallet/entity/PaymentEntity.java b/app/src/main/java/com/omni/wallet/entity/PaymentEntity.java
@@ -6,7 +6,7 @@
  * author: guoyalei
  * date: 2023/1/13
  */
-public class PaymentEntity {
+public class PaymentEntity implements Comparable<PaymentEntity> {
     private long assetId;
     private long date;
     private long amount;
@@ -43,4 +43,9 @@ public int getType() {
     public void setType(int type) {
         this.type = type;
     }
+
+    @Override
+    public int compareTo(PaymentEntity o) {
+        return (int) (o.getDate() - this.getDate());
+    }
 }
diff --git a/app/src/main/java/com/omni/wallet/ui/activity/BalanceDetailActivity.java b/app/src/main/java/com/omni/wallet/ui/activity/BalanceDetailActivity.java
@@ -567,6 +567,9 @@ public void run() {
                             List<LightningOuterClass.AssetTx> mData = new ArrayList<>();
                             mData.add(resp);
                             for (int i = 0; i < mData.size(); i++) {
+                                if (mData.get(i).getPropertyid() != assetId) {
+                                    return;
+                                }
                                 TransactionAssetEntity entity = new TransactionAssetEntity();
                                 entity.setBlockTime(mData.get(i).getBlocktime());
                                 entity.setList(Collections.singletonList(mData.get(i)));
@@ -955,6 +958,9 @@ public void run() {
                                     LightningOuterClass.AssetTx resp = LightningOuterClass.AssetTx.parseFrom(bytes);
                                     LogUtils.e(TAG, "------------------oB_GetOmniTransactionOnPendingResponse-----------------" + resp);
                                     if (StringUtils.isEmpty(String.valueOf(resp.getConfirmations())) || resp.getConfirmations() < 3) {
+                                        if (resp.getPropertyid() != assetId) {
+                                            return;
+                                        }
                                         mPendingTxsAssetData.add(resp);
                                     }
                                     mToBePaidNumTv.setText(mPendingTxsAssetData.size() + "");
diff --git a/app/src/main/java/com/omni/wallet/ui/activity/channel/ChannelViewHolder.java b/app/src/main/java/com/omni/wallet/ui/activity/channel/ChannelViewHolder.java
@@ -75,7 +75,7 @@ public void setLogo(int assetId) {
     }
 
     public void setTime(long time) {
-        mCreateTime.setText(DateUtils.dateFormat(time, DateUtils.YYYY_MM_DD_HH_MM_SS));
+        mCreateTime.setText(DateUtils.yearMonthDayHourMinSec(String.valueOf(time)));
     }
 
     void setBalances(long local, long remote, long capacity) {
diff --git a/app/src/main/java/com/omni/wallet/view/TransactionsAssetView.java b/app/src/main/java/com/omni/wallet/view/TransactionsAssetView.java
@@ -19,6 +19,8 @@
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import butterknife.BindView;
@@ -77,6 +79,12 @@ public void setViewShow(List<LightningOuterClass.AssetTx> list) {
         }
         setVisibility(VISIBLE);
         // 设置右边数据显示
+        Collections.sort(list, new Comparator<LightningOuterClass.AssetTx>() {
+            @Override
+            public int compare(LightningOuterClass.AssetTx o1, LightningOuterClass.AssetTx o2) {
+                return (int) (o2.getBlocktime() - o1.getBlocktime());
+            }
+        });
         mShowData.clear();
         mShowData.addAll(list);
         mAdapter.notifyDataSetChanged();
diff --git a/app/src/main/java/com/omni/wallet/view/TransactionsLightingView.java b/app/src/main/java/com/omni/wallet/view/TransactionsLightingView.java
@@ -17,6 +17,7 @@
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import butterknife.BindView;
@@ -74,6 +75,7 @@ public void setViewShow(List<PaymentEntity> list) {
         }
         setVisibility(VISIBLE);
         // 设置右边数据显示
+        Collections.sort(list);
         mShowData.clear();
         mShowData.addAll(list);
         mAdapter.notifyDataSetChanged();
diff --git a/app/src/main/java/com/omni/wallet/view/dialog/CreateChannelDialog.java b/app/src/main/java/com/omni/wallet/view/dialog/CreateChannelDialog.java
@@ -872,7 +872,7 @@ public void onResponse(byte[] bytes) {
                     new Handler(Looper.getMainLooper()).post(new Runnable() {
                         @Override
                         public void run() {
-                            feeStr = resp.getFeeSat();
+                            feeStr = resp.getSatPerVbyte();
                             channelFeeTv.setText(feeStr + "");
                         }
                     });
diff --git a/app/src/main/java/com/omni/wallet/view/popupwindow/ChannelDetailsPopupWindow.java b/app/src/main/java/com/omni/wallet/view/popupwindow/ChannelDetailsPopupWindow.java
@@ -235,7 +235,7 @@ private void bindOpenChannel(ByteString channelString) throws InvalidProtocolBuf
         } else {
             mStatusDot.setBackgroundResource(R.drawable.bg_btn_round_99000000_25);
         }
-        mCreateTime.setText(DateUtils.dateFormat(channel.getCreateTime(), DateUtils.YYYY_MM_DD_HH_MM_SS));
+        mCreateTime.setText(DateUtils.yearMonthDayHourMinSec(String.valueOf(channel.getCreateTime())));
         mAnotherInfo.setVisibility(View.VISIBLE);
         // time lock
         long timeLockInSeconds = channel.getLocalConstraints().getCsvDelay() * 10 * 60;
@@ -321,7 +321,7 @@ private void setBasicInformation(@NonNull int assetId, @NonNull String remoteNod
             }
         }
         mFundingTransaction.setText(channelPoint.substring(0, channelPoint.indexOf(':')));
-        mCreateTime.setText(DateUtils.dateFormat(createTime, DateUtils.YYYY_MM_DD_HH_MM_SS));
+        mCreateTime.setText(DateUtils.yearMonthDayHourMinSec(String.valueOf(createTime)));
     }
 
     private void setBalances(long local, long remote, long capacity) {
@@ -374,6 +374,7 @@ public void closeChannel(boolean force, int csvDelay, int assetId) {
 
         LightningOuterClass.CloseChannelRequest closeChannelRequest = LightningOuterClass.CloseChannelRequest.newBuilder()
                 .setChannelPoint(point)
+                .setTargetConf(3)
                 .build();
         if (assetId == 0) {
             Obdmobile.closeChannel(closeChannelRequest.toByteArray(), new RecvStream() {
diff --git a/app/src/main/java/com/omni/wallet/view/popupwindow/createinvoice/CreateLuckyPacketPopupWindow.java b/app/src/main/java/com/omni/wallet/view/popupwindow/createinvoice/CreateLuckyPacketPopupWindow.java
@@ -111,6 +111,7 @@ public class CreateLuckyPacketPopupWindow {
     String qrCodeUrl;
     String qrCodeCotent;
     LoadingDialog mLoadingDialog;
+    long expiryTime = System.currentTimeMillis() / 1000 + 86400;
     // pay
     String lnInvoice;
     long payAmount;
@@ -332,6 +333,13 @@ public void onClick() {
                         ToastUtils.showToast(mContext, mContext.getString(R.string.enter_the_time));
                         return;
                     }
+                    if (timeType.equals("Minutes")) {
+                        expiryTime = System.currentTimeMillis() / 1000 + Integer.parseInt(timeInput) * 60;
+                    } else if (timeType.equals("Hours")) {
+                        expiryTime = System.currentTimeMillis() / 1000 + Integer.parseInt(timeInput) * 3600;
+                    } else if (timeType.equals("Days")) {
+                        expiryTime = System.currentTimeMillis() / 1000 + Integer.parseInt(timeInput) * 86400;
+                    }
                     mLoadingDialog.show();
                     try {
                         LuckPkClient client = new LuckPkClient(ConstantWithNetwork.getInstance(ConstantInOB.networkType).getBTC_HOST_ADDRESS(), 38332, mContext.getApplicationContext().getExternalFilesDir(null) + "/obd/tls.cert", mContext.getApplicationContext().getExternalFilesDir(null) + "/obd" + "/tls.key.pcks8");
@@ -343,13 +351,15 @@ public void onClick() {
                                         .setAmt((long) (CalculateUtil.mul(Double.parseDouble(amountEdit.getText().toString()), 100000000)))
                                         .setParts(Long.parseLong(numberInput))
                                         .setErrorCreateMsg(addressTv.getText().toString())
+                                        .setExpiredTimeSec(expiryTime)
                                         .build();
                             } else {
                                 payRequest = LuckPkOuterClass.LuckPk.newBuilder()
                                         .setAssetId(mAssetId)
                                         .setAmt((long) (CalculateUtil.mul(Double.parseDouble(amountEdit.getText().toString()), 100000000)))
                                         .setParts(Long.parseLong(numberInput))
                                         .setErrorCreateMsg(addressTv.getText().toString())
+                                        .setExpiredTimeSec(expiryTime)
                                         .build();
                             }
                             try {
diff --git a/baselibrary/src/main/java/com/omni/wallet/baselibrary/utils/DateUtils.java b/baselibrary/src/main/java/com/omni/wallet/baselibrary/utils/DateUtils.java
@@ -75,6 +75,16 @@ public static String yearMonthDay(String time) {
         return times;
     }
 
+    /**
+     * 十位时间戳字符串转年月日时分秒
+     */
+    public static String yearMonthDayHourMinSec(String time) {
+        SimpleDateFormat sdr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        int i = Integer.parseInt(time);
+        String times = sdr.format(new Date(i * 1000L));
+        return times;
+    }
+
     /**
      * 格式化当前时间
      */

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public void setLogo(int assetId) {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public void setTime(long time) {`
`78`		`- mCreateTime.setText(DateUtils.dateFormat(time, DateUtils.YYYY_MM_DD_HH_MM_SS));`
	`78`	`+ mCreateTime.setText(DateUtils.yearMonthDayHourMinSec(String.valueOf(time)));`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`void setBalances(long local, long remote, long capacity) {`
Original file line number	Diff line number	Diff line change
`@@ -872,7 +872,7 @@ public void onResponse(byte[] bytes) {`
`872`	`872`	`new Handler(Looper.getMainLooper()).post(new Runnable() {`
`873`	`873`	`@Override`
`874`	`874`	`public void run() {`
`875`		`- feeStr = resp.getFeeSat();`
	`875`	`+ feeStr = resp.getSatPerVbyte();`
`876`	`876`	`channelFeeTv.setText(feeStr + "");`
`877`	`877`	`}`
`878`	`878`	`});`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ private void bindOpenChannel(ByteString channelString) throws InvalidProtocolBuf`
`235`	`235`	`} else {`
`236`	`236`	`mStatusDot.setBackgroundResource(R.drawable.bg_btn_round_99000000_25);`
`237`	`237`	`}`
`238`		`- mCreateTime.setText(DateUtils.dateFormat(channel.getCreateTime(), DateUtils.YYYY_MM_DD_HH_MM_SS));`
	`238`	`+ mCreateTime.setText(DateUtils.yearMonthDayHourMinSec(String.valueOf(channel.getCreateTime())));`
`239`	`239`	`mAnotherInfo.setVisibility(View.VISIBLE);`
`240`	`240`	`// time lock`
`241`	`241`	`long timeLockInSeconds = channel.getLocalConstraints().getCsvDelay() * 10 * 60;`
`@@ -321,7 +321,7 @@ private void setBasicInformation(@NonNull int assetId, @NonNull String remoteNod`
`321`	`321`	`}`
`322`	`322`	`}`
`323`	`323`	`mFundingTransaction.setText(channelPoint.substring(0, channelPoint.indexOf(':')));`
`324`		`- mCreateTime.setText(DateUtils.dateFormat(createTime, DateUtils.YYYY_MM_DD_HH_MM_SS));`
	`324`	`+ mCreateTime.setText(DateUtils.yearMonthDayHourMinSec(String.valueOf(createTime)));`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`private void setBalances(long local, long remote, long capacity) {`
`@@ -374,6 +374,7 @@ public void closeChannel(boolean force, int csvDelay, int assetId) {`
`374`	`374`
`375`	`375`	`LightningOuterClass.CloseChannelRequest closeChannelRequest = LightningOuterClass.CloseChannelRequest.newBuilder()`
`376`	`376`	`.setChannelPoint(point)`
	`377`	`+ .setTargetConf(3)`
`377`	`378`	`.build();`
`378`	`379`	`if (assetId == 0) {`
`379`	`380`	`Obdmobile.closeChannel(closeChannelRequest.toByteArray(), new RecvStream() {`