Buy Ticket Works

.gitignore

@@ -0,0 +1,2 @@
+/node_modules
+/build

LotteryOneFunc.sol → contracts/Lotto.sol

@@ -44,12 +44,14 @@ contract Lotto is Pausable, AccessControl{
     }
 
     constructor(address _L){
-        priceFeed = AggregatorV3Interface(0xAB594600376Ec9fD91F8e885dADF0CE036862dE0);
+        priceFeed = AggregatorV3Interface(0xd0D5e3DB44DE05E9F294BB0a3bEEaF030DE24Ada);
         LottoTickets = IERC721(_L);
         startDay = 1642420800;
         lotteryPeriod = startDay + 5 days;
         claimperiod = lotteryPeriod + 2 days;
         _win = false;
+        _grantRole(DEFAULT_ADMIN_ROLE, msg.sender);
+        _grantRole(CEO, msg.sender);
     }
 
     // function fulfillRandomness(bytes32 requestId, uint256 randomness) internal override {
@@ -72,15 +74,15 @@ contract Lotto is Pausable, AccessControl{
         return (uint(1e14) / price) * 1e12; // a dollar in matic
     }
 
-    function getFiveDollar() public view returns(uint256){
-        uint price = getPrice();
-        return ((uint(1e14) / price) * 1e12)*5; // Five dollar in matic
-    }
+    // function getFiveDollar() public view returns(uint256){
+    //     uint price = getPrice();
+    //     return ((uint(1e14) / price) * 1e12)*5; // Five dollar in matic
+    // }
 
