@alephium/web3 0.1.0 → 0.2.0-rc.2

package/dist/src/transaction/status.d.ts

@@ -0,0 +1,10 @@
+import { TxStatus } from '../api/api-alephium';
+import { Subscription, SubscribeOptions } from '../utils';
+export declare class TxStatusSubscription extends Subscription<TxStatus> {
+    readonly txId: string;
+    readonly fromGroup?: number;
+    readonly toGroup?: number;
+    constructor(options: SubscribeOptions<TxStatus>, txId: string, fromGroup?: number, toGroup?: number);
+    polling(): Promise<void>;
+}
+export declare function subscribeToTxStatus(options: SubscribeOptions<TxStatus>, txId: string, fromGroup?: number, toGroup?: number): TxStatusSubscription;

package/dist/src/transaction/status.js

@@ -0,0 +1,48 @@
+"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.subscribeToTxStatus = exports.TxStatusSubscription = void 0;
+const utils_1 = require("../utils");
+class TxStatusSubscription extends utils_1.Subscription {
+    constructor(options, txId, fromGroup, toGroup) {
+        super(options);
+        this.txId = txId;
+        this.fromGroup = fromGroup;
+        this.toGroup = toGroup;
+        this.startPolling();
+    }
+    async polling() {
+        try {
+            const txStatus = await this.provider.transactions.getTransactionsStatus({
+                txId: this.txId,
+                fromGroup: this.fromGroup,
+                toGroup: this.toGroup
+            });
+            await this.messageCallback(txStatus);
+        }
+        catch (err) {
+            await this.errorCallback(err, this);
+        }
+    }
+}
+exports.TxStatusSubscription = TxStatusSubscription;
+function subscribeToTxStatus(options, txId, fromGroup, toGroup) {
+    return new TxStatusSubscription(options, txId, fromGroup, toGroup);
+}
+exports.subscribeToTxStatus = subscribeToTxStatus;

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

@@ -2,5 +2,5 @@ export * from './address';
 export * from './bs58';
 export * from './djb2';
 export * from './password-crypto';
-export * from './transaction';
 export * from './utils';
+export * from './subscription';

package/dist/src/utils/index.js

@@ -31,5 +31,5 @@ __exportStar(require("./address"), exports);
 __exportStar(require("./bs58"), exports);
 __exportStar(require("./djb2"), exports);
 __exportStar(require("./password-crypto"), exports);
-__exportStar(require("./transaction"), exports);
 __exportStar(require("./utils"), exports);
+__exportStar(require("./subscription"), exports);

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

@@ -0,0 +1,24 @@
+import EventEmitter from 'eventemitter3';
+import { NodeProvider } from '../api';
+declare type MessageCallback<Message> = (message: Message) => Promise<void>;
+declare type ErrorCallback<Message> = (error: any, subscription: Subscription<Message>) => Promise<void>;
+export interface SubscribeOptions<Message> {
+    provider: NodeProvider;
+    pollingInterval: number;
+    messageCallback: MessageCallback<Message>;
+    errorCallback: ErrorCallback<Message>;
+}
+export declare abstract class Subscription<Message> {
+    provider: NodeProvider;
+    pollingInterval: number;
+    protected messageCallback: MessageCallback<Message>;
+    protected errorCallback: ErrorCallback<Message>;
+    protected task: ReturnType<typeof setTimeout> | undefined;
+    protected eventEmitter: EventEmitter;
+    protected cancelled: boolean;
+    constructor(options: SubscribeOptions<Message>);
+    startPolling(): void;
+    unsubscribe(): void;
+    abstract polling(): Promise<void>;
+}
+export {};

package/dist/src/utils/subscription.js

@@ -0,0 +1,52 @@
+"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/>.
+*/
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Subscription = void 0;
+const eventemitter3_1 = __importDefault(require("eventemitter3"));
+class Subscription {
+    constructor(options) {
+        this.provider = options.provider;
+        this.pollingInterval = options.pollingInterval;
+        this.messageCallback = options.messageCallback;
+        this.errorCallback = options.errorCallback;
+        this.task = undefined;
+        this.cancelled = false;
+        this.eventEmitter = new eventemitter3_1.default();
+    }
+    startPolling() {
+        this.eventEmitter.on('tick', async () => {
+            await this.polling();
+            if (!this.cancelled) {
+                this.task = setTimeout(() => this.eventEmitter.emit('tick'), this.pollingInterval);
+            }
+        });
+        this.eventEmitter.emit('tick');
+    }
+    unsubscribe() {
+        this.eventEmitter.removeAllListeners();
+        this.cancelled = true;
+        if (typeof this.task !== 'undefined') {
+            clearTimeout(this.task);
+        }
+    }
+}
+exports.Subscription = Subscription;

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

