Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Upgrade ethers to 5.7.2, hardhat to 2.22.15, and ethereum-waffle to 3.4.4 #1481

Merged
merged 19 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/currency/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@types/jest": "29.5.6",
"@types/multicoin-address-validator": "0.5.0",
"@types/node-dijkstra": "2.5.2",
"ethers": "5.5.1",
"ethers": "5.7.2",
"jest": "29.5.0",
"jest-junit": "16.0.0",
"source-map-support": "0.5.19",
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 @@ -41,7 +41,7 @@
},
"dependencies": {
"ajv": "6.12.4",
"ethers": "5.5.1",
"ethers": "5.7.2",
"tslib": "2.5.0"
},
"devDependencies": {
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 @@ -44,7 +44,7 @@
"@requestnetwork/smart-contracts": "0.38.0",
"@requestnetwork/types": "0.45.0",
"@requestnetwork/utils": "0.45.0",
"ethers": "5.5.1",
"ethers": "5.7.2",
"form-data": "3.0.0",
"qs": "6.11.2",
"shelljs": "0.8.5",
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 @@ -57,7 +57,7 @@
"@requestnetwork/utils": "0.45.0",
"@types/jest": "29.5.6",
"@types/node": "18.11.9",
"ethers": "5.5.1",
"ethers": "5.7.2",
MantisClone marked this conversation as resolved.
Show resolved Hide resolved
"jest": "29.5.0",
"jest-junit": "16.0.0",
"npm-run-all": "4.1.5",
Expand Down
4 changes: 2 additions & 2 deletions packages/integration-test/test/node-client.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ describe('Request client using a request node', () => {
requestData1 = requests[0].getData();
expect(requestData1.state).toBe(Types.RequestLogic.STATE.CANCELED);
expect(requestData1.expectedAmount).toBe('90000000');
}, 20000);
});

it('can create requests and get them fromIdentity with smart contract identity', async () => {
const payerSmartContract = {
Expand Down Expand Up @@ -474,7 +474,7 @@ describe('Request client using a request node', () => {

await fetchedRequest.refresh();
expect(fetchedRequest.getData().expectedAmount).toBe('0');
}, 60000);
});

it('create an encrypted and unencrypted request with the same content', async () => {
const requestNetwork = new RequestNetwork({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ describe('ERC20 Fee Proxy detection test-suite (with a TheGraph Retriever)', ()
expect(balance.events[0].name).toBe('payment');
expect(balance.events[0].amount).toBe('1');
expect(Math.abs(declarationTimestamp - (balance.events[0].timestamp ?? 0))).toBeLessThan(5);
}, 15000);
});
MantisClone marked this conversation as resolved.
Show resolved Hide resolved

it('getBalance = 0 if the payer declared the payment', async () => {
// Create a request
Expand Down Expand Up @@ -151,5 +151,5 @@ describe('ERC20 Fee Proxy detection test-suite (with a TheGraph Retriever)', ()
const balance = await erc20FeeProxy.getBalance(updatedRequest);
expect(balance.balance).toBe('0');
expect(balance.events).toHaveLength(0);
}, 15000);
});
});
4 changes: 2 additions & 2 deletions packages/integration-test/test/scheduled/erc20-proxy.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ describe('ERC20 Proxy detection test-suite', () => {
expect(balance.events[0].name).toBe('payment');
expect(balance.events[0].amount).toBe('1');
expect(Math.abs(declarationTimestamp - (balance.events[0].timestamp ?? 0))).toBeLessThan(5);
}, 10000);
});

it('getBalance = 0 if the payer declared the payment', async () => {
// Create a request
Expand Down Expand Up @@ -80,5 +80,5 @@ describe('ERC20 Proxy detection test-suite', () => {
});
expect(balance.balance).toBe('0');
expect(balance.events).toHaveLength(0);
}, 10000);
});
MantisClone marked this conversation as resolved.
Show resolved Hide resolved
});
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('ERC20 with Escrow detection test-suite', () => {
const balance = await feeProxyDetector.getBalance(mockRequest);

expect(balance.balance).toBe('1000000000000000000');
}, 15000);
});

