add remix config file

Author: yann300

libs/remix-ws-templates/src/templates/introToEIP7702/.remix/script.config.json

@@ -0,0 +1,7 @@
+{
+  "defaultConfig": "ethers6",
+  "customConfig": {
+    "baseConfiguration": "default",
+    "dependencies": []
+  }
+}

libs/remix-ws-templates/src/templates/introToEIP7702/index.ts

@@ -13,7 +13,9 @@ export default async (opts) => {
     // @ts-ignore
     'scripts/run-eip7702.ts': (await import('!!raw-loader!./scripts/run-eip7702.ts')).default,
     // @ts-ignore
-    'README.md': (await import('raw-loader!./README.md')).default
+    'README.md': (await import('raw-loader!./README.md')).default,
+    // @ts-ignore
+    '.remix/script.config.json': (await import('!!raw-loader!./.remix/script.config.json')).default
   }
   return filesObj
 }

libs/remix-ws-templates/src/templates/introToEIP7702/scripts/deploy.ts

@@ -1,4 +1,4 @@
-import { ethers } from 'ethers'
+import { ethers } from 'ethers';
 
 /**
  * Deploy the given contract
@@ -8,22 +8,22 @@ import { ethers } from 'ethers'
  * @return {Contract} deployed contract
  */
 export const deploy = async (contractName: string, args: Array<any>, accountIndex?: 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` // 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(accountIndex)
-
-  const factory = new ethers.ContractFactory(metadata.abi, metadata.data.bytecode.object, signer)
+  // 'web3Provider' is a remix global variable object
+  const provider = new ethers.BrowserProvider(web3Provider);
+  const signer = await provider.getSigner(accountIndex);
 
-  const contract = await factory.deploy(...args)
+  const factory = new ethers.ContractFactory(metadata.abi, metadata.data.bytecode.object, signer);
+  const contract = await factory.deploy(...args);
 
   // The contract is NOT deployed yet; we must wait until it is mined
-  await contract.deployed()
-  return contract
-}
+  await contract.waitForDeployment();
+
+  return contract;
+}

libs/remix-ws-templates/src/templates/introToEIP7702/scripts/run-eip7702.ts

@@ -1,3 +1,4 @@
+import { ethers } from "ethers"
 import { deploy } from './deploy'
 
 (async () => {
@@ -7,30 +8,30 @@ import { deploy } from './deploy'
 
     // deploy ERC20
     const erc20 = await deploy('MyToken', ['0x5B38Da6a701c568545dCfcB03FcB875f56beddC4'])
-    console.log(`MyToken address: ${erc20.address}`)
+    console.log(`MyToken address: ${await erc20.getAddress()}`)
 
     // deploy Spender
-    const spender = await deploy('Spender', [erc20.address])
-    console.log(`Spender address: ${spender.address}`)
+    const spender = await deploy('Spender', [await erc20.getAddress()])
+    console.log(`Spender address: ${await spender.getAddress()}`);
 
     // mint 1000000 token to 0x5B38Da6a701c568545dCfcB03FcB875f56beddC4
-    await (await erc20.mint(accountWithToken, 1000000))
+    await (await erc20.mint(accountWithToken, 1000000)).wait()
 
     // check
     console.log('balance', (await erc20.balanceOf(accountWithToken)).toString())
 
     // encode call 1 : Approve Spender to spend 0x5B38Da6a701c568545dCfcB03FcB875f56beddC4 balance (1000000)
-    const data1 = erc20.interface.encodeFunctionData('approve', [spender.address, 1000000])
+    const data1 = erc20.interface.encodeFunctionData('approve', [await spender.getAddress(), 1000000])
     // encode call 2 : Use Spender to send 100000 token to 0xAb8483F64d9C6d1EcF9b849Ae677dD3315835cb2 from 0x5B38Da6a701c568545dCfcB03FcB875f56beddC4 balance
     const data2 = spender.interface.encodeFunctionData('send', [accountWithToken, accountNullBalance, 10000])
 
     const executeBatch = [
-      [erc20.address, 0, data1],
-      [spender.address, 0, data2]
-    ]
+      [await erc20.getAddress(), 0, data1],
+      [await spender.getAddress(), 0, data2]
+    ];
 
     console.log(executeBatch)
   } catch (e) {
     console.log(e.message)
   }
-})()
+})();