From 2c99cac838a33359563928b83636657f7951219a Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Thu, 9 Jan 2025 15:23:26 -0700 Subject: [PATCH 1/3] add whitelistedLps --- package.json | 2 +- .../run_in_band/chain_manager.test.ts | 24 ++++++++++++------- yarn.lock | 4 ++++ 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index cfcd20fa..2faeeaa5 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "@cosmjs/cosmwasm-stargate": "^0.32.4", "@cosmjs/stargate": "0.32.4", "@cosmjs/tendermint-rpc": "^0.32.4", - "@neutron-org/neutronjs": "https://github.com/neutron-org/neutronjs.git#7f45328320b53b4fa2b572bc25bb96bf80260181", + "@neutron-org/neutronjs": "https://github.com/neutron-org/neutronjs.git#2afdc21cb3d58d5aa894e9e96c8e5b756d95cbeb", "@neutron-org/neutronjsplus": "https://github.com/neutron-org/neutronjsplus.git#39dd19b17165ef206b40018ff437054210c2bdbc", "@types/lodash": "^4.14.182", "axios": "1.6.0", diff --git a/src/testcases/run_in_band/chain_manager.test.ts b/src/testcases/run_in_band/chain_manager.test.ts index afc70de1..a7d0f0e2 100644 --- a/src/testcases/run_in_band/chain_manager.test.ts +++ b/src/testcases/run_in_band/chain_manager.test.ts @@ -203,6 +203,7 @@ describe('Neutron / Chain Manager', () => { paused: true, max_jits_per_block: true, good_til_purge_allowance: true, + whitelisted_lps: true, }, }, ], @@ -242,9 +243,8 @@ describe('Neutron / Chain Manager', () => { '1000', ); - const timelockedProp = await subdaoMember1.supportAndExecuteProposal( - proposalId, - ); + const timelockedProp = + await subdaoMember1.supportAndExecuteProposal(proposalId); expect(timelockedProp.id).toEqual(proposalId); expect(timelockedProp.status).toEqual('timelocked'); @@ -287,9 +287,8 @@ describe('Neutron / Chain Manager', () => { '1000', ); - const timelockedProp = await subdaoMember1.supportAndExecuteProposal( - proposalId, - ); + const timelockedProp = + await subdaoMember1.supportAndExecuteProposal(proposalId); expect(timelockedProp.id).toEqual(proposalId); expect(timelockedProp.status).toEqual('timelocked'); @@ -329,6 +328,10 @@ describe('Neutron / Chain Manager', () => { paused: true, max_jits_per_block: 11, good_til_purge_allowance: 50000, + whitelisted_lps: [ + 'neutron10h9stc5v6ntgeygf5xf945njqq5h32r54rf7kf', + 'neutron16yn2gcz24s9qwpuxvrhl3xed0pmhrgwx2mz40zrazfc0pt5kq0psucs6xl', + ], }; beforeAll(async () => { proposalId = await subdaoMember1.submitUpdateParamsDexProposal( @@ -339,9 +342,8 @@ describe('Neutron / Chain Manager', () => { '1000', ); - const timelockedProp = await subdaoMember1.supportAndExecuteProposal( - proposalId, - ); + const timelockedProp = + await subdaoMember1.supportAndExecuteProposal(proposalId); expect(timelockedProp.id).toEqual(proposalId); expect(timelockedProp.status).toEqual('timelocked'); @@ -362,6 +364,10 @@ describe('Neutron / Chain Manager', () => { expect(dexParams.params.paused).toEqual(true); expect(dexParams.params.maxJitsPerBlock).toEqual(11n); expect(dexParams.params.goodTilPurgeAllowance).toEqual(50000n); + expect(dexParams.params.whitelistedLps).toEqual([ + 'neutron10h9stc5v6ntgeygf5xf945njqq5h32r54rf7kf', + 'neutron16yn2gcz24s9qwpuxvrhl3xed0pmhrgwx2mz40zrazfc0pt5kq0psucs6xl', + ]); }); }); diff --git a/yarn.lock b/yarn.lock index 0c07889a..6fc33e3d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1341,6 +1341,10 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" +"@neutron-org/neutronjs@https://github.com/neutron-org/neutronjs.git#2afdc21cb3d58d5aa894e9e96c8e5b756d95cbeb": + version "4.2.0" + resolved "https://github.com/neutron-org/neutronjs.git#2afdc21cb3d58d5aa894e9e96c8e5b756d95cbeb" + "@neutron-org/neutronjs@https://github.com/neutron-org/neutronjs.git#7f45328320b53b4fa2b572bc25bb96bf80260181": version "4.2.0" resolved "https://github.com/neutron-org/neutronjs.git#7f45328320b53b4fa2b572bc25bb96bf80260181" From d48fcd16731da08a69a37ca0b1ba57f4579d1c7b Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Mon, 13 Jan 2025 11:54:03 -0700 Subject: [PATCH 2/3] update neutronjsplus --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 2faeeaa5..e5f4c98c 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@cosmjs/stargate": "0.32.4", "@cosmjs/tendermint-rpc": "^0.32.4", "@neutron-org/neutronjs": "https://github.com/neutron-org/neutronjs.git#2afdc21cb3d58d5aa894e9e96c8e5b756d95cbeb", - "@neutron-org/neutronjsplus": "https://github.com/neutron-org/neutronjsplus.git#39dd19b17165ef206b40018ff437054210c2bdbc", + "@neutron-org/neutronjsplus": "https://github.com/neutron-org/neutronjsplus.git#5276aa2fd6d7a4ec4bca80f2b41a95cfdfab33b5", "@types/lodash": "^4.14.182", "axios": "1.6.0", "commander": "^10.0.0", diff --git a/yarn.lock b/yarn.lock index 6fc33e3d..0b5d5c9c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1345,18 +1345,18 @@ version "4.2.0" resolved "https://github.com/neutron-org/neutronjs.git#2afdc21cb3d58d5aa894e9e96c8e5b756d95cbeb" -"@neutron-org/neutronjs@https://github.com/neutron-org/neutronjs.git#7f45328320b53b4fa2b572bc25bb96bf80260181": +"@neutron-org/neutronjs@https://github.com/neutron-org/neutronjs.git#95a719604fecba39de5540b6ac99ded3e7aacfaa": version "4.2.0" - resolved "https://github.com/neutron-org/neutronjs.git#7f45328320b53b4fa2b572bc25bb96bf80260181" + resolved "https://github.com/neutron-org/neutronjs.git#95a719604fecba39de5540b6ac99ded3e7aacfaa" -"@neutron-org/neutronjsplus@https://github.com/neutron-org/neutronjsplus.git#39dd19b17165ef206b40018ff437054210c2bdbc": +"@neutron-org/neutronjsplus@https://github.com/neutron-org/neutronjsplus.git#5276aa2fd6d7a4ec4bca80f2b41a95cfdfab33b5": version "0.5.0" - resolved "https://github.com/neutron-org/neutronjsplus.git#39dd19b17165ef206b40018ff437054210c2bdbc" + resolved "https://github.com/neutron-org/neutronjsplus.git#5276aa2fd6d7a4ec4bca80f2b41a95cfdfab33b5" dependencies: "@cosmjs/cosmwasm-stargate" "^0.32.4" "@cosmjs/proto-signing" "^0.32.4" "@cosmjs/stargate" "0.32.4" - "@neutron-org/neutronjs" "https://github.com/neutron-org/neutronjs.git#7f45328320b53b4fa2b572bc25bb96bf80260181" + "@neutron-org/neutronjs" "https://github.com/neutron-org/neutronjs.git#95a719604fecba39de5540b6ac99ded3e7aacfaa" axios "1.6.0" bip39 "^3.1.0" long "^5.2.1" From 254d48300cb800ea2c4f06cc88efadb910ab94db Mon Sep 17 00:00:00 2001 From: Julian Compagni Portis Date: Mon, 3 Mar 2025 21:23:22 -0700 Subject: [PATCH 3/3] lint --- src/testcases/run_in_band/chain_manager.test.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/testcases/run_in_band/chain_manager.test.ts b/src/testcases/run_in_band/chain_manager.test.ts index 305f6363..ce4ef015 100644 --- a/src/testcases/run_in_band/chain_manager.test.ts +++ b/src/testcases/run_in_band/chain_manager.test.ts @@ -143,7 +143,7 @@ describe('Neutron / Chain Manager', () => { dao: currentOverruleProposalConfig['dao'], close_proposal_on_execution_failure: currentOverruleProposalConfig[ - 'close_proposal_on_execution_failure' + 'close_proposal_on_execution_failure' ], }, }), @@ -282,8 +282,9 @@ describe('Neutron / Chain Manager', () => { '1000', ); - const timelockedProp = - await subdaoMember1.supportAndExecuteProposal(proposalId); + const timelockedProp = await subdaoMember1.supportAndExecuteProposal( + proposalId, + ); expect(timelockedProp.id).toEqual(proposalId); expect(timelockedProp.status).toEqual('timelocked'); @@ -397,8 +398,9 @@ describe('Neutron / Chain Manager', () => { '1000', ); - const timelockedProp = - await subdaoMember1.supportAndExecuteProposal(proposalId); + const timelockedProp = await subdaoMember1.supportAndExecuteProposal( + proposalId, + ); expect(timelockedProp.id).toEqual(proposalId); expect(timelockedProp.status).toEqual('timelocked');