it('can getBalance on a rinkeby request', async () => {
const mockRequest = createMockErc20FeeRequest({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ describe('ETH Fee proxy detection test-suite', () => {
expect(balance.events[0].name).toBe('payment');
expect(balance.events[0].amount).toBe('50000000000000000');
expect(Math.abs(declarationTimestamp - (balance.events[0].timestamp ?? 0))).toBeLessThan(5);
}, 20000);
});

it('getBalance = 0 if the payer declared the payment', async () => {
// Create a request
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/smart-contracts": "0.38.0",
"@requestnetwork/types": "0.45.0",
"@requestnetwork/utils": "0.45.0",
"ethers": "5.5.1",
"ethers": "5.7.2",
"graphql": "16.8.1",
"graphql-request": "6.1.0",
"graphql-tag": "2.12.6",
Expand Down
10 changes: 5 additions & 5 deletions packages/payment-detection/test/provider.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describe('getDefaultProvider', () => {
});
};

testSuite('rinkeby', 4);
testSuite('sepolia', 11155111);
testSuite('goerli', 5);

it('Can take a private network', async () => {
Expand Down Expand Up @@ -70,13 +70,13 @@ describe('getDefaultProvider', () => {
'http://fakenet.fake',
);
// still works for standard providers
expect((getDefaultProvider('rinkeby') as providers.JsonRpcProvider).connection.url).toMatch(
/https:\/\/rinkeby\.infura.*/,
expect((getDefaultProvider('amoy') as providers.JsonRpcProvider).connection.url).toMatch(
/https:\/\/amoy\.infura.*/,
MantisClone marked this conversation as resolved.
Show resolved Hide resolved
);
});

expect((getDefaultProvider('goerli') as providers.JsonRpcProvider).connection.url).toMatch(
/https:\/\/goerli\.infura.*/,
expect((getDefaultProvider('sepolia') as providers.JsonRpcProvider).connection.url).toMatch(
/https:\/\/rpc.sepolia\.org.*/,
rodrigopavezi marked this conversation as resolved.
Show resolved Hide resolved
);
});

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 @@ -46,7 +46,7 @@
"@requestnetwork/types": "0.45.0",
"@requestnetwork/utils": "0.45.0",
"@superfluid-finance/sdk-core": "0.5.0",
"ethers": "5.5.1",
"ethers": "5.7.2",
"near-api-js": "4.0.2",
"tslib": "2.5.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/payment-processor/test/payment/utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ describe('getNetworkProvider', () => {
});
};

testProvider('rinkeby');
testProvider('sepolia');
MantisClone marked this conversation as resolved.
Show resolved Hide resolved
testProvider('goerli');

it('fails for other network', () => {
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 @@ -54,7 +54,7 @@
"@requestnetwork/transaction-manager": "0.36.0",
"@requestnetwork/types": "0.45.0",
"@requestnetwork/utils": "0.45.0",
"ethers": "5.5.1",
"ethers": "5.7.2",
MantisClone marked this conversation as resolved.
Show resolved Hide resolved
"qs": "6.11.2",
"tslib": "2.5.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/request-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"init-ipfs": "node init-ipfs.js"
},
"dependencies": {
"@ethersproject/experimental": "5.5.0",
"@ethersproject/experimental": "5.7.0",
"@requestnetwork/currency": "0.18.0",
"@requestnetwork/data-access": "0.36.0",
"@requestnetwork/ethereum-storage": "0.36.0",
Expand All @@ -52,7 +52,7 @@
"chalk": "4.1.0",
"cors": "2.8.5",
"dotenv": "8.2.0",
"ethers": "5.5.1",
"ethers": "5.7.2",
"express": "4.21.0",
"graphql": "16.8.1",
"graphql-request": "6.1.0",
Expand Down
11 changes: 6 additions & 5 deletions packages/smart-contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,15 @@
"tslib": "2.5.0"
},
"devDependencies": {
"@ethersproject/providers": "5.7.2",
"@matterlabs/hardhat-zksync-deploy": "0.6.5",
"@matterlabs/hardhat-zksync-node": "0.0.1-beta.6",
"@matterlabs/hardhat-zksync-solc": "0.4.2",
"@matterlabs/hardhat-zksync-verify": "0.2.1",
"@matterlabs/zksync-contracts": "0.6.1",
"@nomicfoundation/hardhat-verify": "2.0.0",
"@nomiclabs/hardhat-ethers": "2.0.2",
"@nomiclabs/hardhat-waffle": "2.0.1",
"@nomiclabs/hardhat-ethers": "2.2.3",
"@nomiclabs/hardhat-waffle": "2.0.6",
"@nomiclabs/hardhat-web3": "2.0.0",
"@openzeppelin/contracts": "4.9.6",
"@rainbow-me/fee-suggestions": "2.1.0",
Expand All @@ -78,10 +79,10 @@
"@types/node": "18.11.9",
"chai": "4.3.4",
"dotenv": "10.0.0",
"ethereum-waffle": "3.4.0",
"ethers": "5.5.1",
"ethereum-waffle": "3.4.4",
"ethers": "5.7.2",
"ganache-cli": "6.12.0",
"hardhat": "2.12.0",
"hardhat": "2.22.15",
"solhint": "3.3.6",
"typechain": "5.1.1",
"web3": "1.7.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/thegraph-data-access/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@requestnetwork/smart-contracts": "0.38.0",
"@requestnetwork/types": "0.45.0",
"@requestnetwork/utils": "0.45.0",
"ethers": "5.5.1",
"ethers": "5.7.2",
"graphql-request": "6.1.0",
"tslib": "2.5.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/toolbox/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@requestnetwork/smart-contracts": "0.38.0",
"@requestnetwork/types": "0.45.0",
"@requestnetwork/utils": "0.45.0",
"ethers": "5.5.1",
"ethers": "5.7.2",
"inquirer": "8.2.0",
"tslib": "2.5.0",
"yargs": "17.6.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"prepare": "yarn run build"
},
"dependencies": {
"ethers": "5.5.1"
"ethers": "5.7.2"
MantisClone marked this conversation as resolved.
Show resolved Hide resolved
},
"devDependencies": {
"ts-node": "10.9.1",
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 @@ -38,7 +38,7 @@
"@requestnetwork/transaction-manager": "0.36.0",
"@requestnetwork/types": "0.45.0",
"@requestnetwork/utils": "0.45.0",
"ethers": "5.5.1",
"ethers": "5.7.2",
"tslib": "2.5.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"dependencies": {
"@requestnetwork/types": "0.45.0",
"@toruslabs/eccrypto": "4.0.0",
"ethers": "5.5.1",
"ethers": "5.7.2",
"secp256k1": "4.0.4",
"tslib": "2.5.0"
},
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 @@ -43,7 +43,7 @@
"dependencies": {
"@requestnetwork/types": "0.45.0",
"@requestnetwork/utils": "0.45.0",
"ethers": "5.5.1",
"ethers": "5.7.2",
"tslib": "2.5.0"
},
"devDependencies": {
Expand Down
Loading