Skip to content

2 - Issue: #94 Merge crypto implementation into SDK #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 14, 2019
Merged

2 - Issue: #94 Merge crypto implementation into SDK #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aff8179
Added #93
rg911 Jun 11, 2019
6a24240
Added #94
rg911 Jun 11, 2019
f3840c9
Added unit test
rg911 Jun 12, 2019
c15999a
Merge pull request #168 from rg911/task/g93_merge_encoders
evias Jun 14, 2019
4262dab
Added #94
rg911 Jun 11, 2019
7daa764
Added unit test
rg911 Jun 12, 2019
08e4bea
Merge branch 'task/g94_merge_crypto_implementation' of github.com:rg9…
rg911 Jun 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions e2e/infrastructure/TransactionHttp.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ import {assert, expect} from 'chai';
import * as CryptoJS from 'crypto-js';
import {ChronoUnit} from 'js-joda';
import {keccak_256, sha3_256} from 'js-sha3';
import {convert, nacl_catapult} from 'nem2-library';
import {Crypto} from '../../src/core/crypto';
import { Convert as convert } from '../../src/core/format';
import {AccountHttp} from '../../src/infrastructure/AccountHttp';
import { NamespaceHttp } from '../../src/infrastructure/infrastructure';
import {Listener} from '../../src/infrastructure/Listener';
Expand Down Expand Up @@ -66,7 +67,6 @@ import {Transaction} from '../../src/model/transaction/Transaction';
import {TransactionType} from '../../src/model/transaction/TransactionType';
import {TransferTransaction} from '../../src/model/transaction/TransferTransaction';
import {UInt64} from '../../src/model/UInt64';

describe('TransactionHttp', () => {
let transactionHash;
let transactionId;
Expand Down Expand Up @@ -992,7 +992,7 @@ describe('TransactionHttp', () => {
NetworkCurrencyMosaic.createAbsolute(10),
UInt64.fromUint(100),
HashType.Op_Sha3_256,
sha3_256.create().update(nacl_catapult.randomBytes(20)).hex(),
sha3_256.create().update(Crypto.randomBytes(20)).hex(),
account2.address,
NetworkType.MIJIN_TEST,
);
Expand Down Expand Up @@ -1028,7 +1028,7 @@ describe('TransactionHttp', () => {
NetworkCurrencyMosaic.createAbsolute(10),
UInt64.fromUint(100),
HashType.Op_Sha3_256,
sha3_256.create().update(nacl_catapult.randomBytes(20)).hex(),
sha3_256.create().update(Crypto.randomBytes(20)).hex(),
account2.address,
NetworkType.MIJIN_TEST,
);
Expand Down Expand Up @@ -1062,7 +1062,7 @@ describe('TransactionHttp', () => {
NetworkCurrencyMosaic.createAbsolute(10),
UInt64.fromUint(100),
HashType.Op_Keccak_256,
sha3_256.create().update(nacl_catapult.randomBytes(20)).hex(),
sha3_256.create().update(Crypto.randomBytes(20)).hex(),
account2.address,
NetworkType.MIJIN_TEST,
);
Expand Down Expand Up @@ -1092,7 +1092,7 @@ describe('TransactionHttp', () => {
NetworkCurrencyMosaic.createAbsolute(10),
UInt64.fromUint(100),
HashType.Op_Keccak_256,
sha3_256.create().update(nacl_catapult.randomBytes(20)).hex(),
sha3_256.create().update(Crypto.randomBytes(20)).hex(),
account2.address,
NetworkType.MIJIN_TEST,
);
Expand Down Expand Up @@ -1121,7 +1121,7 @@ describe('TransactionHttp', () => {
return listener.close();
});
it('standalone', (done) => {
const secretSeed = String.fromCharCode.apply(null, nacl_catapult.randomBytes(20));
const secretSeed = String.fromCharCode.apply(null, Crypto.randomBytes(20));
const secret = CryptoJS.RIPEMD160(CryptoJS.SHA256(secretSeed).toString(CryptoJS.enc.Hex)).toString(CryptoJS.enc.Hex);
const secretLockTransaction = SecretLockTransaction.create(
Deadline.create(),
Expand Down Expand Up @@ -1153,7 +1153,7 @@ describe('TransactionHttp', () => {
return listener.close();
});
it('aggregate', (done) => {
const secretSeed = String.fromCharCode.apply(null, nacl_catapult.randomBytes(20));
const secretSeed = String.fromCharCode.apply(null, Crypto.randomBytes(20));
const secret = CryptoJS.RIPEMD160(CryptoJS.SHA256(secretSeed).toString(CryptoJS.enc.Hex)).toString(CryptoJS.enc.Hex);
const secretLockTransaction = SecretLockTransaction.create(
Deadline.create(),
Expand Down Expand Up @@ -1194,7 +1194,7 @@ describe('TransactionHttp', () => {
NetworkCurrencyMosaic.createAbsolute(10),
UInt64.fromUint(100),
HashType.Op_Hash_256,
sha3_256.create().update(nacl_catapult.randomBytes(20)).hex(),
sha3_256.create().update(Crypto.randomBytes(20)).hex(),
account2.address,
NetworkType.MIJIN_TEST,
);
Expand Down Expand Up @@ -1224,7 +1224,7 @@ describe('TransactionHttp', () => {
NetworkCurrencyMosaic.createAbsolute(10),
UInt64.fromUint(100),
HashType.Op_Hash_256,
sha3_256.create().update(nacl_catapult.randomBytes(20)).hex(),
sha3_256.create().update(Crypto.randomBytes(20)).hex(),
account2.address,
NetworkType.MIJIN_TEST,
);
Expand Down Expand Up @@ -1253,7 +1253,7 @@ describe('TransactionHttp', () => {
return listener.close();
});
it('standalone', (done) => {
const secretSeed = nacl_catapult.randomBytes(20);
const secretSeed = Crypto.randomBytes(20);
const secret = sha3_256.create().update(secretSeed).hex();
const proof = convert.uint8ToHex(secretSeed);

Expand Down Expand Up @@ -1304,7 +1304,7 @@ describe('TransactionHttp', () => {
return listener.close();
});
it('aggregate', (done) => {
const secretSeed = nacl_catapult.randomBytes(20);
const secretSeed = Crypto.randomBytes(20);
const secret = sha3_256.create().update(secretSeed).hex();
const proof = convert.uint8ToHex(secretSeed);
const secretLockTransaction = SecretLockTransaction.create(
Expand Down Expand Up @@ -1352,7 +1352,7 @@ describe('TransactionHttp', () => {
return listener.close();
});
it('standalone', (done) => {
const secretSeed = nacl_catapult.randomBytes(20);
const secretSeed = Crypto.randomBytes(20);
const secret = keccak_256.create().update(secretSeed).hex();
const proof = convert.uint8ToHex(secretSeed);
const secretLockTransaction = SecretLockTransaction.create(
Expand Down Expand Up @@ -1396,7 +1396,7 @@ describe('TransactionHttp', () => {
return listener.close();
});
it('aggregate', (done) => {
const secretSeed = nacl_catapult.randomBytes(20);
const secretSeed = Crypto.randomBytes(20);
const secret = keccak_256.create().update(secretSeed).hex();
const proof = convert.uint8ToHex(secretSeed);
const secretLockTransaction = SecretLockTransaction.create(
Expand Down
2 changes: 2 additions & 0 deletions index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ export * from './src/infrastructure/infrastructure';
export * from './src/model/model';
export * from './src/service/service';
export * from './src/core/utils/utility';
export * from './src/core/format';
export * from './src/core/crypto';
Loading