@alephium/web3 0.41.0 → 0.42.0

package/src/transaction/index.ts

@@ -18,3 +18,4 @@ along with the library. If not, see <http://www.gnu.org/licenses/>.
 
 export * from './status'
 export * from './sign-verify'
+export * from './utils'

package/src/transaction/utils.ts

@@ -0,0 +1,38 @@
+/*
+Copyright 2018 - 2022 The Alephium Authors
+This file is part of the alephium project.
+
+The library is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+The library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with the library. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import { node } from '../api'
+import { getCurrentNodeProvider } from '../global'
+
+function isConfirmed(txStatus: node.TxStatus): txStatus is node.Confirmed {
+  return txStatus.type === 'Confirmed'
+}
+
+export async function waitForTxConfirmation(
+  txId: string,
+  confirmations: number,
+  requestInterval: number
+): Promise<node.Confirmed> {
+  const provider = getCurrentNodeProvider()
+  const status = await provider.transactions.getTransactionsStatus({ txId: txId })
+  if (isConfirmed(status) && status.chainConfirmations >= confirmations) {
+    return status
+  }
+  await new Promise((r) => setTimeout(r, requestInterval))
+  return waitForTxConfirmation(txId, confirmations, requestInterval)
+}

package/webpack.config.js

@@ -41,7 +41,6 @@ module.exports = {
       fs: false,
       stream: require.resolve('stream-browserify'),
       crypto: require.resolve('crypto-browserify'),
-      path: require.resolve('path-browserify'),
       buffer: require.resolve('buffer/')
     }
   },

package/dist/src/utils/error.d.ts

@@ -1,15 +0,0 @@
-declare class CompilationError {
-    lineStart: number;
-    column: number;
-    errorType: string;
-    line: number;
-    codeLine: string;
-    errorIndicator: string;
-    message: string;
-    additionalLine1?: string | undefined;
-    additionalLine2?: string | undefined;
-    constructor(lineStart: number, column: number, errorType: string, line: number, codeLine: string, errorIndicator: string, message: string, additionalLine1?: string | undefined, additionalLine2?: string | undefined);
-    reformat(line: number, file: string): string;
-}
-export declare function parseError(error: string): CompilationError | undefined;
-export {};

package/dist/src/utils/error.js

@@ -1,66 +0,0 @@
-"use strict";
-/*
-Copyright 2018 - 2022 The Alephium Authors
-This file is part of the alephium project.
-
-The library is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-The library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with the library. If not, see <http://www.gnu.org/licenses/>.
-*/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseError = void 0;
-class CompilationError {
-    constructor(lineStart, column, errorType, line, codeLine, errorIndicator, message, additionalLine1, additionalLine2) {
-        this.lineStart = lineStart;
-        this.column = column;
-        this.errorType = errorType;
-        this.line = line;
-        this.codeLine = codeLine;
-        this.errorIndicator = errorIndicator;
-        this.message = message;
-        this.additionalLine1 = additionalLine1;
-        this.additionalLine2 = additionalLine2;
-    }
-    reformat(line, file) {
-        const spaces = `${line}`.replace(/\d/g, ' ');
-        const newError = `${file} (${line}:${this.column}): ${this.errorType}
-${line} |${this.codeLine}
-${spaces} |${this.errorIndicator}
-${spaces} |${this.message}`;
-        if (this.additionalLine1 && this.additionalLine2) {
-            return `${newError}\n${spaces} |${this.additionalLine1}\n${spaces} |${this.additionalLine2}`;
-        }
-        else {
-            return newError;
-        }
-    }
-}
-const errorRegex = /error \((\d+):(\d+)\):\s*(.*)\n\s*(\d+)\s*\|(.*)\n.*\|(.*)\n\s*\|(.*)(?:\n\s*\|(.*)\n\s*\|(.*))?/;
-function parseError(error) {
-    const match = error.match(errorRegex);
-    if (match) {
-        const lineStart = parseInt(match[1]);
-        const column = parseInt(match[2]);
-        const errorType = match[3];
-        const line = parseInt(match[4]);
-        const codeLine = match[5];
-        const errorIndicator = match[6];
-        const message = match[7];
-        const additionalLine1 = match[8];
-        const additionalLine2 = match[9];
-        return new CompilationError(lineStart, column, errorType, line, codeLine, errorIndicator, message, additionalLine1, additionalLine2);
-    }
-    else {
-        undefined;
-    }
-}
-exports.parseError = parseError;

package/src/utils/error.ts

@@ -1,77 +0,0 @@
-/*
-Copyright 2018 - 2022 The Alephium Authors
-This file is part of the alephium project.
-
-The library is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-The library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with the library. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-class CompilationError {
-  constructor(
-    public lineStart: number,
-    public column: number,
-    public errorType: string,
-    public line: number,
-    public codeLine: string,
-    public errorIndicator: string,
-    public message: string,
-    public additionalLine1?: string,
-    public additionalLine2?: string
-  ) {}
-
-  reformat(line: number, file: string): string {
-    const spaces = `${line}`.replace(/\d/g, ' ')
-    const newError = `${file} (${line}:${this.column}): ${this.errorType}
-${line} |${this.codeLine}
-${spaces} |${this.errorIndicator}
-${spaces} |${this.message}`
-
-    if (this.additionalLine1 && this.additionalLine2) {
-      return `${newError}\n${spaces} |${this.additionalLine1}\n${spaces} |${this.additionalLine2}`
-    } else {
-      return newError
-    }
-  }
-}
-
-const errorRegex = /error \((\d+):(\d+)\):\s*(.*)\n\s*(\d+)\s*\|(.*)\n.*\|(.*)\n\s*\|(.*)(?:\n\s*\|(.*)\n\s*\|(.*))?/
-
-export function parseError(error: string): CompilationError | undefined {
-  const match = error.match(errorRegex)
-
-  if (match) {
-    const lineStart = parseInt(match[1])
-    const column = parseInt(match[2])
-    const errorType = match[3]
-    const line = parseInt(match[4])
-    const codeLine = match[5]
-    const errorIndicator = match[6]
-    const message = match[7]
-    const additionalLine1 = match[8]
-    const additionalLine2 = match[9]
-
-    return new CompilationError(
-      lineStart,
-      column,
-      errorType,
-      line,
-      codeLine,
-      errorIndicator,
-      message,
-      additionalLine1,
-      additionalLine2
-    )
-  } else {
-    undefined
-  }
-}