Compare commits

..

2 Commits

Author SHA1 Message Date
ricmoo
dc2583ddd8 Updating dist. 2016-10-05 00:12:15 +08:00
ricmoo
3be962f09d Made secret-storage more closely resemble geth. 2016-10-05 00:06:05 +08:00
6 changed files with 29 additions and 7 deletions

View File

@@ -1537,7 +1537,7 @@ utils.defineProperty(secretStorage, 'encrypt', function(privateKey, password, op
// See: https://github.com/ethereum/wiki/wiki/Web3-Secret-Storage-Definition
var data = {
address: address,
address: address.substring(2).toLowerCase(),
id: uuid.v4({random: uuidRandom}),
version: 3,
Crypto: {

File diff suppressed because one or more lines are too long

View File

@@ -311,7 +311,7 @@ utils.defineProperty(secretStorage, 'encrypt', function(privateKey, password, op
// See: https://github.com/ethereum/wiki/wiki/Web3-Secret-Storage-Definition
var data = {
address: address,
address: address.substring(2).toLowerCase(),
id: uuid.v4({random: uuidRandom}),
version: 3,
Crypto: {

View File

@@ -1,6 +1,6 @@
{
"name": "ethers-wallet",
"version": "1.0.4",
"version": "1.0.5",
"description": "Ethereum wallet library.",
"main": "index.js",
"scripts": {

View File

@@ -1 +1 @@
{"address":"0x17c5185167401eD00cF5F5b2fc97D9BBfDb7D025","id":"01234567-8901-4345-a789-012345678901","version":3,"Crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"deadbeef1deadbeef2deadbeef301234"},"ciphertext":"cea502df4b9405fa2b6d8d19ec4e2953c5ce08e0e01d4c0292512ce62baef8f3","kdf":"scrypt","kdfparams":{"salt":"abcd1abcd2abcd3abcd4abcd5abcd6ef","n":1024,"dklen":32,"p":2,"r":4},"mac":"6e0a8e2409261d464e35a251f4b1fddd6ad0f7045a18d3957c127387f1c0de72"}}
{"address":"17c5185167401ed00cf5f5b2fc97d9bbfdb7d025","id":"01234567-8901-4345-a789-012345678901","version":3,"Crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"deadbeef1deadbeef2deadbeef301234"},"ciphertext":"cea502df4b9405fa2b6d8d19ec4e2953c5ce08e0e01d4c0292512ce62baef8f3","kdf":"scrypt","kdfparams":{"salt":"abcd1abcd2abcd3abcd4abcd5abcd6ef","n":1024,"dklen":32,"p":2,"r":4},"mac":"6e0a8e2409261d464e35a251f4b1fddd6ad0f7045a18d3957c127387f1c0de72"}}

View File

@@ -3,8 +3,29 @@ var Wallet = require('../index.js');
var fs = require('fs');
module.exports = function(test) {
function equals(a, b) {
if (typeof(a) !== typeof(b)) { return false; }
if (Array.isArray(a)) {
if (!Array.isArray(b)) { return false; }
for (var i = 0; i < a.length; i++) {
if (a[i] !== b[i]) { return false; }
}
} else if (typeof(a) === 'object') {
if (!equals(Object.keys(a), Object.keys(b))) {
return false;
}
for (var key in a) {
if (!equals(a[key], b[key])) { return false; }
}
} else {
return (a === b);
}
return true;
}
var crowdsale = [
{
address: '0x2e326fA404Fc3661de4F4361776ed9bBABDC26E3',
@@ -87,7 +108,8 @@ module.exports = function(test) {
uuid: '0x01234567890123456789012345678901',
}).then(function(json) {
var jsonWallet = fs.readFileSync('./test-wallets/wallet-test-life.json').toString();
test.equal(json, jsonWallet, 'failed to encrypt wallet');
test.ok(equals(JSON.parse(json), JSON.parse(jsonWallet)), 'failed to encrypt wallet')
//test.equal(json, jsonWallet, 'failed to encrypt wallet');
Wallet.decrypt(json, password).then(function(wallet) {
test.equal(wallet.privateKey, '0x' + privateKey.toString('hex'), 'decryption failed');
resolve();