@@ -20,6 +20,8 @@ export declare function addressFromContractId(contractId: string): string;
 export declare function contractIdFromTx(txId: string, outputIndex: number): string;
 export declare function subContractId(parentContractId: string, pathInHex: string): string;
 export declare function stringToHex(str: string): string;
+export declare function hexToString(str: any): string;
+export declare function timeout(ms: number): Promise<unknown>;
 declare type _Eq<X, Y> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? true : false;
 export declare type Eq<X, Y> = _Eq<{
     [P in keyof X]: X[P];

package/dist/src/utils/utils.js

@@ -20,7 +20,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertType = exports.stringToHex = exports.subContractId = exports.contractIdFromTx = exports.addressFromContractId = exports.addressFromPublicKey = exports.publicKeyFromPrivateKey = exports.binToHex = exports.hexToBinUnsafe = exports.tokenIdFromAddress = exports.contractIdFromAddress = exports.groupOfAddress = exports.isHexString = exports.signatureDecode = exports.signatureEncode = exports.convertHttpResponse = void 0;
+exports.assertType = exports.timeout = exports.hexToString = exports.stringToHex = exports.subContractId = exports.contractIdFromTx = exports.addressFromContractId = exports.addressFromPublicKey = exports.publicKeyFromPrivateKey = exports.binToHex = exports.hexToBinUnsafe = exports.tokenIdFromAddress = exports.contractIdFromAddress = exports.groupOfAddress = exports.isHexString = exports.signatureDecode = exports.signatureEncode = exports.convertHttpResponse = void 0;
 const elliptic_1 = require("elliptic");
 const bn_js_1 = __importDefault(require("bn.js"));
 const blakejs_1 = __importDefault(require("blakejs"));
@@ -182,7 +182,7 @@ function contractIdFromTx(txId, outputIndex) {
 }
 exports.contractIdFromTx = contractIdFromTx;
 function subContractId(parentContractId, pathInHex) {
-    const data = buffer_1.Buffer.concat([hexToBinUnsafe(pathInHex), hexToBinUnsafe(parentContractId)]);
+    const data = buffer_1.Buffer.concat([hexToBinUnsafe(parentContractId), hexToBinUnsafe(pathInHex)]);
     return binToHex(blakejs_1.default.blake2b(blakejs_1.default.blake2b(data, undefined, 32), undefined, 32));
 }
 exports.subContractId = subContractId;
@@ -194,6 +194,14 @@ function stringToHex(str) {
     return hex;
 }
 exports.stringToHex = stringToHex;
+function hexToString(str) {
+    return buffer_1.Buffer.from(str.toString(), 'hex').toString();
+}
+exports.hexToString = hexToString;
+function timeout(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+exports.timeout = timeout;
 // eslint-disable-next-line @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars
 function assertType() { }
 exports.assertType = assertType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/web3",
-  "version": "0.1.0",
+  "version": "0.2.0-rc.2",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "main": "dist/src/index.js",
@@ -27,8 +27,8 @@
   },
   "author": "Alephium dev <dev@alephium.org>",
   "config": {
-    "alephium_version": "1.4.2",
-    "explorer_backend_version": "1.7.0"
+    "alephium_version": "1.5.0-rc2",
+    "explorer_backend_version": "1.7.1"
   },
   "scripts": {
     "build": "rm -rf dist/* && npx tsc --build . && webpack",

package/scripts/create-project.ts

@@ -87,7 +87,8 @@ function prepareShared(packageRoot: string, projectRoot: string) {
 
 function prepareBase(packageRoot: string, projectRoot: string) {
   prepareShared(packageRoot, projectRoot)
-  copy('contracts', ['greeter.ral', 'greeter_interface.ral', 'greeter_main.ral'])
+  copy('contracts', ['greeter_main.ral'])
+  copy('contracts/greeter', ['greeter.ral', 'greeter_interface.ral'])
   fsExtra.copySync(path.join(packageRoot, 'templates/base'), projectRoot)
 }
 

package/src/api/api-alephium.ts

@@ -96,6 +96,8 @@ export interface Balance {
 
   /** @format x.x ALPH */
   lockedBalanceHint: string
+  tokenBalances?: Token[]
+  lockedTokenBalances?: Token[]
 
   /** @format int32 */
   utxoNum: number
@@ -205,6 +207,9 @@ export interface BuildDeployContractTx {
 
   /** @format uint256 */
   gasPrice?: string
+
+  /** @format block-hash */
+  targetBlockHash?: string
 }
 
 export interface BuildDeployContractTxResult {
@@ -244,6 +249,9 @@ export interface BuildExecuteScriptTx {
 
   /** @format uint256 */
   gasPrice?: string
+
+  /** @format block-hash */
+  targetBlockHash?: string
 }
 
 export interface BuildExecuteScriptTxResult {
@@ -309,6 +317,9 @@ export interface BuildSweepAddressTransactions {
 
   /** @format uint256 */
   gasPrice?: string
+
+  /** @format block-hash */
+  targetBlockHash?: string
 }
 
 export interface BuildSweepAddressTransactionsResult {
@@ -332,6 +343,9 @@ export interface BuildTransaction {
 
   /** @format uint256 */
   gasPrice?: string
+
+  /** @format block-hash */
+  targetBlockHash?: string
 }
 
 export interface BuildTransactionResult {
@@ -776,6 +790,9 @@ export interface Sweep {
 
   /** @format int32 */
   utxosLimit?: number
+
+  /** @format block-hash */
+  targetBlockHash?: string
 }
 
 export interface SweepAddressTransaction {
@@ -1097,7 +1114,7 @@ export enum ContentType {
 }
 
 export class HttpClient<SecurityDataType = unknown> {
-  public baseUrl: string = '{protocol}://{host}:{port}'
+  public baseUrl: string = '../'
   private securityData: SecurityDataType | null = null
   private securityWorker?: ApiConfig<SecurityDataType>['securityWorker']
   private abortControllers = new Map<CancelToken, AbortController>()
@@ -1262,8 +1279,8 @@ export class HttpClient<SecurityDataType = unknown> {
 
 /**
  * @title Alephium API
- * @version 1.4.2
- * @baseUrl {protocol}://{host}:{port}
+ * @version 1.5.0
+ * @baseUrl ../
  */
 export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {
   wallets = {

package/src/api/api-explorer.ts

@@ -847,6 +847,36 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
         path: `/utils/sanity-check`,
         method: 'PUT',
         ...params
+      }).then(convertHttpResponse),
+
+    /**
+     * @description Update global log level, accepted: TRACE, DEBUG, INFO, WARN, ERROR
+     *
+     * @tags Utils
+     * @name PutUtilsUpdateGlobalLoglevel
+     * @request PUT:/utils/update-global-loglevel
+     */
+    putUtilsUpdateGlobalLoglevel: (data: 'TRACE' | 'DEBUG' | 'INFO' | 'WARN' | 'ERROR', params: RequestParams = {}) =>
+      this.request<void, BadRequest | Unauthorized | NotFound | InternalServerError | ServiceUnavailable>({
+        path: `/utils/update-global-loglevel`,
+        method: 'PUT',
+        body: data,
+        ...params
+      }).then(convertHttpResponse),
+
+    /**
+     * @description Update logging file, only logback.xml is accepted
+     *
+     * @tags Utils
+     * @name PutUtilsUpdateLogConfig
+     * @request PUT:/utils/update-log-config
+     */
+    putUtilsUpdateLogConfig: (data: string, params: RequestParams = {}) =>
+      this.request<void, BadRequest | Unauthorized | NotFound | InternalServerError | ServiceUnavailable>({
+        path: `/utils/update-log-config`,
+        method: 'PUT',
+        body: data,
+        ...params
       }).then(convertHttpResponse)
   }
 }

package/src/contract/contract.ts

@@ -27,12 +27,31 @@ import { SignDeployContractTxParams, SignExecuteScriptTxParams, SignerWithNodePr
 import * as ralph from './ralph'
 import { bs58, binToHex, contractIdFromAddress, assertType, Eq } from '../utils'
 
+class SourceFile {
+  readonly dirs: string[]
+  readonly dirPath: string
+  readonly contractPath: string
+  readonly artifactPath: string
+
+  constructor(dirs: string[], fileName: string) {
+    this.dirs = dirs
+    this.dirPath = dirs.length === 0 ? '' : dirs.join('/') + '/'
+    if (fileName.endsWith('.json')) {
+      this.contractPath = './contracts/' + this.dirPath + fileName.slice(0, -5)
+      this.artifactPath = './artifacts/' + this.dirPath + fileName
+    } else {
+      this.contractPath = './contracts/' + this.dirPath + fileName
+      this.artifactPath = './artifacts/' + this.dirPath + fileName + '.json'
+    }
+  }
+}
+
 export abstract class Common {
   readonly sourceCodeSha256: string
   readonly functions: node.FunctionSig[]
 
-  static readonly importRegex = new RegExp('^import "[a-z][a-z_0-9]*.ral"', 'mg')
-  static readonly contractRegex = new RegExp('^TxContract [A-Z][a-zA-Z0-9]*', 'mg')
+  static readonly importRegex = new RegExp('^import "([^"/]+/(([^"]+)/)?)?[a-z][a-z_0-9]*.ral"', 'mg')
+  static readonly contractRegex = new RegExp('^(Abstract[ ]+)?Contract [A-Z][a-zA-Z0-9]*', 'mg')
   static readonly interfaceRegex = new RegExp('^Interface [A-Z][a-zA-Z0-9]* \\{', 'mg')
   static readonly scriptRegex = new RegExp('^TxScript [A-Z][a-zA-Z0-9]*', 'mg')
 
@@ -56,38 +75,53 @@ export abstract class Common {
     this.functions = functions
   }
 
-  protected static _contractPath(fileName: string): string {
-    if (fileName.endsWith('.json')) {
-      return `./contracts/${fileName.slice(0, -5)}`
-    } else {
-      return `./contracts/${fileName}`
-    }
+  protected static _artifactsFolder(): string {
+    return './artifacts/'
   }
 
-  protected static _artifactPath(fileName: string): string {
-    if (fileName.endsWith('.json')) {
-      return `./artifacts/${fileName}`
-    } else {
-      return `./artifacts/${fileName}.json`
+  static getSourceFile(path: string, _dirs: string[]): SourceFile {
+    const parts = path.split('/')
+    const dirs = Array.from(_dirs)
+    if (parts.length === 1) {
+      return new SourceFile(dirs, path)
     }
+    parts.slice(0, parts.length - 1).forEach((part) => {
+      switch (part) {
+        case '.': {
+          break
+        }
+        case '..': {
+          if (dirs.length === 0) {
+            throw new Error('Invalid file path: ' + path)
+          }
+          dirs.pop()
+          break
+        }
+        default: {
+          dirs.push(part)
+        }
+      }
+    })
+    return new SourceFile(dirs, parts[parts.length - 1])
   }
 
-  protected static _artifactsFolder(): string {
-    return './artifacts/'
-  }
-
-  protected static async _handleImports(contractStr: string, importsCache: string[]): Promise<string> {
+  protected static async _handleImports(
+    pathes: string[],
+    contractStr: string,
+    importsCache: string[]
+  ): Promise<string> {
     const localImportsCache: string[] = []
     let result = contractStr.replace(Common.importRegex, (match) => {
       localImportsCache.push(match)
       return ''
     })
     for (const myImport of localImportsCache) {
-      const fileName = myImport.slice(8, -1)
-      if (!importsCache.includes(fileName)) {
-        importsCache.push(fileName)
-        const importContractStr = await Common._loadContractStr(fileName, importsCache, (code) =>
-          Contract.checkCodeType(fileName, code)
+      const relativePath = myImport.slice(8, -1)
+      const importSourceFile = this.getSourceFile(relativePath, pathes)
+      if (!importsCache.includes(importSourceFile.contractPath)) {
+        importsCache.push(importSourceFile.contractPath)
+        const importContractStr = await Common._loadContractStr(importSourceFile, importsCache, (code) =>
+          Contract.checkCodeType(importSourceFile.contractPath, code)
         )
         result = result.concat('\n', importContractStr)
       }
@@ -96,16 +130,16 @@ export abstract class Common {
   }
 
   protected static async _loadContractStr(
-    fileName: string,
+    sourceFile: SourceFile,
     importsCache: string[],
-    validate: (fileName: string) => void
+    validate: (code: string) => void
   ): Promise<string> {
-    const contractPath = this._contractPath(fileName)
+    const contractPath = sourceFile.contractPath
     const contractBuffer = await fsPromises.readFile(contractPath)
     const contractStr = contractBuffer.toString()
 
     validate(contractStr)
-    return Common._handleImports(contractStr, importsCache)
+    return Common._handleImports(sourceFile.dirs, contractStr, importsCache)
   }
 
   static checkFileNameExtension(fileName: string): void {
@@ -116,25 +150,28 @@ export abstract class Common {
 
   protected static async _from<T extends { sourceCodeSha256: string }>(
     provider: NodeProvider,
-    fileName: string,
-    loadContractStr: (fileName: string, importsCache: string[]) => Promise<string>,
-    compile: (provider: NodeProvider, fileName: string, contractStr: string, contractHash: string) => Promise<T>
+    sourceFile: SourceFile,
+    loadContractStr: (sourceFile: SourceFile, importsCache: string[]) => Promise<string>,
+    compile: (provider: NodeProvider, sourceFile: SourceFile, contractStr: string, contractHash: string) => Promise<T>
   ): Promise<T> {
-    Common.checkFileNameExtension(fileName)
+    Common.checkFileNameExtension(sourceFile.contractPath)
 
-    const contractStr = await loadContractStr(fileName, [])
+    const contractStr = await loadContractStr(sourceFile, [])
     const contractHash = cryptojs.SHA256(contractStr).toString()
     const existingContract = this._getArtifactFromCache(contractHash)
     if (typeof existingContract !== 'undefined') {
       return existingContract as unknown as T
     } else {
-      return compile(provider, fileName, contractStr, contractHash)
+      return compile(provider, sourceFile, contractStr, contractHash)
     }
   }
 
-  protected _saveToFile(fileName: string): Promise<void> {
-    const artifactPath = Common._artifactPath(fileName)
-    return fsPromises.writeFile(artifactPath, this.toString())
+  protected _saveToFile(sourceFile: SourceFile): Promise<void> {
+    const folder = Common._artifactsFolder() + sourceFile.dirPath
+    if (!fs.existsSync(folder)) {
+      fs.mkdirSync(folder, { recursive: true })
+    }
+    return fsPromises.writeFile(sourceFile.artifactPath, this.toString())
   }
 
   abstract buildByteCodeToDeploy(initialFields?: Fields): string
@@ -163,32 +200,38 @@ export class Contract extends Common {
 
   static checkCodeType(fileName: string, contractStr: string): void {
     const interfaceMatches = contractStr.match(Contract.interfaceRegex)
-    if (interfaceMatches) {
-      return
-    }
-
     const contractMatches = contractStr.match(Contract.contractRegex)
-    if (contractMatches === null) {
+    if (interfaceMatches === null && contractMatches === null) {
       throw new Error(`No contract found in: ${fileName}`)
-    } else if (contractMatches.length > 1) {
-      throw new Error(`Multiple contracts in: ${fileName}`)
-    } else {
-      return
+    }
+    if (interfaceMatches && contractMatches) {
+      throw new Error(`Multiple contracts and interfaces in: ${fileName}`)
+    }
+    if (interfaceMatches === null) {
+      if (contractMatches !== null && contractMatches.length > 1) {
+        throw new Error(`Multiple contracts in: ${fileName}`)
+      }
+    }
+    if (contractMatches === null) {
+      if (interfaceMatches !== null && interfaceMatches.length > 1) {
+        throw new Error(`Multiple interfaces in: ${fileName}`)
+      }
     }
   }
 
-  private static async loadContractStr(fileName: string, importsCache: string[]): Promise<string> {
-    return Common._loadContractStr(fileName, importsCache, (code) => Contract.checkCodeType(fileName, code))
+  private static async loadContractStr(sourceFile: SourceFile): Promise<string> {
+    return Common._loadContractStr(sourceFile, [], (code) => Contract.checkCodeType(sourceFile.contractPath, code))
   }
 
-  static async fromSource(provider: NodeProvider, fileName: string): Promise<Contract> {
+  static async fromSource(provider: NodeProvider, path: string): Promise<Contract> {
     if (!fs.existsSync(Common._artifactsFolder())) {
       fs.mkdirSync(Common._artifactsFolder(), { recursive: true })
     }
+    const sourceFile = this.getSourceFile(path, [])
     const contract = await Common._from(
       provider,
-      fileName,
-      (fileName, importCaches) => Contract.loadContractStr(fileName, importCaches),
+      sourceFile,
+      (sourceFile) => Contract.loadContractStr(sourceFile),
       Contract.compile
     )
     this._putArtifactToCache(contract)
@@ -197,7 +240,7 @@ export class Contract extends Common {
 
   private static async compile(
     provider: NodeProvider,
-    fileName: string,
+    sourceFile: SourceFile,
     contractStr: string,
     contractHash: string
   ): Promise<Contract> {
@@ -210,7 +253,7 @@ export class Contract extends Common {
       compiled.events,
       compiled.functions
     )
-    await artifact._saveToFile(fileName)
+    await artifact._saveToFile(sourceFile)
     return artifact
   }
 
@@ -239,13 +282,19 @@ export class Contract extends Common {
   }
 
   // support both 'code.ral' and 'code.ral.json'
-  static async fromArtifactFile(fileName: string): Promise<Contract> {
-    const artifactPath = Contract._artifactPath(fileName)
+  static async fromArtifactFile(path: string): Promise<Contract> {
+    const sourceFile = this.getSourceFile(path, [])
+    const artifactPath = sourceFile.artifactPath
     const content = await fsPromises.readFile(artifactPath)
     const artifact = JSON.parse(content.toString())
     return Contract.fromJson(artifact)
   }
 
+  async fetchState(provider: NodeProvider, address: string, group: number): Promise<ContractState> {
+    const state = await provider.contracts.getContractsAddressState(address, { group: group })
+    return this.fromApiContractState(state)
+  }
+
   override toString(): string {
     return JSON.stringify(
       {
@@ -518,28 +567,24 @@ export class Script extends Common {
     }
   }
 
-  private static async loadContractStr(fileName: string, importsCache: string[]): Promise<string> {
-    return Common._loadContractStr(fileName, importsCache, (code) => Script.checkCodeType(fileName, code))
+  private static async loadContractStr(sourceFile: SourceFile): Promise<string> {
+    return Common._loadContractStr(sourceFile, [], (code) => Script.checkCodeType(sourceFile.contractPath, code))
   }
 
-  static async fromSource(provider: NodeProvider, fileName: string): Promise<Script> {
-    return Common._from(
-      provider,
-      fileName,
-      (fileName, importsCache) => Script.loadContractStr(fileName, importsCache),
-      Script.compile
-    )
+  static async fromSource(provider: NodeProvider, path: string): Promise<Script> {
+    const sourceFile = this.getSourceFile(path, [])
+    return Common._from(provider, sourceFile, (sourceFile) => Script.loadContractStr(sourceFile), Script.compile)
   }
 
   private static async compile(
     provider: NodeProvider,
-    fileName: string,
+    sourceFile: SourceFile,
     scriptStr: string,
     contractHash: string
   ): Promise<Script> {
     const compiled = await provider.contracts.postContractsCompileScript({ code: scriptStr })
     const artifact = new Script(contractHash, compiled.bytecodeTemplate, compiled.fields, compiled.functions)
-    await artifact._saveToFile(fileName)
+    await artifact._saveToFile(sourceFile)
     return artifact
   }
 
@@ -556,8 +601,9 @@ export class Script extends Common {
     return new Script(artifact.sourceCodeSha256, artifact.bytecodeTemplate, artifact.fieldsSig, artifact.functions)
   }
 
-  static async fromArtifactFile(fileName: string): Promise<Script> {
-    const artifactPath = Common._artifactPath(fileName)
+  static async fromArtifactFile(path: string): Promise<Script> {
+    const sourceFile = this.getSourceFile(path, [])
+    const artifactPath = sourceFile.artifactPath
     const content = await fsPromises.readFile(artifactPath)
     const artifact = JSON.parse(content.toString())
     return this.fromJson(artifact)