Merge pull request #31 from algorandfoundation/fix/cjs-import

fix: update import statements to avoid having to inline node modules

Author: boblat

src/abi-metadata.ts

@@ -1,6 +1,6 @@
 import { BaseContract, Contract } from '@algorandfoundation/algorand-typescript'
 import { AbiMethodConfig, BareMethodConfig, CreateOptions, OnCompleteActionStr } from '@algorandfoundation/algorand-typescript/arc4'
-import { sha512_256 as js_sha512_256 } from 'js-sha512'
+import js_sha512 from 'js-sha512'
 import { TypeInfo } from './encoders'
 import { getArc4TypeName as getArc4TypeNameForARC4Encoded } from './impl/encoded-types'
 import { DeliberateAny } from './typescript-helpers'
@@ -79,7 +79,7 @@ export const getArc4Signature = (metadata: AbiMetadata): string => {
 }
 
 export const getArc4Selector = (metadata: AbiMetadata): Uint8Array => {
-  const hash = js_sha512_256.array(getArc4Signature(metadata))
+  const hash = js_sha512.sha512_256.array(getArc4Signature(metadata))
   return new Uint8Array(hash.slice(0, 4))
 }
 

src/impl/crypto.ts

@@ -1,8 +1,8 @@
 import { arc4, bytes, Bytes, Ecdsa, gtxn, internal, VrfVerify } from '@algorandfoundation/algorand-typescript'
 import elliptic from 'elliptic'
-import { sha256 as js_sha256 } from 'js-sha256'
-import { keccak256 as js_keccak256, sha3_256 as js_sha3_256 } from 'js-sha3'
-import { sha512_256 as js_sha512_256 } from 'js-sha512'
+import js_sha256 from 'js-sha256'
+import js_sha3 from 'js-sha3'
+import js_sha512 from 'js-sha512'
 import nacl from 'tweetnacl'
 import { LOGIC_DATA_PREFIX, PROGRAM_TAG } from '../constants'
 import { lazyContext } from '../context-helpers/internal-context'
@@ -11,28 +11,28 @@ import { asBytes, asBytesCls, asUint8Array, conactUint8Arrays } from '../util'
 
 export const sha256 = (a: internal.primitives.StubBytesCompat): bytes => {
   const bytesA = internal.primitives.BytesCls.fromCompat(a)
-  const hashArray = js_sha256.create().update(bytesA.asUint8Array()).digest()
+  const hashArray = js_sha256.sha256.create().update(bytesA.asUint8Array()).digest()
   const hashBytes = internal.primitives.BytesCls.fromCompat(new Uint8Array(hashArray))
   return hashBytes.asAlgoTs()
 }
 
 export const sha3_256 = (a: internal.primitives.StubBytesCompat): bytes => {
   const bytesA = internal.primitives.BytesCls.fromCompat(a)
-  const hashArray = js_sha3_256.create().update(bytesA.asUint8Array()).digest()
+  const hashArray = js_sha3.sha3_256.create().update(bytesA.asUint8Array()).digest()
   const hashBytes = internal.primitives.BytesCls.fromCompat(new Uint8Array(hashArray))
   return hashBytes.asAlgoTs()
 }
 
 export const keccak256 = (a: internal.primitives.StubBytesCompat): bytes => {
   const bytesA = internal.primitives.BytesCls.fromCompat(a)
-  const hashArray = js_keccak256.create().update(bytesA.asUint8Array()).digest()
+  const hashArray = js_sha3.keccak256.create().update(bytesA.asUint8Array()).digest()
   const hashBytes = internal.primitives.BytesCls.fromCompat(new Uint8Array(hashArray))
   return hashBytes.asAlgoTs()
 }
 
 export const sha512_256 = (a: internal.primitives.StubBytesCompat): bytes => {
   const bytesA = internal.primitives.BytesCls.fromCompat(a)
-  const hashArray = js_sha512_256.create().update(bytesA.asUint8Array()).digest()
+  const hashArray = js_sha512.sha512_256.create().update(bytesA.asUint8Array()).digest()
   const hashBytes = internal.primitives.BytesCls.fromCompat(new Uint8Array(hashArray))
   return hashBytes.asAlgoTs()
 }
@@ -59,7 +59,7 @@ export const ed25519verify = (
   )
 
   const logicSig = conactUint8Arrays(asUint8Array(PROGRAM_TAG), programBytes.asUint8Array())
