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

Update upgrade-tools #1536

Merged
merged 24 commits into from
Aug 14, 2023
Merged

Update upgrade-tools #1536

merged 24 commits into from
Aug 14, 2023

Conversation

DimaStebaev
Copy link
Contributor

No description provided.

@codecov
Copy link

codecov bot commented Jul 25, 2023

Codecov Report

Merging #1536 (881611a) into beta (7c93034) will decrease coverage by 4.38%.
Report is 35 commits behind head on beta.
The diff coverage is n/a.

❗ Current head 881611a differs from pull request most recent head c3e2e35. Consider uploading reports for the commit c3e2e35 to get more accurate results

@@            Coverage Diff             @@
##             beta    #1536      +/-   ##
==========================================
- Coverage   90.16%   85.79%   -4.38%     
==========================================
  Files          26       26              
  Lines        1322     1464     +142     
  Branches      348      401      +53     
==========================================
+ Hits         1192     1256      +64     
  Misses         33       33              
- Partials       97      175      +78     

see 23 files with indirect coverage changes

@DimaStebaev DimaStebaev linked an issue Aug 2, 2023 that may be closed by this pull request
@DimaStebaev DimaStebaev marked this pull request as ready for review August 7, 2023 09:53
export function getProxyMainnet(contractName: string) {
const defaultFilePath = "../data/proxyMainnet.json";
const jsonData = require(defaultFilePath);
async function getProxyMainnet(contractName: string) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

async??

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. readFile is an async call.

@@ -156,7 +156,7 @@ async function main() {
};
await keyStorage.setBlsCommonPublicKeyForSchain( ethers.utils.solidityKeccak256(['string'], [schainName]), BLSPublicKey );
console.log("Set common public key in KeyStorage contract", keyStorage.address, "\n");
await wallets.rechargeSchainWallet( web3.utils.soliditySha3( schainName ), { value: "10000000000000000000" } ); // originally it was 1000000000000000000 = 1ETH
await wallets.rechargeSchainWallet( ethers.utils.solidityKeccak256( ["string"], [schainName] ), { value: "10000000000000000000" } ); // originally it was 1000000000000000000 = 1ETH
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe using stringKeccak256 from helper?

CommunityPool
} from "../typechain";
import { stringFromHex, stringValue, getPublicKey } from "./utils/helper";
import { stringKeccak256, getBalance, getPublicKey } from "./utils/helper";
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is getBalance used somewhere?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.
At line # 76 for example.

@@ -64,7 +64,7 @@ describe("TokenManagerERC20", () => {
const schainId = ethers.utils.solidityKeccak256(["string"], [schainName]);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use solidityKeccak256 from helper?

Copy link
Collaborator

@payvint payvint left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks solid

@DimaStebaev
Copy link
Contributor Author

Looks solid

ity.

@DimaStebaev DimaStebaev merged commit 1f7d059 into beta Aug 14, 2023
14 of 16 checks passed
@DimaStebaev DimaStebaev deleted the hotfix/upgrade-tools branch August 14, 2023 09:20
@github-actions github-actions bot locked and limited conversation to collaborators Aug 14, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't update IMA due to gnosis safe api url change Can't update manager due to gnosis safe api url change
4 participants