From f020a35ea22464abc392c5d8e37a8ae259e5f5f2 Mon Sep 17 00:00:00 2001
From: getlarge <ed@getlarge.eu>
Date: Wed, 10 Mar 2021 16:31:43 +0100
Subject: [PATCH] fix: improve imports

Signed-off-by: getlarge <ed@getlarge.eu>
---
 README.md          |  2 +-
 src/sha256Hash.js  |  6 ++++--
 src/transaction.js | 10 +++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 7a5967b..4925e85 100644
--- a/README.md
+++ b/README.md
@@ -124,7 +124,7 @@ conn.postTransactionCommit(txSigned)
         <meta charset="utf-8">
         <title>BigchainDB boilerplate</title>
         <!-- Adjust version to your needs -->
-        <script src="https://unpkg.com/bigchaindb-driver@4.0.0/dist/browser/bigchaindb-driver.window.min.js"></script>
+        <script src="https://unpkg.com/bigchaindb-driver@4.2.0/dist/browser/bigchaindb-driver.window.min.js"></script>
 
         <script>
             // BigchainDB server instance (e.g. https://example.com/api/v1/)
diff --git a/src/sha256Hash.js b/src/sha256Hash.js
index c97f9ec..d7c4607 100644
--- a/src/sha256Hash.js
+++ b/src/sha256Hash.js
@@ -2,11 +2,13 @@
 // SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
 // Code is Apache-2.0 and docs are CC-BY-4.0
 
-import sha3 from 'js-sha3'
+/* eslint-disable camelcase */
+import { sha3_256 } from 'js-sha3'
 
 export default function sha256Hash(data) {
-    return sha3.sha3_256
+    return sha3_256
         .create()
         .update(data)
         .hex()
 }
+/* eslint-enable camelcase */
diff --git a/src/transaction.js b/src/transaction.js
index c38f371..89dcb9c 100644
--- a/src/transaction.js
+++ b/src/transaction.js
@@ -6,7 +6,7 @@ import { Buffer } from 'buffer'
 import stableStringify from 'json-stable-stringify'
 import clone from 'clone'
 import base58 from 'bs58'
-import cc from 'crypto-conditions'
+import { Ed25519Sha256, PreimageSha256, ThresholdSha256 } from 'crypto-conditions'
 import ccJsonify from './utils/ccJsonify'
 import sha256Hash from './sha256Hash'
 
@@ -96,7 +96,7 @@ export default class Transaction {
     static makeEd25519Condition(publicKey, json = true) {
         const publicKeyBuffer = base58.decode(publicKey)
 
-        const ed25519Fulfillment = new cc.Ed25519Sha256()
+        const ed25519Fulfillment = new Ed25519Sha256()
         ed25519Fulfillment.setPublicKey(publicKeyBuffer)
 
         if (json) {
@@ -143,7 +143,7 @@ export default class Transaction {
      * @returns {Object} Preimage-Sha256 Condition (that will need to wrapped in an Output)
      */
     static makeSha256Condition(preimage, json = true) {
-        const sha256Fulfillment = new cc.PreimageSha256()
+        const sha256Fulfillment = new PreimageSha256()
         sha256Fulfillment.setPreimage(Buffer.from(preimage))
 
         if (json) {
@@ -160,7 +160,7 @@ export default class Transaction {
      * @returns {Object} Sha256 Threshold Condition (that will need to wrapped in an Output)
      */
     static makeThresholdCondition(threshold, subconditions = [], json = true) {
-        const thresholdCondition = new cc.ThresholdSha256()
+        const thresholdCondition = new ThresholdSha256()
         thresholdCondition.setThreshold(threshold)
 
         subconditions.forEach((subcondition) => {
@@ -244,7 +244,7 @@ export default class Transaction {
                 .concat(input.fulfills.transaction_id)
                 .concat(input.fulfills.output_index) : serializedTransaction
             const transactionHash = sha256Hash(transactionUniqueFulfillment)
-            const ed25519Fulfillment = new cc.Ed25519Sha256()
+            const ed25519Fulfillment = new Ed25519Sha256()
             ed25519Fulfillment.sign(Buffer.from(transactionHash, 'hex'), privateKeyBuffer)
             const fulfillmentUri = ed25519Fulfillment.serializeUri()