diff --git a/package.json b/package.json index 7bdb32eb4..d9d1ce26c 100644 --- 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 index 7390449d9..0d7ad6c29 100644 --- a/src/app/components/delegate/delegate.component.html +++ b/src/app/components/delegate/delegate.component.html @@ -13,7 +13,7 @@

{{ 'DELEGATECOMPONENT.TITLE1' | translate }}
-
@@ -49,7 +49,7 @@

{{ 'DELEGATECOMPONENT.TITLE2' | translate }}

{{ 'DELEGATECOMPONENT.ACCOUNT' | translate }} {{ activePkh }}
{{ 'DELEGATECOMPONENT.DELEGATE' | translate }} {{ toPkh | delegatorName }} -
{{ 'DELEGATECOMPONENT.FEE' | translate }} {{ fee | number:'1.0' }}ꜩ +
{{ 'DELEGATECOMPONENT.FEE' | translate }} {{ fee | number:'1.0-6' }}ꜩ

diff --git a/src/app/components/delegate/delegate.component.ts b/src/app/components/delegate/delegate.component.ts index 2b0232d23..017a38f38 100644 --- 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) { 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 index 373ea190f..43982dd91 100644 --- a/src/app/components/new-account/new-account.component.html +++ b/src/app/components/new-account/new-account.component.html @@ -10,7 +10,7 @@

{{ 'NEWACCOUNTCOMPONENT.TITLE' | translate }}
-
diff --git a/src/app/components/new-account/new-account.component.ts b/src/app/components/new-account/new-account.component.ts index cba1eb234..86d922718 100644 --- 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) { 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 index 33b35b32f..661131113 100644 --- a/src/app/components/send/send.component.html +++ b/src/app/components/send/send.component.html @@ -14,7 +14,7 @@

{{ 'SENDCOMPONENT.TITLE' | translate }}

-
@@ -65,7 +65,7 @@

{{ 'SENDCOMPONENT.TITLE' | translate }}

- +
diff --git a/src/app/components/send/send.component.ts b/src/app/components/send/send.component.ts index b0a154498..33f302b89 100644 --- 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) { 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 index 5c3699ac5..44913bfee 100644 --- 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 index d391f74fd..930e64d61 100644 --- 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 index 02a18dbf4..e042adb57 100644 --- 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,7 +209,7 @@ export class OperationService { source: from, fee: this.microTez.times(fee).toString(), counter: (++counter).toString(), - gas_limit: '100000', + gas_limit: '10000', storage_limit: '0', } ] @@ -217,6 +217,19 @@ export class OperationService { 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 index 885395f3c..015af8c1f 100644 --- 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 ."