fix monaco typescript error with

libs/remix-ui/editor/src/lib/web-types.ts

@@ -199,6 +199,10 @@ export const loadTypes = async (monaco) => {
     const indexWeb3Personal = await import('raw-loader!web3-eth-personal/types/index.d.ts')
     monaco.languages.typescript.typescriptDefaults.addExtraLib(indexWeb3Personal.default, `file:///node_modules/@types/web3-eth-personal/index.d.ts`)
 
+    // @ts-ignore
+    const indexWeb3Contract = await import('raw-loader!web3-eth-contract/types/index.d.ts')
+    monaco.languages.typescript.typescriptDefaults.addExtraLib(indexWeb3Contract.default, `file:///node_modules/@types/web3-eth-contract/index.d.ts`)
+
     // @ts-ignore
     const indexWeb3Net = await import('raw-loader!web3-net/types/index.d.ts')
     monaco.languages.typescript.typescriptDefaults.addExtraLib(indexWeb3Net.default, `file:///node_modules/@types/web3-net/index.d.ts`)

libs/remix-ws-templates/src/templates/ozerc20/scripts/ethers-lib.ts

@@ -1,24 +1,27 @@
 import { ethers } from 'ethers'
 
-export const deploy = async (contractName: string, args: Array<any>, from?: string): Promise<any> => {    
+/**
+ * Deploy the given contract
+ * @param {string} contractName name of the contract to deploy
+ * @param {Array<any>} args list of constructor' parameters
+ * @param {Number} acountIndex account index from the exposed account
+ * @return {Contract} deployed contract
+ */
+export const deploy = async (contractName: string, args: Array<any>, acountIndex?: number): Promise<ethers.Contract> => {    
 
     console.log(`deploying ${contractName}`)
     // Note that the script needs the ABI which is generated from the compilation artifact.
     // Make sure contract is compiled and artifacts are generated
-    const artifactsPath = `browser/contracts/artifacts/${contractName}.json`
+    const artifactsPath = `browser/contracts/artifacts/${contractName}.json` // Change this for different path
 
     const metadata = JSON.parse(await remix.call('fileManager', 'getFile', artifactsPath))
     // 'web3Provider' is a remix global variable object
-    const signer = (new ethers.providers.Web3Provider(web3Provider)).getSigner()
+    
+    const signer = (new ethers.providers.Web3Provider(web3Provider)).getSigner(acountIndex)
 
     const factory = new ethers.ContractFactory(metadata.abi, metadata.data.bytecode.object, signer);
 
-    let contract
-    if (from) {
-        contract = await factory.connect(from).deploy(...args);
-    } else {
-        contract = await factory.deploy(...args);
-    }    
+    let contract = await factory.deploy(...args)   
 
     // The contract is NOT deployed yet; we must wait until it is mined
     await contract.deployed()

libs/remix-ws-templates/src/templates/ozerc20/scripts/web3-lib.ts

@@ -1,6 +1,15 @@
 import Web3 from 'web3'
+import { Contract, ContractSendMethod, Options } from 'web3-eth-contract';
 
-export const deploy = async (contractName: string, args: Array<any>, from?: string, gas?: number): Promise<any> => {
+/**
+ * Deploy the given contract
+ * @param {string} contractName name of the contract to deploy
+ * @param {Array<any>} args list of constructor' parameters
+ * @param {string} from account used to send the transaction
+ * @param {number} gas gas limit
+ * @return {Options} deployed contract
+ */
+export const deploy = async (contractName: string, args: Array<any>, from?: string, gas?: number): Promise<Options> => {
 
     const web3 = new Web3(web3Provider)
     console.log(`deploying ${contractName}`)
@@ -12,14 +21,14 @@ export const deploy = async (contractName: string, args: Array<any>, from?: stri
 
     const accounts = await web3.eth.getAccounts()
 
-    let contract = new web3.eth.Contract(metadata.abi)
+    let contract: Contract  = new web3.eth.Contract(metadata.abi)
 
-    contract = contract.deploy({
+    let contractSend: ContractSendMethod = contract.deploy({
         data: metadata.data.bytecode.object,
         arguments: args
     })
 
-    const newContractInstance = await contract.send({
+    const newContractInstance = await contractSend.send({
         from: from || accounts[0],
         gas: gas || 1500000
     })

libs/remix-ws-templates/src/templates/ozerc721/scripts/ethers-lib.ts

@@ -1,24 +1,27 @@
 import { ethers } from 'ethers'
 
-export const deploy = async (contractName: string, args: Array<any>, from?: string): Promise<any> => {    
+/**
+ * Deploy the given contract
+ * @param {string} contractName name of the contract to deploy
+ * @param {Array<any>} args list of constructor' parameters
+ * @param {Number} acountIndex account index from the exposed account
+ * @return {Contract} deployed contract
+ */
+export const deploy = async (contractName: string, args: Array<any>, acountIndex?: number): Promise<ethers.Contract> => {    
 
     console.log(`deploying ${contractName}`)
     // Note that the script needs the ABI which is generated from the compilation artifact.
     // Make sure contract is compiled and artifacts are generated
-    const artifactsPath = `browser/contracts/artifacts/${contractName}.json`
+    const artifactsPath = `browser/contracts/artifacts/${contractName}.json` // Change this for different path
 
     const metadata = JSON.parse(await remix.call('fileManager', 'getFile', artifactsPath))
     // 'web3Provider' is a remix global variable object
-    const signer = (new ethers.providers.Web3Provider(web3Provider)).getSigner()
+    
+    const signer = (new ethers.providers.Web3Provider(web3Provider)).getSigner(acountIndex)
 
     const factory = new ethers.ContractFactory(metadata.abi, metadata.data.bytecode.object, signer);
 
-    let contract
-    if (from) {
-        contract = await factory.connect(from).deploy(...args);
-    } else {
-        contract = await factory.deploy(...args);
-    }    
+    let contract = await factory.deploy(...args)   
 
     // The contract is NOT deployed yet; we must wait until it is mined
     await contract.deployed()

libs/remix-ws-templates/src/templates/ozerc721/scripts/web3-lib.ts

@@ -1,6 +1,15 @@
 import Web3 from 'web3'
+import { Contract, ContractSendMethod, Options } from 'web3-eth-contract';
 
-export const deploy = async (contractName: string, args: Array<any>, from?: string, gas?: number): Promise<any> => {
+/**
+ * Deploy the given contract
+ * @param {string} contractName name of the contract to deploy
+ * @param {Array<any>} args list of constructor' parameters
+ * @param {string} from account used to send the transaction
+ * @param {number} gas gas limit
+ * @return {Options} deployed contract
+ */
+export const deploy = async (contractName: string, args: Array<any>, from?: string, gas?: number): Promise<Options> => {
 
     const web3 = new Web3(web3Provider)
     console.log(`deploying ${contractName}`)
@@ -12,14 +21,14 @@ export const deploy = async (contractName: string, args: Array<any>, from?: stri
 
     const accounts = await web3.eth.getAccounts()
 
-    let contract = new web3.eth.Contract(metadata.abi)
+    let contract: Contract  = new web3.eth.Contract(metadata.abi)
 
-    contract = contract.deploy({
+    let contractSend: ContractSendMethod = contract.deploy({
         data: metadata.data.bytecode.object,
         arguments: args
     })
 
-    const newContractInstance = await contract.send({
+    const newContractInstance = await contractSend.send({
         from: from || accounts[0],
         gas: gas || 1500000
     })

libs/remix-ws-templates/src/templates/remixDefault/scripts/ethers-lib.ts

@@ -1,6 +1,13 @@
 import { ethers } from 'ethers'
 
-export const deploy = async (contractName: string, args: Array<any>, from?: string): Promise<any> => {    
+/**
+ * Deploy the given contract
+ * @param {string} contractName name of the contract to deploy
+ * @param {Array<any>} args list of constructor' parameters
+ * @param {Number} acountIndex account index from the exposed account
+ * @return {Contract} deployed contract
+ */
+export const deploy = async (contractName: string, args: Array<any>, acountIndex?: number): Promise<ethers.Contract> => {    
 
     console.log(`deploying ${contractName}`)
     // Note that the script needs the ABI which is generated from the compilation artifact.
@@ -9,16 +16,12 @@ export const deploy = async (contractName: string, args: Array<any>, from?: stri
 
     const metadata = JSON.parse(await remix.call('fileManager', 'getFile', artifactsPath))
     // 'web3Provider' is a remix global variable object
-    const signer = (new ethers.providers.Web3Provider(web3Provider)).getSigner()
+    
+    const signer = (new ethers.providers.Web3Provider(web3Provider)).getSigner(acountIndex)
 
     const factory = new ethers.ContractFactory(metadata.abi, metadata.data.bytecode.object, signer);
 
-    let contract
-    if (from) {
-        contract = await factory.connect(from).deploy(...args);
-    } else {
-        contract = await factory.deploy(...args);
-    }    
+    let contract = await factory.deploy(...args)   
 
     // The contract is NOT deployed yet; we must wait until it is mined
     await contract.deployed()

libs/remix-ws-templates/src/templates/remixDefault/scripts/web3-lib.ts

@@ -1,25 +1,34 @@
 import Web3 from 'web3'
+import { Contract, ContractSendMethod, Options } from 'web3-eth-contract';
 
-export const deploy = async (contractName: string, args: Array<any>, from?: string, gas?: number): Promise<any> => {
+/**
+ * Deploy the given contract
+ * @param {string} contractName name of the contract to deploy
+ * @param {Array<any>} args list of constructor' parameters
+ * @param {string} from account used to send the transaction
+ * @param {number} gas gas limit
+ * @return {Options} deployed contract
+ */
+export const deploy = async (contractName: string, args: Array<any>, from?: string, gas?: number): Promise<Options> => {
 
     const web3 = new Web3(web3Provider)
     console.log(`deploying ${contractName}`)
     // Note that the script needs the ABI which is generated from the compilation artifact.
     // Make sure contract is compiled and artifacts are generated
-    const artifactsPath = `browser/contracts/artifacts/${contractName}.json` // Change this for different path
+    const artifactsPath = `browser/contracts/artifacts/${contractName}.json`
 
     const metadata = JSON.parse(await remix.call('fileManager', 'getFile', artifactsPath))
 
     const accounts = await web3.eth.getAccounts()
 
-    let contract = new web3.eth.Contract(metadata.abi)
+    let contract: Contract  = new web3.eth.Contract(metadata.abi)
 
-    contract = contract.deploy({
+    let contractSend: ContractSendMethod = contract.deploy({
         data: metadata.data.bytecode.object,
         arguments: args
     })
 
-    const newContractInstance = await contract.send({
+    const newContractInstance = await contractSend.send({
         from: from || accounts[0],
         gas: gas || 1500000
     })

libs/remix-ws-templates/src/templates/zeroxErc20/scripts/ethers-lib.ts

@@ -1,24 +1,27 @@
 import { ethers } from 'ethers'
 
-export const deploy = async (contractName: string, args: Array<any>, from?: string): Promise<any> => {    
+/**
+ * Deploy the given contract
+ * @param {string} contractName name of the contract to deploy
+ * @param {Array<any>} args list of constructor' parameters
+ * @param {Number} acountIndex account index from the exposed account
+ * @return {Contract} deployed contract
+ */
+export const deploy = async (contractName: string, args: Array<any>, acountIndex?: number): Promise<ethers.Contract> => {    
 
     console.log(`deploying ${contractName}`)
     // Note that the script needs the ABI which is generated from the compilation artifact.
     // Make sure contract is compiled and artifacts are generated
-    const artifactsPath = `browser/contracts/artifacts/${contractName}.json`
+    const artifactsPath = `browser/contracts/artifacts/${contractName}.json` // Change this for different path
 
     const metadata = JSON.parse(await remix.call('fileManager', 'getFile', artifactsPath))
     // 'web3Provider' is a remix global variable object
-    const signer = (new ethers.providers.Web3Provider(web3Provider)).getSigner()
+    
+    const signer = (new ethers.providers.Web3Provider(web3Provider)).getSigner(acountIndex)
 
     const factory = new ethers.ContractFactory(metadata.abi, metadata.data.bytecode.object, signer);
 
-    let contract
-    if (from) {
-        contract = await factory.connect(from).deploy(...args);
-    } else {
-        contract = await factory.deploy(...args);
-    }    
+    let contract = await factory.deploy(...args)   
 
     // The contract is NOT deployed yet; we must wait until it is mined
     await contract.deployed()

libs/remix-ws-templates/src/templates/zeroxErc20/scripts/web3-lib.ts

@@ -1,6 +1,15 @@
 import Web3 from 'web3'
+import { Contract, ContractSendMethod, Options } from 'web3-eth-contract';
 
-export const deploy = async (contractName: string, args: Array<any>, from?: string, gas?: number): Promise<any> => {
+/**
+ * Deploy the given contract
+ * @param {string} contractName name of the contract to deploy
+ * @param {Array<any>} args list of constructor' parameters
+ * @param {string} from account used to send the transaction
+ * @param {number} gas gas limit
+ * @return {Options} deployed contract
+ */
+export const deploy = async (contractName: string, args: Array<any>, from?: string, gas?: number): Promise<Options> => {
 
     const web3 = new Web3(web3Provider)
     console.log(`deploying ${contractName}`)
@@ -12,14 +21,14 @@ export const deploy = async (contractName: string, args: Array<any>, from?: stri
 
     const accounts = await web3.eth.getAccounts()
 
-    let contract = new web3.eth.Contract(metadata.abi)
+    let contract: Contract  = new web3.eth.Contract(metadata.abi)
 
-    contract = contract.deploy({
+    let contractSend: ContractSendMethod = contract.deploy({
         data: metadata.data.bytecode.object,
         arguments: args
     })
 
-    const newContractInstance = await contract.send({
+    const newContractInstance = await contractSend.send({
         from: from || accounts[0],
         gas: gas || 1500000
     })