64 principal game cost time parameters

README.md

@@ -66,24 +66,19 @@ const distributorArguments: MAODistribution.DistributorArgumentsStruct = {
     tokenName: 'tokenName',
     tokenSymbol: 'tokenSymbol',
   },
-  ACIDSettings: {
+  RankifySettings: {
     RankTokenContractURI: 'https://example.com/rank',
-    gamePrice: 1,
-    joinGamePrice: 1,
-    maxPlayersSize: 16,
-    maxTurns: 1,
+    principalCost: RInstanceSettings.PRINCIPAL_COST,
+    principalTimeConstant: RInstanceSettings.PRINCIPAL_TIME_CONSTANT,
     metadata: ethers.utils.hexlify(ethers.utils.toUtf8Bytes('metadata')),
-    minPlayersSize: 4,
-    paymentToken: rankify.address,
     rankTokenURI: 'https://example.com/rank',
-    timePerTurn: 1,
-    timeToJoin: 1,
-    voteCredits: 14,
   },
 };
+// const abi = import('../abi/src/distributions/MAODistribution.sol/MAODistribution.json');
+// Encode the arguments
 const data = ethers.utils.defaultAbiCoder.encode(
   [
-    'tuple(tuple(string daoURI, string subdomain, bytes metadata, string tokenName, string tokenSymbol) DAOSEttings, tuple(uint256 timePerTurn, uint256 maxPlayersSize, uint256 minPlayersSize, uint256 timeToJoin, uint256 maxTurns, uint256 voteCredits, uint256 gamePrice, address paymentToken, uint256 joinGamePrice, string metadata, string rankTokenURI, string RankTokenContractURI) ACIDSettings)',
+    'tuple(tuple(string daoURI, string subdomain, bytes metadata, string tokenName, string tokenSymbol) DAOSEttings, tuple(uint256 principalCost, uint256 principalTimeConstant, string metadata, string rankTokenURI, string RankTokenContractURI) RankifySettings)',
   ],
   [distributorArguments],
 );

deploy/mao.ts

@@ -6,6 +6,7 @@ import { activeContractsList } from '@aragon/osx-ethers';
 import { CodeIndex } from '@peeramid-labs/eds/types';
 import CodeIndexAbi from '@peeramid-labs/eds/abi/src/CodeIndex.sol/CodeIndex.json';
 import { MintSettingsStruct } from '../types/src/tokens/DistributableGovernanceERC20.sol/DistributableGovernanceERC20';
+import { ArguableVotingTournament } from '../types/src/distributions/ArguableVotingTournament';
 const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { deployments, getNamedAccounts } = hre;
   const { deploy } = deployments;
@@ -17,7 +18,7 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
     console.log('network', network, process.env.NODE_ENV);
   }
   if (!network) throw new Error('Network not provided');
-  const { deployer } = await getNamedAccounts();
+  const { deployer, DAO } = await getNamedAccounts();
   const codeIndexContract = (await ethers.getContractAt(
     CodeIndexAbi,
     '0xc0D31d398c5ee86C5f8a23FA253ee8a586dA03Ce',
@@ -101,34 +102,26 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
     skipIfAlreadyDeployed: true,
   });
 
-  const RankifyOwnerFacetDeployment = await deploy('RankifyInstanceGameOwnersFacet', {
-    from: deployer,
-    skipIfAlreadyDeployed: true,
-  });
-
   const OwnershipFacetDeployment = await deploy('OwnershipFacet', {
     from: deployer,
     skipIfAlreadyDeployed: true,
   });
 
