Skip to content

Commit

Permalink
feat: fix generator
Browse files Browse the repository at this point in the history
  • Loading branch information
@sakulstra
sakulstra committed Feb 15, 2024
1 parent 2b0c8e1 commit 80dc44f
Show file tree
Hide file tree
Showing 9 changed files with 724 additions and 2 deletions.
354 changes: 354 additions & 0 deletions generator/features/__snapshots__/rateUpdates.spec.ts.snap
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,354 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`feature: rateUpdatesV2 > should properly generate files 1`] = `
{
"aip": "---
title: "test"
author: "test"
discussions: "test"
snapshot: "test"
---
## Simple Summary
## Motivation
## Specification
## References
- Implementation: [AaveV3Ethereum](https://github.com/bgd-labs/aave-proposals-v3/blob/main/src/20231023_AaveV3Ethereum_Test/AaveV3Ethereum_Test_20231023.sol)
- Tests: [AaveV3Ethereum](https://github.com/bgd-labs/aave-proposals-v3/blob/main/src/20231023_AaveV3Ethereum_Test/AaveV3Ethereum_Test_20231023.t.sol)
- [Snapshot](test)
- [Discussion](test)
## Copyright
Copyright and related rights waived via [CC0](https://creativecommons.org/publicdomain/zero/1.0/).
",
"jsonConfig": "import {ConfigFile} from '../../generator/types';
export const config: ConfigFile = {
rootOptions: {
pools: ['AaveV3Ethereum'],
title: 'test',
shortName: 'Test',
date: '20231023',
author: 'test',
discussion: 'test',
snapshot: 'test',
},
poolOptions: {
AaveV3Ethereum: {
configs: {
PRICE_FEEDS_UPDATE: [
{
asset: 'WETH',
params: {
optimalUtilizationRate: '',
baseVariableBorrowRate: '6',
variableRateSlope1: '',
variableRateSlope2: '',
stableRateSlope1: '',
stableRateSlope2: '',
},
},
{
asset: 'DAI',
params: {
optimalUtilizationRate: '',
baseVariableBorrowRate: '4',
variableRateSlope1: '10',
variableRateSlope2: '',
stableRateSlope1: '',
stableRateSlope2: '',
},
},
{
asset: 'USDC',
params: {
optimalUtilizationRate: '',
baseVariableBorrowRate: '4',
variableRateSlope1: '10',
variableRateSlope2: '',
stableRateSlope1: '',
stableRateSlope2: '',
},
},
{
asset: 'USDT',
params: {
optimalUtilizationRate: '',
baseVariableBorrowRate: '6',
variableRateSlope1: '10',
variableRateSlope2: '',
stableRateSlope1: '',
stableRateSlope2: '',
},
},
{
asset: 'WBTC',
params: {
optimalUtilizationRate: '',
baseVariableBorrowRate: '5',
variableRateSlope1: '',
variableRateSlope2: '',
stableRateSlope1: '',
stableRateSlope2: '',
},
},
],
},
cache: {blockNumber: 42},
},
},
};
",
"payloads": [
{
"contractName": "AaveV3Ethereum_Test_20231023",
"payload": "// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
import {AaveV2ConfigEngine, AaveV2EthereumAMMAssets} from 'aave-address-book/AaveV2EthereumAMM.sol';
import {AaveV3PayloadEthereum} from 'aave-helpers/v3-config-engine/AaveV3PayloadEthereum.sol';
import {EngineFlags} from 'aave-helpers/v3-config-engine/EngineFlags.sol';
import {IAaveV2ConfigEngine} from 'aave-helpers/v2-config-engine/IAaveV2ConfigEngine.sol';
import {IV2RateStrategyFactory} from 'aave-helpers/v2-config-engine/IV2RateStrategyFactory.sol';
/**
* @title test
* @author test
* - Snapshot: test
* - Discussion: test
*/
contract AaveV3Ethereum_Test_20231023 is AaveV3PayloadEthereum {
function rateStrategiesUpdates()
public
pure
override
returns (IAaveV2ConfigEngine.RateStrategyUpdate[] memory)
{
IAaveV2ConfigEngine.RateStrategyUpdate[]
memory rateStrategies = new IAaveV2ConfigEngine.RateStrategyUpdate[](5);
rateStrategies[0] = IAaveV2ConfigEngine.RateStrategyUpdate({
asset: AaveV2EthereumAMMAssets.WETH_UNDERLYING,
params: IV2RateStrategyFactory.RateStrategyParams({
optimalUtilizationRate: EngineFlags.KEEP_CURRENT,
baseVariableBorrowRate: _bpsToRay(6_00),
variableRateSlope1: EngineFlags.KEEP_CURRENT,
variableRateSlope2: EngineFlags.KEEP_CURRENT,
stableRateSlope1: EngineFlags.KEEP_CURRENT,
stableRateSlope2: EngineFlags.KEEP_CURRENT
})
});
rateStrategies[1] = IAaveV2ConfigEngine.RateStrategyUpdate({
asset: AaveV2EthereumAMMAssets.DAI_UNDERLYING,
params: IV2RateStrategyFactory.RateStrategyParams({
optimalUtilizationRate: EngineFlags.KEEP_CURRENT,
baseVariableBorrowRate: _bpsToRay(4_00),
variableRateSlope1: _bpsToRay(10_00),
variableRateSlope2: EngineFlags.KEEP_CURRENT,
stableRateSlope1: EngineFlags.KEEP_CURRENT,
stableRateSlope2: EngineFlags.KEEP_CURRENT
})
});
rateStrategies[2] = IAaveV2ConfigEngine.RateStrategyUpdate({
asset: AaveV2EthereumAMMAssets.USDC_UNDERLYING,
params: IV2RateStrategyFactory.RateStrategyParams({
optimalUtilizationRate: EngineFlags.KEEP_CURRENT,
baseVariableBorrowRate: _bpsToRay(4_00),
variableRateSlope1: _bpsToRay(10_00),
variableRateSlope2: EngineFlags.KEEP_CURRENT,
stableRateSlope1: EngineFlags.KEEP_CURRENT,
stableRateSlope2: EngineFlags.KEEP_CURRENT
})
});
rateStrategies[3] = IAaveV2ConfigEngine.RateStrategyUpdate({
asset: AaveV2EthereumAMMAssets.USDT_UNDERLYING,
params: IV2RateStrategyFactory.RateStrategyParams({
optimalUtilizationRate: EngineFlags.KEEP_CURRENT,
baseVariableBorrowRate: _bpsToRay(6_00),
variableRateSlope1: _bpsToRay(10_00),
variableRateSlope2: EngineFlags.KEEP_CURRENT,
stableRateSlope1: EngineFlags.KEEP_CURRENT,
stableRateSlope2: EngineFlags.KEEP_CURRENT
})
});
rateStrategies[4] = IAaveV2ConfigEngine.RateStrategyUpdate({
asset: AaveV2EthereumAMMAssets.WBTC_UNDERLYING,
params: IV2RateStrategyFactory.RateStrategyParams({
optimalUtilizationRate: EngineFlags.KEEP_CURRENT,
baseVariableBorrowRate: _bpsToRay(5_00),
variableRateSlope1: EngineFlags.KEEP_CURRENT,
variableRateSlope2: EngineFlags.KEEP_CURRENT,
stableRateSlope1: EngineFlags.KEEP_CURRENT,
stableRateSlope2: EngineFlags.KEEP_CURRENT
})
});
return rateStrategies;
}
}
",
"test": "// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
import {AaveV3Ethereum} from 'aave-address-book/AaveV3Ethereum.sol';
import 'forge-std/Test.sol';
import {ProtocolV3TestBase, ReserveConfig} from 'aave-helpers/ProtocolV3TestBase.sol';
import {AaveV3Ethereum_Test_20231023} from './AaveV3Ethereum_Test_20231023.sol';
/**
* @dev Test for AaveV3Ethereum_Test_20231023
* command: make test-contract filter=AaveV3Ethereum_Test_20231023
*/
contract AaveV3Ethereum_Test_20231023_Test is ProtocolV3TestBase {
AaveV3Ethereum_Test_20231023 internal proposal;
function setUp() public {
vm.createSelectFork(vm.rpcUrl('mainnet'), 42);
proposal = new AaveV3Ethereum_Test_20231023();
}
/**
* @dev executes the generic test suite including e2e and config snapshots
*/
function test_defaultProposalExecution() public {
defaultTest('AaveV3Ethereum_Test_20231023', AaveV3Ethereum.POOL, address(proposal));
}
}
",
},
],
"script": "// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
import {GovV3Helpers, IPayloadsControllerCore, PayloadsControllerUtils} from 'aave-helpers/GovV3Helpers.sol';
import {EthereumScript} from 'aave-helpers/ScriptUtils.sol';
import {AaveV3Ethereum_Test_20231023} from './AaveV3Ethereum_Test_20231023.sol';
/**
* @dev Deploy Ethereum
* deploy-command: make deploy-ledger contract=src/20231023_AaveV3Ethereum_Test/Test_20231023.s.sol:DeployEthereum chain=mainnet
* verify-command: npx catapulta-verify -b broadcast/Test_20231023.s.sol/1/run-latest.json
*/
contract DeployEthereum is EthereumScript {
function run() external broadcast {
// deploy payloads
address payload0 = GovV3Helpers.deployDeterministic(
type(AaveV3Ethereum_Test_20231023).creationCode
);
// compose action
IPayloadsControllerCore.ExecutionAction[]
memory actions = new IPayloadsControllerCore.ExecutionAction[](1);
actions[0] = GovV3Helpers.buildAction(payload0);
// register action at payloadsController
GovV3Helpers.createPayload(actions);
}
}
/**
* @dev Create Proposal
* command: make deploy-ledger contract=src/20231023_AaveV3Ethereum_Test/Test_20231023.s.sol:CreateProposal chain=mainnet
*/
contract CreateProposal is EthereumScript {
function run() external {
// create payloads
PayloadsControllerUtils.Payload[] memory payloads = new PayloadsControllerUtils.Payload[](1);
// compose actions for validation
IPayloadsControllerCore.ExecutionAction[]
memory actionsEthereum = new IPayloadsControllerCore.ExecutionAction[](1);
actionsEthereum[0] = GovV3Helpers.buildAction(type(AaveV3Ethereum_Test_20231023).creationCode);
payloads[0] = GovV3Helpers.buildMainnetPayload(vm, actionsEthereum);
// create proposal
vm.startBroadcast();
GovV3Helpers.createProposal(
vm,
payloads,
GovV3Helpers.ipfsHashFile(vm, 'src/20231023_AaveV3Ethereum_Test/Test.md')
);
}
}
",
}
`;
exports[`feature: rateUpdatesV2 > should return reasonable code 1`] = `
{
"code": {
"fn": [
"function rateStrategiesUpdates()
public
pure
override
returns (IAaveV2ConfigEngine.RateStrategyUpdate[] memory)
{
IAaveV2ConfigEngine.RateStrategyUpdate[] memory rateStrategies = new IAaveV2ConfigEngine.RateStrategyUpdate[](5);
rateStrategies[0] = IAaveV2ConfigEngine.RateStrategyUpdate({
asset: AaveV2EthereumAMMAssets.WETH_UNDERLYING,
params: IV2RateStrategyFactory.RateStrategyParams({
optimalUtilizationRate: EngineFlags.KEEP_CURRENT,
baseVariableBorrowRate: _bpsToRay(6_00),
variableRateSlope1: EngineFlags.KEEP_CURRENT,
variableRateSlope2: EngineFlags.KEEP_CURRENT,
stableRateSlope1: EngineFlags.KEEP_CURRENT,
stableRateSlope2: EngineFlags.KEEP_CURRENT
})
});
rateStrategies[1] = IAaveV2ConfigEngine.RateStrategyUpdate({
asset: AaveV2EthereumAMMAssets.DAI_UNDERLYING,
params: IV2RateStrategyFactory.RateStrategyParams({
optimalUtilizationRate: EngineFlags.KEEP_CURRENT,
baseVariableBorrowRate: _bpsToRay(4_00),
variableRateSlope1: _bpsToRay(10_00),
variableRateSlope2: EngineFlags.KEEP_CURRENT,
stableRateSlope1: EngineFlags.KEEP_CURRENT,
stableRateSlope2: EngineFlags.KEEP_CURRENT
})
});
rateStrategies[2] = IAaveV2ConfigEngine.RateStrategyUpdate({
asset: AaveV2EthereumAMMAssets.USDC_UNDERLYING,
params: IV2RateStrategyFactory.RateStrategyParams({
optimalUtilizationRate: EngineFlags.KEEP_CURRENT,
baseVariableBorrowRate: _bpsToRay(4_00),
variableRateSlope1: _bpsToRay(10_00),
variableRateSlope2: EngineFlags.KEEP_CURRENT,
stableRateSlope1: EngineFlags.KEEP_CURRENT,
stableRateSlope2: EngineFlags.KEEP_CURRENT
})
});
rateStrategies[3] = IAaveV2ConfigEngine.RateStrategyUpdate({
asset: AaveV2EthereumAMMAssets.USDT_UNDERLYING,
params: IV2RateStrategyFactory.RateStrategyParams({
optimalUtilizationRate: EngineFlags.KEEP_CURRENT,
baseVariableBorrowRate: _bpsToRay(6_00),
variableRateSlope1: _bpsToRay(10_00),
variableRateSlope2: EngineFlags.KEEP_CURRENT,
stableRateSlope1: EngineFlags.KEEP_CURRENT,
stableRateSlope2: EngineFlags.KEEP_CURRENT
})
});
rateStrategies[4] = IAaveV2ConfigEngine.RateStrategyUpdate({
asset: AaveV2EthereumAMMAssets.WBTC_UNDERLYING,
params: IV2RateStrategyFactory.RateStrategyParams({
optimalUtilizationRate: EngineFlags.KEEP_CURRENT,
baseVariableBorrowRate: _bpsToRay(5_00),
variableRateSlope1: EngineFlags.KEEP_CURRENT,
variableRateSlope2: EngineFlags.KEEP_CURRENT,
stableRateSlope1: EngineFlags.KEEP_CURRENT,
stableRateSlope2: EngineFlags.KEEP_CURRENT
})
});
return rateStrategies;
}",
],
},
}
`;
Loading

0 comments on commit 80dc44f

Please sign in to comment.