Skip to content

Commit f85fcd7

Browse files
sobolev-igorsobolev-igor
authored
Merge pull request #43 from zeriontech/piedao-metadata
Added PieDAO metadata
2 parents f1a069a + 703a248 commit f85fcd7

30 files changed

+151
-99
lines changed

‎migrations_scripts/1_deploy_registry_and_add_adapters.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const ChaiAdapter = artifacts.require('ChaiAdapter');
1414
const DSRAdapter = artifacts.require('DSRAdapter');
1515
const MCDAssetAdapter = artifacts.require('MCDAssetAdapter');
1616
const MCDDebtAdapter = artifacts.require('MCDDebtAdapter');
17+
const PieDAOPieAdapter = artifacts.require('PieDAOPieAdapter');
1718
const PoolTogetherAdapter = artifacts.require('PoolTogetherAdapter');
1819
const SynthetixAssetAdapter = artifacts.require('SynthetixAssetAdapter');
1920
const SynthetixDebtAdapter = artifacts.require('SynthetixDebtAdapter');
@@ -30,6 +31,7 @@ const DmmTokenAdapter = artifacts.require('DmmTokenAdapter');
3031
const IdleTokenAdapter = artifacts.require('IdleTokenAdapter');
3132
const IearnTokenAdapter = artifacts.require('IearnTokenAdapter');
3233
const ChaiTokenAdapter = artifacts.require('ChaiTokenAdapter');
34+
const PieDAOPieTokenAdapter = artifacts.require('PieDAOPieTokenAdapter');
3335
const PoolTogetherTokenAdapter = artifacts.require('PoolTogetherTokenAdapter');
3436
const TokenSetsTokenAdapter = artifacts.require('TokenSetsTokenAdapter');
3537
const UniswapV1TokenAdapter = artifacts.require('UniswapV1TokenAdapter');
@@ -113,6 +115,8 @@ const usdcPoolAddress = '0x0034Ea9808E620A0EF79261c51AF20614B742B24';
113115

114116
const chaiAddress = '0x06AF07097C9Eeb7fD685c692751D5C66dB49c215';
115117

