Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@swelf19
swelf19 committed Nov 11, 2024
1 parent d7e6016 commit cf765db
Show file tree
Hide file tree
Showing 4 changed files with 218 additions and 9 deletions.
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"@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/neutronjsplus": "https://github.com/neutron-org/neutronjsplus.git#39dd19b17165ef206b40018ff437054210c2bdbc",
"@neutron-org/neutronjs": "https://github.com/neutron-org/neutronjs.git#8ca4875e81fc7cdfffab513bb410ca7cff09db78",
"@neutron-org/neutronjsplus": "https://github.com/neutron-org/neutronjsplus.git#27317fc2658f2e5056ba900b01db7d749508d647",
"@types/lodash": "^4.14.182",
"axios": "1.6.0",
"commander": "^10.0.0",
Expand Down Expand Up @@ -91,4 +91,4 @@
"engines": {
"node": ">=20.0"
}
}
}
4 changes: 2 additions & 2 deletions src/helpers/dao.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export const deploySubdao = async (
},
},
},
close_proposal_on_execution_failure: closeProposalOnExecutionFailure,
close_proposal_on_execution_failure: false,
};
const proposalModuleInstantiateInfo = {
code_id: proposeCodeId,
Expand Down Expand Up @@ -164,7 +164,7 @@ export const setupSubDaoTimelockSet = async (
mockMainDao ? user : daoContracts.core.address,
daoContracts.proposals.overrule.pre_propose.address,
securityDaoAddr,
closeProposalOnExecutionFailure,
false,
);

const mainDaoMember = new DaoMember(
Expand Down
209 changes: 207 additions & 2 deletions src/testcases/run_in_band/chain_manager.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import {
updateTokenfactoryParamsProposal,
AddSchedule,
RemoveSchedule,
updateGlobalFeeParamsProposal,
updateConsumerParamsProposal,
} from '@neutron-org/neutronjsplus/dist/proposal';
import { LocalState } from '../../helpers/local_state';
import { RunnerTestSuite, inject } from 'vitest';
Expand All @@ -23,6 +25,9 @@ import { QueryClientImpl as AdminQueryClient } from '@neutron-org/neutronjs/cosm
import { QueryClientImpl as TokenfactoryQueryClient } from '@neutron-org/neutronjs/osmosis/tokenfactory/v1beta1/query.rpc.Query';
import { QueryClientImpl as UpgradeQueryClient } from '@neutron-org/neutronjs/cosmos/upgrade/v1beta1/query.rpc.Query';
import { QueryClientImpl as DexQueryClient } from '@neutron-org/neutronjs/neutron/dex/query.rpc.Query';
import { QueryClientImpl as DynamicfeesQueryClient } from '@neutron-org/neutronjs/neutron/dynamicfees/v1/query.rpc.Query';
import { QueryClientImpl as GlobalfeeQueryClient } from '@neutron-org/neutronjs/gaia/globalfee/v1beta1/query.rpc.Query';
import { QueryClientImpl as CCVQueryClient } from '@neutron-org/neutronjs/interchain_security/ccv/consumer/v1/query.rpc.Query';
import { SigningNeutronClient } from '../../helpers/signing_neutron_client';
import config from '../../config.json';
import { Wallet } from '../../helpers/wallet';
Expand All @@ -39,6 +44,9 @@ describe('Neutron / Chain Manager', () => {
let cronQuerier: CronQueryClient;
let tokenfactoryQuerier: TokenfactoryQueryClient;
let dexQuerier: DexQueryClient;
let dynamicfeesQuerier: DynamicfeesQueryClient;
let globalfeeQuerier: GlobalfeeQueryClient;
let ccvQuerier: CCVQueryClient;
let upgradeQuerier: UpgradeQueryClient;
let chainManagerAddress: string;

Expand Down Expand Up @@ -73,7 +81,7 @@ describe('Neutron / Chain Manager', () => {
neutronClient,
mainDao.contracts.core.address,
securityDaoAddr,
true,
false,
);

subdaoMember1 = new DaoMember(
Expand All @@ -97,6 +105,9 @@ describe('Neutron / Chain Manager', () => {
cronQuerier = new CronQueryClient(neutronRpcClient);
dexQuerier = new DexQueryClient(neutronRpcClient);
upgradeQuerier = new UpgradeQueryClient(neutronRpcClient);
dynamicfeesQuerier = new DynamicfeesQueryClient(neutronRpcClient);
globalfeeQuerier = new GlobalfeeQueryClient(neutronRpcClient);
ccvQuerier = new CCVQueryClient(neutronRpcClient);
});

// We need to do this because the real main dao has a super long voting period.
Expand Down Expand Up @@ -205,6 +216,35 @@ describe('Neutron / Chain Manager', () => {
good_til_purge_allowance: true,
},
},
{
update_ccv_params_permission: {
blocks_per_distribution_transmission: true,
distribution_transmission_channel: true,
provider_fee_pool_addr_str: true,
ccv_timeout_period: true,
transfer_timeout_period: true,
consumer_redistribution_fraction: true,
historical_entries: true,
unbonding_period: true,
// !!! DEPRECATED !!! soft_opt_out_threshold is deprecated. see docs/docs/adrs/adr-015-partial-set-security.md
soft_opt_out_threshold: true,
reward_denoms: true,
provider_reward_denoms: true,
retry_delay_period: true,
},
},
{
update_globalfee_params_permission: {
minimum_gas_prices: true,
bypass_min_fee_msg_types: true,
max_total_bypass_min_fee_msg_gas_usage: true,
},
},
{
update_dynamicfees_params_permission: {
ntrn_prices: true,
},
},
],
},
},
Expand Down Expand Up @@ -325,7 +365,7 @@ describe('Neutron / Chain Manager', () => {
describe('ALLOW_ONLY: change DEX parameters', () => {
let proposalId: number;
const newParams = {
fee_tiers: [1, 2, 99],
fee_tiers: ['1', '2', '99'],
paused: true,
max_jits_per_block: 11,
good_til_purge_allowance: 50000,
Expand Down Expand Up @@ -365,6 +405,171 @@ describe('Neutron / Chain Manager', () => {
});
});

describe('ALLOW_ONLY: change Dynamicfees parameters', () => {
let proposalId: number;
beforeAll(async () => {
proposalId = await subdaoMember1.submitDynamicfeesChangeParamsProposal(
chainManagerAddress,
'Proposal #2',
'Dynamicfees update params proposal. Will pass',
'1000',
{
ntrn_prices: [{ denom: 'newdenom', amount: '0.5' }],
},
);

const timelockedProp = await subdaoMember1.supportAndExecuteProposal(
proposalId,
);

expect(timelockedProp.id).toEqual(proposalId);
expect(timelockedProp.status).toEqual('timelocked');
expect(timelockedProp.msgs).toHaveLength(1);
});

test('execute timelocked: success', async () => {
await waitSeconds(10);

await subdaoMember1.executeTimelockedProposal(proposalId);
const timelockedProp = await subDao.getTimelockedProposal(proposalId);
expect(timelockedProp.id).toEqual(proposalId);
expect(timelockedProp.status).toEqual('executed');
expect(timelockedProp.msgs).toHaveLength(1);

const dynamicfeesParams = await dynamicfeesQuerier.params();
expect(dynamicfeesParams.params.ntrnPrices).toEqual([
{ denom: 'newdenom', amount: '0.5' },
]);
});
});

describe('ALLOW_ONLY: change Globalfee parameters', () => {
let proposalId: number;
beforeAll(async () => {
proposalId = await subdaoMember1.submitUpdateParamsGlobalfeeProposal(
chainManagerAddress,
'Proposal #3',
'Globalfee update params proposal. Will pass',
updateGlobalFeeParamsProposal({
minimum_gas_prices: [{ denom: 'newdenom', amount: '0.5' }],
bypass_min_fee_msg_types: ['/gaia.globalfee.v1beta1.MsgUpdateParams'],
max_total_bypass_min_fee_msg_gas_usage: '12345',
}),
'1000',
);

const timelockedProp = await subdaoMember1.supportAndExecuteProposal(
proposalId,
);

expect(timelockedProp.id).toEqual(proposalId);
expect(timelockedProp.status).toEqual('timelocked');
expect(timelockedProp.msgs).toHaveLength(1);
});

test('execute timelocked: success', async () => {
await waitSeconds(10);

await subdaoMember1.executeTimelockedProposal(proposalId);
const timelockedProp = await subDao.getTimelockedProposal(proposalId);
expect(timelockedProp.id).toEqual(proposalId);
expect(timelockedProp.status).toEqual('executed');
expect(timelockedProp.msgs).toHaveLength(1);

const globalfeeParams = await globalfeeQuerier.params();
expect(globalfeeParams.params.minimumGasPrices).toEqual([
{ denom: 'newdenom', amount: '0.5' },
]);
expect(globalfeeParams.params.bypassMinFeeMsgTypes).toEqual([
'/gaia.globalfee.v1beta1.MsgUpdateParams',
]);
expect(globalfeeParams.params.maxTotalBypassMinFeeMsgGasUsage).toEqual(
12345n,
);
});
});

describe('ALLOW_ONLY: change ccv consumer parameters', () => {
let proposalId: number;
beforeAll(async () => {
proposalId = await subdaoMember1.submitUpdateParamsConsumerProposal(
chainManagerAddress,
'Proposal #4',
'Consumer update params proposal. Will pass',
updateConsumerParamsProposal({
enabled: true,
blocks_per_distribution_transmission: 321,
distribution_transmission_channel: 'channel-23',
provider_fee_pool_addr_str: chainManagerAddress,
ccv_timeout_period: '32s',
transfer_timeout_period: '23s',
consumer_redistribution_fraction: '0.33',
historical_entries: 123,
unbonding_period: '43s',
soft_opt_out_threshold: '0.55',
reward_denoms: ['tia'],
provider_reward_denoms: ['tia'],
retry_delay_period: '43s',
}),
'1000',
);

const timelockedProp = await subdaoMember1.supportAndExecuteProposal(
proposalId,
);

expect(timelockedProp.id).toEqual(proposalId);
expect(timelockedProp.status).toEqual('timelocked');
expect(timelockedProp.msgs).toHaveLength(1);
});

test('execute timelocked: success', async () => {
await waitSeconds(10);

await subdaoMember1.executeTimelockedProposal(proposalId);
console.log(
'subdao',
subdaoMember1.dao.contracts.proposals['single'].pre_propose.timelock
.address,
);
const timelockedProp = await subDao.getTimelockedProposal(proposalId);
expect(timelockedProp.id).toEqual(proposalId);
expect(timelockedProp.status).toEqual('executed');
expect(timelockedProp.msgs).toHaveLength(1);

const ccvParams = await ccvQuerier.queryParams();
expect(ccvParams.params.enabled).toEqual(true);
expect(ccvParams.params.blocksPerDistributionTransmission).toEqual(321n);
expect(ccvParams.params.distributionTransmissionChannel).toEqual(
'channel-23',
);
expect(ccvParams.params.providerFeePoolAddrStr).toEqual(
chainManagerAddress,
);
expect(ccvParams.params.ccvTimeoutPeriod).toEqual({
nanos: 0,
seconds: 32n,
});
expect(ccvParams.params.transferTimeoutPeriod).toEqual({
nanos: 0,
seconds: 23n,
});
expect(ccvParams.params.consumerRedistributionFraction).toEqual('0.33');
expect(ccvParams.params.historicalEntries).toEqual(123n);
expect(ccvParams.params.unbondingPeriod).toEqual({
nanos: 0,
seconds: 43n,
});
expect(ccvParams.params.softOptOutThreshold).toEqual('0.55');
expect(ccvParams.params.rewardDenoms).toEqual(['tia']);
expect(ccvParams.params.providerRewardDenoms).toEqual(['tia']);
expect(ccvParams.params.retryDelayPeriod).toEqual({
nanos: 0,
seconds: 43n,
});
});
});

describe('ALLOW_ONLY: CRON add schedule / remove schedule', () => {
let cronAccessClient: SigningNeutronClient;
let cronAccessWallet: Wallet;
Expand Down
8 changes: 6 additions & 2 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1345,9 +1345,13 @@
version "4.2.0"
resolved "https://github.com/neutron-org/neutronjs.git#7f45328320b53b4fa2b572bc25bb96bf80260181"

"@neutron-org/neutronjsplus@https://github.com/neutron-org/neutronjsplus.git#39dd19b17165ef206b40018ff437054210c2bdbc":
"@neutron-org/neutronjs@https://github.com/neutron-org/neutronjs.git#8ca4875e81fc7cdfffab513bb410ca7cff09db78":
version "4.2.0"
resolved "https://github.com/neutron-org/neutronjs.git#8ca4875e81fc7cdfffab513bb410ca7cff09db78"

"@neutron-org/neutronjsplus@https://github.com/neutron-org/neutronjsplus.git#27317fc2658f2e5056ba900b01db7d749508d647":
version "0.5.0"
resolved "https://github.com/neutron-org/neutronjsplus.git#39dd19b17165ef206b40018ff437054210c2bdbc"
resolved "https://github.com/neutron-org/neutronjsplus.git#27317fc2658f2e5056ba900b01db7d749508d647"
dependencies:
"@cosmjs/cosmwasm-stargate" "^0.32.4"
"@cosmjs/proto-signing" "^0.32.4"
Expand Down

0 comments on commit cf765db

Please sign in to comment.