[fix] add expire to pending banner;

update pw-core to latest version

dev.env.example

@@ -6,8 +6,8 @@
 # PORT=8080
 
 BASE_URL=https://cellapitest.ckb.pw
-CKB_NODE=https://lay2.ckb.dev
+CKB_NODE=https://testnet.ckb.dev
 
-EXPLORER_URL=https://explorer.ckb.pw/devnet
+EXPLORER_URL=https://explorer.nervos.org/aggron
 DAO_LOCK_PERIOD_EPOCHS=180
 

package.json

@@ -10,7 +10,7 @@
     "test": "echo \"No test specified\" && exit 0"
   },
   "dependencies": {
-    "@lay2/pw-core": "^0.3.8",
+    "@lay2/pw-core": "^0.3.22",
     "@quasar/extras": "^1.0.0",
     "axios": "^0.18.1",
     "jsbi": "^3.1.3",

prod.env.example

@@ -6,7 +6,7 @@
 # PORT=8080
 
 BASE_URL=https://cellapiprod.ckb.pw
-CKB_NODE=https://lina.ckb.dev
+CKB_NODE=https://mainnet.ckb.dev
 
 EXPLORER_URL=https://explorer.nervos.org
 DAO_LOCK_PERIOD_EPOCHS=180

src/models/dao-cell.js

@@ -17,7 +17,13 @@ export class DaoCell extends Cell {
     daysLeft,
     epochsPast
   ) {
-    super(capacity, lock, PWCore.config.daoType.script, outPoint, data);
+    super(
+      capacity,
+      lock,
+      PWCore.config.daoType.script,
+      outPoint,
+      data || "0x0000000000000000"
+    );
     this.currentCapacity = currentCapacity;
     this.revenue = currentCapacity.sub(capacity);
     this.apc = apc;

src/pages/Index.vue

@@ -218,6 +218,7 @@
             this.items.find((i) =>
               this.banner.link.endsWith(i.outPoint.txHash)
             ) !== undefined
+            || this.banner.expired <= new Date().getTime()
           ) {
             this.banner = {};
             this.$q.localStorage.remove("banner");
@@ -266,6 +267,7 @@
         this.banner = {
           show: true,
           type: "positive",
+          expired: new Date().getTime() + 5 * 60 * 1000,
           loading: true,
           message: this.$t("banner.pending"),
           link: `${process.env.EXPLORER_URL}/transaction/${txHash}`,

src/services/deposit-builder.js

@@ -26,10 +26,9 @@ export default class DepositBuilder extends Builder {
     let neededAmount = this.capacity;
     if (fee) neededAmount = neededAmount.add(fee);
 
-    const inputCells = await PWCore.defaultCollector.collect(
-      address,
+    const inputCells = await PWCore.defaultCollector.collect(address, {
       neededAmount
-    );
+    });
     const inputAmount = inputCells
       .map(c => c.capacity)
       .reduce((sum, a) => sum.add(a));

src/services/withdraw1-builder.js

@@ -28,7 +28,9 @@ export default class Withdraw1Builder extends Builder {
 
     const inputCells = await PWCore.defaultCollector.collect(
       this.cell.lock.toAddress(),
-      neededAmount
+      {
+        neededAmount
+      }
     );
 
     const inputAmount = inputCells

yarn.lock

@@ -1064,17 +1064,18 @@
   dependencies:
     "@hapi/hoek" "^8.3.0"
 
-"@lay2/pw-core@^0.3.8":
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/@lay2/pw-core/-/pw-core-0.3.8.tgz#215572042ea54f8843e5ac0728543aecf778c0b3"
-  integrity sha512-1Fl2e3HLi5tUqiqfxr657w6h6bg+KVRZBoG1rSJFAuUauJ/h3mI4Hj2Kc7HO6NZTPlq9KqCm/EY0WT0wrEUqAg==
+"@lay2/pw-core@^0.3.22":
+  version "0.3.22"
+  resolved "https://registry.yarnpkg.com/@lay2/pw-core/-/pw-core-0.3.22.tgz#c52ecd762317703f150825f12d48cb51d78bca11"
+  integrity sha512-Wo4vhWynLqSR4EcES+64Xbnoo4XGY7dAd5RmIBZEEgxKCL7afMrkH0km4qC5J9aDqKKD0WDrUHekomzIMVuEMA==
   dependencies:
     "@ckb-lumos/types" "^0.2.4"
     "@nervosnetwork/ckb-sdk-utils" "^0.32.0"
     axios "^0.19.2"
     bech32 "^1.1.4"
     blake2b "^2.1.3"
     ckb-js-toolkit "^0.9.1"
+    decimal.js "^10.2.1"
     ethereum-ens "^0.8.0"
     ethereumjs-util "^7.0.2"
     jsbi "^3.1.2"
@@ -3520,6 +3521,11 @@ decamelize@^1.1.2, decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
+decimal.js@^10.2.1:
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3"
+  integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==
+
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"