118+
const BTCPPAddress = '0x0327112423F3A68efdF1fcF402F6c5CB9f7C33fd';
119+
116120
const aaveAssetAdapterTokens = [
117121
aDaiAddress,
118122
aTusdAddress,
@@ -218,6 +222,9 @@ const mcdAssetAdapterTokens = [
218222
const mcdDebtAdapterTokens = [
219223
daiAddress,
220224
];
225+
const pieDAOPieAdapterTokens = [
226+
BTCPPAddress,
227+
];
221228
const poolTogetherAdapterTokens = [
222229
saiPoolAddress,
223230
daiPoolAddress,
@@ -412,6 +419,18 @@ module.exports = async (deployer, network, accounts) => {
412419
'0',
413420
]);
414421

422+
await deployer.deploy(PieDAOPieAdapter, { from: accounts[0] });
423+
adapters.push([PieDAOPieAdapter.address]);
424+
tokens.push([pieDAOPieAdapterTokens]);
425+
protocolNames.push('PieDAO');
426+
metadata.push([
427+
'PieDAO BTC++',
428+
'BTC on Ethereum diversified',
429+
'btc.piedao.org',
430+
'protocol-icons.s3.us-east-1.amazonaws.com/piedao.png',
431+
'0',
432+
]);
433+
415434
await deployer.deploy(SynthetixAssetAdapter, { from: accounts[0] });
416435
await deployer.deploy(SynthetixDebtAdapter, { from: accounts[0] });
417436
adapters.push([SynthetixAssetAdapter.address, SynthetixDebtAdapter.address]);
@@ -521,6 +540,12 @@ module.exports = async (deployer, network, accounts) => {
521540
ChaiTokenAdapter.address,
522541
);
523542
});
543+
await deployer.deploy(PieDAOPieTokenAdapter, { from: accounts[0] })
544+
.then(() => {
545+
tokenAdapters.push(
546+
PieDAOPieTokenAdapter.address,
547+
);
548+
});
524549
await deployer.deploy(PoolTogetherTokenAdapter, { from: accounts[0] })
525550
.then(() => {
526551
tokenAdapters.push(

‎migrations_scripts/1_use_registry_and_add_adapters.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const ChaiAdapter = artifacts.require('ChaiAdapter');
1414
const DSRAdapter = artifacts.require('DSRAdapter');
1515
const MCDAssetAdapter = artifacts.require('MCDAssetAdapter');
1616
const MCDDebtAdapter = artifacts.require('MCDDebtAdapter');
17+
const PieDAOPieAdapter = artifacts.require('PieDAOPieAdapter');
1718
const PoolTogetherAdapter = artifacts.require('PoolTogetherAdapter');
1819
const SynthetixAssetAdapter = artifacts.require('SynthetixAssetAdapter');
1920
const SynthetixDebtAdapter = artifacts.require('SynthetixDebtAdapter');
@@ -30,6 +31,7 @@ const DmmTokenAdapter = artifacts.require('DmmTokenAdapter');
3031
const IdleTokenAdapter = artifacts.require('IdleTokenAdapter');
3132
const IearnTokenAdapter = artifacts.require('IearnTokenAdapter');
3233
const ChaiTokenAdapter = artifacts.require('ChaiTokenAdapter');
34+
const PieDAOPieTokenAdapter = artifacts.require('PieDAOPieTokenAdapter');
3335
const PoolTogetherTokenAdapter = artifacts.require('PoolTogetherTokenAdapter');
3436
const TokenSetsTokenAdapter = artifacts.require('TokenSetsTokenAdapter');
3537
const UniswapV1TokenAdapter = artifacts.require('UniswapV1TokenAdapter');
@@ -113,6 +115,8 @@ const usdcPoolAddress = '0x0034Ea9808E620A0EF79261c51AF20614B742B24';
113115

114116
const chaiAddress = '0x06AF07097C9Eeb7fD685c692751D5C66dB49c215';
115117

118+
const BTCPPAddress = '0x0327112423F3A68efdF1fcF402F6c5CB9f7C33fd';
119+
116120
const aaveAssetAdapterTokens = [
117121
aDaiAddress,
118122
aTusdAddress,
@@ -218,6 +222,9 @@ const mcdAssetAdapterTokens = [
218222
const mcdDebtAdapterTokens = [
219223
daiAddress,
220224
];
225+
const pieDAOPieAdapterTokens = [
226+
BTCPPAddress,
227+
];
221228
const poolTogetherAdapterTokens = [
222229
saiPoolAddress,
223230
daiPoolAddress,
@@ -412,6 +419,18 @@ module.exports = async (deployer, network, accounts) => {
412419
'0',
413420
]);
414421

422+
await deployer.deploy(PieDAOPieAdapter, { from: accounts[0] });
423+
adapters.push([PieDAOPieAdapter.address]);
424+
tokens.push([pieDAOPieAdapterTokens]);
425+
protocolNames.push('PieDAO');
426+
metadata.push([
427+
'PieDAO BTC++',
428+
'BTC on Ethereum diversified',
429+
'btc.piedao.org',
430+
'protocol-icons.s3.us-east-1.amazonaws.com/piedao.png',
431+
'0',
432+
]);
433+
415434
await deployer.deploy(SynthetixAssetAdapter, { from: accounts[0] });
416435
await deployer.deploy(SynthetixDebtAdapter, { from: accounts[0] });
417436
adapters.push([SynthetixAssetAdapter.address, SynthetixDebtAdapter.address]);
@@ -521,6 +540,12 @@ module.exports = async (deployer, network, accounts) => {
521540
ChaiTokenAdapter.address,
522541
);
523542
});
543+
await deployer.deploy(PieDAOPieTokenAdapter, { from: accounts[0] })
544+
.then(() => {
545+
tokenAdapters.push(
546+
PieDAOPieTokenAdapter.address,
547+
);
548+
});
524549
await deployer.deploy(PoolTogetherTokenAdapter, { from: accounts[0] })
525550
.then(() => {
526551
tokenAdapters.push(

‎migrations_scripts/1_use_registry_and_add_deployed_adapter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ let tokenAdapters = [];
88

99
module.exports = async (deployer, network, accounts) => {
1010
adapters.push(['']);
11-
tokens.push([dmmAssetAdapterTokens]);
11+
tokens.push([[]]);
1212
protocolNames.push('Initial protocol name');
1313
metadata.push([
1414
'Name',

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"eth-gas-reporter": "0.2.17",
3939
"ethlint": "1.2.5",
4040
"ganache-cli": "6.9.1",
41-
"solhint": "2.3.1",
41+
"solhint": "3.0.0-rc.8",
4242
"solidity-coverage": "0.7.4"
4343
}
4444
}

‎test/AaveAssetAdapter.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import displayToken from './helpers/displayToken';
22

3-
const AdapterRegistry = artifacts.require('./AdapterRegistry');
4-
const ProtocolAdapter = artifacts.require('./AaveAssetAdapter');
5-
const TokenAdapter = artifacts.require('./AaveTokenAdapter');
6-
const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter');
3+
const AdapterRegistry = artifacts.require('AdapterRegistry');
4+
const ProtocolAdapter = artifacts.require('AaveAssetAdapter');
5+
const TokenAdapter = artifacts.require('AaveTokenAdapter');
6+
const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter');
77

88
contract('AaveAssetAdapter', () => {
99
const aDAIAddress = '0xfC1E690f61EFd961294b3e1Ce3313fBD8aa4f85d';

‎test/AaveDebtAdapter.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import displayToken from './helpers/displayToken';
22

3-
const AdapterRegistry = artifacts.require('./AdapterRegistry');
4-
const ProtocolAdapter = artifacts.require('./AaveDebtAdapter');
5-
const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter');
3+
const AdapterRegistry = artifacts.require('AdapterRegistry');
4+
const ProtocolAdapter = artifacts.require('AaveDebtAdapter');
5+
const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter');
66

77
contract('AaveDebtAdapter', () => {
88
const daiAddress = '0x6B175474E89094C44Da98b954EedeAC495271d0F';

‎test/AdapterRegistry.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import expectRevert from './helpers/expectRevert';
22

3-
const AdapterRegistry = artifacts.require('./AdapterRegistry');
4-
const ProtocolAdapter = artifacts.require('./MockAdapter');
5-
const TokenAdapter = artifacts.require('./MockTokenAdapter');
3+
const AdapterRegistry = artifacts.require('AdapterRegistry');
4+
const ProtocolAdapter = artifacts.require('MockAdapter');
5+
const TokenAdapter = artifacts.require('MockTokenAdapter');
66

77
const ZERO = '0x0000000000000000000000000000000000000000';
88
const ONE = '0x1111111111111111111111111111111111111111';

‎test/AdapterRegistryDeployed.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const AdapterRegistry = artifacts.require('./AdapterRegistry');
1+
const AdapterRegistry = artifacts.require('AdapterRegistry');
22

33
contract.skip('AdapterRegistry deployed', () => {
44
let adapterRegistry;
@@ -22,6 +22,7 @@ contract.skip('AdapterRegistry deployed', () => {
2222
'TokenSets',
2323
'Synthetix',
2424
'PoolTogether',
25+
'PieDAO',
2526
'Multi-Collateral Dai',
2627
'Dai Savings Protocol',
2728
'Chai',
@@ -48,6 +49,7 @@ contract.skip('AdapterRegistry deployed', () => {
4849
'SmartToken',
4950
'SetToken',
5051
'PoolTogether pool',
52+
'PieDAO Pie Token',
5153
'Chai token',
5254
'YToken',
5355
'IdleToken',

‎test/BalancerAdapter.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import displayToken from './helpers/displayToken';
22

3-
const AdapterRegistry = artifacts.require('./AdapterRegistry');
4-
const ProtocolAdapter = artifacts.require('./BalancerAdapter');
5-
const TokenAdapter = artifacts.require('./BalancerTokenAdapter');
6-
const CompoundTokenAdapter = artifacts.require('./CompoundTokenAdapter');
7-
const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter');
3+
const AdapterRegistry = artifacts.require('AdapterRegistry');
4+
const ProtocolAdapter = artifacts.require('BalancerAdapter');
5+
const TokenAdapter = artifacts.require('BalancerTokenAdapter');
6+
const CompoundTokenAdapter = artifacts.require('CompoundTokenAdapter');
7+
const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter');
88

99
contract('BalancerAdapter', () => {
1010
const wethDai3070PoolAddress = '0x53b89CE35928dda346c574D9105A5479CB87231c';

‎test/BancorAdapter.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import displayToken from './helpers/displayToken';
22

3-
const AdapterRegistry = artifacts.require('./AdapterRegistry');
4-
const ProtocolAdapter = artifacts.require('./BancorAdapter');
5-
const TokenAdapter = artifacts.require('./BancorTokenAdapter');
6-
const ERC20TokenAdapter = artifacts.require('./ERC20TokenAdapter');
3+
const AdapterRegistry = artifacts.require('AdapterRegistry');
4+
const ProtocolAdapter = artifacts.require('BancorAdapter');
5+
const TokenAdapter = artifacts.require('BancorTokenAdapter');
6+
const ERC20TokenAdapter = artifacts.require('ERC20TokenAdapter');
77

88
contract('BalancerAdapter', () => {
99
const bntBethPoolAddress = '0xb1CD6e4153B2a390Cf00A6556b0fC1458C4A5533';

0 commit comments

Comments
 (0)