This repository has been archived by the owner on Feb 23, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #83 from nervosnetwork/fix-process
fix(base, web3): bug in buildDeployProcess when using metamask
- Loading branch information
Showing
8 changed files
with
259 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| import { personalSign } from "@metamask/eth-sig-util"; | ||
| import crypto from "crypto"; | ||
| import keccak256 from "keccak256"; | ||
| import Web3 from "web3"; | ||
|
|
||
| export function privateKeyToEthAddress(privateKey) { | ||
| const ecdh = crypto.createECDH(`secp256k1`); | ||
| ecdh.generateKeys(); | ||
| ecdh.setPrivateKey(Buffer.from(privateKey.slice(2), "hex")); | ||
| const publicKey = "0x" + ecdh.getPublicKey("hex", "uncompressed"); | ||
| const _ethAddress = | ||
| "0x" + | ||
| keccak256(Buffer.from(publicKey.slice(4), "hex")) | ||
| .slice(12) | ||
| .toString("hex"); | ||
| const ethAddress = Web3.utils.toChecksumAddress(_ethAddress); | ||
| return ethAddress; | ||
| } | ||
|
|
||
| export async function initMockWindowsEthereum(privateKey: string) { | ||
| let window = { | ||
| ethereum: { | ||
| request: async function ({ method, params }) { | ||
| if (method !== "personal_sign") { | ||
| throw new Error( | ||
| "mock window.ethereum only impl personal_sign method." | ||
| ); | ||
| } | ||
| const [message_without_prefix, address] = params; | ||
| const ethAddress = privateKeyToEthAddress(privateKey); | ||
| if (address === ethAddress.toLocaleLowerCase()) { | ||
| return personalSign({ | ||
| privateKey: Buffer.from(privateKey.slice(2), "hex"), | ||
| data: message_without_prefix, | ||
| }); | ||
| } | ||
|
|
||
| throw new Error("invalid test data"); | ||
| }, | ||
| }, | ||
| }; | ||
| return window; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| import test from "ava"; | ||
| import Web3 from "web3"; | ||
| import { PolyjuiceHttpProvider } from "../lib/index"; | ||
| import { AbiItems, PolyjuiceConfig } from "@polyjuice-provider/base"; | ||
| import anotherContract from "../../../contract-testcase/ErrorReceipt.json"; | ||
| import deployArgsTestContract from "../../../contract-testcase/DeployArgs.json"; | ||
| import { genNewEthAddress } from "../../../contract-testcase/helper"; | ||
| import { initMockWindowsEthereum } from "./helper"; | ||
| const Contract = require("web3-eth-contract"); | ||
|
|
||
| const root = require("path").join.bind(this, __dirname, ".."); | ||
| require("dotenv").config({ path: root(".test.env") }); | ||
|
|
||
| const ABI = deployArgsTestContract.abi as AbiItems; | ||
| const BYTECODE = deployArgsTestContract.bytecode; | ||
|
|
||
| const PRIVATE_KEY = process.env.PRIVATE_KEY; | ||
| let ethAddressFromPrivateKey = process.env.ETH_ADDRESS; | ||
|
|
||
| let testAddressArray = [ | ||
| genNewEthAddress(), | ||
| "0x0000000000000000000000000000000000000000", | ||
| ethAddressFromPrivateKey, | ||
| ]; | ||
|
|
||
| let contractAddressFromBadDeployment: string; | ||
| let contractAddressFromGoodDeployment: string; | ||
| let contractDeployArgs: any[]; | ||
|
|
||
| let provider: PolyjuiceHttpProvider; | ||
| let web3: Web3; | ||
|
|
||
| test.before(async (t) => { | ||
| // init provider and web3 | ||
| const web3Rpc = process.env.WEB3_JSON_RPC; | ||
| const polyjuiceConfig: PolyjuiceConfig = { | ||
| abiItems: [...ABI, ...anotherContract.abi] as AbiItems, | ||
| web3Url: web3Rpc, | ||
| }; | ||
|
|
||
| provider = new PolyjuiceHttpProvider(web3Rpc, polyjuiceConfig); | ||
| web3 = new Web3(provider); | ||
| (global as any).window = await initMockWindowsEthereum(PRIVATE_KEY); | ||
| Contract.setProvider(provider); | ||
| }); | ||
|
|
||
| test.serial("prepare one contract address by deploying", async (t) => { | ||
| const deployTx = new Contract(anotherContract.abi as AbiItems) | ||
| .deploy({ | ||
| data: anotherContract.bytecode, | ||
| arguments: [], | ||
| }) | ||
| .send({ | ||
| from: ethAddressFromPrivateKey, | ||
| gasPrice: "0x00", | ||
| }); | ||
| const contract = await deployTx; | ||
|
|
||
| t.is(contract.options.address.slice(0, 2), "0x"); | ||
| contractAddressFromBadDeployment = contract.options.address; | ||
| testAddressArray.push(contractAddressFromBadDeployment); | ||
| }); | ||
|
|
||
| test.serial("deploy example contract without converting address", async (t) => { | ||
| const constructorArgs = [1, testAddressArray]; | ||
| contractDeployArgs = constructorArgs; | ||
| const deployTx = new Contract(ABI) | ||
| .deploy({ | ||
| data: BYTECODE, | ||
| arguments: constructorArgs, | ||
| }) | ||
| .send({ | ||
| from: ethAddressFromPrivateKey, | ||
| gasPrice: "0x00", | ||
| }); | ||
| const contract = await deployTx; | ||
|
|
||
| t.is(contract.options.address.slice(0, 2), "0x"); | ||
| contractAddressFromBadDeployment = contract.options.address; | ||
| }); | ||
|
|
||
| test.serial( | ||
| "call example contract to show deploy arguments is not supporting automatically address-converting", | ||
| async (t) => { | ||
| const contract = new web3.eth.Contract( | ||
| ABI as AbiItems, | ||
| contractAddressFromBadDeployment | ||
| ); | ||
| const value: string = await contract.methods.getValue().call(); | ||
| t.is(value, contractDeployArgs[0].toString()); | ||
|
|
||
| // the return addressList should be the same with the contract constructor arguments | ||
| // since the address converting for deployment arguments | ||
| // are not supported in providers for now. | ||
| // therefor, when you call contract method to return addressList, | ||
| // the address-type converting from polyjuiceAddress to ethAddress will go wrong, | ||
| // thus throw error is expected | ||
| const callRevert = async () => { | ||
| try { | ||
| await contract.methods.getAddressList().call(); | ||
| } catch (error) { | ||
| throw new Error(error.message); | ||
| } | ||
| }; | ||
| const callRevertRunResult = await t.throwsAsync(callRevert); | ||
| t.true( | ||
| callRevertRunResult.message.includes( | ||
| "result from jsonRPC poly_getEthAddressByGodwokenShortAddress is null or undefined. unable to fetch eth address from" | ||
| ) | ||
| ); | ||
| const errorAddress = callRevertRunResult.message.slice(-42); | ||
| t.true(testAddressArray.includes(errorAddress)); | ||
| } | ||
| ); | ||
|
|
||
| test.serial("deploy example contract in the right way", async (t) => { | ||
| const constructorArgs = [1, testAddressArray]; | ||
| contractDeployArgs = constructorArgs; | ||
|
|
||
| // you need this extra steps to convert your constructor arguments | ||
| // for deploying contract otherwise the address type will go wrong | ||
| const newConstructorArgs = await provider.convertDeployArgs( | ||
| constructorArgs, | ||
| ABI as AbiItems, | ||
| BYTECODE | ||
| ); | ||
| t.not(constructorArgs, newConstructorArgs); | ||
| // pass the new args with address converting to deploy contract | ||
| const deployTx = new Contract(ABI) | ||
| .deploy({ | ||
| data: BYTECODE, | ||
| arguments: newConstructorArgs, | ||
| }) | ||
| .send({ | ||
| from: ethAddressFromPrivateKey, | ||
| gasPrice: "0x00", | ||
| }); | ||
| const contract = await deployTx; | ||
| t.is(contract.options.address.slice(0, 2), "0x"); | ||
| contractAddressFromGoodDeployment = contract.options.address; | ||
| }); | ||
|
|
||
| test.serial( | ||
| "call example contract with good deployment to show deploy arguments supporting automatically address-converting", | ||
| async (t) => { | ||
| const contract = new web3.eth.Contract( | ||
| ABI as AbiItems, | ||
| contractAddressFromGoodDeployment | ||
| ); | ||
| const value: string = await contract.methods.getValue().call(); | ||
| t.is(value, contractDeployArgs[0].toString()); | ||
|
|
||
| // the return addressList should be the same with the contract constructor arguments | ||
| const addressList = await contract.methods.getAddressList().call(); | ||
| t.deepEqual(addressList, contractDeployArgs[1]); | ||
| } | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters