fixed royalties decoding for eth addresses

Author: fend25

package.json

@@ -55,5 +55,6 @@
     "base-x": "^4.0.0",
     "coin-format": "^0.0.2",
     "utf-helpers": "^0.0.3"
-  }
+  },
+  "packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
 }

src/Royalties/decoding.ts

@@ -4,7 +4,7 @@ import {IV2Royalty, RoyaltyType, UniqueRoyaltyPart} from './types'
 import {splitStringEvery} from './utils'
 
 export const decodeRoyaltyPart = (encoded: string): UniqueRoyaltyPart => {
-  if (encoded.length !== 66) {
+  if (encoded.length !== 130) {
     throw new Error('Invalid royalty part encoding - length is not 32 bytes ("0x" + 64 symbols)')
   }
   const encodedMeta = encoded.slice(2, 66)
@@ -13,12 +13,13 @@ export const decodeRoyaltyPart = (encoded: string): UniqueRoyaltyPart => {
   const version = parseInt(encodedMeta.slice(0, 2), 16)
   const decimals = parseInt(encodedMeta.slice(46, 46 + 2), 16)
   const value = BigInt('0x' + encodedMeta.slice(48))
-  const royaltyType =
-    encodedMeta[44] === '0' ? RoyaltyType.DEFAULT : RoyaltyType.PRIMARY_ONLY
+  const royaltyType = encodedMeta[44] === '0'
+    ? RoyaltyType.DEFAULT
+    : RoyaltyType.PRIMARY_ONLY
 
   const isEthereum = encodedMeta[45] === '0'
   const address = isEthereum
-    ? '0x' + encodedAddress.slice(24)
+    ? Address.normalize.ethereumAddress('0x' + encodedAddress.slice(24))
     : Address.substrate.encode(encodedAddress)
 
   return {

src/test/royalties.samples.ts

@@ -25,12 +25,12 @@ export const ETH_DEFAULT = {
     decimals: 6,
     value: 15n,
     royaltyType: RoyaltyType.DEFAULT,
-    address: '0x1234a38988dd5ecc93dd9ce90a44a00e5fb91e4c',
+    address: '0xcafe52dae8874E9E6d7511e05d213590E47e97B6',
   },
   encoded:
     '0x' +
     '010000000000000000000000000000000000000000000006000000000000000f' +
-    '0000000000000000000000001234a38988dd5ecc93dd9ce90a44a00e5fb91e4c',
+    '000000000000000000000000cafe52dae8874e9e6d7511e05d213590e47e97b6',
 } satisfies Sample
 
 export const ROYALTY_ENCODED =

src/test/royalties.test.ts

@@ -169,7 +169,7 @@ describe('Royalties TS implementation', async () => {
           decimals: 4,
           value: 9999n,
           royaltyType: 'PRIMARY_ONLY' as const,
-          address: '0x1234a38988dd5ecc93dd9ce90a44a00e5fb91e4c'
+          address: '0x1234A38988Dd5ecC93Dd9cE90a44A00e5FB91e4C'
         }
       ]
 
@@ -182,7 +182,7 @@ describe('Royalties TS implementation', async () => {
           percent: 1
         },
         {
-          address: '0x1234a38988dd5ecc93dd9ce90a44a00e5fb91e4c',
+          address: '0x1234A38988Dd5ecC93Dd9cE90a44A00e5FB91e4C',
           percent: 99.99,
           isPrimaryOnly: true
         }