test(a3p): create a3p test for replace electorate core eval #10241

frazarshad · 2024-10-08T12:45:04Z

closes: #10138
closes: #10185
closes: #10258

Description

A3P tests for the replace electorate core eval. also adds the replace-electorate-core.js script to upgrade.go since it will now be a part of the chain halting upgrade

new tests are as follows:

adds new n:replace-electorate which tests for acceptance of new invitations
adds params governance proposal and voting tests to z:acceptance

Security Considerations

Scaling Considerations

Documentation Considerations

Testing Considerations

Upgrade Considerations

cloudflare-workers-and-pages · 2024-10-08T12:47:01Z

Deploying agoric-sdk with Cloudflare Pages

Latest commit:	`56f8b3c`
Status:	✅ Deploy successful!
Preview URL:	https://a65be0fe.agoric-sdk.pages.dev
Branch Preview URL:	https://fraz-replace-committee-a3p.agoric-sdk.pages.dev

View logs

a3p-integration/proposals/b:replace-electorate/replaceElectorate.test.js

dckc · 2024-10-08T18:42:00Z

a3p-integration/proposals/b:replace-electorate/utils.js

@@ -0,0 +1,5 @@
+export const waitUntil = async waitTime => {


Suggested change

export const waitUntil = async waitTime => {

export const waitUntil = async (waitTime, { setTimeout = globalThis.setTimeout, now = Date.now } = {}) => {

see

transitional approach to OCap Discipline #10038

dckc · 2024-10-08T18:43:16Z

a3p-integration/proposals/b:replace-electorate/replaceElectorate.test.js

+    -1,
+    fromCapData,
+  );
+  await waitUntil(latestQuestion.closingRule.deadline);


Suggested change

await waitUntil(latestQuestion.closingRule.deadline);

const { setTimeout } = globalThis;

const { now } = Date;

await waitUntil(latestQuestion.closingRule.deadline, { setTimeout, now });

a3p-integration/proposals/b:replace-electorate/utils.js

dckc · 2024-10-08T18:45:51Z

a3p-integration/proposals/b:replace-electorate/utils.js

@@ -0,0 +1,5 @@
+export const waitUntil = async waitTime => {
+  while (Math.floor(Date.now() / 1000) < waitTime) {


Suggested change

while (Math.floor(Date.now() / 1000) < waitTime) {

while (Math.floor(now() / 1000) < waitTime) {

dckc

Lots of good stuff here. But the EC changes should take place as part of n:upgrade-next; see #10258 .

The z:acceptance stuff could probably land as its own PR. I would expect it to work before or after the change of membership. Hm... maybe that would complicate things.

a3p-integration/proposals/b:replace-electorate/package.json

dckc

There are several parts that I don't understand.

dckc · 2024-10-21T15:53:03Z

a3p-integration/proposals/n:upgrade-next/acceptInvites.js

+await agops.ec(
+  'charter',
+  '--send-from',
+  GOV1ADDR,


only gov1? Won't we need the others to accept theirs too?

the config for A3P_INTEGRATION seems to have only one member in the committee. hence only one call to accept the invitation

agoric-sdk/packages/builders/scripts/inter-protocol/replace-electorate-core.js

Lines 70 to 72 in 919c173

voterAddresses: {

gov1: 'agoric1ee9hr0jyrxhy999y755mp862ljgycmwyp4pl7q',

},

packages/synthetic-chain/src/lib/constants.js has GOV1ADDR, GOV2ADDR, and GOV3ADDR.

packages/builders/scripts/inter-protocol/updatePriceFeeds.js has all three.

Where did you find a short list?

a3p-integration/proposals/n:upgrade-next/replaceElectorate.test.js

dckc · 2024-10-21T16:10:57Z

a3p-integration/proposals/z:acceptance/test-lib/index.js

+export const governanceDriver = await makeGovernanceDriver(
+  fetch,
+  networkConfig,
+);


Injecting fetch and networkConfig should be left to test scripts and not in a module like this.

see OCap Discipline

updated.
also isnt the walletUtils object in this file breaking this principle?

So is waitUntil, for that matter.

packages/builders/scripts/inter-protocol/replace-electorate-core.js

dckc · 2024-10-21T16:54:01Z

packages/builders/scripts/inter-protocol/replace-electorate-core.js

-  const config = configurations[variant];
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
+  const config = configurations[opts.variant];


ah! I missed this earlier. Now I get it.

dckc

This looks like it addresses the critical stuff. Good work!

I leave updating walletUtils and waitUntil to your discretion.

Chris-Hibbert · 2024-10-21T17:53:20Z

I'd like to wait to review till @dckc's requested changes are in. Please ping me at that point.

frazarshad · 2024-10-21T19:29:08Z

@Chris-Hibbert all requested changes from @dckc are done

Chris-Hibbert · 2024-10-21T20:23:15Z

a3p-integration/proposals/n:upgrade-next/acceptInvites.js

+await agops.ec(
+  'charter',
+  '--send-from',
+  GOV1ADDR,


packages/synthetic-chain/src/lib/constants.js has GOV1ADDR, GOV2ADDR, and GOV3ADDR.

packages/builders/scripts/inter-protocol/updatePriceFeeds.js has all three.

Where did you find a short list?

Chris-Hibbert · 2024-10-21T20:54:52Z

a3p-integration/proposals/z:acceptance/governance.test.js

+        getLastUpdate(address, { readLatestHead }),
+      ),
+    );
+    voteUpdates.forEach(voteUpdate => {


Lint flags this with Prefer for...of instead of Array.forEach. Is there any reason to prefer forEach here?

not particularly, just missed it. updating

a3p-integration/proposals/z:acceptance/test-lib/governance.js

Chris-Hibbert · 2024-10-21T21:38:25Z

golang/cosmos/app/upgrade.go

+	var variant string
+
+	switch validUpgradeName(upgradeName) {
+	case "UNRELEASED_A3P_INTEGRATION":
+		variant = "A3P_INTEGRATION"
+	case "UNRELEASED_main":
+		variant = "MAINNET"
+	case "UNRELEASED_devnet":
+		variant = "DEVNET"
+	// Noupgrade for this version.
+	case "UNRELEASED_BASIC":
+	}
+	variantJson, err := json.Marshal(variant)
+	if err != nil {
+		return nil, err
+	}
+	var result strings.Builder
+	err = t.Execute(&result, map[string]any{
+		"variantJson": string(variantJson),
+	})
+	if err != nil {
+		return nil, err
+	}
+	jsonStr := result.String()
+	jsonBz := []byte(jsonStr)
+	if !json.Valid(jsonBz) {
+		return nil, fmt.Errorf("invalid JSON: %s", jsonStr)
+	}
+	proposal := vm.ArbitraryCoreProposal{Json: jsonBz}
+	return vm.CoreProposalStepForModules(proposal), nil


I'm going to need to do all of this for the priceFeed upgrade. Can it be defined so it can be shared rather than requiring me to copy it?

Thanks! I build on top of this for #10317

frazarshad · 2024-10-22T10:52:16Z

Where did you find a short list?

@Chris-Hibbert new A3P_INTEGRATION committee only has one member

agoric-sdk/packages/builders/scripts/inter-protocol/replace-electorate-core.js

Lines 70 to 72 in 919c173

    
           voterAddresses: { 
        
             gov1: 'agoric1ee9hr0jyrxhy999y755mp862ljgycmwyp4pl7q', 
        
           },

dckc

a3p config needs gov4

dckc · 2024-10-22T16:22:43Z

packages/builders/scripts/inter-protocol/replace-electorate-core.js

-  const config = configurations[variant];
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
+  const config = configurations[opts.variant];


Let's be sure to add gov4 in the a3p configuration.

dckc · 2024-10-22T18:16:06Z

a3p-integration/proposals/z:acceptance/governance.test.js

+    for (const address of governanceAddresses) {
+      /** @type {any} */
+      const voteWallet = await readLatestHead(
+        `published.wallet.${GOV1ADDR}.current`,


Suggested change

`published.wallet.${GOV1ADDR}.current`,

`published.wallet.${address}.current`,

my request was addressed

dckc

presuming that the emerynet deployment uses the UNRELEASED_devnet config, this looks great!

frazarshad self-assigned this Oct 8, 2024

frazarshad force-pushed the rs-faraz-replace-charter branch from ffce1a7 to aef84d0 Compare October 8, 2024 18:05

dckc reviewed Oct 8, 2024

View reviewed changes

a3p-integration/proposals/b:replace-electorate/replaceElectorate.test.js Outdated Show resolved Hide resolved

dckc reviewed Oct 8, 2024

View reviewed changes

a3p-integration/proposals/b:replace-electorate/utils.js Outdated Show resolved Hide resolved

dckc reviewed Oct 8, 2024

View reviewed changes

rabi-siddique force-pushed the rs-faraz-replace-charter branch from 6a3afcb to 78581b1 Compare October 10, 2024 05:48

Base automatically changed from rs-faraz-replace-charter to master October 10, 2024 06:24

frazarshad force-pushed the fraz/replace-committee-a3p branch from 5082910 to 519de18 Compare October 10, 2024 06:33

dckc mentioned this pull request Oct 11, 2024

integrate EC membership changes into upgrade handler #10258

Closed

frazarshad added the force:integration Force integration tests to run on PR label Oct 14, 2024

frazarshad requested a review from dckc October 14, 2024 10:58

frazarshad marked this pull request as ready for review October 14, 2024 10:58

frazarshad requested a review from a team as a code owner October 14, 2024 10:58

dckc requested changes Oct 15, 2024

View reviewed changes

a3p-integration/proposals/b:replace-electorate/package.json Outdated Show resolved Hide resolved

This was referenced Oct 17, 2024

odd {x, y, z} >= {z} failure in AmountMath.isGTE with AssetKind.SET #10292

Closed

The newly elected EC must be able to govern (propose + vote) #10185

Closed

frazarshad requested review from Chris-Hibbert and dckc October 21, 2024 13:21

dckc reviewed Oct 21, 2024

View reviewed changes

frazarshad requested a review from dckc October 21, 2024 16:44

dckc reviewed Oct 21, 2024

View reviewed changes

dckc approved these changes Oct 21, 2024

View reviewed changes

Chris-Hibbert approved these changes Oct 21, 2024

View reviewed changes

dckc previously requested changes Oct 22, 2024

View reviewed changes

dckc reviewed Oct 22, 2024

View reviewed changes

dckc mentioned this pull request Oct 22, 2024

bug: half the committee members casting ballots is not a quorum #10306

Merged

rabi-siddique mentioned this pull request Oct 24, 2024

chore: update EC config for MAINNET #10323

Merged

frazarshad added 6 commits October 24, 2024 19:52

test(a3p): create a3p test for replace electorate core eval

d87e70c

test(a3p): add governance tests to z:acceptance

430be20

feat: added replace electorate proposal in chain upgrade

4e88d9f

refactor: util functions should follow ocap discipline

9ace4b9

chore: added gov4 to replace electorate config for a3p

ee39ed9

fix: using auctioneerKit to get auctioneer data

f406d25

dckc approved these changes Oct 24, 2024

View reviewed changes

frazarshad force-pushed the fraz/replace-committee-a3p branch from 56f8b3c to f406d25 Compare October 24, 2024 15:35

frazarshad added the automerge:rebase Automatically rebase updates, then merge label Oct 24, 2024

mergify bot merged commit a67502b into master Oct 24, 2024
87 checks passed

mergify bot deleted the fraz/replace-committee-a3p branch October 24, 2024 15:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test(a3p): create a3p test for replace electorate core eval #10241

test(a3p): create a3p test for replace electorate core eval #10241

frazarshad commented Oct 8, 2024 •

edited

Loading

cloudflare-workers-and-pages bot commented Oct 8, 2024 •

edited

Loading

dckc Oct 8, 2024 •

edited

Loading

dckc Oct 8, 2024 •

edited

Loading

dckc Oct 8, 2024

dckc left a comment

dckc left a comment

dckc Oct 21, 2024

frazarshad Oct 21, 2024

dckc Oct 21, 2024

Chris-Hibbert Oct 21, 2024

dckc Oct 21, 2024

frazarshad Oct 21, 2024

dckc Oct 21, 2024

dckc Oct 21, 2024

dckc Oct 21, 2024

dckc left a comment

Chris-Hibbert commented Oct 21, 2024

frazarshad commented Oct 21, 2024

Chris-Hibbert Oct 21, 2024

Chris-Hibbert Oct 21, 2024

frazarshad Oct 22, 2024

Chris-Hibbert Oct 21, 2024

frazarshad Oct 22, 2024

Chris-Hibbert Oct 23, 2024

frazarshad commented Oct 22, 2024

dckc left a comment

dckc Oct 22, 2024

dckc Oct 22, 2024

dckc left a comment •

edited

Loading

	export const waitUntil = async waitTime => {
	export const waitUntil = async (waitTime, { setTimeout = globalThis.setTimeout, now = Date.now } = {}) => {

-  await waitUntil(latestQuestion.closingRule.deadline);
+  const { setTimeout } = globalThis;
+  const { now } = Date;
+  await waitUntil(latestQuestion.closingRule.deadline, { setTimeout, now });

		@@ -0,0 +1,5 @@
		export const waitUntil = async waitTime => {
		while (Math.floor(Date.now() / 1000) < waitTime) {

	while (Math.floor(Date.now() / 1000) < waitTime) {
	while (Math.floor(now() / 1000) < waitTime) {

	voterAddresses: {
	gov1: 'agoric1ee9hr0jyrxhy999y755mp862ljgycmwyp4pl7q',
	},

	`published.wallet.${GOV1ADDR}.current`,
	`published.wallet.${address}.current`,

test(a3p): create a3p test for replace electorate core eval #10241

test(a3p): create a3p test for replace electorate core eval #10241

Conversation

frazarshad commented Oct 8, 2024 • edited Loading

Description

Security Considerations

Scaling Considerations

Documentation Considerations

Testing Considerations

Upgrade Considerations

cloudflare-workers-and-pages bot commented Oct 8, 2024 • edited Loading

Deploying agoric-sdk with Cloudflare Pages

dckc Oct 8, 2024 • edited Loading

Choose a reason for hiding this comment

dckc Oct 8, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dckc left a comment

Choose a reason for hiding this comment

dckc left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dckc left a comment

Choose a reason for hiding this comment

Chris-Hibbert commented Oct 21, 2024

frazarshad commented Oct 21, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

frazarshad commented Oct 22, 2024

dckc left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dckc left a comment • edited Loading

Choose a reason for hiding this comment

frazarshad commented Oct 8, 2024 •

edited

Loading

cloudflare-workers-and-pages bot commented Oct 8, 2024 •

edited

Loading

dckc Oct 8, 2024 •

edited

Loading

dckc Oct 8, 2024 •

edited

Loading

dckc left a comment •

edited

Loading