Merge pull request #119 from G7DAO/feat/Update-gamesummary-contract

reuse achievo soulbound contract and whitelist sig
G7DAO · May 16, 2024 · 247ffd6 · 247ffd6
2 parents 15353e4 + 60e7402
commit 247ffd6
Show file tree

Hide file tree

Showing 37 changed files with 1,333 additions and 1,165 deletions.
diff --git a/constants/constructor-args.ts b/constants/constructor-args.ts
@@ -258,10 +258,24 @@ export const ERC20ChainlinkPaymasterArgs = {
 
 export const GameSummaryArgs = {
     MAINNET: {
-        _uri: 'FILL_ME',
+        _name: 'GameSummary',
+        _symbol: 'GS',
+        _defaultTokenURI: 'FILL_ME',
+        _contractURI: 'FILL_ME',
+        _compoundURI: 'https://api.achievo.xyz/v1/uri/achievements',
+        _maxPerMint: 1,
+        _isPaused: false,
+        _devWallet: 'DEPLOYER_WALLET',
     },
     TESTNET: {
-        _uri: 'FILL_ME',
+        _name: 'GameSummary',
+        _symbol: 'GS',
+        _defaultTokenURI: 'FILL_ME',
+        _contractURI: 'FILL_ME',
+        _compoundURI: 'https://staging-api.achievo.xyz/v1/uri/achievements',
+        _maxPerMint: 1,
+        _isPaused: false,
+        _devWallet: 'DEPLOYER_WALLET',
     },
 };
 

diff --git a/constants/deployments/deployments-mantle-sepolia.ts b/constants/deployments/deployments-mantle-sepolia.ts
diff --git a/constants/deployments/index.ts b/constants/deployments/index.ts
@@ -1,15 +1,14 @@
 import { ARBITRUM_ONE_CONTRACTS } from '@constants/deployments/deployments-arbitrum-one';
 import { ARBITRUM_SEPOLIA_CONTRACTS } from '@constants/deployments/deployments-arbitrum-sepolia';
+import { BASE_SEPOLIA_CONTRACTS } from '@constants/deployments/deployments-base-sepolia';
+import { G7_SEPOLIA_ARB_CONTRACTS } from '@constants/deployments/deployments-g7-sepolia-arb';
+import { G7_SEPOLIA_BASE_CONTRACTS } from '@constants/deployments/deployments-g7-sepolia-base';
 
-import { MANTLE_SEPOLIA_CONTRACTS } from './deployments-mantle-sepolia';
 import { POLYGON_MAINNET_CONTRACTS } from './deployments-polygon-mainnet';
 import { POLYGON_MUMBAI_CONTRACTS } from './deployments-polygon-mumbai';
 import { SEPOLIA_CONTRACTS } from './deployments-sepolia';
 import { ZKSYNC_MAINNET_CONTRACTS } from './deployments-zksync-mainnet';
 import { ZKSYNC_SEPOLIA_CONTRACTS } from './deployments-zksync-sepolia';
-import { BASE_SEPOLIA_CONTRACTS } from '@constants/deployments/deployments-base-sepolia';
-import { G7_SEPOLIA_BASE_CONTRACTS } from '@constants/deployments/deployments-g7-sepolia-base';
-import { G7_SEPOLIA_ARB_CONTRACTS } from '@constants/deployments/deployments-g7-sepolia-arb';
 
 export const CONTRACTS = [
     ...G7_SEPOLIA_ARB_CONTRACTS,
@@ -22,7 +21,6 @@ export const CONTRACTS = [
     ...ZKSYNC_MAINNET_CONTRACTS,
     ...ZKSYNC_SEPOLIA_CONTRACTS,
     ...SEPOLIA_CONTRACTS,
-    ...MANTLE_SEPOLIA_CONTRACTS,
 ];
 
 export const ACHIEVO_TMP_DIR = '.achievo';

diff --git a/constants/nonce-deployments/deployments-mantle-mainnet.ts b/constants/nonce-deployments/deployments-mantle-mainnet.ts
@@ -1,4 +1,4 @@
-import { HelloWorldArgs, LootDropArgs, RewardTokenArgs } from '@constants/constructor-args';
+import { GameSummaryArgs, LootDropArgs, RewardTokenArgs } from '@constants/constructor-args';
 import { CONTRACT_FILE_NAME, CONTRACT_NAME, CONTRACT_TYPE } from '@constants/contract';
 import { TENANT } from '@constants/tenant';
 
@@ -35,4 +35,17 @@ export const MANTLE_MAINNET_CONTRACTS: DeploymentContract[] = [
         functionCalls: [],
         args: RewardTokenArgs.MAINNET,
     },
+    {
+        contractFileName: CONTRACT_FILE_NAME.GameSummary,
+        type: CONTRACT_TYPE.GameSummary,
+        name: CONTRACT_NAME.GameSummary,
+        chain,
+        networkType,
+        tenants: [TENANT.HyperPlay],
+        verify: true,
+        upgradable: false,
+        dependencies: [],
+        functionCalls: [],
+        args: GameSummaryArgs.MAINNET,
+    },
 ];
diff --git a/constants/nonce-deployments/deployments-mantle-sepolia.ts b/constants/nonce-deployments/deployments-mantle-sepolia.ts
@@ -1,4 +1,4 @@
-import { HelloWorldArgs, LootDropArgs, RewardTokenArgs } from '@constants/constructor-args';
+import { LootDropArgs, RewardTokenArgs, GameSummaryArgs } from '@constants/constructor-args';
 import { CONTRACT_FILE_NAME, CONTRACT_NAME, CONTRACT_TYPE } from '@constants/contract';
 import { TENANT } from '@constants/tenant';
 
@@ -36,16 +36,16 @@ export const MANTLE_SEPOLIA_CONTRACTS: DeploymentContract[] = [
         args: RewardTokenArgs.TESTNET,
     },
     {
-        contractFileName: CONTRACT_FILE_NAME.HelloWorld,
-        type: CONTRACT_TYPE.HelloWorld,
-        name: CONTRACT_NAME.HelloWorld,
+        contractFileName: CONTRACT_FILE_NAME.GameSummary,
+        type: CONTRACT_TYPE.GameSummary,
+        name: CONTRACT_NAME.GameSummary,
         chain,
         networkType,
-        tenants: [TENANT.Game7],
+        tenants: [TENANT.HyperPlay],
         verify: true,
         upgradable: false,
         dependencies: [],
         functionCalls: [],
-        args: HelloWorldArgs.TESTNET,
+        args: GameSummaryArgs.TESTNET,
     },
 ];