+  const addresses: ArguableVotingTournament.ArguableTournamentAddressesStruct = {
+    loupeFacet: loupeFacetDeployment.address,
+    inspectorFacet: inspectorFacetDeployment.address,
+    RankifyMainFacet: RankifyMainFacetDeployment.address,
+    RankifyReqsFacet: RankifyReqsFacetDeployment.address,
+    RankifyGMFacet: RankifyGMFacetDeployment.address,
+    OwnershipFacet: OwnershipFacetDeployment.address,
+  };
+
   const arguableVotingTournamentDeployment = await deploy('ArguableVotingTournament', {
     from: deployer,
     gasLimit: 8000000,
     estimatedGasLimit: 8000000,
     skipIfAlreadyDeployed: true,
-    args: [
-      initializerAdr,
-      initializerSelector,
-      distributionName,
-      version,
-      loupeFacetDeployment.address,
-      inspectorFacetDeployment.address,
-      RankifyMainFacetDeployment.address,
-      RankifyReqsFacetDeployment.address,
-      RankifyGMFacetDeployment.address,
-      RankifyOwnerFacetDeployment.address,
-      OwnershipFacetDeployment.address,
-    ],
+    args: [initializerAdr, initializerSelector, distributionName, version, addresses],
   });
   const arguableVotingTournamentDeploymentCode = await hre.ethers.provider.getCode(
     arguableVotingTournamentDeployment.address,
@@ -160,14 +153,16 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   }
   const govTokenCode = await hre.ethers.provider.getCode(govTokenDeployment.address);
   const govTokenCodeId = ethers.utils.keccak256(govTokenCode);
