Merge pull request #97 from algorandfoundation/refactor/bytes

refactor: allow fixed sized bytes to be created by Bytes factory methods by passing same options parameter

Author: boblat

examples/voting/contract.algo.spec.ts

@@ -16,7 +16,7 @@ describe('VotingRoundApp', () => {
 
   const createContract = () => {
     const contract = ctx.contract.create(VotingRoundApp)
-    const snapshotPublicKey = Bytes(keyPair.publicKey).toFixed({ length: 32 })
+    const snapshotPublicKey = Bytes(keyPair.publicKey, { length: 32 })
     const metadataIpfsCid = ctx.any.string(16)
     const startTime = ctx.any.uint64(Date.now() - 10_000, Date.now())
     const endTime = ctx.any.uint64(Date.now() + 10_000, Date.now() + 100_000)
@@ -52,7 +52,7 @@ describe('VotingRoundApp', () => {
     const account = ctx.any.account()
     const signature = nacl.sign.detached(toExternalValue(account.bytes), keyPair.secretKey)
     ctx.txn.createScope([ctx.any.txn.applicationCall({ sender: account })]).execute(() => {
-      const preconditions = contract.getPreconditions(Bytes(signature).toFixed({ length: 64 }))
+      const preconditions = contract.getPreconditions(Bytes(signature, { length: 64 }))
 
       expect(preconditions.is_allowed_to_vote).toEqual(1)
       expect(preconditions.is_voting_open).toEqual(1)
@@ -75,11 +75,7 @@ describe('VotingRoundApp', () => {
     )
 
     ctx.txn.createScope([ctx.any.txn.applicationCall({ appId: app, sender: account })]).execute(() => {
-      contract.vote(
-        ctx.any.txn.payment({ receiver: app.address, amount: voteMinBalanceReq }),
-        Bytes(signature).toFixed({ length: 64 }),
-        answerIds,
-      )
+      contract.vote(ctx.any.txn.payment({ receiver: app.address, amount: voteMinBalanceReq }), Bytes(signature, { length: 64 }), answerIds)
 
       expect(contract.votesByAccount(account).value.bytes).toEqual(answerIds.bytes)
       expect(contract.voterCount.value).toEqual(13)

package-lock.json

@@ -68,8 +68,8 @@
     "vitest": "3.2.4"
   },
   "dependencies": {
-    "@algorandfoundation/algorand-typescript": "1.0.0-alpha.85",
-    "@algorandfoundation/puya-ts": "1.0.0-alpha.85",
+    "@algorandfoundation/algorand-typescript": "1.0.0-alpha.87",
+    "@algorandfoundation/puya-ts": "1.0.0-alpha.87",
     "elliptic": "^6.6.1",
     "js-sha256": "^0.11.0",
     "js-sha3": "^0.9.3",

package.json

@@ -45,7 +45,8 @@ export const DEFAULT_GLOBAL_GENESIS_HASH = Bytes(
     133, 89, 181, 20, 120, 253, 137, 193, 118, 67, 208, 93, 21, 168, 174, 107, 16, 171, 71, 187, 109, 138, 49, 136, 17, 86, 230, 189, 59,
     174, 149, 209,
   ]),
-).toFixed({ length: 32 })
+  { length: 32 },
+)
 
 /** @internal
  * algorand encoded address of 32 zero bytes

src/constants.ts

@@ -16,31 +16,31 @@ import { Bytes, BytesCls, Uint64Cls } from './primitives'
 export const sha256 = (a: StubBytesCompat): bytes<32> => {
   const bytesA = BytesCls.fromCompat(a)
   const hashArray = js_sha256.sha256.create().update(bytesA.asUint8Array()).digest()
-  const hashBytes = Bytes(new Uint8Array(hashArray)).toFixed({ length: 32 })
+  const hashBytes = Bytes(new Uint8Array(hashArray), { length: 32 })
   return hashBytes
 }
 
 /** @internal */
 export const sha3_256 = (a: StubBytesCompat): bytes<32> => {
   const bytesA = BytesCls.fromCompat(a)
   const hashArray = js_sha3.sha3_256.create().update(bytesA.asUint8Array()).digest()
-  const hashBytes = Bytes(new Uint8Array(hashArray)).toFixed({ length: 32 })
+  const hashBytes = Bytes(new Uint8Array(hashArray), { length: 32 })
   return hashBytes
 }
 
 /** @internal */
 export const keccak256 = (a: StubBytesCompat): bytes<32> => {
   const bytesA = BytesCls.fromCompat(a)
   const hashArray = js_sha3.keccak256.create().update(bytesA.asUint8Array()).digest()
-  const hashBytes = Bytes(new Uint8Array(hashArray)).toFixed({ length: 32 })
+  const hashBytes = Bytes(new Uint8Array(hashArray), { length: 32 })
   return hashBytes
 }
 
 /** @internal */
 export const sha512_256 = (a: StubBytesCompat): bytes<32> => {
   const bytesA = BytesCls.fromCompat(a)
   const hashArray = js_sha512.sha512_256.create().update(bytesA.asUint8Array()).digest()
-  const hashBytes = Bytes(new Uint8Array(hashArray)).toFixed({ length: 32 })
+  const hashBytes = Bytes(new Uint8Array(hashArray), { length: 32 })
   return hashBytes
 }
 
@@ -114,7 +114,7 @@ export const ecdsaPkRecover = (
 
   const x = pubKey.getX().toArray('be')
   const y = pubKey.getY().toArray('be')
-  return [Bytes(x).toFixed({ length: 32 }), Bytes(y).toFixed({ length: 32 })]
+  return [Bytes(x, { length: 32 }), Bytes(y, { length: 32 })]
 }
 
 /** @internal */
@@ -127,7 +127,7 @@ export const ecdsaPkDecompress = (v: Ecdsa, a: StubBytesCompat): readonly [bytes
 
   const x = pubKey.getX().toArray('be')
   const y = pubKey.getY().toArray('be')
-  return [Bytes(x).toFixed({ length: 32 }), Bytes(y).toFixed({ length: 32 })]
+  return [Bytes(x, { length: 32 }), Bytes(y, { length: 32 })]
 }
 
 /** @internal */