Skip to content

Commit

Permalink
chore: upgrade-18 cherrypick(s) (#10377)
Browse files Browse the repository at this point in the history
## Description

Cherry-picks the following commit from master:
- #10376
(25db2b9)
 
Constructed using the following `git rebase -i HEAD` todo list:
```
pick 25db2b9 Add configuration for emeryNet to upgrade.go and build scripts (#10376)
```
  • Loading branch information
mujahidkay authored Oct 31, 2024
2 parents ef001c0 + 5abf29c commit a0f4883
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 1 deletion.
6 changes: 5 additions & 1 deletion golang/cosmos/app/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ var upgradeNamesOfThisVersion = []string{
"UNRELEASED_A3P_INTEGRATION",
"UNRELEASED_main",
"UNRELEASED_devnet",
"UNRELEASED_emerynet",
"UNRELEASED_REAPPLY",
}

Expand Down Expand Up @@ -55,7 +56,8 @@ func isPrimaryUpgradeName(name string) bool {
case validUpgradeName("UNRELEASED_BASIC"),
validUpgradeName("UNRELEASED_A3P_INTEGRATION"),
validUpgradeName("UNRELEASED_main"),
validUpgradeName("UNRELEASED_devnet"):
validUpgradeName("UNRELEASED_devnet"),
validUpgradeName("UNRELEASED_emerynet"):
return true
case validUpgradeName("UNRELEASED_REAPPLY"):
return false
Expand Down Expand Up @@ -113,6 +115,8 @@ func getVariantFromUpgradeName(upgradeName string) string {
return "MAINNET"
case "UNRELEASED_devnet":
return "DEVNET"
case "UNRELEASED_emerynet":
return "EMERYNET"
// Noupgrade for this version.
case "UNRELEASED_BASIC":
return ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* where [ENVIRONMENT] is one of the following:
* - MAINNET
* - DEVNET
* - EMERYNET
* - A3P_INTEGRATION
* - BOOTSTRAP_TEST
*
Expand Down Expand Up @@ -47,6 +48,18 @@ const configurations = {
addressesToRemove: ['agoric1w8wktaur4zf8qmmtn3n7x3r0jhsjkjntcm3u6h'],
},
},
EMERYNET: {
committeeName: 'Economic Committee',
voterAddresses: {
gov1: 'agoric1ldmtatp24qlllgxmrsjzcpe20fvlkp448zcuce',
gov2: 'agoric140dmkrz2e42ergjj7gyvejhzmjzurvqeq82ang',
gov4: 'agoric1f0h5zgxyg3euxsqzs0506uj4cmu56y30pqx46s',
},
highPrioritySendersConfig: {
addressesToAdd: ['agoric1f0h5zgxyg3euxsqzs0506uj4cmu56y30pqx46s'],
addressesToRemove: ['agoric1w8wktaur4zf8qmmtn3n7x3r0jhsjkjntcm3u6h'],
},
},
A3P_INTEGRATION: {
committeeName: 'Economic Committee',
voterAddresses: {
Expand Down
7 changes: 7 additions & 0 deletions packages/builders/scripts/inter-protocol/updatePriceFeeds.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ const configurations = {
],
inBrandNames: ['ATOM', 'stTIA', 'stkATOM'],
},
EMERYNET: {
oracleAddresses: [
'agoric1ldmtatp24qlllgxmrsjzcpe20fvlkp448zcuce', // GOV1
'agoric140dmkrz2e42ergjj7gyvejhzmjzurvqeq82ang', // GOV2
],
inBrandNames: ['ATOM', 'stATOM', 'stOSMO', 'stTIA', 'stkATOM'],
},
};

const { keys } = Object;
Expand Down

0 comments on commit a0f4883

Please sign in to comment.