-
+  const rankifyToken = await deployments.get('Rankify');
   const result = await deploy('MAODistribution', {
     from: deployer,
     skipIfAlreadyDeployed: true,
     args: [
       _tokenVotingPluginRepo,
       _daoFactory,
       _trustedForwarder,
+      rankifyToken.address,
+      DAO,
       rankTokenCodeId,
       arguableVotingTournamentCodeId,
       accessManagerId,
@@ -183,8 +178,8 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   if (MaoDistrCodeIdAddress === ethers.constants.AddressZero) {
     await codeIndexContract.register(result.address);
   }
-  const code = await hre.ethers.provider.getCode(result.address);
-  const codeId = ethers.utils.keccak256(code);
+  //   const code = await hre.ethers.provider.getCode(result.address);
+  //   const codeId = ethers.utils.keccak256(code);
   //   console.log('MAO deployed at', result.address, 'codeId', codeId);
   return;
 };

deploy/sacm.ts

@@ -23,7 +23,9 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const codeId = ethers.utils.keccak256(code);
   const registerAddress = await codeIndexContract.get(codeId);
   if (registerAddress == ethers.constants.AddressZero) {
-    console.warn('registering contract', registerAddress, sacmDeployment.address, codeId);
+    if (process.env.NODE_ENV !== 'TEST') {
+      console.warn('registering contract', registerAddress, sacmDeployment.address, codeId);
+    }
     await codeIndexContract.register(sacmDeployment.address);
   }
 };

hardhat.config.ts

@@ -12,8 +12,9 @@ import 'hardhat-contract-sizer';
 import 'hardhat-deploy';
 import 'hardhat-tracer';
 import 'solidity-docgen';
-import './playbook/initializeDomain';
 import './playbook/createGame';
+import getSuperInterface from './scripts/getSuperInterface';
+import { ErrorFragment, EventFragment, FunctionFragment } from '@ethersproject/abi';
 
 task('accounts', 'Prints the list of accounts', async (taskArgs, hre) => {
   const accounts = await hre.ethers.getSigners();
@@ -23,19 +24,28 @@ task('accounts', 'Prints the list of accounts', async (taskArgs, hre) => {
   }
 });
 
-// task("upload2IPFS", "Uploads files to ipfs")
-//   .addParam("path", "file path")
-//   .setAction(async (taskArgs) => {
-//     const data = fs.readFileSync(taskArgs.path);
-//     await ipfsUtils.upload2IPFS(data);
-//   });
-
-// task("uploadDir2IPFS", "Uploads directory to ipfs")
-//   .addParam("path", "path")
-//   .setAction(async (taskArgs) => {
-//     await ipfsUtils.uploadDir2IPFS(taskArgs.path);
-//   });
-
+task('getSuperInterface', 'Prints the super interface of a contract').setAction(async (taskArgs, hre) => {
+  const su = getSuperInterface();
+  let return_value: {
+    functions: Record<string, FunctionFragment>;
+    events: Record<string, EventFragment>;
+    errors: Record<string, ErrorFragment>;
+  } = {
+    functions: {},
+    events: {},
+    errors: {},
+  };
+  Object.values(su.functions).forEach(x => {
+    return_value['functions'][su.getSighash(x)] = x;
+  });
+  Object.values(su.events).forEach(x => {
+    return_value['events'][su.getSighash(x)] = x;
+  });
+  Object.values(su.errors).forEach(x => {
+    return_value['errors'][su.getSighash(x)] = x;
+  });
+  console.log(JSON.stringify(return_value, null, 2));
+});
 task('replaceFacet', 'Upgrades facet')
   .addParam('facet', 'facet')
   .addParam('address', 'contract address')
@@ -99,6 +109,9 @@ export default {
     defaultPlayer: {
       localhost: '0xF52E5dF676f51E410c456CC34360cA6F27959420',
     },
+    DAO: {
+      default: '0x520E00225C4a43B6c55474Db44a4a44199b4c3eE',
+    },
   },
   mocha: {
     timeout: 400000,
@@ -148,6 +161,15 @@ export default {
   },
   solidity: {
     compilers: [
+      {
+        version: '0.8.28',
+        settings: {
+          optimizer: {
+            enabled: true,
+            runs: 2000,
+          },
+        },
+      },
       {
         version: '0.8.20',
         settings: {
@@ -169,19 +191,6 @@ export default {
     ],
   },
   diamondAbi: [
-    {
-      // (required) The name of your Diamond ABI
-      name: 'MultipassDiamond',
-      include: ['DNSFacet', 'OwnershipFacet', 'DiamondLoupeFacet', 'EIP712InspectorFacet'],
-      // We explicitly set `strict` to `true` because we want to validate our facets don't accidentally provide overlapping functions
-      strict: true,
-      // We use our diamond utils to filter some functions we ignore from the combined ABI
-      filter(abiElement: unknown, index: number, abi: unknown[], fullyQualifiedName: string) {
-        // const changes = new diamondUtils.DiamondChanges();
-        const signature = toSignature(abiElement);
-        return isIncluded(fullyQualifiedName, signature);
-      },
-    },
     {
       name: 'RankifyDiamondInstance',
       include: [
@@ -191,9 +200,8 @@ export default {
         'RankifyInstanceMainFacet',
         'RankifyInstanceRequirementsFacet',
         'RankifyInstanceGameMastersFacet',
-        'RankifyInstanceGameOwnersFacet',
       ],
-      strict: true,
+      strict: false,
       filter(abiElement: unknown, index: number, abi: unknown[], fullyQualifiedName: string) {
         const signature = toSignature(abiElement);
         return isIncluded(fullyQualifiedName, signature);

package.json

@@ -36,9 +36,8 @@
     "@nomiclabs/buidler-web3": "^1.3.4",
     "@nomiclabs/hardhat-ethers": "^2.0.6",
     "@nomiclabs/hardhat-etherscan": "^3.1.8",
-    "@peeramid-labs/eds": "^2.1.0",
+    "@peeramid-labs/eds": "^2.1.3",
     "@shopify/eslint-plugin": "^43.0.0",
-    "@solidstate/contracts": "^0.0.35",
     "@typechain/ethers-v5": "^11.1.2",
     "@typechain/hardhat": "^7.0.0",
     "@typechain/web3-v1": "^6.0.1",
@@ -49,20 +48,20 @@
     "chai": "^4.3.6",
     "crypto-js": "^4.1.1",
     "eslint": "^9.6.0",
-    "prettier": "^3.3.3",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-promise": "^6.4.0",
     "eth-create2-calculator": "^1.1.5",
     "ethers": "^5.6.6",
     "globals": "^15.9.0",
-    "hardhat": "2.22.11",
+    "hardhat": "^2.22.16",
     "hardhat-abi-exporter": "^2.9.0",
-    "hardhat-contract-sizer": "^2.6.1",
+    "hardhat-contract-sizer": "^2.10.0",
     "hardhat-deploy": "^0.12.2",
     "hardhat-diamond-abi": "^3.0.0",
     "hardhat-tracer": "^3.1.0",
     "keccak": "^3.0.1",
     "mocha": "^10.0.0",
+    "prettier": "^3.3.3",
     "prettier-plugin-solidity": "^1.1.3",
     "solhint": "^3.6.2",
     "solidity-coverage": "^0.8.5",