diff --git a/contracts/airdrops/FreeMint.sol b/contracts/airdrops/FreeMint.sol
@@ -18,8 +18,7 @@ pragma solidity ^0.8.17;
 // MMMM0cdNMM0cdNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
 
 /**
- * Authors: Omar Garcia
- * GitHub: https://github.com/ogarciarevett
+ * Author: Achievo Team - (https://achievo.xyz/)
  */
 
 import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";

diff --git a/contracts/bridges/ERC20Bridge.sol b/contracts/bridges/ERC20Bridge.sol
@@ -2,8 +2,7 @@
 pragma solidity ^0.8.17;
 
 /**
- * Author: Omar <ogarciarevett>(https://github.com/ogarciarevett)
- * Co-Authors: Max <vasinl124>(https://github.com/vasinl124)
+ * Author: Achievo Team - (https://achievo.xyz/)
  */
 
 // MMMMNkc. .,oKWMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM

diff --git a/contracts/ercs/ERCWhitelistSignature.sol b/contracts/ercs/ERCWhitelistSignature.sol
@@ -2,8 +2,7 @@
 pragma solidity ^0.8.17;
 
 /**
- * Author: Omar <ogarciarevett>(https://github.com/ogarciarevett)
- * Co-Authors: Max <vasinl124>(https://github.com/vasinl124)
+ * Author: Achievo Team - (https://achievo.xyz/)
  */
 
 // MMMMNkc. .,oKWMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM

diff --git a/contracts/ercs/extensions/Achievo1155Soulbound.sol b/contracts/ercs/extensions/Achievo1155Soulbound.sol
@@ -2,8 +2,7 @@
 pragma solidity ^0.8.17;
 
 /*
- * Author: Omar ogarciarevett(https://github.com/ogarciarevett)
- * Co-Authors: Max vasinl124(https://github.com/vasinl124)
+ * Author: Achievo Team - (https://achievo.xyz/)
  */
 
 // MMMMNkc. .,oKWMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM

diff --git a/contracts/ercs/extensions/Achievo721Soulbound.sol b/contracts/ercs/extensions/Achievo721Soulbound.sol
@@ -17,8 +17,7 @@ pragma solidity ^0.8.17;
 // MMMM0cdNMM0cdNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
 
 /*
- * Author: Omar <ogarciarevett>(https://github.com/ogarciarevett)
- * Co-Authors: Max <vasinl124>(https://github.com/vasinl124)
+ * Author: Achievo Team - (https://achievo.xyz/)
  */
 
 contract Achievo721Soulbound {

diff --git a/contracts/games/AvatarBound.sol b/contracts/games/AvatarBound.sol
@@ -2,8 +2,7 @@
 pragma solidity ^0.8.17;
 
 /**
- * Author: Omar <ogarciarevett>(https://github.com/ogarciarevett)
- * Co-Authors: Max <vasinl124>(https://github.com/vasinl124)
+ * Author: Achievo Team - (https://achievo.xyz/)
  */
 
 // MMMMNkc. .,oKWMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM