@alephium/web3 0.30.1 → 0.31.0

package/dist/src/utils/error.js

@@ -0,0 +1,66 @@
+"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/dist/src/utils/utils.d.ts

@@ -1,6 +1,5 @@
 import { ec as EC, SignatureInput } from 'elliptic';
 import BN from 'bn.js';
-import { KeyType } from '../signer';
 import { HexString } from '../contract';
 export declare const networkIds: readonly ["mainnet", "testnet", "devnet"];
 export type NetworkId = (typeof networkIds)[number];
@@ -10,28 +9,10 @@ export declare function encodeSignature(signature: EC.Signature | {
 }): string;
 export declare function encodeHexSignature(rHex: string, sHex: string): string;
 export declare function signatureDecode(ec: EC, signature: string): SignatureInput;
-export declare function xorByte(intValue: number): number;
 export declare function isHexString(input: string): boolean;
 export declare function toNonNegativeBigInt(input: string): bigint | undefined;
-export declare enum AddressType {
-    P2PKH = 0,
-    P2MPKH = 1,
-    P2SH = 2,
-    P2C = 3
-}
-export declare function groupOfAddress(address: string): number;
-export declare function contractIdFromAddress(address: string): Uint8Array;
-export declare function tokenIdFromAddress(address: string): Uint8Array;
 export declare function hexToBinUnsafe(hex: string): Uint8Array;
 export declare function binToHex(bin: Uint8Array): string;
-export declare function groupOfPrivateKey(privateKey: string, keyType?: KeyType): number;
-export declare function publicKeyFromPrivateKey(privateKey: string, _keyType?: KeyType): string;
-export declare function addressFromPublicKey(publicKey: string, _keyType?: KeyType): string;
-export declare function addressFromScript(script: Uint8Array): string;
-export declare function addressFromContractId(contractId: string): string;
-export declare function addressFromTokenId(tokenId: string): string;
-export declare function contractIdFromTx(txId: string, outputIndex: number): string;
-export declare function subContractId(parentContractId: string, pathInHex: string, group: number): string;
 export declare function blockChainIndex(blockHash: HexString): {
     fromGroup: number;
     toGroup: number;

package/dist/src/utils/utils.js

@@ -20,14 +20,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertType = exports.isDevnet = exports.sleep = exports.hexToString = exports.stringToHex = exports.blockChainIndex = exports.subContractId = exports.contractIdFromTx = exports.addressFromTokenId = exports.addressFromContractId = exports.addressFromScript = exports.addressFromPublicKey = exports.publicKeyFromPrivateKey = exports.groupOfPrivateKey = exports.binToHex = exports.hexToBinUnsafe = exports.tokenIdFromAddress = exports.contractIdFromAddress = exports.groupOfAddress = exports.AddressType = exports.toNonNegativeBigInt = exports.isHexString = exports.xorByte = exports.signatureDecode = exports.encodeHexSignature = exports.encodeSignature = exports.networkIds = void 0;
+exports.assertType = exports.isDevnet = exports.sleep = exports.hexToString = exports.stringToHex = exports.blockChainIndex = exports.binToHex = exports.hexToBinUnsafe = exports.toNonNegativeBigInt = exports.isHexString = exports.signatureDecode = exports.encodeHexSignature = exports.encodeSignature = exports.networkIds = void 0;
 const elliptic_1 = require("elliptic");
 const bn_js_1 = __importDefault(require("bn.js"));
-const blakejs_1 = __importDefault(require("blakejs"));
-const bs58_1 = __importDefault(require("./bs58"));
 const buffer_1 = require("buffer/");
 const constants_1 = require("../constants");
-const djb2_1 = __importDefault(require("./djb2"));
 exports.networkIds = ['mainnet', 'testnet', 'devnet'];
 const ec = new elliptic_1.ec('secp256k1');
 function encodeSignature(signature) {
@@ -60,14 +57,6 @@ function signatureDecode(ec, signature) {
     }
 }
 exports.signatureDecode = signatureDecode;
-function xorByte(intValue) {
-    const byte0 = (intValue >> 24) & 0xff;
-    const byte1 = (intValue >> 16) & 0xff;
-    const byte2 = (intValue >> 8) & 0xff;
-    const byte3 = intValue & 0xff;
-    return (byte0 ^ byte1 ^ byte2 ^ byte3) & 0xff;
-}
-exports.xorByte = xorByte;
 function isHexString(input) {
     return input.length % 2 === 0 && /^[0-9a-fA-F]*$/.test(input);
 }
@@ -82,80 +71,6 @@ function toNonNegativeBigInt(input) {
     }
 }
 exports.toNonNegativeBigInt = toNonNegativeBigInt;
