-
Notifications
You must be signed in to change notification settings - Fork 64
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
fix: duplicate addresses #145
Conversation
fadeev
commented
Apr 30, 2024
•
edited
Loading
edited
- removed duplicate addresses
- removed Mumbai
@brewmaster012 @lumtis please, review. Need a second review. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just 2 small comments
package.json
Outdated
@@ -64,15 +64,16 @@ | |||
"license": "MIT", | |||
"main": "./dist/lib/index.js", | |||
"name": "@zetachain/protocol-contracts", | |||
"packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just to double check if this change is needed since its not mentioned in description?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When I try to remove it,
yarn
! The local project doesn't define a 'packageManager' field. Corepack will now add one referencing yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72.
For some reason even on older node versions Corepack decides to set the package manager explicitly. I've changed this to yarn@1.22.21
: 4454170
@@ -1,11 +1,4 @@ | |||
[ | |||
{ | |||
"address": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this doesnt look like a duplicate in this file, just to double check, or is it handled by this:
addresses.push({
address: factoryAddress,
category: "messaging",
chain_id: router.chain_id,
chain_name: router.chain_name,
type: "uniswapV2Factory",
});
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In main
we have two identical entries:
protocol-contracts/data/addresses.mainnet.json
Lines 37 to 50 in 44edae0
{ | |
"address": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f", | |
"category": "messaging", | |
"chain_id": 1, | |
"chain_name": "eth_mainnet", | |
"type": "uniswapV2Factory" | |
}, | |
{ | |
"address": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f", | |
"category": "messaging", | |
"chain_id": 1, | |
"chain_name": "eth_mainnet", | |
"type": "uniswapV2Factory" | |
}, |
This PR leaves just one:
protocol-contracts/data/addresses.mainnet.json
Lines 37 to 43 in a0e7a4b
{ | |
"address": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f", | |
"category": "messaging", | |
"chain_id": 1, | |
"chain_name": "eth_mainnet", | |
"type": "uniswapV2Factory" | |
}, |
This is handled by the script, so I've removed the entry from tasks/addresses.ts
to avoid having duplicate entries.
04afbfc
@fadeev I solved the conflict in |
it seems that one of those 2 is not iterable and spread operator is used on them, i can also check:
also maybe related to yarn version change there is duplicate entry in package.json, will remove it EDIT: this did the trick, approving PR again |