refactor: bytes and metadata encoding

aragon · Apr 15, 2024 · b43e614 · b43e614
1 parent 9d0c061
commit b43e614
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 21 deletions.
diff --git a/packages/contracts/test/10_unit-testing/11_plugin.ts b/packages/contracts/test/10_unit-testing/11_plugin.ts
@@ -62,9 +62,7 @@ async function fixture(): Promise<FixtureResult> {
   const [deployer, alice, bob, carol, dave, eve] = await ethers.getSigners();
 
   // Deploy a DAO proxy.
-  const dummyMetadata = ethers.utils.hexlify(
-    ethers.utils.toUtf8Bytes('0x123456789')
-  );
+  const dummyMetadata = '0x12345678';
   const dao = await createDaoProxy(deployer, dummyMetadata);
 
   // Deploy a plugin proxy factory containing the multisig implementation.
@@ -95,7 +93,7 @@ async function fixture(): Promise<FixtureResult> {
     deployer
   );
 
-  // Deploy an initialized plugin proxy.
+  // Deploy an uninitialized plugin proxy.
   const deploymentTx2 = await proxyFactory.deployUUPSProxy([]);
   const proxyCreatedEvent2 = await findEvent<ProxyCreatedEvent>(
     deploymentTx2,

diff --git a/packages/contracts/test/10_unit-testing/12_plugin-setup.ts b/packages/contracts/test/10_unit-testing/12_plugin-setup.ts
@@ -39,9 +39,7 @@ async function fixture(): Promise<FixtureResult> {
   const [deployer, alice, bob, carol] = await ethers.getSigners();
 
   // Deploy a DAO proxy.
-  const dummyMetadata = ethers.utils.hexlify(
-    ethers.utils.toUtf8Bytes('0x123456789')
-  );
+  const dummyMetadata = '0x12345678';
   const dao = await createDaoProxy(deployer, dummyMetadata);
 
   // Deploy a plugin setup contract
@@ -354,7 +352,7 @@ describe('MultisigSetup', function () {
             ethers.Wallet.createRandom().address,
             ethers.Wallet.createRandom().address,
           ],
-          data: '0x00',
+          data: [],
           plugin: ethers.Wallet.createRandom().address,
         }
       );

diff --git a/packages/contracts/test/20_integration-testing/22_setup-processing.ts b/packages/contracts/test/20_integration-testing/22_setup-processing.ts
@@ -54,9 +54,7 @@ async function fixture(): Promise<FixtureResult> {
   await deployments.fixture(tags);
 
   const [deployer, alice, bob] = await ethers.getSigners();
-  const dummyMetadata = ethers.utils.hexlify(
-    ethers.utils.toUtf8Bytes('0x123456789')
-  );
+  const dummyMetadata = '0x12345678';
   const dao = await createDaoProxy(deployer, dummyMetadata);
 
   const network = getNetworkNameByAlias(productionNetworkName);

diff --git a/packages/contracts/test/20_integration-testing/test-helpers.ts b/packages/contracts/test/20_integration-testing/test-helpers.ts
@@ -66,7 +66,12 @@ export async function installPLugin(
     pluginSetupRef: pluginSetupRef,
     plugin: plugin,
     permissions: preparedPermissions,
-    helpersHash: hashHelpers(preparedEvent.args.preparedSetupData.helpers),
+    helpersHash: ethers.utils.keccak256(
+      ethers.utils.defaultAbiCoder.encode(
+        ['address[]'],
+        [preparedEvent.args.preparedSetupData.helpers]
+      )
+    ),
   });
 
   const appliedEvent =
@@ -183,7 +188,12 @@ export async function updatePlugin(
     pluginSetupRef: pluginSetupRefUpdate,
     initData: preparedEvent.args.initData,
     permissions: preparedPermissions,
-    helpersHash: hashHelpers(preparedEvent.args.preparedSetupData.helpers),
+    helpersHash: ethers.utils.keccak256(
+      ethers.utils.defaultAbiCoder.encode(
+        ['address[]'],
+        [preparedEvent.args.preparedSetupData.helpers]
+      )
+    ),
   });
   const appliedEvent =
     await findEvent<PluginSetupProcessorEvents.UpdateAppliedEvent>(

diff --git a/packages/contracts/test/30_regression-testing/31_upgradeability.ts b/packages/contracts/test/30_regression-testing/31_upgradeability.ts
@@ -10,7 +10,10 @@ import {
   deployAndUpgradeSelfCheck,
   getProtocolVersion,
 } from '../test-utils/uups-upgradeable';
-import {PLUGIN_UUPS_UPGRADEABLE_PERMISSIONS} from '@aragon/osx-commons-sdk';
+import {
+  PLUGIN_UUPS_UPGRADEABLE_PERMISSIONS,
+  hexToBytes,
+} from '@aragon/osx-commons-sdk';
 import {DAO} from '@aragon/osx-ethers';
 import {loadFixture} from '@nomicfoundation/hardhat-network-helpers';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
@@ -109,9 +112,7 @@ type FixtureResult = {
 async function fixture(): Promise<FixtureResult> {
   const [deployer, alice, bob, carol] = await ethers.getSigners();
 
-  const dummyMetadata = ethers.utils.hexlify(
-    ethers.utils.toUtf8Bytes('0x123456789')
-  );
+  const dummyMetadata = '0x12345678';
 
   const dao = await createDaoProxy(deployer, dummyMetadata);
 

diff --git a/packages/contracts/utils/helpers.ts b/packages/contracts/utils/helpers.ts
@@ -192,10 +192,6 @@ export async function getPastVersionCreatedEvents(
   });
 }
 
-export function hashHelpers(helpers: string[]) {
-  return keccak256(defaultAbiCoder.encode(['address[]'], [helpers]));
-}
-
 export type LatestVersion = {
   versionTag: VersionTag;
   pluginSetupContract: string;