build: use the official typechain ethers-v5 library (#239)

* build: use the official typechain ethers-v5 library

Author: abarmat

package-lock.json

@@ -20,6 +20,7 @@
     "@nomiclabs/buidler-etherscan": "^1.3.3",
     "@nomiclabs/buidler-waffle": "^2.0.0",
     "@openzeppelin/contracts": "3.0.1",
+    "@typechain/ethers-v5": "0.0.2",
     "@types/bs58": "^4.0.1",
     "@types/dotenv": "^8.2.0",
     "@types/minimist": "^1.2.0",
@@ -55,7 +56,6 @@
     "ts-generator": "0.0.8",
     "ts-node": "^8.10.1",
     "typechain": "^2.0.0",
-    "typechain-target-abarmat-ethers-v5": "^1.0.0",
     "typescript": "^3.9.3",
     "yaml": "^1.10.0",
     "yargs": "^15.3.1"
@@ -82,7 +82,7 @@
     "prettier:sol": "prettier --write 'contracts/*.sol'",
     "flatten": "scripts/flatten",
     "abi:extract": "truffle-abi -d ./build/contracts -o ./build/abis/ -v",
-    "typechain": "typechain --target abarmat-ethers-v5 --outDir build/typechain/contracts 'build/abis/*.json'",
+    "typechain": "typechain --target ethers-v5 --outDir build/typechain/contracts 'build/abis/*.json'",
     "verify": "buidler verify"
   },
   "lint-staged": {

package.json

@@ -309,7 +309,7 @@ export class MiniCommitment {
         return {
           to: ctdt.address,
           value: 0,
-          data: ctdt.interface.encodeFunctionData('executeWithdraw(address,bytes32,bytes,bytes)', [
+          data: ctdt.interface.encodeFunctionData('executeWithdraw', [
             withdrawInterpreterAddress,
             randomBytes(32), // nonce
             encode(withdrawOutcomeEncoding, { to: recipient, amount: BigNumber.from(amount) }),
@@ -344,16 +344,13 @@ export class MiniCommitment {
         return {
           to: ctdt.address,
           value: 0,
-          data: ctdt.interface.encodeFunctionData(
-            'executeEffectOfInterpretedAppOutcome(address,bytes32,bytes32,address,bytes)',
-            [
-              mockDispute.address,
-              freeBalanceIdentityHash,
-              appIdentityHash,
-              interpreterAddr,
-              encodedParams,
-            ],
-          ),
+          data: ctdt.interface.encodeFunctionData('executeEffectOfInterpretedAppOutcome', [
+            mockDispute.address,
+            freeBalanceIdentityHash,
+            appIdentityHash,
+            interpreterAddr,
+            encodedParams,
+          ]),
           operation: MultisigOperation.DelegateCall,
         }
       }
@@ -369,10 +366,11 @@ export class MiniCommitment {
         return {
           to: ctdt.address,
           value: 0,
-          data: ctdt.interface.encodeFunctionData(
-            'executeEffectOfFreeBalance(address,bytes32,address)',
-            [mockDispute.address, freeBalanceIdentityHash, interpreterAddr],
-          ),
+          data: ctdt.interface.encodeFunctionData('executeEffectOfFreeBalance', [
+            mockDispute.address,
+            freeBalanceIdentityHash,
+            interpreterAddr,
+          ]),
           operation: MultisigOperation.DelegateCall,
         }
       }
@@ -409,10 +407,13 @@ export class MiniCommitment {
     // Encode call to execute transaction
     const multisig = new Interface(MultisigArtifact.abi)
 
-    const txData = multisig.encodeFunctionData(
-      'execTransaction(address,uint256,bytes,uint8,bytes[])',
-      [details.to, details.value, details.data, details.operation, signatures],
-    )
+    const txData = multisig.encodeFunctionData('execTransaction', [
+      details.to,
+      details.value,
+      details.data,
+      details.operation,
+      signatures,
+    ])
 
     return { to: this.multisigAddress, value: 0, data: txData }
   }

test/lib/channel.ts

@@ -251,9 +251,7 @@ export async function deployMultisigWithProxy(
   } = ctx
   const tx = await proxyFactory.functions.createProxyWithNonce(
     masterCopy.address,
-    masterCopy.interface.encodeFunctionData('setup(address[])', [
-      owners.map((owner) => owner.address),
-    ]),
+    masterCopy.interface.encodeFunctionData('setup', [owners.map((owner) => owner.address)]),
     // hardcode ganache chainId
     solidityKeccak256(['uint256', 'uint256'], [4447, 0]),
   )