@alephium/web3 0.2.0-test.0 → 0.2.0-test.1

package/src/contract/events.ts

@@ -31,7 +31,7 @@ export class EventSubscription extends Subscription<ContractEvent> {
     this.startPolling()
   }
 
-  override startPolling() {
+  override startPolling(): void {
     this.eventEmitter.on('tick', async () => {
       await this.polling()
     })
@@ -42,7 +42,7 @@ export class EventSubscription extends Subscription<ContractEvent> {
     return this.fromCount
   }
 
-  override async polling() {
+  override async polling(): Promise<void> {
     try {
       const events = await this.provider.events.getEventsContractContractaddress(this.contractAddress, {
         start: this.fromCount

package/src/contract/ralph.test.ts

@@ -133,9 +133,9 @@ describe('contract', function () {
   it('should test buildScriptByteCode', async () => {
     const variables = { x: true, y: 0x05, z: 'ff', a: '1C2RAVWSuaXw8xtUxqVERR7ChKBE1XgscNFw73NSHE1v3' }
     const fieldsSig: node.FieldsSig = {
-      signature: 'Not really',
       names: ['x', 'y', 'z', 'a'],
-      types: ['Bool', 'U256', 'ByteVec', 'Address']
+      types: ['Bool', 'U256', 'ByteVec', 'Address'],
+      isMutable: [false, false, false, false]
     }
     const bytecode = ralph.buildScriptByteCode('-{0}-{1}-{2}-{3}-', variables, fieldsSig)
     expect(bytecode).toEqual('-03-1305-1401ff-1500a3cd757be03c7dac8d48bf79e2a7d6e735e018a9c054b99138c7b29738c437ec-')
@@ -150,9 +150,9 @@ describe('contract', function () {
       e: [false, true]
     }
     const fieldsSig: node.FieldsSig = {
-      signature: 'Not really',
       names: ['a', 'b', 'c', 'd', 'e'],
-      types: ['I256', 'U256', 'ByteVec', 'Address', '[Bool;2]']
+      types: ['I256', 'U256', 'ByteVec', 'Address', '[Bool;2]'],
+      isMutable: [false, false, false, false]
     }
     const encoded = ralph.buildContractByteCode('ff', fields, fieldsSig)
     expect(encoded).toEqual(

package/src/global.ts

@@ -0,0 +1,36 @@
+/*
+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 { NodeProvider } from './api'
+
+let _currentNodeProvider: NodeProvider | undefined = undefined
+
+export function setCurrentNodeProvider(provider: NodeProvider | string): void {
+  if (typeof provider == 'string') {
+    _currentNodeProvider = new NodeProvider(provider)
+  } else {
+    _currentNodeProvider = provider
+  }
+}
+
+export function getCurrentNodeProvider(): NodeProvider {
+  if (typeof _currentNodeProvider === 'undefined') {
+    throw Error('No node provider is set.')
+  }
+  return _currentNodeProvider
+}

package/src/index.ts

@@ -23,3 +23,4 @@ export * from './utils'
 export * from './transaction'
 
 export * from './constants'
+export * from './global'

package/src/signer/node-wallet.ts

@@ -16,15 +16,14 @@ 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 { NodeProvider } from '../api'
 import { Account, SignerWithNodeProvider } from '../signer'
 
 export class NodeWallet extends SignerWithNodeProvider {
   public walletName: string
   public accounts: Account[] | undefined
 
-  constructor(provider: NodeProvider, walletName: string, alwaysSubmitTx = true) {
-    super(provider, alwaysSubmitTx)
+  constructor(walletName: string, alwaysSubmitTx = true) {
+    super(alwaysSubmitTx)
     this.walletName = walletName
   }
 
@@ -45,14 +44,6 @@ export class NodeWallet extends SignerWithNodeProvider {
     return accounts
   }
 
-  static async FromCliqueClient(
-    provider: NodeProvider,
-    walletName: string,
-    alwaysSubmitTx = true
-  ): Promise<NodeWallet> {
-    return new NodeWallet(provider, walletName, alwaysSubmitTx)
-  }
-
   async signRaw(signerAddress: string, hexString: string): Promise<string> {
     const currentActiveAddressResponse = await this.provider.wallets.getWalletsWalletNameAddresses(this.walletName)
     const { activeAddress } = currentActiveAddressResponse

package/src/signer/signer.ts

@@ -23,6 +23,7 @@ import * as utils from '../utils'
 import { Eq, assertType } from '../utils'
 import blake from 'blakejs'
 import { Token } from '../api/api-alephium'
+import { getCurrentNodeProvider } from '../global'
 
 const ec = new EC('secp256k1')
 
@@ -42,7 +43,7 @@ export interface Account {
 
 export type SubmitTx = { submitTx?: boolean }
 export type SignerAddress = { signerAddress: string }
-type TxBuildParams<T> = Omit<T, 'fromPublicKey'> & SignerAddress & SubmitTx
+type TxBuildParams<T> = Omit<T, 'fromPublicKey' | 'targetBlockHash'> & SignerAddress & SubmitTx
 
 export type GetAccountsParams = undefined
 export type GetAccountsResult = Account[]
@@ -167,8 +168,8 @@ export abstract class SignerWithNodeProvider implements SignerProvider {
     }
   }
 
-  constructor(provider: NodeProvider, alwaysSubmitTx: boolean) {
-    this.provider = provider
+  constructor(alwaysSubmitTx: boolean) {
+    this.provider = getCurrentNodeProvider()
     this.alwaysSubmitTx = alwaysSubmitTx
   }
 

package/src/test/index.ts

@@ -16,15 +16,14 @@ 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 { NodeProvider } from '../api'
 import { NodeWallet } from '../signer'
 
 export const testWalletName = 'alephium-web3-test-only-wallet'
 export const testAddress = '1DrDyTr9RpRsQnDnXo2YRiPzPW4ooHX5LLoqXrqfMrpQH'
 export const testPassword = 'alph'
 
-export async function testWallet(provider: NodeProvider): Promise<NodeWallet> {
-  const wallet = new NodeWallet(provider, testWalletName)
+export async function testNodeWallet(): Promise<NodeWallet> {
+  const wallet = new NodeWallet(testWalletName)
   await wallet.unlock(testPassword)
   return wallet
 }

package/src/test/privatekey-wallet.ts

@@ -17,7 +17,6 @@ along with the library. If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { ec as EC } from 'elliptic'
-import { NodeProvider } from '../api'
 import { Account, SignerWithNodeProvider } from '../signer'
 import * as utils from '../utils'
 
@@ -29,17 +28,17 @@ export class PrivateKeyWallet extends SignerWithNodeProvider {
   readonly address: string
   readonly group: number
 
-  constructor(provider: NodeProvider, privateKey: string, alwaysSubmitTx = true) {
-    super(provider, alwaysSubmitTx)
+  constructor(privateKey: string, alwaysSubmitTx = true) {
+    super(alwaysSubmitTx)
     this.privateKey = privateKey
     this.publicKey = utils.publicKeyFromPrivateKey(privateKey)
     this.address = utils.addressFromPublicKey(this.publicKey)
     this.group = utils.groupOfAddress(this.address)
   }
 
-  static Random(provider: NodeProvider, alwaysSubmitTx = true): PrivateKeyWallet {
+  static Random(alwaysSubmitTx = true): PrivateKeyWallet {
     const keyPair = ec.genKeyPair()
-    return new PrivateKeyWallet(provider, keyPair.getPrivate().toString('hex'), alwaysSubmitTx)
+    return new PrivateKeyWallet(keyPair.getPrivate().toString('hex'), alwaysSubmitTx)
   }
 
   async getAccounts(): Promise<Account[]> {

package/src/transaction/status.ts

@@ -33,7 +33,7 @@ export class TxStatusSubscription extends Subscription<TxStatus> {
     this.startPolling()
   }
 
-  override async polling() {
+  override async polling(): Promise<void> {
     try {
       const txStatus = await this.provider.transactions.getTransactionsStatus({
         txId: this.txId,

package/src/utils/subscription.ts

@@ -17,13 +17,13 @@ along with the library. If not, see <http://www.gnu.org/licenses/>.
 */
 
 import EventEmitter from 'eventemitter3'
+import { getCurrentNodeProvider } from '../global'
 import { NodeProvider } from '../api'
 
 type MessageCallback<Message> = (message: Message) => Promise<void>
 type ErrorCallback<Message> = (error: any, subscription: Subscription<Message>) => Promise<void>
 
 export interface SubscribeOptions<Message> {
-  provider: NodeProvider
   pollingInterval: number
   messageCallback: MessageCallback<Message>
   errorCallback: ErrorCallback<Message>
@@ -40,7 +40,7 @@ export abstract class Subscription<Message> {
   protected cancelled: boolean
 
   constructor(options: SubscribeOptions<Message>) {
-    this.provider = options.provider
+    this.provider = getCurrentNodeProvider()
     this.pollingInterval = options.pollingInterval
     this.messageCallback = options.messageCallback
     this.errorCallback = options.errorCallback
@@ -49,7 +49,7 @@ export abstract class Subscription<Message> {
     this.eventEmitter = new EventEmitter()
   }
 
-  startPolling() {
+  startPolling(): void {
     this.eventEmitter.on('tick', async () => {
       await this.polling()
 

package/src/utils/utils.test.ts

@@ -151,7 +151,7 @@ describe('utils', function () {
         '0a38bc48fbb4300f1e305b201cd6129372d867122efb814d871d18c0bfe43b56',
         '4f51cd1f0af97cf5ec9c7a3397eaeea549d55a93c216e54f2ab4a8cf29f6f865'
       )
-    ).toBe('293c948c81c5a9495178fff8b8c9f29f4f3e09e1728c40e9253c87adf5e18770')
+    ).toBe('0e28f15ca290002c31d691aa008aa56ac12356b0380efb6c88fff929b6a268a9')
   })
 
   it('should convert from string to hex and back', () => {

package/src/utils/utils.ts

@@ -190,7 +190,7 @@ export function contractIdFromTx(txId: string, outputIndex: number): string {
 }
 
 export function subContractId(parentContractId: string, pathInHex: string): string {
-  const data = Buffer.concat([hexToBinUnsafe(pathInHex), hexToBinUnsafe(parentContractId)])
+  const data = Buffer.concat([hexToBinUnsafe(parentContractId), hexToBinUnsafe(pathInHex)])
 
   return binToHex(blake.blake2b(blake.blake2b(data, undefined, 32), undefined, 32))
 }
@@ -203,11 +203,11 @@ export function stringToHex(str: string): string {
   return hex
 }
 
-export function hexToString(str: any): string {
-  return Buffer.from(str.toString(), 'hex').toString()
+export function hexToString(str: string): string {
+  return Buffer.from(str, 'hex').toString()
 }
 
-export function timeout(ms: number) {
+export function timeout(ms: number): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, ms))
 }
 

package/templates/base/package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "license": "GPL",
   "config": {
-    "alephium_version": "1.4.0-rc2"
+    "alephium_version": "1.5.0-rc6"
   },
   "scripts": {
     "build": "rm -rf dist && npx tsc --build .",
@@ -12,7 +12,7 @@
     "stop-devnet": "node scripts/stop-devnet.js"
   },
   "dependencies": {
-    "@alephium/web3": "0.1.0"
+    "@alephium/web3": "0.2.0-rc.7"
   },
   "devDependencies": {
     "@types/elliptic": "^6.4.13",

package/templates/base/src/greeter.ts

@@ -2,21 +2,22 @@
  * greeter.ts
  */
 
-import { NodeProvider, Contract, Script, TestContractParams } from '@alephium/web3'
-import { testWallet } from '@alephium/web3/test'
+import { TestContractParams, setCurrentNodeProvider, Project } from '@alephium/web3'
+import { testNodeWallet } from '@alephium/web3/test'
 
 async function greet() {
-  const provider = new NodeProvider('http://127.0.0.1:22973')
+  setCurrentNodeProvider('http://127.0.0.1:22973')
+  await Project.build()
 
-  const greeter = await Contract.fromSource(provider, 'greeter.ral')
+  const greeter = Project.contract('greeter/greeter.ral')
 
   const testParams: TestContractParams = {
     initialFields: { btcPrice: 1 }
   }
-  const testResult = await greeter.testPublicMethod(provider, 'greet', testParams)
+  const testResult = await greeter.testPublicMethod('greet', testParams)
   console.log(testResult)
 
-  const signer = await testWallet(provider)
+  const signer = await testNodeWallet()
 
   const deployTx = await greeter.transactionForDeployment(signer, { initialFields: testParams.initialFields })
   const greeterContractId = deployTx.contractId
@@ -26,7 +27,7 @@ async function greet() {
   const submitResult = await signer.submitTransaction(deployTx.unsignedTx, deployTx.txId)
   console.log(submitResult)
 
-  const main = await Script.fromSource(provider, 'greeter_main.ral')
+  const main = Project.script('greeter_main.ral')
 
   const mainScriptTx = await main.transactionForDeployment(signer, {
     initialFields: { greeterContractId: greeterContractId }

package/templates/react/package.json

@@ -2,7 +2,7 @@
   "name": "my-dapp",
   "version": "0.1.0",
   "config": {
-    "alephium_version": "1.4.0-rc2"
+    "alephium_version": "1.5.0-rc6"
   },
   "dependencies": {
     "@testing-library/jest-dom": "^5.16.4",
@@ -12,7 +12,7 @@
     "@types/node": "^16.11.26",
     "@types/react": "^18.0.3",
     "@types/react-dom": "^18.0.0",
-    "@alephium/web3": "0.1.0",
+    "@alephium/web3": "0.2.0-rc.7",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-scripts": "5.0.1",

package/templates/react/src/App.tsx

@@ -1,12 +1,12 @@
 import React, { useEffect, useState } from 'react'
 import './App.css'
 
-import { explorer, Contract, Script } from '@alephium/web3'
+import { ExplorerProvider, Contract, Script } from '@alephium/web3'
 import contractJson from './artifacts/greeter.ral.json'
 import scriptJson from './artifacts/greeter_main.ral.json'
 
 function Dashboard() {
-  const api = new explorer.Api<null>({ baseUrl: 'https://mainnet-backend.alephium.org' })
+  const api = new ExplorerProvider('https://mainnet-backend.alephium.org')
   const contract = Contract.fromJson(contractJson).toString()
   const script = Script.fromJson(scriptJson).toString()
   const [blocks, setBlocks] = useState('')

package/test/contract.test.ts

@@ -18,31 +18,32 @@ along with the library. If not, see <http://www.gnu.org/licenses/>.
 
 import * as fs from 'fs'
 import * as path from 'path'
-
-import { NodeProvider } from '../src/api'
-import { Contract, Script, TestContractParams } from '../src/contract'
-import { testWallet } from '../src/test'
+import { setCurrentNodeProvider } from '../src'
+import { Contract, Project, Script, TestContractParams } from '../src/contract'
+import { testNodeWallet } from '../src/test'
 import { addressFromContractId } from '../src/utils'
 
 describe('contract', function () {
   async function testSuite1() {
-    const provider = new NodeProvider('http://127.0.0.1:22973')
+    setCurrentNodeProvider('http://127.0.0.1:22973')
+    await Project.build()
 
-    const add = await Contract.fromSource(provider, 'add/add.ral')
-    const sub = await Contract.fromSource(provider, 'sub/sub.ral')
+    // ignore unused private function warnings
+    const add = Project.contract('add/add.ral', { errorOnWarnings: false })
+    const sub = Project.contract('sub/sub.ral')
 
     const subState = sub.toState({ result: 0 }, { alphAmount: BigInt('1000000000000000000') })
     const testParams: TestContractParams = {
-      initialFields: { subContractId: subState.contractId, result: 0 },
+      initialFields: { sub: subState.contractId, result: 0 },
       testArgs: { array: [2, 1] },
       existingContracts: [subState]
     }
-    const testResult = await add.testPublicMethod(provider, 'add', testParams)
+    const testResult = await add.testPublicMethod('add', testParams)
     expect(testResult.returns).toEqual([[3, 1]])
     expect(testResult.contracts[0].codeHash).toEqual(sub.codeHash)
     expect(testResult.contracts[0].fields.result).toEqual(1)
     expect(testResult.contracts[1].codeHash).toEqual(add.codeHash)
-    expect(testResult.contracts[1].fields.subContractId).toEqual(subState.contractId)
+    expect(testResult.contracts[1].fields.sub).toEqual(subState.contractId)
     expect(testResult.contracts[1].fields.result).toEqual(3)
     const events = testResult.events.sort((a, b) => a.name.localeCompare(b.name))
     expect(events[0].name).toEqual('Add')
@@ -52,10 +53,10 @@ describe('contract', function () {
     expect(events[1].fields.x).toEqual(2)
     expect(events[1].fields.y).toEqual(1)
 
-    const testResultPrivate = await add.testPrivateMethod(provider, 'addPrivate', testParams)
+    const testResultPrivate = await add.testPrivateMethod('addPrivate', testParams)
     expect(testResultPrivate.returns).toEqual([[3, 1]])
 
-    const signer = await testWallet(provider)
+    const signer = await testNodeWallet()
 
     const subDeployTx = await sub.transactionForDeployment(signer, {
       initialFields: { result: 0 },
@@ -71,7 +72,7 @@ describe('contract', function () {
     expect(subSubmitResult.txId).toEqual(subDeployTx.txId)
 
     const addDeployTx = await add.transactionForDeployment(signer, {
-      initialFields: { subContractId: subContractId, result: 0 },
+      initialFields: { sub: subContractId, result: 0 },
       initialTokenAmounts: []
     })
     expect(addDeployTx.fromGroup).toEqual(0)
@@ -85,13 +86,13 @@ describe('contract', function () {
     const addContractAddress = addressFromContractId(addContractId)
 
     // Check state for add/sub before main script is executed
-    let fetchedSubState = await sub.fetchState(provider, subContractAddress, 0)
+    let fetchedSubState = await sub.fetchState(subContractAddress, 0)
     expect(fetchedSubState.fields.result).toEqual(0)
-    let fetchedAddState = await add.fetchState(provider, addContractAddress, 0)
-    expect(fetchedAddState.fields.subContractId).toEqual(subContractId)
+    let fetchedAddState = await add.fetchState(addContractAddress, 0)
+    expect(fetchedAddState.fields.sub).toEqual(subContractId)
     expect(fetchedAddState.fields.result).toEqual(0)
 
-    const main = await Script.fromSource(provider, 'main.ral')
+    const main = Project.script('main.ral')
     const mainScriptTx = await main.transactionForDeployment(signer, {
       initialFields: { addContractId: addContractId }
     })
@@ -102,27 +103,28 @@ describe('contract', function () {
     expect(mainSubmitResult.toGroup).toEqual(0)
 
     // Check state for add/sub after main script is executed
-    fetchedSubState = await sub.fetchState(provider, subContractAddress, 0)
+    fetchedSubState = await sub.fetchState(subContractAddress, 0)
     expect(fetchedSubState.fields.result).toEqual(1)
-    fetchedAddState = await add.fetchState(provider, addContractAddress, 0)
-    expect(fetchedAddState.fields.subContractId).toEqual(subContractId)
+    fetchedAddState = await add.fetchState(addContractAddress, 0)
+    expect(fetchedAddState.fields.sub).toEqual(subContractId)
     expect(fetchedAddState.fields.result).toEqual(3)
   }
 
   async function testSuite2() {
-    const provider = new NodeProvider('http://127.0.0.1:22973')
+    setCurrentNodeProvider('http://127.0.0.1:22973')
+    await Project.build()
 
-    const greeter = await Contract.fromSource(provider, 'greeter/greeter.ral')
+    const greeter = Project.contract('greeter/greeter.ral')
 
     const testParams: TestContractParams = {
       initialFields: { btcPrice: 1 }
     }
-    const testResult = await greeter.testPublicMethod(provider, 'greet', testParams)
+    const testResult = await greeter.testPublicMethod('greet', testParams)
     expect(testResult.returns).toEqual([1])
     expect(testResult.contracts[0].codeHash).toEqual(greeter.codeHash)
     expect(testResult.contracts[0].fields.btcPrice).toEqual(1)
 
-    const signer = await testWallet(provider)
+    const signer = await testNodeWallet()
 
     const deployTx = await greeter.transactionForDeployment(signer, {
       initialFields: { btcPrice: 1 },
@@ -136,7 +138,7 @@ describe('contract', function () {
     expect(submitResult.txId).toEqual(deployTx.txId)
 
     const greeterContractId = deployTx.contractId
-    const main = await Script.fromSource(provider, 'greeter_main.ral')
+    const main = Project.script('greeter_main.ral')
 
     const mainScriptTx = await main.transactionForDeployment(signer, {
       initialFields: { greeterContractId: greeterContractId }
@@ -167,6 +169,14 @@ describe('contract', function () {
     Script.fromJson(loadJson(fileName))
   }
 
+  it('should load source files by order', async () => {
+    const sourceFiles = await Project['loadSourceFiles']('./contracts') // `loadSourceFiles` is a private method
+    expect(sourceFiles.length).toEqual(8)
+    sourceFiles.slice(0, 5).forEach((c) => expect(c.type).toEqual(0)) // contracts
+    sourceFiles.slice(5, 7).forEach((s) => expect(s.type).toEqual(1)) // scripts
+    sourceFiles.slice(7).forEach((i) => expect(i.type).toEqual(3)) // interfaces
+  })
+
   it('should load contract from json', async () => {
     loadContract('./artifacts/add/add.ral.json')
     loadContract('./artifacts/sub/sub.ral.json')
@@ -175,4 +185,29 @@ describe('contract', function () {
     loadContract('./artifacts/greeter/greeter.ral.json')
     loadScript('./artifacts/greeter_main.ral.json')
   })
+
+  it('should extract metadata of contracts', async () => {
+    setCurrentNodeProvider('http://127.0.0.1:22973')
+    await Project.build()
+
+    const contract = Project.contract('test/metadata.ral', { errorOnWarnings: false })
+    expect(contract.functions.map((func) => func.name)).toEqual(['foo', 'bar', 'baz'])
+    expect(contract.publicFunctions()).toEqual(['foo'])
+    expect(contract.usingPreapprovedAssetsFunctions()).toEqual(['foo'])
+    expect(contract.usingAssetsInContractFunctions()).toEqual(['bar'])
+  })
+
+  it('should handle compiler warnings', async () => {
+    setCurrentNodeProvider('http://127.0.0.1:22973')
+    await Project.build()
+    const contract = Project.contract('test/warnings.ral', { errorOnWarnings: false })
+    expect(contract.publicFunctions()).toEqual(['foo'])
+
+    expect(() => Project.contract('test/warnings.ral')).toThrowError(
+      'Compilation warnings:\n  - Found unused variables in Warnings: foo.y\n  - Found unused fields in Warnings: b'
+    )
+    expect(() => Project.contract('test/warnings.ral', { ignoreUnusedConstantsWarnings: false })).toThrowError(
+      'Compilation warnings:\n  - Found unused variables in Warnings: foo.y\n  - Found unused constants in Warnings: C\n  - Found unused fields in Warnings: b'
+    )
+  })
 })

package/test/events.test.ts

@@ -16,17 +16,19 @@ 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 { NodeProvider } from '../src/api'
 import { subscribeToEvents } from '../src/contract/events'
-import { Contract, Script } from '../src/contract'
+import { Project } from '../src/contract'
 import { NodeWallet, SignExecuteScriptTxParams } from '../src/signer'
 import { ContractEvent } from '../src/api/api-alephium'
-import { testWallet } from '../src/test'
+import { testNodeWallet } from '../src/test'
 import { SubscribeOptions, timeout } from '../src/utils'
+import { setCurrentNodeProvider } from '../src'
 
 describe('events', function () {
-  async function deployContract(provider: NodeProvider, signer: NodeWallet): Promise<[string, string]> {
-    const sub = await Contract.fromSource(provider, 'sub/sub.ral')
+  async function deployContract(signer: NodeWallet): Promise<[string, string]> {
+    setCurrentNodeProvider('http://127.0.0.1:22973')
+    await Project.build()
+    const sub = Project.contract('sub/sub.ral')
     const subDeployTx = await sub.transactionForDeployment(signer, {
       initialFields: { result: 0 },
       initialTokenAmounts: []
@@ -35,9 +37,10 @@ describe('events', function () {
     const subSubmitResult = await signer.submitTransaction(subDeployTx.unsignedTx, subDeployTx.txId)
     expect(subSubmitResult.txId).toEqual(subDeployTx.txId)
 
-    const add = await Contract.fromSource(provider, 'add/add.ral')
+    // ignore unused private function warnings
+    const add = Project.contract('add/add.ral', { errorOnWarnings: false })
     const addDeployTx = await add.transactionForDeployment(signer, {
-      initialFields: { subContractId: subContractId, result: 0 },
+      initialFields: { sub: subContractId, result: 0 },
       initialTokenAmounts: []
     })
     const addSubmitResult = await signer.submitTransaction(addDeployTx.unsignedTx, addDeployTx.txId)
@@ -53,13 +56,13 @@ describe('events', function () {
   }
 
   it('should subscribe contract events', async () => {
-    const provider = new NodeProvider('http://127.0.0.1:22973')
-    const signer = await testWallet(provider)
+    setCurrentNodeProvider('http://127.0.0.1:22973')
+    await Project.build()
+    const signer = await testNodeWallet()
 
-    const [contractAddress, contractId] = await deployContract(provider, signer)
+    const [contractAddress, contractId] = await deployContract(signer)
     const events: Array<ContractEvent> = []
     const subscriptOptions: SubscribeOptions<ContractEvent> = {
-      provider: provider,
       pollingInterval: 500,
       messageCallback: (event: ContractEvent): Promise<void> => {
         events.push(event)
@@ -72,7 +75,7 @@ describe('events', function () {
       }
     }
     const subscription = subscribeToEvents(subscriptOptions, contractAddress)
-    const script = await Script.fromSource(provider, 'main.ral')
+    const script = Project.script('main.ral')
     const scriptTxParams = await script.paramsForDeployment({
       initialFields: { addContractId: contractId },
       signerAddress: (await signer.getAccounts())[0].address
@@ -93,13 +96,13 @@ describe('events', function () {
   }, 15000)
 
   it('should cancel event subscription', async () => {
-    const provider = new NodeProvider('http://127.0.0.1:22973')
-    const signer = await testWallet(provider)
+    setCurrentNodeProvider('http://127.0.0.1:22973')
+    await Project.build()
+    const signer = await testNodeWallet()
 
-    const [contractAddress, contractId] = await deployContract(provider, signer)
+    const [contractAddress, contractId] = await deployContract(signer)
     const events: Array<ContractEvent> = []
     const subscriptOptions = {
-      provider: provider,
       pollingInterval: 500,
       messageCallback: (event: ContractEvent): Promise<void> => {
         events.push(event)
@@ -112,7 +115,7 @@ describe('events', function () {
       }
     }
     const subscription = subscribeToEvents(subscriptOptions, contractAddress)
-    const script = await Script.fromSource(provider, 'main.ral')
+    const script = Project.script('main.ral')
     const scriptTx0 = await script.transactionForDeployment(signer, {
       initialFields: { addContractId: contractId }
     })