Skip to content

Commit

Permalink
fix: upgrade ethers to 5.2.0 (#532)
Browse files Browse the repository at this point in the history
* fix: upgrade ethers to 5.2.0

* fix: remove ether 5.1.4

* upgrade typechain

* abstract-signer resolved to 5.2.0

* fix: payment processor test

* fix: bank the new nullable transaction gasPrice property on the transaction

* Revert "fix: bank the new nullable transaction gasPrice property on the transaction"

This reverts commit 66ccdd5.

* fix:remove pinpointing etherprojects

Co-authored-by: Benjamin Levesque <14175665+benjlevesque@users.noreply.github.com>
  • Loading branch information
siibars and benjlevesque committed Jun 29, 2021
1 parent 487f473 commit 6c7cf35
Show file tree
Hide file tree
Showing 16 changed files with 594 additions and 383 deletions.
2 changes: 1 addition & 1 deletion packages/currency/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"devDependencies": {
"@types/jest": "26.0.13",
"@types/node-dijkstra": "2.5.1",
"ethers": "5.1.4",
"ethers": "5.2.0",
"jest": "26.4.2",
"prettier": "2.1.1",
"shx": "0.3.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/data-format/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
},
"dependencies": {
"ajv": "6.12.4",
"ethers": "5.1.4"
"ethers": "5.2.0"
},
"devDependencies": {
"@types/node": "14.14.16",
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"bn.js": "5.1.3",
"classnames": "2.2.6",
"core-js": "3.6.5",
"ethers": "5.1.4",
"ethers": "5.2.0",
"mobx": "5.15.6",
"react": "16.13.1",
"react-dom": "16.13.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/ethereum-storage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@requestnetwork/types": "0.35.0",
"@requestnetwork/utils": "0.35.0",
"bluebird": "3.7.2",
"ethers": "5.1.4",
"ethers": "5.2.0",
"form-data": "3.0.0",
"ipfs-unixfs": "2.0.3",
"keyv": "4.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/integration-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@truffle/hdwallet-provider": "1.2.3",
"@types/jest": "26.0.13",
"@types/node": "14.14.16",
"ethers": "5.1.4",
"ethers": "5.2.0",
"jest": "26.4.2",
"npm-run-all": "4.1.5",
"prettier": "2.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/payment-detection/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@requestnetwork/types": "0.35.0",
"@requestnetwork/utils": "0.35.0",
"axios": "0.21.1",
"ethers": "5.1.4",
"ethers": "5.2.0",
"graphql": "15.5.0",
"graphql-request": "3.4.0",
"graphql-tag": "2.12.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/payment-processor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@requestnetwork/smart-contracts": "0.28.0",
"@requestnetwork/types": "0.35.0",
"@requestnetwork/utils": "0.35.0",
"ethers": "5.1.4"
"ethers": "5.2.0"
},
"devDependencies": {
"@types/jest": "26.0.13",
Expand Down
2 changes: 1 addition & 1 deletion packages/payment-processor/test/payment/eth-proxy.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ describe('payEthProxyRequest', () => {
expect(balanceEthBefore.toString()).toBe(
balanceEthAfter
.add(validRequest.expectedAmount)
.add(confirmedTx.gasUsed!.mul(tx.gasPrice))
.add(confirmedTx.gasUsed?.mul(tx?.gasPrice ?? 1))
.toString(),
);
});
Expand Down
2 changes: 1 addition & 1 deletion packages/request-client.js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@requestnetwork/types": "0.35.0",
"@requestnetwork/utils": "0.35.0",
"axios": "0.21.1",
"ethers": "5.1.4"
"ethers": "5.2.0"
},
"devDependencies": {
"@compodoc/compodoc": "1.1.11",
Expand Down
8 changes: 4 additions & 4 deletions packages/smart-contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,21 @@
"deploy": "truffle --contracts_directory=./src deploy",
"test": "truffle test --contracts_directory=./src test/contracts/*.js",
"test:lib": "jest test test/lib",
"generate-types": "typechain --target=ethers-v5 --outDir=src/types 'build/contracts/*.json'"
"generate-types": "typechain --target=ethers-v5 --out-dir=src/types 'build/contracts/*.json'"
},
"devDependencies": {
"@openzeppelin/contracts": "2.5.1",
"@openzeppelin/test-helpers": "0.5.6",
"@requestnetwork/currency": "0.8.0",
"@requestnetwork/utils": "0.35.0",
"@typechain/ethers-v5": "6.0.5",
"@typechain/ethers-v5": "7.0.1",
"@types/node": "14.14.16",
"chai-as-promised": "7.1.1",
"chai-bn": "0.2.1",
"ethers": "5.1.4",
"ethers": "5.2.0",
"ganache-cli": "6.12.0",
"shx": "0.3.2",
"truffle": "5.1.44",
"typechain": "4.0.3"
"typechain": "5.1.1"
}
}
2 changes: 1 addition & 1 deletion packages/toolbox/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@requestnetwork/smart-contracts": "0.28.0",
"@requestnetwork/types": "0.35.0",
"axios": "0.21.1",
"ethers": "5.1.4",
"ethers": "5.2.0",
"yargs": "16.2.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"prepare": "yarn run build"
},
"dependencies": {
"ethers": "5.1.4",
"ethers": "5.2.0",
"events": "3.2.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/usage-examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@requestnetwork/transaction-manager": "0.26.9",
"@requestnetwork/types": "0.35.0",
"@requestnetwork/utils": "0.35.0",
"ethers": "5.1.4"
"ethers": "5.2.0"
},
"devDependencies": {
"prettier": "2.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"dependencies": {
"@requestnetwork/types": "0.35.0",
"eccrypto": "1.1.6",
"ethers": "5.1.4",
"ethers": "5.2.0",
"secp256k1": "4.0.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/web3-signature/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"dependencies": {
"@requestnetwork/types": "0.35.0",
"@requestnetwork/utils": "0.35.0",
"ethers": "5.1.4"
"ethers": "5.2.0"
},
"devDependencies": {
"@types/jest": "26.0.13",
Expand Down

0 comments on commit 6c7cf35

Please sign in to comment.