From 7fbac23dc2d6ea967b9ecb4db69ea09a1ea615c3 Mon Sep 17 00:00:00 2001 From: Jernej Pregelj Date: Thu, 23 Nov 2017 16:39:13 +0100 Subject: [PATCH 1/2] five-bells-conditions -> js-crypto-conditions --- package.json | 2 +- src/transaction/makeEd25519Condition.js | 2 +- src/transaction/makeSha256Condition.js | 2 +- src/transaction/makeThresholdCondition.js | 2 +- src/transaction/signTransaction.js | 2 +- src/transaction/utils/ccJsonLoad.js | 2 +- test/transaction/test_cryptoconditions.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 105a8c24..3f6453d3 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "decamelize": "^1.2.0", "es6-promise": "^4.0.5", "fetch-ponyfill": "^4.0.0", - "five-bells-condition": "^5.0.1", + "js-crypto-conditions": "^1.0.3", "isomorphic-fetch": "^2.2.1", "js-sha3": "^0.6.1", "js-utility-belt": "^1.5.0", diff --git a/src/transaction/makeEd25519Condition.js b/src/transaction/makeEd25519Condition.js index 3f0ff57d..775256c3 100644 --- a/src/transaction/makeEd25519Condition.js +++ b/src/transaction/makeEd25519Condition.js @@ -1,7 +1,7 @@ import { Buffer } from 'buffer' import base58 from 'bs58' -import cc from 'five-bells-condition' +import cc from 'js-crypto-conditions' import ccJsonify from './utils/ccJsonify' diff --git a/src/transaction/makeSha256Condition.js b/src/transaction/makeSha256Condition.js index 1ecded9e..0dc715be 100644 --- a/src/transaction/makeSha256Condition.js +++ b/src/transaction/makeSha256Condition.js @@ -1,6 +1,6 @@ import { Buffer } from 'buffer' -import cc from 'five-bells-condition' +import cc from 'js-crypto-conditions' import ccJsonify from './utils/ccJsonify' diff --git a/src/transaction/makeThresholdCondition.js b/src/transaction/makeThresholdCondition.js index 3a8ec115..9daf088c 100644 --- a/src/transaction/makeThresholdCondition.js +++ b/src/transaction/makeThresholdCondition.js @@ -1,4 +1,4 @@ -import cc from 'five-bells-condition' +import cc from 'js-crypto-conditions' import ccJsonify from './utils/ccJsonify' diff --git a/src/transaction/signTransaction.js b/src/transaction/signTransaction.js index 32422a7f..c482ab4f 100644 --- a/src/transaction/signTransaction.js +++ b/src/transaction/signTransaction.js @@ -1,6 +1,6 @@ import { Buffer } from 'buffer' import base58 from 'bs58' -import cc from 'five-bells-condition' +import cc from 'js-crypto-conditions' import clone from 'clone' import serializeTransactionIntoCanonicalString from './serializeTransactionIntoCanonicalString' diff --git a/src/transaction/utils/ccJsonLoad.js b/src/transaction/utils/ccJsonLoad.js index 941dfae2..3ea93636 100644 --- a/src/transaction/utils/ccJsonLoad.js +++ b/src/transaction/utils/ccJsonLoad.js @@ -1,6 +1,6 @@ import { Buffer } from 'buffer' import base58 from 'bs58' -import cc from 'five-bells-condition' +import cc from 'js-crypto-conditions' /** * @public diff --git a/test/transaction/test_cryptoconditions.js b/test/transaction/test_cryptoconditions.js index c6bab619..53962499 100644 --- a/test/transaction/test_cryptoconditions.js +++ b/test/transaction/test_cryptoconditions.js @@ -1,5 +1,5 @@ import test from 'ava' -import cc from 'five-bells-condition' +import cc from 'js-crypto-conditions' import { Ed25519Keypair, Transaction } from '../../src' From da4c4a942b3dc00166a849a0b2cc9fde75df5172 Mon Sep 17 00:00:00 2001 From: Jernej Pregelj Date: Mon, 27 Nov 2017 14:56:11 +0100 Subject: [PATCH 2/2] js-crypto-conditions -> crypto-conditions --- package.json | 2 +- src/transaction/makeEd25519Condition.js | 2 +- src/transaction/makeSha256Condition.js | 2 +- src/transaction/makeThresholdCondition.js | 2 +- src/transaction/signTransaction.js | 2 +- src/transaction/utils/ccJsonLoad.js | 2 +- test/transaction/test_cryptoconditions.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 3f6453d3..0fd4f46b 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "decamelize": "^1.2.0", "es6-promise": "^4.0.5", "fetch-ponyfill": "^4.0.0", - "js-crypto-conditions": "^1.0.3", + "crypto-conditions": "^2.0.1", "isomorphic-fetch": "^2.2.1", "js-sha3": "^0.6.1", "js-utility-belt": "^1.5.0", diff --git a/src/transaction/makeEd25519Condition.js b/src/transaction/makeEd25519Condition.js index 775256c3..c7988e83 100644 --- a/src/transaction/makeEd25519Condition.js +++ b/src/transaction/makeEd25519Condition.js @@ -1,7 +1,7 @@ import { Buffer } from 'buffer' import base58 from 'bs58' -import cc from 'js-crypto-conditions' +import cc from 'crypto-conditions' import ccJsonify from './utils/ccJsonify' diff --git a/src/transaction/makeSha256Condition.js b/src/transaction/makeSha256Condition.js index 0dc715be..27a8adf7 100644 --- a/src/transaction/makeSha256Condition.js +++ b/src/transaction/makeSha256Condition.js @@ -1,6 +1,6 @@ import { Buffer } from 'buffer' -import cc from 'js-crypto-conditions' +import cc from 'crypto-conditions' import ccJsonify from './utils/ccJsonify' diff --git a/src/transaction/makeThresholdCondition.js b/src/transaction/makeThresholdCondition.js index 9daf088c..34058612 100644 --- a/src/transaction/makeThresholdCondition.js +++ b/src/transaction/makeThresholdCondition.js @@ -1,4 +1,4 @@ -import cc from 'js-crypto-conditions' +import cc from 'crypto-conditions' import ccJsonify from './utils/ccJsonify' diff --git a/src/transaction/signTransaction.js b/src/transaction/signTransaction.js index c482ab4f..a92cfdf4 100644 --- a/src/transaction/signTransaction.js +++ b/src/transaction/signTransaction.js @@ -1,6 +1,6 @@ import { Buffer } from 'buffer' import base58 from 'bs58' -import cc from 'js-crypto-conditions' +import cc from 'crypto-conditions' import clone from 'clone' import serializeTransactionIntoCanonicalString from './serializeTransactionIntoCanonicalString' diff --git a/src/transaction/utils/ccJsonLoad.js b/src/transaction/utils/ccJsonLoad.js index 3ea93636..4122f4b0 100644 --- a/src/transaction/utils/ccJsonLoad.js +++ b/src/transaction/utils/ccJsonLoad.js @@ -1,6 +1,6 @@ import { Buffer } from 'buffer' import base58 from 'bs58' -import cc from 'js-crypto-conditions' +import cc from 'crypto-conditions' /** * @public diff --git a/test/transaction/test_cryptoconditions.js b/test/transaction/test_cryptoconditions.js index 53962499..0b5f7754 100644 --- a/test/transaction/test_cryptoconditions.js +++ b/test/transaction/test_cryptoconditions.js @@ -1,5 +1,5 @@ import test from 'ava' -import cc from 'js-crypto-conditions' +import cc from 'crypto-conditions' import { Ed25519Keypair, Transaction } from '../../src'