@@ -56,4 +59,12 @@
+
+
diff --git a/src/pages/Index.vue b/src/pages/Index.vue
index 6e5e567..81c4e37 100644
--- a/src/pages/Index.vue
+++ b/src/pages/Index.vue
@@ -3,6 +3,5 @@
Start page
-
{{ message }}
diff --git a/src/scripts/Ethereum/Address.js b/src/scripts/Ethereum/Address.js
index 8940609..c64b5c8 100644
--- a/src/scripts/Ethereum/Address.js
+++ b/src/scripts/Ethereum/Address.js
@@ -1,5 +1,6 @@
import Contract from './contracts/Contract.js'
-
+import Transaction from './Transaction.js'
+var QRious = require('QRious')
var ethers = require('ethers')
const contacts = [
@@ -17,7 +18,15 @@ export default {
newAddress() {
var pKey = ethers.Wallet.createRandom().privateKey
- alert('New wallets private key: ' + pKey)
+ alert('New wallets private key: ')
+
+
+ var qr = new QRious({
+ element: document.getElementById('qr'),
+ value: pKey
+ })
+
+
contacts.push({ id: 6, name: 'first wallet', key: pKey })
},
@@ -47,11 +56,8 @@ export default {
//console.log("factory: " + factory);
let transaction = await factory.getDeployTransaction(['0x55D73ccA422253a8a287074c6f4857Dd15EFdC46', '0xE704eBE589b6ac907887D1997df7BF69A50D416E'], 2, overrides);
//console.log(transaction)
- let signPromise = wallet.sign(transaction);
- //console.log("wallet : " + wallet.address);
-
- signPromise.then((signedTransaction) => console.log("deployed transaction: " + signedTransaction));
+ Transaction.signing(wallet, transaction)
})();
},
diff --git a/src/scripts/Ethereum/ERC20Token.js b/src/scripts/Ethereum/ERC20Token.js
index 94c1132..b565fd6 100644
--- a/src/scripts/Ethereum/ERC20Token.js
+++ b/src/scripts/Ethereum/ERC20Token.js
@@ -5,7 +5,7 @@ var ethers = require('ethers');
export default {
- transfer(privateKey, transaction){
+ transfer(privateKey, transaction, tokenAddress){
let abiToken = new MultisigContract().abiJSON;
//to do: get provider by id from transaction
@@ -15,13 +15,14 @@ export default {
var iface = new ethers.utils.Interface(abiToken);
var func = iface.functions.transfer;
- transaction.data = func.encode(['0x6692d46B5319a0AE807264155C6725EF951378eD', transaction.value])
- transaction.value = 0
+ transaction.data = func.encode([transaction.to, transaction.value]);
+ transaction.to = tokenAddress;
+ transaction.value = 0;
return Transaction.signing(wallet, transaction)
},
- transferMulti(privateKey, transaction, tokenAddress, reciever){
+ transferMulti(privateKey, transaction, tokenAddress, contractAddress){
let abiJSON = new Contract().abiJSON
//to do: get provider by id from transaction
@@ -30,8 +31,8 @@ export default {
let iface = new ethers.utils.Interface(abiJSON);
let func = iface.functions.submitTransaction;
- transaction.data = func.encode([tokenAddress, 0, '0xa9059cbb000000000000000000000000' + reciever + '00000000000000000000000000000000000000000000000000000000000003e8']),
-
+ transaction.data = func.encode([tokenAddress, 0, '0xa9059cbb000000000000000000000000' + transaction.to + '00000000000000000000000000000000000000000000000000000000000003e8']),
+ transaction.to = contractAddress;
transaction.value = 0
return Transaction.signing(wallet, transaction)
diff --git a/src/scripts/Ethereum/Transaction.js b/src/scripts/Ethereum/Transaction.js
index 89986fe..20f86e9 100644
--- a/src/scripts/Ethereum/Transaction.js
+++ b/src/scripts/Ethereum/Transaction.js
@@ -1,4 +1,6 @@
var ethers = require('ethers')
+var QRious = require('QRious')
+
import Contract from './contracts/Contract.js'
@@ -14,7 +16,18 @@ export default {
let signPromise = wallet.sign(transaction)
signPromise.then((signedTransaction) => {
- console.log(signedTransaction)
+ console.log('Singed Transaction: \n' + signedTransaction)
+
+ var qr = new QRious({
+
+ element: document.getElementById('qr'),
+ value: signedTransaction,
+ level: 'H',
+ size: 1000,
+ })
+
+ return signedTransaction
+
//return signedTransaction
@@ -34,26 +47,23 @@ export default {
},
//to do arguments: wallet, transaction
- createMultiSigTransaction(wallet){
- //TO DO scan from QR-code
- let contractAddress = "0x6692d46B5319a0AE807264155C6725EF951378eD";
-
+ createMultiSigTransaction(privateKey, transaction, contractAddress){
+ let provider = ethers.getDefaultProvider('ropsten');
+
+ let wallet = new ethers.Wallet(privateKey, provider);
+
var abiJSON = new Contract().abiJSON
var iface = new ethers.utils.Interface(abiJSON);
var func = iface.functions.submitTransaction;
- var transaction = {
- gasPrice: ethers.utils.parseUnits('40.0', 'gwei'),
- gasLimit: 8000000,
- data: func.encode(['0xCe39AB30911Eeb024eB6316123339A4893337639', 5, '0x']),
- to: contractAddress,
- nonce: 12,
- chainId: 3
- }
+
+ transaction.data = func.encode([transaction.to, transaction.value, transaction.data]);
+ transaction.to = contractAddress;
+ transaction.value = 0;
this.signing(wallet, transaction)
},
- confirmMultisigTransaction(privateKey, transaction, txNumber){
+ confirmMultisigTransaction(privateKey, transaction, contractAddress, txNumber){
let provider = ethers.getDefaultProvider('ropsten');
let wallet = new ethers.Wallet(privateKey, provider);
@@ -61,7 +71,10 @@ export default {
var abiJSON = new Contract().abiJSON
var iface = new ethers.utils.Interface(abiJSON);
var func = iface.functions.confirmTransaction;
+
transaction.data = func.encode([txNumber]);
+ transaction.to = contractAddress;
+ transaction.value = 0;
this.signing(wallet, transaction)
},
diff --git a/src/scripts/Ethereum/index.js b/src/scripts/Ethereum/index.js
index 3773e93..32363fc 100644
--- a/src/scripts/Ethereum/index.js
+++ b/src/scripts/Ethereum/index.js
@@ -1,13 +1,15 @@
var ethers = require('ethers');
-
-import Addresses from './Address.js'
-import Transaction from './Transaction.js'
+var QRious = require('QRious')
+//var QRCode = require('./qr-code/qrcode.js');
+//import QRcode2 from './qr-code/qrcode.js';
+import Addresses from './Address.js';
+import Transaction from './Transaction.js';
import QRcode from './QRcode.js'
-import Desktop from './Desktop.js'
-import ERC20Token from './ERC20Token.js'
-import Vue from 'vue'
-import QrcodeVue from 'qrcode.vue'
-
+import Desktop from './Desktop.js';
+import ERC20Token from './ERC20Token.js';
+import Vue from 'vue';
+//import QrcodeVue from 'qrcode.vue'
+
const contacts = [
{name: 'first', key: '0x6aa6b11778e120f4e856693953c07b2c679397763fa8afc6d5984425bc456f1a'}, //0x55D73ccA422253a8a287074c6f4857Dd15EFdC46
@@ -32,7 +34,13 @@ export default {
methods: {
Address () {
- new Vue({ el: '#components-demo' })
+ var qr = new QRious({
+
+ element: document.getElementById('qr'),
+ value: 'fff'
+
+ })
+ //new Vue({ el: '#components-demo' })
return Addresses.newAddress();
},
@@ -44,20 +52,96 @@ export default {
return QRcode.Scan();
},
- DesktopSending() {
- return Desktop.send();
- },
+ CallMultiSig(){
+
+ let contractAddress = '0x6692d46B5319a0AE807264155C6725EF951378eD';
+
+ let to = '0xE704eBE589b6ac907887D1997df7BF69A50D416E';
+
+ let privateKey = '0x6aa6b11778e120f4e856693953c07b2c679397763fa8afc6d5984425bc456f1a';
- CallMultiSig(){ //creating transaction to send tokens
- return Transaction.createMultiSigTransaction()
+ var transaction = {
+ gasPrice: ethers.utils.parseUnits('40.0', 'gwei'),
+ gasLimit: 8000000,
+ data: '0x',
+ to: to,
+ value: 5,
+ nonce: 12,
+ chainId: 3
+ };
+
+ return Transaction.createMultiSigTransaction(privateKey, transaction, contractAddress);
},
ConfirmMultiSig(){
- return Transaction.createMultiSigTransaction()
+
+ let contractAddress = '0x6692d46B5319a0AE807264155C6725EF951378eD';
+
+ let to = '0xE704eBE589b6ac907887D1997df7BF69A50D416E';
+
+ let privateKey = '0x6aa6b11778e120f4e856693953c07b2c679397763fa8afc6d5984425bc456f1a';
+
+ let txNumber = 9;
+
+ var transaction = {
+ gasPrice: ethers.utils.parseUnits('40.0', 'gwei'),
+ gasLimit: 8000000,
+ data: '0x',
+ to: to,
+ value: 5,
+ nonce: 12,
+ chainId: 3
+ };
+
+ return Transaction.confirmMultisigTransaction(privateKey, transaction, contractAddress, txNumber)
},
- TokenContract(){ //testing single-sig contract
- return ERC20Token.transfer()
- }
+ TokenContract(){ //testing single-sig contract
+ let nonce = 60;
+
+ let privateKey = '0x6aa6b11778e120f4e856693953c07b2c679397763fa8afc6d5984425bc456f1a';
+
+ let tokenAddress = "0x3b94F6446C1EB46472B246d40dC99162C271c3D4";
+
+ let reciever = '0x6692d46B5319a0AE807264155C6725EF951378eD';
+
+ let transaction = {
+ gasPrice: ethers.utils.parseUnits('40.0', 'gwei'),
+ gasLimit: 8000000,
+ data: '',
+ value: 1000,
+ to: reciever,
+ nonce: nonce,
+ chainId: 3
+ }
+
+
+ return ERC20Token.transfer(privateKey, transaction, tokenAddress)
+ },
+
+ TokenMultiContractSubmit(){
+ let nonce = 60;
+
+ let privateKey = '0x6aa6b11778e120f4e856693953c07b2c679397763fa8afc6d5984425bc456f1a';
+
+ //Address: 0xE704eBE589b6ac907887D1997df7BF69A50D416E
+ let contractAddress = "0x6692d46B5319a0AE807264155C6725EF951378eD";
+
+ let tokenAddress = "0x3b94F6446C1EB46472B246d40dC99162C271c3D4";
+
+ let reciever = '6692d46B5319a0AE807264155C6725EF951378eD'
+
+ let transaction = {
+ gasPrice: ethers.utils.parseUnits('40.0', 'gwei'),
+ gasLimit: 8000000,
+ data: '0x',//func.encode(['0xCe39AB30911Eeb024eB6316123339A4893337639', 5, '0x']),
+ to: reciever,
+ nonce: nonce,
+ chainId: 3
+ }
+
+ console.log('Creating multisig transaction: \n')
+ ERC20Token.transferMulti(privateKey, transaction, tokenAddress, contractAddress)
+ }
}
}
\ No newline at end of file
diff --git a/src/scripts/Ethereum/tests/ERC-20-test.js b/src/scripts/Ethereum/tests/ERC-20-test.js
index 7efe7af..ad69a85 100644
--- a/src/scripts/Ethereum/tests/ERC-20-test.js
+++ b/src/scripts/Ethereum/tests/ERC-20-test.js
@@ -7,17 +7,19 @@ function sendToken(nonce){
let tokenAddress = "0x3b94F6446C1EB46472B246d40dC99162C271c3D4";
+ let reciever = '6692d46B5319a0AE807264155C6725EF951378eD'
+
let transaction = {
gasPrice: ethers.utils.parseUnits('40.0', 'gwei'),
gasLimit: 8000000,
data: '',
value: 1000,
- to: tokenAddress,
+ to: reciever,
nonce: nonce,
chainId: 3
}
console.log('Single sig token sending: \n')
- ERC20Token.transfer(privateKey, transaction)
+ ERC20Token.transfer(privateKey, transaction, tokenAddress)
}
function sendTokenMulti(nonce, nonce2, txNum){
@@ -37,18 +39,18 @@ function sendTokenMulti(nonce, nonce2, txNum){
gasPrice: ethers.utils.parseUnits('40.0', 'gwei'),
gasLimit: 8000000,
data: '',//func.encode(['0xCe39AB30911Eeb024eB6316123339A4893337639', 5, '0x']),
- to: contractAddress,
+ to: reciever,
nonce: nonce,
chainId: 3
}
console.log('Creating multisig transaction: \n')
- ERC20Token.transferMulti(privateKey, transaction, tokenAddress, reciever)
+ ERC20Token.transferMulti(privateKey, transaction, tokenAddress, contractAddress)
transaction.nonce = nonce2;
console.log('Confirming multisig transacrion: \n')
- Transaction.confirmMultisigTransaction(secondPrivateKey, transaction, txNum)
+ Transaction.confirmMultisigTransaction(secondPrivateKey, transaction, contractAddress, txNum)
}
module.exports = { sendToken, sendTokenMulti };
\ No newline at end of file