add polling timeout to account for longer block times

Author: jagdeep sidhu

README.md

@@ -14,6 +14,9 @@ Syscoin itself enforces the SPV proof by running Geth in light mode to sync up t
 
 In the project directory, you can run:
 
+### `npm install`
+Installs the dependencies. You should use node version 16.
+
 ### `npm start`
 
 Runs the app in the development mode.<br>
@@ -22,6 +25,7 @@ Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
 The page will reload if you make edits.<br>
 You will also see any lint errors in the console.
 
+set REACT_APP_USE_TESTNET=true in your env for testnet.
 ### `npm test`
 
 Launches the test runner in the interactive watch mode.<br>

package-lock.json

@@ -22,8 +22,8 @@
     "react-textarea-autosize": "^7.1.2",
     "react-validation-mixin": "^5.4.0",
     "satoshi-bitcoin": "^1.0.5",
-    "syscoinjs-lib": "^1.0.224",
-    "web3": "^1.5.2"
+    "syscoinjs-lib": "^1.0.228",
+    "web3": "^1.7.5"
   },
   "scripts": {
     "start": "react-scripts start",

package.json

@@ -1,23 +1,40 @@
-const sjs = require('syscoinjs-lib')
+const sjs = require('syscoinjs-lib');
+
 class CONFIGURATION {
-  constructor() {
-    this.Web3URL = "https://rpc.syscoin.org";
-    this.RelayContract = "0xd714E7915362FF89388025F584726E6dF26D20f9";
-    this.ERC20Manager = "0x7904299b3D3dC1b03d1DdEb45E9fDF3576aCBd5f";
-    this.TokenFreezeFunction = "0x0b8914e27c9a6c88836bc5547f82ccf331142c761f84e9f1d36934a6a31eefad";
-    this.NEVMExplorerURL = "https://explorer.syscoin.org/";
+  constructor(useTestnet = false) {
+    if (useTestnet) {
+      // 🧪 TESTNET SETTINGS
+      this.Web3URL = "wss://rpc.tanenbaum.io/wss";
+      this.NEVMExplorerURL = "https://explorer.tanenbaum.io/";
+      this.FaucetURL = "https://faucet.syscoin.org/";
+      this.BlockbookAPIURL = "https://sys-test.org/";
+      this.ChainId = "0x1644"; // 5700
+      this.NativeCurrencySymbol = "tSYS";
+      this.SysNetwork = sjs.utils.syscoinNetworks.testnet;
+    } else {
+      // ✅ MAINNET SETTINGS
+      this.Web3URL = "wss://rpc.syscoin.org/wss";
+      this.NEVMExplorerURL = "https://explorer.syscoin.org/";
+      this.FaucetURL = ""; // No faucet on mainnet
+      this.BlockbookAPIURL = "https://blockbook.syscoin.org/";
+      this.ChainId = "0x39"; // 57
+      this.NativeCurrencySymbol = "SYS";
+      this.SysNetwork = sjs.utils.syscoinNetworks.mainnet;
+    }
+
     this.NEVMAddressExplorerURL = this.NEVMExplorerURL + "address/";
-    this.SyscoinTxExplorerURL = "https://blockbook.syscoin.org/tx/";
     this.NEVMTxExplorerURL = this.NEVMExplorerURL + "tx/";
-    this.FaucetURL = "https://faucet.syscoin.org/";
-    this.BlockbookAPIURL = "https://blockbook.syscoin.org/";
-    this.ChainId = "0x39"; // 5700 testnet, 57 mainnet
+    this.SyscoinTxExplorerURL = this.BlockbookAPIURL + "tx/";
+    
+    // Shared
+    this.RelayContract = "0xd714E7915362FF89388025F584726E6dF26D20f9"; 
+    this.ERC20Manager = "0x7904299b3D3dC1b03d1DdEb45E9fDF3576aCBd5f"; 
+    this.TokenFreezeFunction = "0x0b8914e27c9a6c88836bc5547f82ccf331142c761f84e9f1d36934a6a31eefad";
+    this.SYSXAsset = "123456";
+    this.TokenUnfreezeFn = "0xb27598a6740f5e57c905fdf107266796e030a0739a6e06cee3b5b74c69d0545e";
     this.ChainName = "Syscoin NEVM";
     this.NativeCurrencyName = "Syscoin";
-    this.NativeCurrencySymbol = "SYS";
-    this.SYSXAsset = "123456";
-    this.TokenUnfreezeFn = '0x4f3215d035d7407ce0b19bc31b8e8e9269d0af49093fbf8ec1a11a2c58a73061';
-    this.SysNetwork = sjs.utils.syscoinNetworks.mainnet;
   }
 }
-export default new CONFIGURATION();
+
+export default new CONFIGURATION(process.env.REACT_APP_USE_TESTNET === 'true');

src/config.js

@@ -265,13 +265,16 @@ class Step1ES extends Component {
     fromAccount
   ) {
     let thisObj = this
+
     thisObj.state.receiptObj = null;
+
     syscoinERC20Manager.methods
       .freezeBurn(amount, sysxContract, tokenId, syscoinWitnessAddress)
       .send({
         from: fromAccount,
         gas: 400000,
         value: tokenId === 0 ? amount : undefined,
+        transactionPollingTimeout: 1800,
       })
       .once("transactionHash", function (hash) {
         validateNewInput.buttonVal = true;
@@ -545,7 +548,7 @@ class Step1ES extends Component {
 
       if (allowance.lt(amount)) {
         await contractBase.methods.approve(CONFIGURATION.ERC20Manager, amount.toString())
-          .send({ from: fromAccount, gas: 400000 })
+          .send({ from: fromAccount, gas: 400000, transactionPollingTimeout: 1800 })
           .once("transactionHash", (hash) => {
             validateNewInput.buttonVal = true;
             validateNewInput.receiptTxHash = hash;
@@ -576,7 +579,7 @@ class Step1ES extends Component {
         let approved = await contractBase.methods.isApprovedForAll(fromAccount, CONFIGURATION.ERC20Manager).call();
         if (!approved) {
           await contractBase.methods.setApprovalForAll(CONFIGURATION.ERC20Manager, true)
-            .send({ from: fromAccount, gas: 400000 })
+            .send({ from: fromAccount, gas: 400000, transactionPollingTimeout: 1800 })
             .once("transactionHash", (hash) => {
               validateNewInput.buttonValMsg = this.props.t("step3AuthAllowanceMetamask");
               this.setState(Object.assign(userInput, validateNewInput, this._validationErrors(validateNewInput)));
@@ -606,6 +609,7 @@ class Step1ES extends Component {
       syscoinERC20Manager,
       validateNewInput,
       amount.toString(),
+      userInput.sysxContract,
       tokenId,
       syscoinWitnessAddress,
       userInput,

src/wizard/Step1EthToSys.js

@@ -251,7 +251,7 @@ class Step3 extends Component {
         merkleProof.sibling,
         _syscoinBlockHeader
       )
-      .send({ from: accounts[0], gas: 400000 })
+      .send({ from: accounts[0], gas: 400000, transactionPollingTimeout: 1800})
       .once("transactionHash", function (hash) {
         thisObj.setState({
           receiptTxHash: hash,