-var AddressType;
-(function (AddressType) {
-    AddressType[AddressType["P2PKH"] = 0] = "P2PKH";
-    AddressType[AddressType["P2MPKH"] = 1] = "P2MPKH";
-    AddressType[AddressType["P2SH"] = 2] = "P2SH";
-    AddressType[AddressType["P2C"] = 3] = "P2C";
-})(AddressType = exports.AddressType || (exports.AddressType = {}));
-function groupOfAddress(address) {
-    const decoded = bs58_1.default.decode(address);
-    if (decoded.length == 0)
-        throw new Error('Address string is empty');
-    const addressType = decoded[0];
-    const addressBody = decoded.slice(1);
-    if (addressType == AddressType.P2PKH) {
-        return groupOfP2pkhAddress(addressBody);
-    }
-    else if (addressType == AddressType.P2MPKH) {
-        return groupOfP2mpkhAddress(addressBody);
-    }
-    else if (addressType == AddressType.P2SH) {
-        return groupOfP2shAddress(addressBody);
-    }
-    else {
-        // Contract Address
-        const id = contractIdFromAddress(address);
-        return id[`${id.length - 1}`];
-    }
-}
-exports.groupOfAddress = groupOfAddress;
-function groupOfAddressBytes(bytes) {
-    const hint = (0, djb2_1.default)(bytes) | 1;
-    const hash = xorByte(hint);
-    const group = hash % constants_1.TOTAL_NUMBER_OF_GROUPS;
-    return group;
-}
-// Pay to public key hash address
-function groupOfP2pkhAddress(address) {
-    if (address.length != 32) {
-        throw new Error(`Invalid p2pkh address length: ${address.length}`);
-    }
-    return groupOfAddressBytes(address);
-}
-// Pay to multiple public key hash address
-function groupOfP2mpkhAddress(address) {
-    if ((address.length - 2) % 32 != 0) {
-        throw new Error(`Invalid p2mpkh address length: ${address.length}`);
-    }
-    return groupOfAddressBytes(address.slice(1, 33));
-}
-// Pay to script hash address
-function groupOfP2shAddress(address) {
-    return groupOfAddressBytes(address);
-}
-function contractIdFromAddress(address) {
-    return idFromAddress(address);
-}
-exports.contractIdFromAddress = contractIdFromAddress;
-function tokenIdFromAddress(address) {
-    return idFromAddress(address);
-}
-exports.tokenIdFromAddress = tokenIdFromAddress;
-function idFromAddress(address) {
-    const decoded = bs58_1.default.decode(address);
-    if (decoded.length == 0)
-        throw new Error('Address string is empty');
-    const addressType = decoded[0];
-    const addressBody = decoded.slice(1);
-    if (addressType == AddressType.P2C) {
-        return addressBody;
-    }
-    else {
-        throw new Error(`Invalid contract address type: ${addressType}`);
-    }
-}
 function hexToBinUnsafe(hex) {
     return buffer_1.Buffer.from(hex, 'hex');
 }
@@ -164,72 +79,6 @@ function binToHex(bin) {
     return buffer_1.Buffer.from(bin).toString('hex');
 }
 exports.binToHex = binToHex;
