Some work in progress

Author: brickpop

packages/contracts/plugin-settings.ts

@@ -19,15 +19,15 @@ export const VOTING_POWER_CONDITION_CONTRACT_NAME = 'VotingPowerCondition';
 export const VERSION: VersionTag = {
   release: 1, // Increment this number ONLY if breaking/incompatible changes were made. Updates between releases are NOT possible.
   build: 4, // Increment this number if non-breaking/compatible changes were made. Updates to newer builds are possible.
-};
+} as const;
 
 // The metadata associated with the plugin version you are currently working on.
 // For more details, visit https://devs.aragon.org/docs/osx/how-to-guides/plugin-development/publication/metadata.
 // Don't change this unless you know what you are doing.
 export const METADATA = {
   build: buildMetadata,
   release: releaseMetadata,
-};
+} as const;
 
 const zeroDaoAddress = ethers.constants.AddressZero;
 const zeroTokenAddress = ethers.constants.AddressZero;

packages/contracts/test/20_integration-testing/22_setup-processing.ts

@@ -1,12 +1,19 @@
 import {METADATA, VERSION} from '../../plugin-settings';
-import {GovernanceERC20, TokenVoting__factory} from '../../typechain';
+import {
+  GovernanceERC20,
+  PluginUpgradeableSetup__factory,
+  TokenVoting__factory,
+} from '../../typechain';
+import {PromiseOrValue} from '../../typechain/common';
+import {PluginUUPSUpgradeable__factory} from '../../typechain/factories/@aragon/osx-v1.3.0/core/plugin';
 import {MajorityVotingBase} from '../../typechain/src/MajorityVotingBase';
 import {getProductionNetworkName, findPluginRepo} from '../../utils/helpers';
 import {skipTestSuiteIfNetworkIsZkSync} from '../test-utils/skip-functions';
 import {
   Operation,
   TargetConfig,
   latestInitializerVersion,
+  latestPluginBuild,
 } from '../test-utils/token-voting-constants';
 import {
   GovernanceERC20__factory,
@@ -19,6 +26,7 @@ import {
   installPLugin,
   uninstallPLugin,
   updateFromBuildTest,
+  updatePlugin,
 } from './test-helpers';
 import {
   getLatestNetworkDeployment,
@@ -27,6 +35,7 @@ import {
 import {
   DAO_PERMISSIONS,
   PLUGIN_SETUP_PROCESSOR_PERMISSIONS,
+  PLUGIN_UUPS_UPGRADEABLE_PERMISSIONS,
   TIME,
   UnsupportedNetworkError,
   getNamedTypesFromMetadata,
@@ -39,12 +48,14 @@ import {
   PluginSetupProcessor__factory,
   DAO,
 } from '@aragon/osx-ethers';
-import {BigNumber} from '@ethersproject/bignumber';
+import {BigNumber, BigNumberish} from '@ethersproject/bignumber';
 import {loadFixture} from '@nomicfoundation/hardhat-network-helpers';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
 import {expect} from 'chai';
 import hre, {deployments, ethers} from 'hardhat';
 
+const OZ_INITIALIZED_SLOT_POSITION = 0;
+
 const productionNetworkName = getProductionNetworkName(hre);
 
 type FixtureResult = {
@@ -68,8 +79,24 @@ type FixtureResult = {
   defaultExcludedAccounts: string[];
   defaultTargetConfig: TargetConfig;
   prepareInstallationInputs: string;
-  prepareInstallData: any;
-  prepareUpdateData: any;
+  prepareInstallData: {
+    votingSettings: PromiseOrValue<BigNumberish>[];
+    tokenSettings: string[];
+    mintSettings: never[][];
+    targetConfig: (string | Operation)[];
+    defaultMinApproval: BigNumber;
+    defaultMetadata: string;
+    defaultExcludedAccounts: string[];
+  };
+  prepareUpdateData: readonly [
+    BigNumber,
+    {
+      target: string;
+      operation: Operation;
+    },
+    string,
+    string[]
+  ];
 };
 
 async function fixture(): Promise<FixtureResult> {
@@ -188,7 +215,9 @@ async function fixture(): Promise<FixtureResult> {
     defaultMinApproval,
     defaultTargetConfig,
     defaultMetadata,
-  ];
+    defaultExcludedAccounts,
+  ] as const;
+
   // Provide update inputs
   // const prepareUpdateBuild3Data = [defaultMinApproval];
   return {

packages/contracts/test/30_regression-testing/31_upgradeability.ts

@@ -12,8 +12,8 @@ import {
   TargetConfig,
 } from '../test-utils/token-voting-constants';
 import {
-  TokenVoting_V1_0_0__factory,
-  TokenVoting_V1_3_0__factory,
+  TokenVoting_r1_b1__factory,
+  TokenVoting_r1_b2__factory,
   TokenVoting__factory,
 } from '../test-utils/typechain-versions';
 import {
@@ -69,7 +69,7 @@ describe('Upgrades', () => {
     const {deployer, dao, defaultInitData, encodeDataForUpgrade} =
       await loadFixtureCustom(fixture);
     const currentContractFactory = new TokenVoting__factory(deployer);
-    const legacyContractFactory = new TokenVoting_V1_0_0__factory(deployer);
+    const legacyContractFactory = new TokenVoting_r1_b1__factory(deployer);
 
     const data = [
       0,
@@ -91,7 +91,7 @@ describe('Upgrades', () => {
           defaultInitData.metadata,
         ],
       },
-      ARTIFACT_SOURCES.TokenVoting_V1_0_0,
+      ARTIFACT_SOURCES.TokenVoting_r1_b1,
       ARTIFACT_SOURCES.TokenVoting,
       PLUGIN_UUPS_UPGRADEABLE_PERMISSIONS.UPGRADE_PLUGIN_PERMISSION_ID,
       dao,
@@ -172,7 +172,7 @@ describe('Upgrades', () => {
     const {deployer, dao, defaultInitData, encodeDataForUpgrade} =
       await loadFixtureCustom(fixture);
     const currentContractFactory = new TokenVoting__factory(deployer);
-    const legacyContractFactory = new TokenVoting_V1_3_0__factory(deployer);
+    const legacyContractFactory = new TokenVoting_r1_b2__factory(deployer);
 
     const data = [
       0,
@@ -194,7 +194,7 @@ describe('Upgrades', () => {
           defaultInitData.metadata,
         ],
       },
-      ARTIFACT_SOURCES.TokenVoting_V1_3_0,
+      ARTIFACT_SOURCES.TokenVoting_r1_b2,
       ARTIFACT_SOURCES.TokenVoting,
       PLUGIN_UUPS_UPGRADEABLE_PERMISSIONS.UPGRADE_PLUGIN_PERMISSION_ID,
       dao,

packages/contracts/test/test-utils/token-voting-constants.ts

@@ -60,5 +60,5 @@ export type TargetConfig = {
   operation: number;
 };
 
-export const latestInitializerVersion = 2;
+export const latestInitializerVersion = 3;
 export const latestPluginBuild = VERSION.build;