fix: tt 372 deploy v5 contracts (#33)

* refactor: update method and event name * fix: deleted tt-base file * fix: removed amoy url * chore: upgrade to EtersV6 * chore: upgrade oppenzeppelin contracts * chore: upgrad contracts upgradable * fix: lintng fixes * fix: lintig errors * fix: lint * chore:deploy latest version contracts * chore: upgraded addresses * chore: upgrade smart contracts from v8.0 to v8.20 and update addresses * chore: Update tasks/deploy-token.ts Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * chore: deploy latest version contracts * chore: upgraded addresses * chore: upgrade smart contracts from v8.0 to v8.20 and update addresses * chore: bump * chore: bump * chore: bump * chore: bump * chore: bump * fix: update code support (#28) * fix: make sure code supports ethers v5 * fix: v5 errors * fix: resolve v5 import * chore: fix linting --------- Co-authored-by: Rishabh Singh <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Ng Han Inn <[email protected]>
TradeTrust · Nov 26, 2024 · 1ce973b · 1ce973b
1 parent 9b4f1a1
commit 1ce973b
Show file tree

Hide file tree

Showing 51 changed files with 456 additions and 69 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ yarn-error.log
 /contracts/.deps
 /coverage
 coverage.json
+.openzeppelin/
diff --git a/contracts/TitleEscrow.sol b/contracts/TitleEscrow.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 import { Pausable } from "@openzeppelin/contracts/utils/Pausable.sol";

diff --git a/contracts/TitleEscrowFactory.sol b/contracts/TitleEscrowFactory.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { Clones } from "@openzeppelin/contracts/proxy/Clones.sol";
 import { TitleEscrow } from "./TitleEscrow.sol";

diff --git a/contracts/TradeTrustToken.sol b/contracts/TradeTrustToken.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { TradeTrustTokenBase, ITitleEscrowFactory } from "./base/TradeTrustTokenBase.sol";
 

diff --git a/contracts/base/RegistryAccess.sol b/contracts/base/RegistryAccess.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import { RegistryAccessErrors } from "../interfaces/RegistryAccessErrors.sol";

diff --git a/contracts/base/SBTUpgradeable.sol b/contracts/base/SBTUpgradeable.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v4.5.0) (token/ERC721/ERC721.sol)
 
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { IERC721Receiver } from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 import { ContextUpgradeable } from "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol";

diff --git a/contracts/base/TradeTrustSBT.sol b/contracts/base/TradeTrustSBT.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { PausableUpgradeable } from "@openzeppelin/contracts-upgradeable/utils/PausableUpgradeable.sol";
 import { SBTUpgradeable } from "./SBTUpgradeable.sol";

diff --git a/contracts/base/TradeTrustTokenBase.sol b/contracts/base/TradeTrustTokenBase.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { RegistryAccess } from "./RegistryAccess.sol";
 import { TradeTrustTokenBurnable, TradeTrustSBT, SBTUpgradeable } from "./TradeTrustTokenBurnable.sol"; //check-circular-imports

diff --git a/contracts/base/TradeTrustTokenBaseURI.sol b/contracts/base/TradeTrustTokenBaseURI.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { TradeTrustSBT } from "./TradeTrustSBT.sol";
 import { RegistryAccess } from "./RegistryAccess.sol";

diff --git a/contracts/base/TradeTrustTokenBurnable.sol b/contracts/base/TradeTrustTokenBurnable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { TradeTrustSBT, ITitleEscrow, SBTUpgradeable } from "./TradeTrustSBT.sol";
 import { RegistryAccess } from "./RegistryAccess.sol";

diff --git a/contracts/base/TradeTrustTokenMintable.sol b/contracts/base/TradeTrustTokenMintable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { TradeTrustSBT, ITitleEscrow, SBTUpgradeable } from "./TradeTrustSBT.sol";
 import { RegistryAccess } from "./RegistryAccess.sol";

diff --git a/contracts/base/TradeTrustTokenRestorable.sol b/contracts/base/TradeTrustTokenRestorable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { TradeTrustSBT, ITitleEscrow, SBTUpgradeable } from "./TradeTrustSBT.sol";
 import { RegistryAccess } from "./RegistryAccess.sol";

diff --git a/contracts/interfaces/IERC721MetadataUpgradeable.sol b/contracts/interfaces/IERC721MetadataUpgradeable.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts v4.4.1 (token/ERC721/extensions/IERC721Metadata.sol)
 
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { ISBTUpgradeable } from "./ISBTUpgradeable.sol";
 

diff --git a/contracts/interfaces/ISBTUpgradeable.sol b/contracts/interfaces/ISBTUpgradeable.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts v4.4.1 (token/ERC721/IERC721.sol)
 
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 

diff --git a/contracts/interfaces/ITitleEscrow.sol b/contracts/interfaces/ITitleEscrow.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { IERC721Receiver } from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 

diff --git a/contracts/interfaces/ITitleEscrowFactory.sol b/contracts/interfaces/ITitleEscrowFactory.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 interface ITitleEscrowFactory {
   event TitleEscrowCreated(address indexed titleEscrow, address indexed tokenRegistry, uint256 indexed tokenId);

diff --git a/contracts/interfaces/ITitleEscrowSignable.sol b/contracts/interfaces/ITitleEscrowSignable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { IERC721Receiver } from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 import { SigHelper } from "../utils/SigHelper.sol";

diff --git a/contracts/interfaces/ITradeTrustSBT.sol b/contracts/interfaces/ITradeTrustSBT.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { IERC721Receiver } from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 import { ISBTUpgradeable, IERC165 } from "./ISBTUpgradeable.sol";

diff --git a/contracts/interfaces/ITradeTrustToken.sol b/contracts/interfaces/ITradeTrustToken.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { ITradeTrustSBT, ITitleEscrowFactory } from "./ITradeTrustSBT.sol";
 import { ITradeTrustTokenRestorable } from "./ITradeTrustTokenRestorable.sol";

diff --git a/contracts/interfaces/ITradeTrustTokenBurnable.sol b/contracts/interfaces/ITradeTrustTokenBurnable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 interface ITradeTrustTokenBurnable {
   /**

diff --git a/contracts/interfaces/ITradeTrustTokenMintable.sol b/contracts/interfaces/ITradeTrustTokenMintable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 interface ITradeTrustTokenMintable {
   /**

diff --git a/contracts/interfaces/ITradeTrustTokenRestorable.sol b/contracts/interfaces/ITradeTrustTokenRestorable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 interface ITradeTrustTokenRestorable {
   /**

diff --git a/contracts/interfaces/RegistryAccessErrors.sol b/contracts/interfaces/RegistryAccessErrors.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 interface RegistryAccessErrors {
   error InvalidAdminAddress();

diff --git a/contracts/interfaces/SigHelperErrors.sol b/contracts/interfaces/SigHelperErrors.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 interface SigHelperErrors {
   error SignatureAlreadyCancelled();

diff --git a/contracts/interfaces/TDocDeployerErrors.sol b/contracts/interfaces/TDocDeployerErrors.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 interface TDocDeployerErrors {
   error UnsupportedImplementationContractAddress();

diff --git a/contracts/interfaces/TitleEscrowErrors.sol b/contracts/interfaces/TitleEscrowErrors.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 interface TitleEscrowErrors {
   error CallerNotBeneficiary();

diff --git a/contracts/interfaces/TitleEscrowFactoryErrors.sol b/contracts/interfaces/TitleEscrowFactoryErrors.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 interface TitleEscrowFactoryErrors {
   error CreateCallerNotContract();

diff --git a/contracts/interfaces/TitleEscrowSignableErrors.sol b/contracts/interfaces/TitleEscrowSignableErrors.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 interface TitleEscrowSignableErrors {
   error SignatureExpired(uint256 currentTimestamp);

diff --git a/contracts/interfaces/TradeTrustTokenErrors.sol b/contracts/interfaces/TradeTrustTokenErrors.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 interface TradeTrustTokenErrors {
   error TokenNotReturnedToIssuer();

diff --git a/contracts/lib/TitleEscrowStructs.sol b/contracts/lib/TitleEscrowStructs.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 /**
   @dev BeneficiaryTransferEndorsement represents the endorsement details.

diff --git a/contracts/mocks/ERC721ReceiverMock.sol b/contracts/mocks/ERC721ReceiverMock.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { IERC721Receiver } from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 

diff --git a/contracts/mocks/SBTUpgradeableMock.sol b/contracts/mocks/SBTUpgradeableMock.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { SBTUpgradeable } from "../base/SBTUpgradeable.sol";
 

diff --git a/contracts/mocks/SigHelperMock.sol b/contracts/mocks/SigHelperMock.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { SigHelper } from "../utils/SigHelper.sol";
 

diff --git a/contracts/mocks/SimpleCaller.sol b/contracts/mocks/SimpleCaller.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 contract SimpleCaller {
   /**

diff --git a/contracts/mocks/TitleEscrowFactoryCallerMock.sol b/contracts/mocks/TitleEscrowFactoryCallerMock.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { ITitleEscrowFactory } from "../interfaces/ITitleEscrowFactory.sol";
 

diff --git a/contracts/mocks/TitleEscrowFactoryGetterMock.sol b/contracts/mocks/TitleEscrowFactoryGetterMock.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { ITitleEscrowFactory } from "../interfaces/ITitleEscrowFactory.sol";
 

diff --git a/contracts/mocks/TitleEscrowMock.sol b/contracts/mocks/TitleEscrowMock.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { TitleEscrow } from "../TitleEscrow.sol";
 

diff --git a/contracts/mocks/TradeTrustTokenMock.sol b/contracts/mocks/TradeTrustTokenMock.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { TradeTrustToken } from "../TradeTrustToken.sol";
 

diff --git a/contracts/presets/TitleEscrowSignable.sol b/contracts/presets/TitleEscrowSignable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { TitleEscrow } from "../TitleEscrow.sol";
 import { SigHelper } from "../utils/SigHelper.sol";

diff --git a/contracts/presets/TradeTrustTokenStandard.sol b/contracts/presets/TradeTrustTokenStandard.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { TradeTrustTokenBase, ITitleEscrowFactory } from "../base/TradeTrustTokenBase.sol";
 

diff --git a/contracts/utils/SigHelper.sol b/contracts/utils/SigHelper.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { ECDSA } from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import { SigHelperErrors } from "../interfaces/SigHelperErrors.sol";

diff --git a/contracts/utils/TDocDeployer.sol b/contracts/utils/TDocDeployer.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.20;
 
 import { Clones } from "@openzeppelin/contracts/proxy/Clones.sol";
 import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -1,5 +1,6 @@
 import "@nomicfoundation/hardhat-toolbox";
 import "@typechain/hardhat";
+import "hardhat-gas-reporter";
 import { randomBytes } from "crypto";
 import dotenv from "dotenv";
 import "hardhat-watcher";
@@ -40,7 +41,7 @@ if (IS_CI_ENV) {
 
 const config: HardhatUserConfig = {
   solidity: {
-    compilers: [{ version: "0.8.27" }],
+    compilers: [{ version: "0.8.22" }],
 
     settings: {
       optimizer: {
@@ -67,6 +68,7 @@ const config: HardhatUserConfig = {
   gasReporter: {
     coinmarketcap: COINMARKETCAP_API_KEY,
     currency: "USD",
+    enabled: true,
   },
   etherscan: {
     apiKey: {
@@ -78,6 +80,14 @@ const config: HardhatUserConfig = {
        * Polygon
        */
       polygon: POLYGONSCAN_API_KEY!,
+      /**
+       * polygon amoy
+       */
+      polygonAmoy: POLYGONSCAN_API_KEY!,
+      /**
+       * stability testnet
+       */
+      stabilitytestnet: STABILITY_API_KEY!,
     },
   },
   networks: {
@@ -128,7 +138,8 @@ const config: HardhatUserConfig = {
     },
     amoy: {
       ...networkConfig,
-      url: `https://polygon-amoy.infura.io/v3/${INFURA_APP_ID}`,
+      url: "https://rpc-amoy.polygon.technology",
+      // url: `https://polygon-amoy.infura.io/v3/${INFURA_APP_ID}`,
     },
     /**
      * Development