Fix e2e (#2379)

cypress/support/commands.js

@@ -20,6 +20,8 @@ export const TEST_ADDRESS_NEVER_USE_SHORTENED = `${TEST_ADDRESS_NEVER_USE.substr
   6
 )}...${TEST_ADDRESS_NEVER_USE.substr(-4, 4)}`
 
+// Redefined bridge to fix a supper annoying issue making some contract calls to fail
+//  See https://github.com/ethers-io/ethers.js/issues/1683
 class CustomizedBridge extends Eip1193Bridge {
   chainId = 4
 
@@ -41,6 +43,7 @@ class CustomizedBridge extends Eip1193Bridge {
       method = args[0]
       params = args[1]
     }
+    // Mock out request accounts and chainId
     if (method === 'eth_requestAccounts' || method === 'eth_accounts') {
       if (isCallbackForm) {
         callback({ result: [TEST_ADDRESS_NEVER_USE] })
@@ -56,14 +59,41 @@ class CustomizedBridge extends Eip1193Bridge {
       }
     }
     try {
-      const result = await super.send(method, params)
+      // If from is present on eth_call it errors, removing it makes the library set
+      // from as the connected wallet which works fine
+      if (params && params.length && params[0].from && method === 'eth_call') delete params[0].from
+      let result
+      // For sending a transaction if we call send it will error
+      // as it wants gasLimit in sendTransaction but hexlify sets the property gas
+      // to gasLimit which makes sensd transaction error.
+      // This have taken the code from the super method for sendTransaction and altered
+      // it slightly to make it work with the gas limit issues.
+      if (params && params.length && params[0].from && method === 'eth_sendTransaction') {
+        // Hexlify will not take gas, must be gasLimit, set this property to be gasLimit
+        params[0].gasLimit = params[0].gas
+        delete params[0].gas
+        // If from is present on eth_sendTransaction it errors, removing it makes the library set
+        // from as the connected wallet which works fine
+        delete params[0].from
+        const req = ethers.providers.JsonRpcProvider.hexlifyTransaction(params[0])
+        // Hexlify sets the gasLimit property to be gas again and send transaction requires gasLimit
+        req.gasLimit = req.gas
+        delete req.gas
+        // Send the transaction
+        const tx = await this.signer.sendTransaction(req)
+        result = tx.hash
+      } else {
+        // All other transactions the base class works for
+        result = await super.send(method, params)
+      }
       console.debug('result received', method, params, result)
       if (isCallbackForm) {
         callback(null, { result })
       } else {
         return result
       }
     } catch (error) {
+      console.log(error)
       if (isCallbackForm) {
         callback(error, null)
       } else {