Fix decode of empty rule data v2 to work for constructing legacy spac…

…es in harmony tests (#1220)
river-build · Oct 4, 2024 · 1ea5ba0 · 1ea5ba0
1 parent f6ee779
commit 1ea5ba0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/packages/web3/src/entitlement.test.ts b/packages/web3/src/entitlement.test.ts
@@ -24,6 +24,7 @@ import {
     decodeERC1155Params,
     createOperationsTree,
     XchainConfig,
+    EncodedNoopRuleData,
 } from './entitlement'
 import { MOCK_ADDRESS, MOCK_ADDRESS_2, MOCK_ADDRESS_3 } from './Utils'
 import { zeroAddress } from 'viem'
@@ -989,6 +990,13 @@ test('encode/decode rule data v2', async () => {
     expect(randomTree.opType === newTree.opType).toBeTruthy()
 })
 
+test('decode empty ruledata v2 to NoopRuleData v1', async () => {
+    const converted = convertRuleDataV2ToV1(decodeRuleDataV2(EncodedNoopRuleData))
+    expect(converted.operations).toHaveLength(0)
+    expect(converted.checkOperations).toHaveLength(0)
+    expect(converted.logicalOperations).toHaveLength(0)
+})
+
 // encode/decode should respect address equality semantics but may not maintain case
 function addressesEqual(a: string, b: string): boolean {
     return a.toLowerCase() === b.toLowerCase()

diff --git a/packages/web3/src/entitlement.ts b/packages/web3/src/entitlement.ts
@@ -308,6 +308,14 @@ export function encodeRuleDataV2(ruleData: IRuleEntitlementV2Base.RuleDataV2Stru
 }
 
 export function decodeRuleDataV2(entitlementData: Hex): IRuleEntitlementV2Base.RuleDataV2Struct {
+    if (entitlementData === '0x') {
+        return {
+            operations: [],
+            checkOperations: [],
+            logicalOperations: [],
+        } as IRuleEntitlementV2Base.RuleDataV2Struct
+    }
+
     const getRuleDataV2Abi: ExtractAbiFunction<typeof IRuleEntitlementV2Abi, 'getRuleDataV2'> =
         getAbiItem({
             abi: IRuleEntitlementV2Abi,