[xp] fix transfer deserialization

packages/massa-web3/src/experimental/basicElements/address.ts

@@ -9,7 +9,7 @@ import varint from 'varint'
 const ADDRESS_PREFIX = 'A'
 const ADDRESS_USER_PREFIX = 'U'
 const ADDRESS_CONTRACT_PREFIX = 'S'
-export const BLAKE3_HASH_BYTELENGTH = 32
+const UNDERLYING_HASH_LEN = 32
 /**
  * A class representing an address.
  *
@@ -113,7 +113,7 @@ export class Address {
     )
     const address = Address.initFromVersion(version)
     address.bytes = data
-    address.isEOA = !!addressType
+    address.isEOA = addressType === 0
     return address
   }
 
@@ -144,4 +144,21 @@ export class Address {
       this.isEOA ? ADDRESS_USER_PREFIX : ADDRESS_CONTRACT_PREFIX
     }${this.serializer.serialize(versionedBytes)}`
   }
+
+  /**
+   * Get byte length of address in binary format .
+   *
+   * @returns The address length in bytes.
+   */
+  static getByteLength(data: Uint8Array): number {
+    // addr type
+    varint.decode(data)
+    let addrByteLen = varint.decode.bytes
+    // version
+    varint.decode(data, addrByteLen)
+    addrByteLen += varint.decode.bytes
+
+    addrByteLen += UNDERLYING_HASH_LEN
+    return addrByteLen
+  }
 }

packages/massa-web3/src/experimental/basicElements/operationManager.ts

@@ -1,5 +1,5 @@
 import { unsigned } from 'big-varint'
-import { Address, BLAKE3_HASH_BYTELENGTH } from './address'
+import { Address } from './address'
 import { PrivateKey, PublicKey } from './keys'
 import { BlockchainClient } from '../client'
 import { Signature } from './signature'
@@ -95,8 +95,8 @@ export class OperationManager {
     // TODO: check that unsigned.encode is equivalent to varint.encode
     const components = [
       unsigned.encode(operation.fee),
-      unsigned.encode(BigInt(operation.expirePeriod)),
-      unsigned.encode(BigInt(operation.type)),
+      varint.encode(operation.expirePeriod),
+      varint.encode(operation.type),
     ]
 
     switch (operation.type) {
@@ -164,12 +164,11 @@ export class OperationManager {
 
     switch (operationDetails.type) {
       case OperationType.Transaction: {
-        // decode address type to get encoded size
-        varint.decode(data, offset)
+        const addrLen = Address.getByteLength(data.slice(offset))
         const recipientAddress = Address.fromBytes(
-          data.slice(offset, varint.decode.bytes + BLAKE3_HASH_BYTELENGTH)
+          data.slice(offset, offset + addrLen)
         )
-        offset += varint.decode.bytes + BLAKE3_HASH_BYTELENGTH
+        offset += addrLen
         return {
           ...operationDetails,
           recipientAddress,

packages/massa-web3/test/experimental/unit/Address.spec.ts

@@ -0,0 +1,23 @@
+import { Account } from '../../../src/experimental/account'
+import { Address } from '../../../src/experimental/basicElements'
+import { Address as LegacyAddress } from '../../../src/utils/keyAndAddresses'
+
+describe('Address tests', () => {
+  let account: Account
+  beforeAll(async () => {
+    account = await Account.generate()
+  })
+
+  test('Serialization', async () => {
+    const addStr = account.address.toString()
+    const address = Address.fromString(addStr)
+    const ref = new LegacyAddress(addStr)
+    const bytes = address.toBytes()
+
+    // serialization
+    expect(bytes).toStrictEqual(Uint8Array.from(ref.toBytes()))
+
+    // deserialization
+    expect(Address.fromBytes(bytes)).toStrictEqual(Address.fromString(addStr))
+  })
+})