-  const logicSigAddress = js_sha512_256.array(logicSig)
+  const logicSigAddress = js_sha512.sha512_256.array(logicSig)
 
   const addressBytes = Bytes(logicSigAddress)
   const data = LOGIC_DATA_PREFIX.concat(addressBytes).concat(asBytes(a))

src/util.ts

@@ -1,7 +1,7 @@
 import { Account, Bytes, bytes, internal } from '@algorandfoundation/algorand-typescript'
 import { encodingUtil } from '@algorandfoundation/puya-ts'
 import { randomBytes } from 'crypto'
-import { sha512_256 as js_sha512_256 } from 'js-sha512'
+import js_sha512 from 'js-sha512'
 import {
   ALGORAND_ADDRESS_BYTE_LENGTH,
   ALGORAND_ADDRESS_LENGTH,
@@ -172,12 +172,12 @@ export const uint8ArrayToNumber = (value: Uint8Array): number => {
 }
 
 export const checksumFromPublicKey = (pk: Uint8Array): Uint8Array => {
-  return Uint8Array.from(js_sha512_256.array(pk).slice(HASH_BYTES_LENGTH - ALGORAND_CHECKSUM_BYTE_LENGTH, HASH_BYTES_LENGTH))
+  return Uint8Array.from(js_sha512.sha512_256.array(pk).slice(HASH_BYTES_LENGTH - ALGORAND_CHECKSUM_BYTE_LENGTH, HASH_BYTES_LENGTH))
 }
 
 export const getApplicationAddress = (appId: internal.primitives.StubUint64Compat): Account => {
   const toBeSigned = conactUint8Arrays(asUint8Array(APP_ID_PREFIX), encodingUtil.bigIntToUint8Array(asBigInt(appId), 8))
-  const appIdHash = js_sha512_256.array(toBeSigned)
+  const appIdHash = js_sha512.sha512_256.array(toBeSigned)
   const publicKey = Uint8Array.from(appIdHash)
   const address = encodeAddress(publicKey)
   return Account(Bytes.fromBase32(address))

tests/crypto-op-codes.spec.ts

@@ -2,8 +2,8 @@ import { AlgoAmount } from '@algorandfoundation/algokit-utils/types/amount'
 import { AppSpec } from '@algorandfoundation/algokit-utils/types/app-spec'
 import { Bytes, Ec, Ecdsa, internal, uint64, VrfVerify } from '@algorandfoundation/algorand-typescript'
 import elliptic from 'elliptic'
-import { keccak256 as js_keccak256 } from 'js-sha3'
-import { sha512_256 as js_sha512_256 } from 'js-sha512'
+import js_sha3 from 'js-sha3'
+import js_sha512 from 'js-sha512'
 import nacl from 'tweetnacl'
 import { afterEach, describe, expect, it, Mock, test, vi } from 'vitest'
 import { TestExecutionContext } from '../src'
@@ -122,7 +122,7 @@ describe('crypto op codes', async () => {
       const account = await generateAVMTestAccount()
       const publicKey = decodePublicKey(account.addr.toString())
       const logicSig = conactUint8Arrays(asUint8Array(PROGRAM_TAG), approval.compiledBase64ToBytes)
-      const logicSigAddress = js_sha512_256.array(logicSig)
+      const logicSigAddress = js_sha512.sha512_256.array(logicSig)
       const parts = conactUint8Arrays(new Uint8Array(logicSigAddress), asUint8Array(message))
       const toBeSigned = conactUint8Arrays(asUint8Array(LOGIC_DATA_PREFIX), parts)
       const signature = nacl.sign.detached(toBeSigned, account.account.sk)
@@ -302,7 +302,7 @@ const generateEcdsaTestData = (v: Ecdsa) => {
   const keyPair = ecdsa.genKeyPair()
   const pk = keyPair.getPublic('array')
   const data = internal.primitives.BytesCls.fromCompat('test data for ecdsa')
-  const messageHash = js_keccak256.create().update(data.asUint8Array()).digest()
+  const messageHash = js_sha3.keccak256.create().update(data.asUint8Array()).digest()
   const signature = keyPair.sign(messageHash)
   const recoveryId = 0 // Recovery ID is typically 0 or 1