fix smart contract error checking

scrtlabs · Jun 15, 2024 · ae61c83 · ae61c83
1 parent 7981699
commit ae61c83
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/query/compute.ts b/src/query/compute.ts
@@ -209,11 +209,17 @@ export class ComputeQuerier {
       return JSON.parse(fromUtf8(fromBase64(fromUtf8(decryptedBase64Result))));
     } catch (err) {
       try {
-        const errorMessageRgx =
+        const errorMessageRgx1 =
           /encrypted: (.+?): (?:instantiate|execute|query|reply to|migrate) contract failed/g;
-        const rgxMatches = errorMessageRgx.exec(err.message);
+        const errorMessageRgx2 =
+          /(?:instantiate|execute|query|reply to|migrate) contract failed: encrypted: ([\w+\/=]+)/g;
+
+        let rgxMatches = errorMessageRgx1.exec(err.message);
         if (rgxMatches == null || rgxMatches?.length != 2) {
-          throw err;
+          rgxMatches = errorMessageRgx2.exec(err.message);
+          if (rgxMatches == null || rgxMatches?.length != 2) {
+            throw err;
+          }
         }
 
         const encryptedError = fromBase64(rgxMatches[1]);

diff --git a/test/utils.ts b/test/utils.ts
@@ -32,10 +32,10 @@ export type Account = {
 
 export const accounts: Account[] = [];
 
-export const chain1LCD = "http://localhost:1317";
+export const chain1LCD = "http://20.84.98.207:1316";
 export const chain2LCD = "http://localhost:2317";
 
-export const chain1RPC = "http://localhost:26657";
+export const chain1RPC = "http://20.84.98.207:26657";
 export const chain2RPC = "http://localhost:36657";
 
 // Initialize genesis accounts
@@ -405,9 +405,9 @@ export async function waitForChainToStart({
         break;
       }
     } catch (e) {
-      // console.error(e);
+      console.warn("Chain is not ready:" + e.message);
     }
-    await sleep(250);
+    await sleep(1000);
   }
 }