Update 1.2.3 (#17)

* fix reveal issue and default fee * update alphanet api * stage for mainnet * minor changes
kukai-wallet · Dec 11, 2018 · 0963a72 · 0963a72
1 parent 833a611
commit 0963a72
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 35 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kukai",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "license": "MIT",
   "scripts": {
     "ng": "ng",

diff --git a/src/app/components/delegate/delegate.component.html b/src/app/components/delegate/delegate.component.html
@@ -13,7 +13,7 @@ <h4 class="modal-title pull-left"> {{ 'DELEGATECOMPONENT.TITLE1' | translate }}
                 <div class="form-row">
                     <div class="form-group col-md-8">
                         <label for="fromAdress"> {{ 'DELEGATECOMPONENT.FROM' | translate }} </label>
-                        <select [(ngModel)]="activePkh" id="fromAdress" class="form-control" name="first">
+                        <select [(ngModel)]="activePkh" (change)="checkReveal()" id="fromAdress" class="form-control" name="first">
                             <option *ngFor="let account of accounts | slice:1" [ngValue]="account.pkh">{{ account.pkh }}</option>
                         </select>
                     </div>
@@ -49,7 +49,7 @@ <h4 class="modal-title pull-left"> {{ 'DELEGATECOMPONENT.TITLE2' | translate }}
         <div class="modal-body">
             <p> {{ 'DELEGATECOMPONENT.ACCOUNT' | translate }} {{ activePkh }}
                 <BR> {{ 'DELEGATECOMPONENT.DELEGATE' | translate }} {{ toPkh | delegatorName }}
-                <BR> {{ 'DELEGATECOMPONENT.FEE' | translate }} {{ fee | number:'1.0' }}&#42793;
+                <BR> {{ 'DELEGATECOMPONENT.FEE' | translate }} {{ fee | number:'1.0-6' }}&#42793;
             </p>
             <div class="row">
                 <div *ngIf='walletService.isFullWallet()' class="form-group col-md-6">

diff --git a/src/app/components/delegate/delegate.component.ts b/src/app/components/delegate/delegate.component.ts
@@ -54,6 +54,7 @@ export class DelegateComponent implements OnInit {
     open1(template1: TemplateRef<any>) {
         if (this.walletService.wallet) {
             this.clearForm();
+            this.checkReveal();
             this.modalRef1 = this.modalService.show(template1, { class: 'first' });
         }
     }
@@ -122,6 +123,17 @@ export class DelegateComponent implements OnInit {
             );
         }, 100);
     }
+    checkReveal() {
+        console.log('check reveal');
+        this.operationService.isRevealed(this.activePkh)
+                .subscribe((revealed: boolean) => {
+                    if (!revealed) {
+                        this.recommendedFee = 0.0026;
+                    } else {
+                        this.recommendedFee = 0.0013;
+                    }
+                });
+    }
     clearForm() {
         this.toPkh = '';
         this.fee = '';

diff --git a/src/app/components/new-account/new-account.component.html b/src/app/components/new-account/new-account.component.html
@@ -10,7 +10,7 @@ <h4 class="modal-title pull-left"> {{ 'NEWACCOUNTCOMPONENT.TITLE' | translate }}
     <div class="modal-body">
         <div class="form-group">
             <label for="fromAdress"> {{ 'NEWACCOUNTCOMPONENT.FUNDSFROM' | translate }} </label>
-            <select [(ngModel)]="activePkh" id="fromAdress" class="form-control mono" name="first">
+            <select [(ngModel)]="activePkh" (change)="checkReveal()" id="fromAdress" class="form-control mono" name="first">
                 <option *ngFor="let account of accounts" [ngValue]="account.pkh">{{ account.pkh }}</option>
             </select>
         </div>

diff --git a/src/app/components/new-account/new-account.component.ts b/src/app/components/new-account/new-account.component.ts
@@ -57,14 +57,7 @@ export class NewAccountComponent implements OnInit {
   open1(template1: TemplateRef<any>) {
     if (this.walletService.wallet) {
       this.clearForm();
-      this.operationService.isRevealed(this.walletService.wallet.accounts[0].pkh)
-        .subscribe((revealed: boolean) => {
-          if (!revealed) {
-            this.recommendedFee = 0.0026;
-          } else {
-            this.recommendedFee = 0.0013;
-          }
-        });
+      this.checkReveal();
       this.modalRef1 = this.modalService.show(template1, { class: 'first' });
     }
   }
@@ -143,7 +136,17 @@ export class NewAccountComponent implements OnInit {
       );
     }, 100);
   }
