Merge pull request #4 from Aku-mi/web3

Web3 integration
Akuqt · Sep 1, 2021 · cafe48d · cafe48d
2 parents 71f8e68 + 771e843
commit cafe48d
Show file tree

Hide file tree

Showing 20 changed files with 7,329 additions and 2,247 deletions.
diff --git a/cattleia-backend/.env.example b/cattleia-backend/.env.example
@@ -0,0 +1,9 @@
+PORT=
+JWT_ACCESS=
+JWT_REFRESH=
+MONGODB_URI=
+DAPP_TOKEN=
+INFURA_MAIN=
+INFURA_ROPSTEN=
+INFURA_RINKEBY=
+GANACHE=
diff --git a/cattleia-backend/package.json b/cattleia-backend/package.json
@@ -37,7 +37,7 @@
     "typescript": "^4.3.5"
   },
   "dependencies": {
-    "@openzeppelin/contracts": "^4.3.0",
+    "@openzeppelin/contracts": "2.5",
     "argon2": "^0.28.2",
     "cookie-parser": "^1.4.5",
     "cors": "^2.8.5",

diff --git a/cattleia-backend/src/abis/CattleiaToken.json b/cattleia-backend/src/abis/CattleiaToken.json
diff --git a/cattleia-backend/src/abis/Migrations.json b/cattleia-backend/src/abis/Migrations.json
diff --git a/cattleia-backend/src/contracts/CattleiaToken.sol b/cattleia-backend/src/contracts/CattleiaToken.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.6;
+pragma solidity ^0.5.0;
 
-import "@openzeppelin/contracts/token/ERC20/";
+// import "@openzeppelin/contracts/token/ERC20/";
 
 contract CattleiaToken {
     string public name;
@@ -19,7 +19,7 @@ contract CattleiaToken {
         uint256 _value
     );
 
-    constructor(string memory _name, string memory _symbol) {
+    constructor(string memory _name, string memory _symbol) public {
         name = _name;
         symbol = _symbol;
         decimals = 18;

diff --git a/cattleia-backend/src/contracts/Migrations.sol b/cattleia-backend/src/contracts/Migrations.sol
@@ -1,19 +1,19 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.4.22 <0.9.0;
+pragma solidity ^0.5.0;
 
 contract Migrations {
-  address public owner = msg.sender;
-  uint public last_completed_migration;
+    address public owner = msg.sender;
+    uint256 public last_completed_migration;
 
-  modifier restricted() {
-    require(
-      msg.sender == owner,
-      "This function is restricted to the contract's owner"
-    );
-    _;
-  }
+    modifier restricted() {
+        require(
+            msg.sender == owner,
+            "This function is restricted to the contract's owner"
+        );
+        _;
+    }
 
-  function setCompleted(uint completed) public restricted {
-    last_completed_migration = completed;
-  }
+    function setCompleted(uint256 completed) public restricted {
+        last_completed_migration = completed;
+    }
 }