Skip to content

Commit

Permalink
Merge branch 'master' of github.com:wighawag/hardhat-deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
wighawag committed May 30, 2024
2 parents e88e4eb + 6e86fb1 commit e0ffcf9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ You'll need to wait the tx resolve, or increase the gas price via --gasprice (th
}

function fixProvider(providerGiven: any): any {
// alow it to be used by ethers without any change
// allow it to be used by ethers without any change
if (providerGiven.sendAsync === undefined) {
providerGiven.sendAsync = (
req: {
Expand Down Expand Up @@ -2322,7 +2322,7 @@ Note that in this case, the contract deployment will not behave the same if depl
if (typeof options.deterministicSalt === 'string') {
if (options.deterministicSalt === salt) {
throw new Error(
`deterministicSalt cannot be 0x000..., it needs to be a non-zero bytes32 salt. This is to ensure you are explicitly specyfying different addresses for multiple diamonds`
`deterministicSalt cannot be 0x000..., it needs to be a non-zero bytes32 salt. This is to ensure you are explicitly specifying different addresses for multiple diamonds`
);
} else {
if (options.deterministicSalt.length !== 66) {
Expand Down Expand Up @@ -2964,7 +2964,7 @@ data: ${data}
)) as TransactionResponse;
txHashToWait = tx.hash;
if (tx.hash !== txHash) {
console.error('non mathcing tx hashes after resubmitting...');
console.error('non matching tx hashes after resubmitting...');
}
console.log('waiting for newly broadcasted tx ...');
} else {
Expand Down Expand Up @@ -3012,7 +3012,7 @@ data: ${data}
);
}
await onPendingTx(txReq);
console.error('non mathcing tx hashes after resubmitting...');
console.error('non matching tx hashes after resubmitting...');
}
}
} else if (answer === 'increase gas') {
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ task(TASK_NODE, 'Starts a JSON-RPC server on top of Hardhat EVM')
`
Unsupported network for JSON-RPC server. Only hardhat is currently supported.
hardhat-deploy cannot run on the hardhat provider when defaultNetwork is not hardhat, see https://github.com/nomiclabs/hardhat/issues/1139 and https://github.com/wighawag/hardhat-deploy/issues/63
you can specifiy hardhat via "--network hardhat"
you can specify hardhat via "--network hardhat"
`
);
}
Expand Down

0 comments on commit e0ffcf9

Please sign in to comment.