factory class added

.gitignore

@@ -31,3 +31,4 @@ dist-ssr
 
 # misc
 .DS_Store
+build

client/package.json

@@ -1,15 +1,15 @@
 {
   "name": "client",
   "private": true,
-  "version": "0.0.0",
+  "version": "1.0.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
     "check": "svelte-check --tsconfig ./tsconfig.json"
   },
-  "devDependencies": {
+  "dependencies": {
     "@sveltejs/vite-plugin-svelte": "^1.1.0",
     "@tsconfig/svelte": "^3.0.0",
     "autoprefixer": "^10.4.13",
@@ -23,8 +23,5 @@
     "tslib": "^2.4.0",
     "typescript": "^4.6.4",
     "vite": "^3.2.3"
-  },
-  "dependencies": {
-    "web3": "^1.8.1"
   }
 }

client/src/lib/MetaMask.svelte

@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   let currentAddress = ''
   let ethereum = window.ethereum
   let refresh = false

truffle/contracts/WordGame.sol

@@ -1,45 +1,40 @@
 // SPDX-License-Identifier: GPL-3.0+
 pragma solidity ^0.8.0;
 
-//import '@openzeppelin/contracts/access/Ownable.sol';
 import './strings.sol';
 
 contract WordGame {
   using strings for *;
   address[] players;
   string word;
   bool hasStarted;
-  uint turn;
+  uint256 turn;
 
   constructor() {
     word = 'abdakdabra';
     hasStarted = false;
     turn = 0;
   }
-  function checkIfPlayer(address p) public view returns (bool sufficient)
-  {
-    for(uint i = 0;i<players.length;++i)
-    {
-      if(players[i]==p)return true;
+
+  function checkIfPlayer(address p) public view returns (bool sufficient) {
+    for (uint256 i = 0; i < players.length; ++i) {
+      if (players[i] == p) return true;
     }
     return false;
   }
-  function joinGame() public returns (bool sufficient)
-  {
-
-    if(checkIfPlayer(msg.sender))return true; //check is game already joined
-    if(hasStarted)return false; // check if game has already started
-
+
+  function joinGame() public returns (bool sufficient) {
+    if (checkIfPlayer(msg.sender)) return true; //check is game already joined
+    if (hasStarted) return false; // check if game has already started
+
     players.push(msg.sender);
     return true;
   }
 
-  function startGame() public returns (bool sufficient)
-  {
+  function startGame() public returns (bool sufficient) {
     //start game only if a player says
-    if(checkIfPlayer(msg.sender))
-    {
-      hasStarted=true;
+    if (checkIfPlayer(msg.sender)) {
+      hasStarted = true;
       return true;
     }
     return false;
@@ -50,23 +45,34 @@ contract WordGame {
   }
 
   function sendWord(string memory newWord) public returns (bool sufficient) {
-  if(players[turn]==msg.sender) // the player whose turn is now sent the word
-  {
-    strings.slice memory startNew = newWord.toSlice();
-    startNew._len = 1;
+    if (
+      players[turn] == msg.sender
+    ) // the player whose turn is now sent the word
+    {
+      strings.slice memory startNew = newWord.toSlice();
+      startNew._len = 1;
 
-    if (word.toSlice().endsWith(startNew)) // check if word sent is valid
-    { 
-      word = newWord;
-      turn = turn + 1;
-      turn = turn % players.length;
-      return true;
+      if (word.toSlice().endsWith(startNew)) // check if word sent is valid
+      {
+        word = newWord;
+        turn = turn + 1;
+        turn = turn % players.length;
+        return true;
+      }
     }
-  }
     return false;
   }
-  function getState() public view returns(address[] memory, string memory, bool, uint)
+
+  function getState()
+    public
+    view
+    returns (
+      address[] memory,
+      string memory,
+      bool,
+      uint256
+    )
   {
-    return (players,word,hasStarted,turn);
+    return (players, word, hasStarted, turn);
   }
 }

truffle/contracts/WordGameFactory.sol

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-3.0+
+pragma solidity ^0.8.0;
+
+import './WordGame.sol';
+
+contract WordGameFactory {
+  address[] public games;
+
+  constructor() {}
+
+  function newGame() public returns (address newGameAdd) {
+    WordGame game = new WordGame();
+    newGameAdd = address(game);
+    games.push(newGameAdd);
+  }
+}

truffle/contracts/strings.sol

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0+
 /*
  * @title String & slice utility library for Solidity contracts.
  * @author Nick Johnson <[email protected]>
@@ -45,10 +46,10 @@ library strings {
   function memcpy(
     uint256 dest,
     uint256 src,
-    uint256 len
+    uint256 _len
   ) private pure {
     // Copy word-length chunks while possible
-    for (; len >= 32; len -= 32) {
+    for (; _len >= 32; _len -= 32) {
       assembly {
         mstore(dest, mload(src))
       }
@@ -58,8 +59,8 @@ library strings {
 
     // Copy remaining bytes
     uint256 mask = type(uint256).max;
-    if (len > 0) {
-      mask = 256**(32 - len) - 1;
+    if (_len > 0) {
+      mask = 256**(32 - _len) - 1;
     }
     assembly {
       let srcpart := and(mload(src), not(mask))

truffle/migrations/deploy_contracts.js

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

truffle/test/wordgamefactory_test.js

@@ -0,0 +1,8 @@
+const WordGameFactory = artifacts.require('WordGameFactory')
+
+contract('WordGameFactory: deployment', () => {
+  it('has been deployed', async () => {
+    const fundraiserFactory = WordGameFactory.deployed()
+    assert(fundraiserFactory, 'fundraiser factory was not deployed')
+  })
+})

truffle/truffle-config.js

@@ -1,141 +1,14 @@
-/**
- * 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:
- *
- * https://trufflesuite.com/docs/truffle/reference/configuration
- *
- * Hands-off deployment with Infura
- * --------------------------------
- *
- * Do you have a complex application that requires lots of transactions to deploy?
- * Use this approach to make deployment a breeze 🏖️:
- *
- * Infura deployment needs a wallet provider (like @truffle/hdwallet-provider)
- * to sign transactions before they're sent to a remote public node.
- * Infura accounts are available for free at 🔍: https://infura.io/register
- *
- * You'll need a mnemonic - the twelve word phrase the wallet uses to generate
- * public/private key pairs. You can store your secrets 🤐 in a .env file.
- * In your project root, run `$ npm install dotenv`.
- * Create .env (which should be .gitignored) and declare your MNEMONIC
- * and Infura PROJECT_ID variables inside.
- * For example, your .env file will have the following structure:
- *
- * MNEMONIC = <Your 12 phrase mnemonic>
- * PROJECT_ID = <Your Infura project id>
- *
- * Deployment with Truffle Dashboard (Recommended for best security practice)
- * --------------------------------------------------------------------------
- *
- * Are you concerned about security and minimizing rekt status 🤔?
- * Use this method for best security:
- *
- * Truffle Dashboard lets you review transactions in detail, and leverages
- * MetaMask for signing, so there's no need to copy-paste your mnemonic.
- * More details can be found at 🔎:
- *
- * https://trufflesuite.com/docs/truffle/getting-started/using-the-truffle-dashboard/
- */
-
-// require('dotenv').config();
-// const { MNEMONIC, PROJECT_ID } = process.env;
-
-// const HDWalletProvider = require('@truffle/hdwallet-provider');
-
 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 managed Ganache instance 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, 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)
-     },
-    //
-    // An additional network, but with some 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 transactions from (default: accounts[0])
-    //   websocket: true         // Enable EventEmitter interface for web3 (default: false)
-    // },
-    //
-    // Useful for deploying to a public network.
-    // Note: It's important to wrap the provider as a function to ensure truffle uses a new provider every time.
-    // goerli: {
-    //   provider: () => new HDWalletProvider(MNEMONIC, `https://goerli.infura.io/v3/${PROJECT_ID}`),
-    //   network_id: 5,       // Goerli's id
-    //   confirmations: 2,    // # of confirmations 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
+    development: {
+      host: '127.0.0.1',
+      port: 7545,
+      network_id: '*'
+    }
   },
-
-  // Configure your compilers
   compilers: {
     solc: {
-      version: "0.8.17" // 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"
-      // }
+      version: '0.8.17'
     }
   }
-
-  // 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: "indexeddb",
-  //     settings: {
-  //       directory: ".db"
-  //     }
-  //   }
-  // }
-};
+}