-function groupOfPrivateKey(privateKey, keyType) {
-    return groupOfAddress(addressFromPublicKey(publicKeyFromPrivateKey(privateKey, keyType), keyType));
-}
-exports.groupOfPrivateKey = groupOfPrivateKey;
-function publicKeyFromPrivateKey(privateKey, _keyType) {
-    const keyType = _keyType ?? 'default';
-    if (keyType === 'default') {
-        const key = ec.keyFromPrivate(privateKey);
-        return key.getPublic(true, 'hex');
-    }
-    else {
-        return ec.g.mul(new bn_js_1.default(privateKey, 16)).encode('hex', true).slice(2);
-    }
-}
-exports.publicKeyFromPrivateKey = publicKeyFromPrivateKey;
-function addressFromPublicKey(publicKey, _keyType) {
-    const keyType = _keyType ?? 'default';
-    if (keyType === 'default') {
-        const addressType = buffer_1.Buffer.from([AddressType.P2PKH]);
-        const hash = buffer_1.Buffer.from(blakejs_1.default.blake2b(buffer_1.Buffer.from(publicKey, 'hex'), undefined, 32));
-        const bytes = buffer_1.Buffer.concat([addressType, hash]);
-        return bs58_1.default.encode(bytes);
-    }
-    else {
-        const lockupScript = buffer_1.Buffer.from(`0101000000000458144020${publicKey}8685`, 'hex');
-        return addressFromScript(lockupScript);
-    }
-}
-exports.addressFromPublicKey = addressFromPublicKey;
-function addressFromScript(script) {
-    const scriptHash = blakejs_1.default.blake2b(script, undefined, 32);
-    const addressType = buffer_1.Buffer.from([AddressType.P2SH]);
-    return bs58_1.default.encode(buffer_1.Buffer.concat([addressType, scriptHash]));
-}
-exports.addressFromScript = addressFromScript;
-function addressFromContractId(contractId) {
-    const addressType = buffer_1.Buffer.from([AddressType.P2C]);
-    const hash = buffer_1.Buffer.from(hexToBinUnsafe(contractId));
-    const bytes = buffer_1.Buffer.concat([addressType, hash]);
-    return bs58_1.default.encode(bytes);
-}
-exports.addressFromContractId = addressFromContractId;
-function addressFromTokenId(tokenId) {
-    const contractId = tokenId; // contract ID is the same as token ID
-    return addressFromContractId(contractId);
-}
-exports.addressFromTokenId = addressFromTokenId;
-function contractIdFromTx(txId, outputIndex) {
-    const txIdBin = hexToBinUnsafe(txId);
-    const data = buffer_1.Buffer.concat([txIdBin, buffer_1.Buffer.from([outputIndex])]);
-    const hash = blakejs_1.default.blake2b(data, undefined, 32);
-    return binToHex(hash);
-}
-exports.contractIdFromTx = contractIdFromTx;
-function subContractId(parentContractId, pathInHex, group) {
-    if (group < 0 || group >= constants_1.TOTAL_NUMBER_OF_GROUPS) {
-        throw new Error(`Invalid group ${group}`);
-    }
-    const data = buffer_1.Buffer.concat([hexToBinUnsafe(parentContractId), hexToBinUnsafe(pathInHex)]);
-    const bytes = buffer_1.Buffer.concat([
-        blakejs_1.default.blake2b(blakejs_1.default.blake2b(data, undefined, 32), undefined, 32).slice(0, -1),
-        buffer_1.Buffer.from([group])
-    ]);
-    return binToHex(bytes);
-}
-exports.subContractId = subContractId;
 function blockChainIndex(blockHash) {
     if (blockHash.length != 64) {
         throw Error(`Invalid block hash: ${blockHash}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/web3",
-  "version": "0.30.1",
+  "version": "0.31.0",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "main": "dist/src/index.js",
@@ -27,7 +27,7 @@
   },
   "author": "Alephium dev <dev@alephium.org>",
   "config": {
-    "alephium_version": "2.8.4",
+    "alephium_version": "2.8.5",
     "explorer_backend_version": "1.16.1"
   },
   "type": "commonjs",

package/src/api/api-alephium.ts

@@ -752,6 +752,11 @@ export interface Reachable {
   type: string
 }
 
+export interface Result {
+  /** @format bigint */
+  hashrate: string
+}
+
 export interface RevealMnemonic {
   password: string
 }
@@ -842,6 +847,11 @@ export interface SweepAddressTransaction {
   gasPrice: string
 }
 
+export interface TargetToHashrate {
+  /** @format hex-string */
+  target: string
+}
+
 export interface TestContract {
   /** @format int32 */
   group?: number
@@ -1282,7 +1292,7 @@ export class HttpClient<SecurityDataType = unknown> {
 
 /**
  * @title Alephium API
- * @version 2.8.4
+ * @version 2.8.5
  * @baseUrl ../
  */
 export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {
@@ -2460,18 +2470,10 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * @summary Get contract state
      * @request GET:/contracts/{address}/state
      */
-    getContractsAddressState: (
-      address: string,
-      query: {
-        /** @format int32 */
-        group: number
-      },
-      params: RequestParams = {}
-    ) =>
+    getContractsAddressState: (address: string, params: RequestParams = {}) =>
       this.request<ContractState, BadRequest | Unauthorized | NotFound | InternalServerError | ServiceUnavailable>({
         path: `/contracts/${address}/state`,
         method: 'GET',
-        query: query,
         format: 'json',
         ...params
       }).then(convertHttpResponse),
@@ -2619,40 +2621,6 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
         ...params
       }).then(convertHttpResponse)
   }
-  utils = {
-    /**
-     * No description
-     *
-     * @tags Utils
-     * @name PostUtilsVerifySignature
-     * @summary Verify the SecP256K1 signature of some data
-     * @request POST:/utils/verify-signature
-     */
-    postUtilsVerifySignature: (data: VerifySignature, params: RequestParams = {}) =>
-      this.request<boolean, BadRequest | Unauthorized | NotFound | InternalServerError | ServiceUnavailable>({
-        path: `/utils/verify-signature`,
-        method: 'POST',
-        body: data,
-        type: ContentType.Json,
-        format: 'json',
-        ...params
-      }).then(convertHttpResponse),
-
-    /**
-     * No description
-     *
-     * @tags Utils
-     * @name PutUtilsCheckHashIndexing
-     * @summary Check and repair the indexing of block hashes
-     * @request PUT:/utils/check-hash-indexing
-     */
-    putUtilsCheckHashIndexing: (params: RequestParams = {}) =>
-      this.request<void, BadRequest | Unauthorized | NotFound | InternalServerError | ServiceUnavailable>({
-        path: `/utils/check-hash-indexing`,
-        method: 'PUT',
-        ...params
-      }).then(convertHttpResponse)
-  }
   miners = {
     /**
      * No description
@@ -2833,4 +2801,56 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
         ...params
       }).then(convertHttpResponse)
   }
+  utils = {
+    /**
+     * No description
+     *
+     * @tags Utils
+     * @name PostUtilsVerifySignature
+     * @summary Verify the SecP256K1 signature of some data
+     * @request POST:/utils/verify-signature
+     */
+    postUtilsVerifySignature: (data: VerifySignature, params: RequestParams = {}) =>
+      this.request<boolean, BadRequest | Unauthorized | NotFound | InternalServerError | ServiceUnavailable>({
+        path: `/utils/verify-signature`,
+        method: 'POST',
+        body: data,
+        type: ContentType.Json,
+        format: 'json',
+        ...params
+      }).then(convertHttpResponse),
+
+    /**
+     * No description
+     *
+     * @tags Utils
+     * @name PostUtilsTargetToHashrate
+     * @summary Convert a target to hashrate
+     * @request POST:/utils/target-to-hashrate
+     */
+    postUtilsTargetToHashrate: (data: TargetToHashrate, params: RequestParams = {}) =>
+      this.request<Result, BadRequest | Unauthorized | NotFound | InternalServerError | ServiceUnavailable>({
+        path: `/utils/target-to-hashrate`,
+        method: 'POST',
+        body: data,
+        type: ContentType.Json,
+        format: 'json',
+        ...params
+      }).then(convertHttpResponse),
+
+    /**
+     * No description
+     *
+     * @tags Utils
+     * @name PutUtilsCheckHashIndexing
+     * @summary Check and repair the indexing of block hashes
+     * @request PUT:/utils/check-hash-indexing
+     */
+    putUtilsCheckHashIndexing: (params: RequestParams = {}) =>
+      this.request<void, BadRequest | Unauthorized | NotFound | InternalServerError | ServiceUnavailable>({
+        path: `/utils/check-hash-indexing`,
+        method: 'PUT',
+        ...params
+      }).then(convertHttpResponse)
+  }
 }

package/src/api/node-provider.ts

@@ -182,8 +182,8 @@ export class NodeProvider implements NodeProviderApis {
   }
 
   // Only use this when the contract follows the NFT collection interface, check `guessFollowsNFTCollectionStd` first
-  fetchNFTCollectionMetaData = async (contractId: HexString): Promise<NFTCollectionMetaData> => {
-    const address = addressFromContractId(contractId)
+  fetchNFTCollectionMetaData = async (collectionId: HexString): Promise<NFTCollectionMetaData> => {
+    const address = addressFromContractId(collectionId)
     const group = groupOfAddress(address)
     const calls = Array.from([0, 1], (index) => ({ methodIndex: index, group: group, address: address }))
     const result = await this.contracts.postContractsMulticallContract({ calls })
@@ -194,10 +194,33 @@ export class NodeProvider implements NodeProviderApis {
     }
   }
 
+  // Only use this when the contract follows the NFT collection with royalty interface, check `guessFollowsNFTCollectionWithRoyaltyStd` first
+  fetchNFTRoyaltyAmount = async (collectionId: HexString, tokenId: HexString, salePrice: bigint): Promise<bigint> => {
+    const address = addressFromContractId(collectionId)
+    const group = groupOfAddress(address)
+    const apiResult = await this.contracts.postContractsCallContract({
+      address: address,
+      group: group,
+      methodIndex: 4,
+      args: [
+        {
+          type: 'ByteVec',
+          value: tokenId
+        },
+        {
+          type: 'U256',
+          value: salePrice.toString()
+        }
+      ]
+    })
+
+    const result = tryGetCallResult(apiResult)
+    return BigInt(result.returns[0].value as any as string)
+  }
+
   guessStdInterfaceId = async (tokenId: HexString): Promise<HexString | undefined> => {
     const address = addressFromTokenId(tokenId)
-    const group = groupOfAddress(address)
-    const rawState = await this.contracts.getContractsAddressState(addressFromTokenId(tokenId), { group })
+    const rawState = await this.contracts.getContractsAddressState(address)
     const lastImmField = rawState.immFields.slice(-1).pop()?.value
     const interfaceIdPrefix = '414c5048' // the hex of 'ALPH'
     if (typeof lastImmField === 'string' && lastImmField.startsWith(interfaceIdPrefix)) {
@@ -212,6 +235,11 @@ export class NodeProvider implements NodeProviderApis {
     return !!interfaceId && interfaceId.startsWith(StdInterfaceIds.NFTCollection)
   }
 
+  guessFollowsNFTCollectionWithRoyaltyStd = async (contractId: HexString): Promise<boolean> => {
+    const interfaceId = await this.guessStdInterfaceId(contractId)
+    return interfaceId === StdInterfaceIds.NFTCollectionWithRoyalty
+  }
+
   guessStdTokenType = async (tokenId: HexString): Promise<'fungible' | 'non-fungible' | undefined> => {
     const interfaceId = await this.guessStdInterfaceId(tokenId)
     switch (interfaceId) {

package/src/api/types.ts

@@ -343,12 +343,10 @@ export interface NFTTokenUriMetaData {
   name: string
   description?: string
   image: string
-  attributes?: [
-    {
-      trait_type: string
-      value: string | number | boolean
-    }
-  ]
+  attributes?: {
+    trait_type: string
+    value: string | number | boolean
+  }[]
 }
 
 export interface NFTCollectionUriMetaData {

package/src/contract/contract.ts

@@ -36,6 +36,7 @@ import {
   typeLength,
   getDefaultValue
 } from '../api'
+import { CompileProjectResult } from '../api/api-alephium'
 import {
   SignDeployContractTxParams,
   SignDeployContractTxResult,
@@ -53,16 +54,17 @@ import {
   Eq,
   Optional,
   groupOfAddress,
-  addressFromContractId,
   WebCrypto,
   hexToBinUnsafe,
-  isDevnet
+  isDevnet,
+  addressFromContractId
 } from '../utils'
 import { getCurrentNodeProvider } from '../global'
 import * as path from 'path'
 import { EventSubscribeOptions, EventSubscription, subscribeToEvents } from './events'
 import { ONE_ALPH } from '../constants'
 import * as blake from 'blakejs'
+import { parseError } from '../utils/error'
 
 const crypto = new WebCrypto()
 
@@ -190,6 +192,28 @@ type CodeInfo = {
   warnings: string[]
 }
 
+type SourceInfoIndexes = {
+  sourceInfo: SourceInfo
+  startIndex: number
+  endIndex: number
+}
+
+function findSourceInfoAtLineNumber(sources: SourceInfo[], line: number): SourceInfoIndexes | undefined {
+  let currentLine = 0
+  const sourceInfosWithLine: SourceInfoIndexes[] = sources.map((source) => {
+    const startIndex = currentLine + 1
+    currentLine += source.sourceCode.split('\n').length
+    const endIndex = currentLine
+    return { sourceInfo: source, startIndex: startIndex, endIndex: endIndex }
+  })
+
+  const sourceInfo = sourceInfosWithLine.find((sourceInfoWithLine) => {
+    return line >= sourceInfoWithLine.startIndex && line <= sourceInfoWithLine.endIndex
+  })
+
+  return sourceInfo
+}
+
 export class ProjectArtifact {
   static readonly artifactFileName = '.project.json'
 
@@ -431,6 +455,38 @@ export class Project {
     return contract.artifact
   }
 
+  private static async getCompileResult(
+    provider: NodeProvider,
+    compilerOptions: node.CompilerOptions,
+    sources: SourceInfo[]
+  ): Promise<CompileProjectResult> {
+    try {
+      const sourceStr = sources.map((f) => f.sourceCode).join('\n')
+      return await provider.contracts.postContractsCompileProject({
+        code: sourceStr,
+        compilerOptions: compilerOptions
+      })
+    } catch (error) {
+      if (!(error instanceof Error)) {
+        throw error
+      }
+
+      const parsed = parseError(error.message)
+      if (!parsed) {
+        throw error
+      }
+
+      const sourceInfo = findSourceInfoAtLineNumber(sources, parsed.lineStart)
+      if (!sourceInfo) {
+        throw error
+      }
+
+      const shiftIndex = parsed.lineStart - sourceInfo.startIndex + 1
+      const newError = parsed.reformat(shiftIndex, sourceInfo.sourceInfo.contractRelativePath)
+      throw new Error(newError)
+    }
+  }
+
   private static async compile(
     fullNodeVersion: string,
     provider: NodeProvider,
@@ -447,11 +503,8 @@ export class Project {
       }
       return acc
     }, [])
-    const sourceStr = removeDuplicates.map((f) => f.sourceCode).join('\n')
-    const result = await provider.contracts.postContractsCompileProject({
-      code: sourceStr,
-      compilerOptions: compilerOptions
-    })
+
+    const result = await Project.getCompileResult(provider, compilerOptions, removeDuplicates)
     const contracts = new Map<string, Compiled<Contract>>()
     const scripts = new Map<string, Compiled<Script>>()
     result.contracts.forEach((contractResult) => {
@@ -1522,6 +1575,7 @@ export interface CallContractResult<R> {
 function specialContractAddress(n: number): string {
   const bytes = new Uint8Array(32).fill(0)
   bytes[31] = n
+  console.log(addressFromContractId)
   return addressFromContractId(binToHex(bytes))
 }
 
@@ -1651,9 +1705,7 @@ export async function fetchContractState<F extends Fields, I extends ContractIns
   contract: ContractFactory<I, F>,
   instance: ContractInstance
 ): Promise<ContractState<F>> {
-  const contractState = await getCurrentNodeProvider().contracts.getContractsAddressState(instance.address, {
-    group: instance.groupIndex
-  })
+  const contractState = await getCurrentNodeProvider().contracts.getContractsAddressState(instance.address)
   const state = contract.contract.fromApiContractState(contractState)
   return {
     ...state,