@alephium/web3 2.0.0-rc.3 → 2.0.0

package/dist/src/api/api-alephium.d.ts

@@ -131,6 +131,7 @@ export interface BlockEntry {
     /** @format hex-string */
     target: string;
     ghostUncles: GhostUncleBlockEntry[];
+    conflictedTxs?: string[];
 }
 /** BlockHeaderEntry */
 export interface BlockHeaderEntry {
@@ -612,6 +613,20 @@ export interface Confirmed {
     toGroupConfirmations: number;
     type: string;
 }
+/** Conflicted */
+export interface Conflicted {
+    /** @format block-hash */
+    blockHash: string;
+    /** @format int32 */
+    txIndex: number;
+    /** @format int32 */
+    chainConfirmations: number;
+    /** @format int32 */
+    fromGroupConfirmations: number;
+    /** @format int32 */
+    toGroupConfirmations: number;
+    type: string;
+}
 /** Constant */
 export interface Constant {
     name: string;
@@ -992,6 +1007,7 @@ export interface RichBlockEntry {
     /** @format hex-string */
     target: string;
     ghostUncles: GhostUncleBlockEntry[];
+    conflictedTxs?: string[];
 }
 /** RichBlocksAndEventsPerTimeStampRange */
 export interface RichBlocksAndEventsPerTimeStampRange {
@@ -1241,7 +1257,7 @@ export interface TxNotFound {
     type: string;
 }
 /** TxStatus */
-export type TxStatus = Confirmed | MemPooled | TxNotFound;
+export type TxStatus = Confirmed | Conflicted | MemPooled | TxNotFound;
 /** UTXO */
 export interface UTXO {
     ref: OutputRef;
@@ -1427,7 +1443,7 @@ export declare class HttpClient<SecurityDataType = unknown> {
 }
 /**
  * @title Alephium API
- * @version 4.0.0
+ * @version 4.2.0
  * @baseUrl ../
  */
 export declare class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {
@@ -2046,7 +2062,7 @@ export declare class Api<SecurityDataType extends unknown> extends HttpClient<Se
             fromGroup?: number;
             /** @format int32 */
             toGroup?: number;
-        }, params?: RequestParams) => Promise<Confirmed | MemPooled | TxNotFound>;
+        }, params?: RequestParams) => Promise<Confirmed | Conflicted | MemPooled | TxNotFound>;
         /**
          * No description
          *

package/dist/src/api/api-alephium.js

@@ -151,7 +151,7 @@ class HttpClient {
 exports.HttpClient = HttpClient;
 /**
  * @title Alephium API
- * @version 4.0.0
+ * @version 4.2.0
  * @baseUrl ../
  */
 class Api extends HttpClient {

package/dist/src/utils/sign.js

@@ -59,7 +59,7 @@ necc.utils.hmacSha256Sync = (key, ...messages) => {
 };
 function checkKeyType(keyType) {
     if (keyType !== 'default' && keyType !== 'bip340-schnorr' && keyType !== 'gl-secp256k1') {
-        throw new Error(`Invalid key type ${keyType}`);
+        throw new Error(`Invalid key type ${keyType}, only supports secp256k1 and schnorr for now`);
     }
 }
 // hash has to be 32 bytes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/web3",
-  "version": "2.0.0-rc.3",
+  "version": "2.0.0",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "main": "dist/src/index.js",
@@ -33,7 +33,7 @@
   },
   "author": "Alephium dev <dev@alephium.org>",
   "config": {
-    "alephium_version": "4.0.0",
+    "alephium_version": "4.2.0",
     "explorer_backend_version": "2.3.2"
   },
   "type": "commonjs",

package/src/api/api-alephium.ts

@@ -155,6 +155,7 @@ export interface BlockEntry {
   /** @format hex-string */
   target: string
   ghostUncles: GhostUncleBlockEntry[]
+  conflictedTxs?: string[]
 }
 
 /** BlockHeaderEntry */
@@ -686,6 +687,21 @@ export interface Confirmed {
   type: string
 }
 
+/** Conflicted */
+export interface Conflicted {
+  /** @format block-hash */
+  blockHash: string
+  /** @format int32 */
+  txIndex: number
+  /** @format int32 */
+  chainConfirmations: number
+  /** @format int32 */
+  fromGroupConfirmations: number
+  /** @format int32 */
+  toGroupConfirmations: number
+  type: string
+}
+
 /** Constant */
 export interface Constant {
   name: string
@@ -1121,6 +1137,7 @@ export interface RichBlockEntry {
   /** @format hex-string */
   target: string
   ghostUncles: GhostUncleBlockEntry[]
+  conflictedTxs?: string[]
 }
 
 /** RichBlocksAndEventsPerTimeStampRange */
@@ -1400,7 +1417,7 @@ export interface TxNotFound {
 }
 
 /** TxStatus */
-export type TxStatus = Confirmed | MemPooled | TxNotFound
+export type TxStatus = Confirmed | Conflicted | MemPooled | TxNotFound
 
 /** UTXO */
 export interface UTXO {
@@ -1760,7 +1777,7 @@ export class HttpClient<SecurityDataType = unknown> {
 
 /**
  * @title Alephium API
- * @version 4.0.0
+ * @version 4.2.0
  * @baseUrl ../
  */
 export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {

package/src/utils/sign.ts

@@ -38,7 +38,7 @@ necc.utils.hmacSha256Sync = (key: Uint8Array, ...messages: Uint8Array[]): Uint8A
 
 function checkKeyType(keyType: KeyType) {
   if (keyType !== 'default' && keyType !== 'bip340-schnorr' && keyType !== 'gl-secp256k1') {
-    throw new Error(`Invalid key type ${keyType}`)
+    throw new Error(`Invalid key type ${keyType}, only supports secp256k1 and schnorr for now`)
   }
 }