-
+  checkReveal() {
+    console.log('check reveal');
+    this.operationService.isRevealed(this.activePkh)
+            .subscribe((revealed: boolean) => {
+                if (!revealed) {
+                    this.recommendedFee = 0.0026;
+                } else {
+                    this.recommendedFee = 0.0013;
+                }
+            });
+}
   invalidInput(): string {
     if (!Number(this.amount) && this.amount && this.amount !== '0') {
       let invalidAmount = '';

diff --git a/src/app/components/send/send.component.html b/src/app/components/send/send.component.html
@@ -14,7 +14,7 @@ <h4 class="modal-title pull-left"> {{ 'SENDCOMPONENT.TITLE' | translate }} </h4>
                 <div class="form-row">
                     <div class="form-group col-md-8">
                         <label for="fromAdress"> {{ 'SENDCOMPONENT.FROMADDRESS' | translate }} </label>
-                        <select [(ngModel)]="activePkh" id="fromAdress" class="form-control mono" name="first1">
+                        <select [(ngModel)]="activePkh" (change)="checkReveal()" id="fromAdress" class="form-control mono" name="first1">
                             <option *ngFor="let account of accounts" [ngValue]="account.pkh">{{ account.pkh }}</option>
                         </select>
                     </div>
@@ -65,7 +65,7 @@ <h4 class="modal-title pull-left"> {{ 'SENDCOMPONENT.TITLE' | translate }} </h4>
                     <div class="form-row">
                         <div class="form-group col-md-4">
                             <label for="transactionFee"> {{ 'SENDCOMPONENT.FEE' | translate }} (&#42793;)</label>
-                            <input type="text" class="form-control" id="transactionFee" placeholder="0.00" [(ngModel)]="fee" name="four">
+                            <input type="text" class="form-control" id="transactionFee" placeholder={{this.recommendedFee.toString()}} [(ngModel)]="fee" name="four">
                         </div>
                     </div>
                 </div>

diff --git a/src/app/components/send/send.component.ts b/src/app/components/send/send.component.ts
@@ -155,18 +155,8 @@ export class SendComponent implements OnInit {
 
     open1(template1: TemplateRef<any>) {
         if (this.walletService.wallet) {
-            this.operationService.isRevealed(this.walletService.wallet.accounts[0].pkh)
-                .subscribe((revealed: boolean) => {
-                    if (!revealed) {
-                        this.recommendedFee = 0.0026;
-                    } else {
-                        this.recommendedFee = 0.0013;
-                    }
-                });
-            /*if (this.walletService.wallet.accounts[0].numberOfActivites === 0) {
-                this.recommendedFee += 0.0011;
-            }*/
             this.clearForm();
+            this.checkReveal();
             this.modalRef1 = this.modalService.show(template1, { class: 'first' });  // modal-sm / modal-lg
         }
     }
@@ -332,7 +322,17 @@ export class SendComponent implements OnInit {
 
         return result;
     }
-
+    checkReveal() {
+        console.log('check reveal');
+        this.operationService.isRevealed(this.activePkh)
+                .subscribe((revealed: boolean) => {
+                    if (!revealed) {
+                        this.recommendedFee = 0.0026;
+                    } else {
+                        this.recommendedFee = 0.0013;
+                    }
+                });
+    }
     invalidInputSingle(): string {
         if (!this.activePkh || this.activePkh.length !== 36) {
 

diff --git a/src/app/constants.ts b/src/app/constants.ts
@@ -9,6 +9,7 @@ export class Constants {
     // Select Zeronet, Alphanet or Mainnet
     readonly NET: Net = this.mainnet();
     // readonly NET: Net = this.zeronet();
+    // readonly NET: Net = this.alphanet();
 
     zeronet(): Net {
         const ZERONET: Net = {
@@ -23,10 +24,10 @@ export class Constants {
     alphanet(): Net {
         const ALPHANET: Net = {
             NAME:  'Alphanet',
-            API_URL:  'https://alphanet-api.tzscan.io/',
+            API_URL:  'https://api.alphanet.tzscan.io/',
             NODE_URL: 'https://alphanet-node.tzscan.io/',
             BLOCK_EXPLORER_URL: 'https://alphanet.tzscan.io/',
-            CHAIN_ID: 'PsYLVpVvgbLhAhoqAkMFUo6gudkJ9weNXhUYCiLDzcUpFpkk8Wt'
+            CHAIN_ID: 'PsddFKi32cMJ2qPjf43Qv5GDWLDPZb3T3bF6fLKiF5HtvHNU7aP'
         };
         return ALPHANET;
     }

diff --git a/src/app/pipes/error-handling.pipe.ts b/src/app/pipes/error-handling.pipe.ts
@@ -2,7 +2,7 @@ import { Pipe, PipeTransform } from '@angular/core';
 
 /*
     Informs users on most common errors
-    RPC errors doc: http://doc.tzalpha.net/api/errors.html
+    RPC errors doc: http://tezos.gitlab.io/mainnet/api/errors.html
 */
 
 @Pipe({

diff --git a/src/app/services/operation.service.ts b/src/app/services/operation.service.ts
@@ -121,7 +121,7 @@ export class OperationService {
                       gas_limit: '10000',
                       storage_limit: '277',
                       managerPubkey: keys.pkh,  // Mainnet
-                      /// manager_pubkey: keys.pkh,  // Zeronet
+                      // manager_pubkey: keys.pkh,  // Zeronet
                       balance: this.microTez.times(amount).toString(),
                       spendable: true,
                       delegatable: true
@@ -179,7 +179,7 @@ export class OperationService {
                     source: from,
                     fee: this.microTez.times(fee).toString(),
                     counter: (++counter).toString(),
-                    gas_limit: '10200',
+                    gas_limit: '10300',
                     storage_limit: '277',
                     amount: this.microTez.times(transactions[i].amount).toString(),
                     destination: transactions[i].to,
@@ -209,14 +209,27 @@ export class OperationService {
                       source: from,
                       fee: this.microTez.times(fee).toString(),
                       counter: (++counter).toString(),
-                      gas_limit: '100000',
+                      gas_limit: '10000',
                       storage_limit: '0',
                     }
                   ]
                 };
                 if (to !== '') {
                   fop.contents[0].delegate = to;
                 }
+                if (manager.key === undefined) {
+                  fop.contents[1] = fop.contents[0];
+                  fop.contents[0] = {
+                    kind: 'reveal',
+                    source: from,
+                    fee: '0',
+                    counter: (counter).toString(),
+                    gas_limit: '10000',
+                    storage_limit: '0', // '60000',
+                    public_key: keys.pk
+                  };
+                  fop.contents[1].counter = (Number(fop.contents[1].counter) + 1).toString();
+                }
                 return this.operation(fop, keys);
               });
           });
@@ -533,7 +546,7 @@ export class OperationService {
     let index = 0;
     const op = this.decodeCommon({ kind: 'origination' }, content);
     op.data.managerPubkey = this.decodePkh(op.rest.slice(index, index += 42));  // mainnet
-    /// op.data.manager_pubkey = this.decodePkh(op.rest.slice(index, index += 42));  // zeronet
+    // op.data.manager_pubkey = this.decodePkh(op.rest.slice(index, index += 42));  // zeronet
     const balance = this.zarithDecode(op.rest.slice(index));
     op.data.balance = balance.value.toString();
     op.data.spendable = (op.rest.slice(index += balance.count * 2, index += 2) === 'ff');

diff --git a/src/electron/package.json b/src/electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kukai",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "main": "main.js",
   "scripts": {
     "start": "electron ."