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

Feat/multichain reputation rebased hardhat 2 #1238

Merged
merged 65 commits into from
May 1, 2024

Conversation

area
Copy link
Member

@area area commented Apr 5, 2024

Intended to be the same as #1216 but based on #1196. #1237 is based on this branch.

contracts/bridging/WormholeBridgeForColony.sol Outdated Show resolved Hide resolved
contracts/colonyNetwork/ColonyNetworkDataTypes.sol Outdated Show resolved Hide resolved
contracts/colonyNetwork/ColonyNetworkMining.sol Outdated Show resolved Hide resolved
contracts/colonyNetwork/ColonyNetworkMining.sol Outdated Show resolved Hide resolved
contracts/colonyNetwork/ColonyNetworkSkills.sol Outdated Show resolved Hide resolved
helpers/test-helper.js Outdated Show resolved Hide resolved
helpers/test-helper.js Outdated Show resolved Hide resolved
migrations/6_setup_mining_cycle_resolver.js Outdated Show resolved Hide resolved
migrations/6_setup_mining_cycle_resolver.js Outdated Show resolved Hide resolved
migrations/8_setup_meta_colony.js Outdated Show resolved Hide resolved
@area
Copy link
Member Author

area commented Apr 6, 2024

I've included your suggested changes to the migrations, though really they should have been deleted in #1196 😄

@area area force-pushed the feat/multichain-reputation-rebased-hardhat-2 branch from 6cb7ac0 to dd974be Compare April 6, 2024 14:22
@area area force-pushed the feat/multichain-reputation-rebased-hardhat-2 branch from dd974be to 15c78f3 Compare April 6, 2024 14:23

bool success = callThroughBridgeWithGuards(payload);

if (success) {
Copy link
Member

Choose a reason for hiding this comment

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

Could do this as

require(success, "colony-network-bridging-tx-unsuccessful");

emit ReputationUpdateSentToBridge(_colony, _updateNumber);

);
return skill.children[_childSkillIndex];
return;
Copy link
Member

Choose a reason for hiding this comment

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

Why not do an else here?

Copy link
Member Author

Choose a reason for hiding this comment

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

This is the same pattern as came up recently, namely that I don't want to forget that we introduced the else to implicitly mean 'and do nothing else in the if branch', and then introduce something after the if statement at a later date that breaks that assumption.

@area area force-pushed the feat/multichain-reputation-rebased-hardhat-2 branch from 8a1a142 to 0d9436c Compare April 9, 2024 05:37
area added a commit that referenced this pull request May 1, 2024
Adds CREATE2/CREATE3 deployments, but also includes the hardhat migration (#1196) and multi-chain work (#1238)
Base automatically changed from maint/hardhat-2 to develop May 1, 2024 07:21
@area area merged commit 0d9436c into develop May 1, 2024
1 of 2 checks passed
@area area deleted the feat/multichain-reputation-rebased-hardhat-2 branch May 1, 2024 07:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants