Skip to content

Commit 056ca42

Browse files
committed
check address
1 parent 1dca557 commit 056ca42

File tree

1 file changed

+33
-25
lines changed

1 file changed

+33
-25
lines changed

src/components/SimpleStorage.vue

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@ import Units from 'ethereumjs-units'
188188
let contractAbi = '[{"constant":false,"inputs":[{"name":"x","type":"uint256"}],"name":"set","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"get","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"}]'
189189
let contractBytecode = '0x6060604052341561000f57600080fd5b60d38061001d6000396000f3006060604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c14606e575b600080fd5b3415605857600080fd5b606c60048080359060200190919050506094565b005b3415607857600080fd5b607e609e565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582030036eed4617b76ee4550080d2fced7bfbc3ddba9d7b7212901e539bd92c6f5a0029'
190190
191+
let web3 = new Web3()
192+
191193
export default {
192194
name: 'VueSimpleStorage',
193195
data () {
@@ -214,26 +216,35 @@ export default {
214216
}
215217
},
216218
methods: {
217-
getBalance(address) {
218-
// New web3 instance
219-
let web3 = new Web3()
219+
// Dial node
220+
dialNode() {
221+
// Get provider
220222
web3.setProvider(new web3.providers.HttpProvider(this.nodeUrl))
221-
222-
// Get balance
223-
let vm = this
224-
web3.eth.getBalance(address)
225-
.then(function(balance){
226-
console.log('Get balance: ' + balance)
227-
balance = Units.convert(balance, 'wei', 'eth')
228-
vm.balance = balance + ' Ether'
229-
})
223+
},
224+
// Get balance
225+
getBalance(address) {
226+
if (web3.utils.isAddress(address)) {
227+
// Dial node
228+
this.dialNode()
229+
230+
// Get balance
231+
let vm = this
232+
web3.eth.getBalance(address)
233+
.then(function(balance){
234+
console.log('Get balance: ' + balance)
235+
balance = Units.convert(balance, 'wei', 'eth')
236+
vm.balance = balance + ' Ether'
237+
})
238+
} else {
239+
console.log('Address not valid')
240+
return
241+
}
230242
},
231243
generateAddress() {
232244
console.log('Generate address')
233245
234-
// New web3 instance
235-
let web3 = new Web3()
236-
web3.setProvider(new web3.providers.HttpProvider(this.nodeUrl))
246+
// Dial node
247+
this.dialNode()
237248
238249
// Create account
239250
let account = web3.eth.accounts.create();
@@ -250,9 +261,8 @@ export default {
250261
deployContract() {
251262
console.log('Deploy contract on node: ' + this.nodeUrl + ', for address: ' + this.address)
252263
253-
// New web3 instance
254-
let web3 = new Web3()
255-
web3.setProvider(new web3.providers.HttpProvider(this.nodeUrl));
264+
// Dial node
265+
this.dialNode()
256266
257267
// Get keys
258268
var privateKey = new Buffer(this.privateKey, 'hex')
@@ -352,9 +362,8 @@ export default {
352362
setValue() {
353363
console.log('Set value:' + this.storageValue + ' to contract: ' + this.contractAddress + ' on node: ' + this.nodeUrl)
354364
355-
// New web3 instance
356-
let web3 = new Web3()
357-
web3.setProvider(new web3.providers.HttpProvider(this.nodeUrl));
365+
// Dial node
366+
this.dialNode()
358367
359368
// Get keys
360369
var privateKey = new Buffer(this.privateKey, 'hex')
@@ -365,7 +374,7 @@ export default {
365374
366375
var abi = JSON.parse(contractAbi)
367376
// Exec contract
368-
var contract = new web3.eth.Contract(abi, this.contractAddress);
377+
var contract = new web3.eth.Contract(abi, this.contractAddress)
369378
console.log('Contract: ', contract);
370379
371380
// Save current this
@@ -456,9 +465,8 @@ export default {
456465
getValue() {
457466
console.log('Get contract value')
458467
459-
// New web3 instance
460-
let web3 = new Web3()
461-
web3.setProvider(new web3.providers.HttpProvider(this.nodeUrl));
468+
// Dial node
469+
this.dialNode()
462470
463471
var abi = JSON.parse(contractAbi)
464472
// Exec contract

0 commit comments

Comments
 (0)