-    function getTenDollar() public view returns(uint256){
-        uint price = getPrice();
-        return ((uint(1e14) / price) * 1e12)*10; // Ten dollar in matic
-    }
+    // function getTenDollar() public view returns(uint256){
+    //     uint price = getPrice();
+    //     return ((uint(1e14) / price) * 1e12)*10; // Ten dollar in matic
+    // }
 
     function getPot() public view returns(uint256){
         return address(this).balance;
@@ -108,55 +110,36 @@ contract Lotto is Pausable, AccessControl{
         startLottery(claimperiod, 5);
     }
 
-    function BuyTicket() public payable{
-        if(msg.value == getDollar()){
-            require(msg.value >= getDollar(), "BTS: Price should be greater than a dollar");
-        require(block.timestamp < lotteryPeriod, "Lottery Period Ended: No More buying allowed");
-        Players[++Ticket] = msg.sender;
-        LottoTickets.safeMint(msg.sender, Ticket);
-        }
+    // Seperate the NFT Issuing part with the loop into a function
 
-        else if(msg.value == getFiveDollar()){
-            require(msg.value >= getFiveDollar(), "BTS: Price should be greater than 5 dollar");
-        require(block.timestamp < lotteryPeriod, "Lottery Period Ended: No More buying allowed");
-        uint j=1;
-        for(j;j<=5;j+=1){
-            Players[++Ticket] = msg.sender;
-        LottoTickets.safeMint(msg.sender, Ticket);
-        }
-        }
-
-        else if(msg.value == getTenDollar()){
-            require(msg.value >= getTenDollar(), "BTS: Price should be greater than 10 dollar");
+    function BuyTicket() public payable{
         require(block.timestamp < lotteryPeriod, "Lottery Period Ended: No More buying allowed");
-        uint j=1;
-        for(j;j<=10;j+=1){
-            Players[++Ticket] = msg.sender;
-        LottoTickets.safeMint(msg.sender, Ticket);
-        }
-        }
+        //---------
+        uint price = getPrice();
+        uint onedollar = (uint(1e14) / price) * 1e12; // a dollar in matic
+
+        require(msg.value >= onedollar, "BTS: Price should be greater than a dollar");
+
+        // if(msg.value >= (onedollar * 10)){
+        //     uint j=1;
+        //     while(j <= 10){
+        //         Players[++Ticket] = msg.sender;
+        //         LottoTickets.safeMint(msg.sender, Ticket);
+        //         j += 1;
+        //     }
+        // }else if(msg.value >= (onedollar * 5)){
+        //     uint j=1;
+        //     while(j <= 10){
+        //         Players[++Ticket] = msg.sender;
+        //         LottoTickets.safeMint(msg.sender, Ticket);
+        //         j += 1;
+        //     }
+        // }else{
+            //Players[++Ticket] = msg.sender;
+            LottoTickets.safeMint(msg.sender, Ticket);
+        //}
     }
 
-    // function BuyFiveTicket() public payable{
-    //     require(msg.value >= getFiveDollar(), "BTS: Price should be greater than a dollar");
-    //     require(block.timestamp < lotteryPeriod, "Lottery Period Ended: No More buying allowed");
-    //     uint j=1;
-    //     for(j;j<=5;j+=1){
-    //         Players[++Ticket] = msg.sender;
-    //     LottoTickets.safeMint(msg.sender, Ticket);
-    //     }
-    // }
-
-    // function BuyTenTicket() public payable{
-    //     require(msg.value >= getTenDollar(), "BTS: Price should be greater than a dollar");
-    //     require(block.timestamp < lotteryPeriod, "Lottery Period Ended: No More buying allowed");
-    //     uint j=1;
-    //     for(j;j<=10;j+=1){
-    //         Players[++Ticket] = msg.sender;
-    //     LottoTickets.safeMint(msg.sender, Ticket);
-    //     }
-    // }
-
     function AnnounceLotteryWinner() public validate{
         require(block.timestamp > lotteryPeriod, "Lottery Period Not Ended: No winners yet");
         require(_win == false, "Cannot Announce winner yet");

contracts/Migrations.sol

@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.4.22 <0.9.0;
+
+contract Migrations {
+  address public owner = msg.sender;
+  uint public last_completed_migration;
+
+  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;
+  }
+}

LotteryNFTTicket.sol → contracts/NftLottery.sol

@@ -6,7 +6,7 @@ import "@openzeppelin/contracts/security/Pausable.sol";
 import "@openzeppelin/contracts/access/AccessControl.sol";
 import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Burnable.sol";
 
-contract NFTLOTTERY is ERC721, Pausable, AccessControl, ERC721Burnable {
+contract NftLottery is ERC721, Pausable, AccessControl, ERC721Burnable {
     bytes32 public constant CEO = keccak256("CEO");
     bytes32 public constant CTO = keccak256("CTO");
     bytes32 public constant CFO = keccak256("CFO");

migrations/1_initial_migration.js

@@ -0,0 +1,5 @@
+const Migrations = artifacts.require("Migrations");
+
+module.exports = function (deployer) {
+  deployer.deploy(Migrations);
+};

migrations/2_deploy_contract.js

@@ -0,0 +1,8 @@
+const Lotto = artifacts.require('Lotto.sol');
+const NftLottery = artifacts.require('NftLottery.sol');
+
+module.exports = function(deployer){
+    deployer.deploy(NftLottery).then(() => {
+        return deployer.deploy(Lotto, NftLottery.address);
+    });
+};

package.json

@@ -0,0 +1,26 @@
+{
+  "name": "maticlottery",
+  "version": "1.0.0",
+  "description": "",
+  "main": "truffle-config.js",
+  "directories": {
+    "test": "test"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/pranavms13/maticLottery.git"
+  },
+  "author": "Pranav M S",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/pranavms13/maticLottery/issues"
+  },
+  "homepage": "https://github.com/pranavms13/maticLottery#readme",
+  "dependencies": {
+    "@chainlink/contracts": "^0.4.0",
+    "@openzeppelin/contracts": "^4.5.0"
+  }
+}

truffle-config.js

@@ -0,0 +1,116 @@
+/**
+ * Use this file to configure your truffle project. It's seeded with some
+ * common settings for different networks and features like migrations,
+ * compilation and testing. Uncomment the ones you need or modify
+ * them to suit your project as necessary.
+ *
+ * More information about configuration can be found at:
+ *
+ * trufflesuite.com/docs/advanced/configuration
+ *
+ * To deploy via Infura you'll need a wallet provider (like @truffle/hdwallet-provider)
+ * to sign your transactions before they're sent to a remote public node. Infura accounts
+ * are available for free at: infura.io/register.
+ *
+ * You'll also need a mnemonic - the twelve word phrase the wallet uses to generate
+ * public/private key pairs. If you're publishing your code to GitHub make sure you load this
+ * phrase from a file you've .gitignored so it doesn't accidentally become public.
+ *
+ */
+
+// const HDWalletProvider = require('@truffle/hdwallet-provider');
+//
+// const fs = require('fs');
+// const mnemonic = fs.readFileSync(".secret").toString().trim();
+
+module.exports = {
+  /**
+   * Networks define how you connect to your ethereum client and let you set the
+   * defaults web3 uses to send transactions. If you don't specify one truffle
+   * will spin up a development blockchain for you on port 9545 when you
+   * run `develop` or `test`. You can ask a truffle command to use a specific
+   * network from the command line, e.g
+   *
+   * $ truffle test --network <network-name>
+   */
+
+  networks: {
+    // Useful for testing. The `development` name is special - truffle uses it by default
+    // if it's defined here and no other network is specified at the command line.
+    // You should run a client (like ganache-cli, geth or parity) in a separate terminal
+    // tab if you use this network and you must also set the `host`, `port` and `network_id`
+    // options below to some value.
+    //
+    development: {
+     host: "127.0.0.1",     // Localhost (default: none)
+     port: 7545,            // Standard Ethereum port (default: none)
+     network_id: "*",       // Any network (default: none)
+    },
+    // Another network with more advanced options...
+    // advanced: {
+    // port: 8777,             // Custom port
+    // network_id: 1342,       // Custom network
+    // gas: 8500000,           // Gas sent with each transaction (default: ~6700000)
+    // gasPrice: 20000000000,  // 20 gwei (in wei) (default: 100 gwei)
+    // from: <address>,        // Account to send txs from (default: accounts[0])
+    // websocket: true        // Enable EventEmitter interface for web3 (default: false)
+    // },
+    // Useful for deploying to a public network.
+    // NB: It's important to wrap the provider as a function.
+    // ropsten: {
+    // provider: () => new HDWalletProvider(mnemonic, `https://ropsten.infura.io/v3/YOUR-PROJECT-ID`),
+    // network_id: 3,       // Ropsten's id
+    // gas: 5500000,        // Ropsten has a lower block limit than mainnet
+    // confirmations: 2,    // # of confs to wait between deployments. (default: 0)
+    // timeoutBlocks: 200,  // # of blocks before a deployment times out  (minimum/default: 50)
+    // skipDryRun: true     // Skip dry run before migrations? (default: false for public nets )
+    // },
+    // Useful for private networks
+    // private: {
+    // provider: () => new HDWalletProvider(mnemonic, `https://network.io`),
+    // network_id: 2111,   // This network is yours, in the cloud.
+    // production: true    // Treats this network as if it was a public net. (default: false)
+    // }
+  },
+
+  // Set default mocha options here, use special reporters etc.
+  mocha: {
+    // timeout: 100000
+  },
+
+  // Configure your compilers
+  compilers: {
+    solc: {
+      version: "0.8.11",    // Fetch exact version from solc-bin (default: truffle's version)
+      // docker: true,        // Use "0.5.1" you've installed locally with docker (default: false)
+      settings: {          // See the solidity docs for advice about optimization and evmVersion
+       optimizer: {
+         enabled: false,
+         runs: 200
+       },
+      //  evmVersion: "byzantium"
+      }
+    }
+  },
+
+  // Truffle DB is currently disabled by default; to enable it, change enabled:
+  // false to enabled: true. The default storage location can also be
+  // overridden by specifying the adapter settings, as shown in the commented code below.
+  //
+  // NOTE: It is not possible to migrate your contracts to truffle DB and you should
+  // make a backup of your artifacts to a safe location before enabling this feature.
+  //
+  // After you backed up your artifacts you can utilize db by running migrate as follows: 
+  // $ truffle migrate --reset --compile-all
+  //
+  // db: {
+    // enabled: false,
+    // host: "127.0.0.1",
+    // adapter: {
+    //   name: "sqlite",
+    //   settings: {
+    //     directory: ".db"
+    //   }
+    // }
+  // }
+};