Add setERC20() calls in cloneable contract deploy scripts

Signed-off-by: Jim Zhang <[email protected]>

solidity/scripts/deploy_cloneable.ts

@@ -8,14 +8,8 @@ export async function deployFungible(tokenName: string) {
   const { deployer, args, libraries } = await verifiersDeployer.deployDependencies();
 
   let zetoFactory;
-  const opts = {
-    kind: 'uups',
-    initializer: 'initialize',
-    unsafeAllow: ['delegatecall']
-  };
   if (libraries) {
     zetoFactory = await getLinkedContractFactory(tokenName, libraries);
-    opts.unsafeAllow.push('external-library-linking');
   } else {
     zetoFactory = await ethers.getContractFactory(tokenName)
   }
@@ -24,6 +18,9 @@ export async function deployFungible(tokenName: string) {
   await zetoImpl.waitForDeployment();
   await zetoImpl.connect(deployer).initialize(...args);
 
+  const tx3 = await zetoImpl.connect(deployer).setERC20(erc20.target);
+  await tx3.wait();
+
   console.log(`ERC20 deployed:     ${erc20.target}`);
   console.log(`ZetoToken deployed: ${zetoImpl.target}`);
 
@@ -36,14 +33,8 @@ export async function deployNonFungible(tokenName: string) {
   const { args, libraries } = await verifiersDeployer.deployDependencies();
 
   let zetoFactory;
-  const opts = {
-    kind: 'uups',
-    initializer: 'initialize',
-    unsafeAllow: ['delegatecall']
-  };
   if (libraries) {
     zetoFactory = await getLinkedContractFactory(tokenName, libraries);
-    opts.unsafeAllow.push('external-library-linking');
   } else {
     zetoFactory = await ethers.getContractFactory(tokenName)
   }

solidity/test/lib/deploy.ts

@@ -37,6 +37,8 @@ export async function deployZeto(tokenName: string) {
     const result = await deployFunc(tokenName);
     ({ deployer, zetoImpl, erc20, args } = result as any);
 
+    // we want to test the effectiveness of the factory contract
+    // to create clones of the Zeto implementation contract
     const Factory = await ethers.getContractFactory("ZetoTokenFactory");
     const factory = await Factory.deploy();
     await factory.waitForDeployment();
@@ -58,6 +60,9 @@ export async function deployZeto(tokenName: string) {
       }
     }
     zeto = await ethers.getContractAt(tokenName, zetoAddress);
+
+    const tx3 = await zeto.connect(deployer).setERC20(erc20.target);
+    await tx3.wait();
   }
 
   return { deployer, zeto, erc20 };