feat: improve esm compatibility (#21373)

solana-labs · Nov 24, 2021 · 1aebe65 · 1aebe65
1 parent c68a11f
commit 1aebe65
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/web3.js/src/account.ts b/web3.js/src/account.ts
@@ -1,4 +1,4 @@
-import * as nacl from 'tweetnacl';
+import nacl from 'tweetnacl';
 import type {SignKeyPair as KeyPair} from 'tweetnacl';
 import type {Buffer} from 'buffer';
 

diff --git a/web3.js/src/keypair.ts b/web3.js/src/keypair.ts
@@ -1,4 +1,4 @@
-import * as nacl from 'tweetnacl';
+import nacl from 'tweetnacl';
 
 import {PublicKey} from './publickey';
 

diff --git a/web3.js/src/secp256k1-program.ts b/web3.js/src/secp256k1-program.ts
@@ -1,7 +1,7 @@
 import {Buffer} from 'buffer';
 import * as BufferLayout from '@solana/buffer-layout';
 import secp256k1 from 'secp256k1';
-import {keccak_256} from 'js-sha3';
+import sha3 from 'js-sha3';
 
 import {PublicKey} from './publickey';
 import {TransactionInstruction} from './transaction';
@@ -86,9 +86,9 @@ export class Secp256k1Program {
     );
 
     try {
-      return Buffer.from(keccak_256.update(toBuffer(publicKey)).digest()).slice(
-        -ETHEREUM_ADDRESS_BYTES,
-      );
+      return Buffer.from(
+        sha3.keccak_256.update(toBuffer(publicKey)).digest(),
+      ).slice(-ETHEREUM_ADDRESS_BYTES);
     } catch (error) {
       throw new Error(`Error constructing Ethereum address: ${error}`);
     }
@@ -197,7 +197,7 @@ export class Secp256k1Program {
       const privateKey = toBuffer(pkey);
       const publicKey = publicKeyCreate(privateKey, false).slice(1); // throw away leading byte
       const messageHash = Buffer.from(
-        keccak_256.update(toBuffer(message)).digest(),
+        sha3.keccak_256.update(toBuffer(message)).digest(),
       );
       const {signature, recid: recoveryId} = ecdsaSign(messageHash, privateKey);