Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
734ec5c
Added multi asset v1 pool converter for more than 2 token pools
amisha120 May 7, 2021
8f67169
Added Enumerable set contract to utility
amisha120 May 11, 2021
10fefdd
Added oracle observations to track prices
amisha120 May 11, 2021
a3ebb3b
Updated price calculations
amisha120 May 11, 2021
7146f08
Fixed compiler errors
amisha120 May 11, 2021
c320033
created Oracle contract
amisha120 May 13, 2021
6d1e4bb
Added Oracle interface
amisha120 May 13, 2021
6e35eb6
Included Oracle in Liquidity pool v1
amisha120 May 13, 2021
58496f8
Added multiAsset tests file
amisha120 May 13, 2021
3146836
Added function to get expected out amount from LP tokens
amisha120 May 14, 2021
243375d
Added pool address to Oracle
amisha120 May 17, 2021
6210d0e
Added oracle unit tests
amisha120 May 17, 2021
194e30b
Configure hardhat
amisha120 May 17, 2021
29911c8
Added tests for Liquidity pool converter v1
amisha120 May 17, 2021
72b8520
Added documentation for the oracle contract
amisha120 May 17, 2021
9e1e172
Fixed contract as per review
amisha120 May 18, 2021
94157a1
Updated tests
amisha120 May 18, 2021
a04da65
Added script for v1 pool deployments with Oracle
amisha120 May 19, 2021
291dc6b
Removed Enumerable set
amisha120 May 24, 2021
4d32c44
Added zero address support for oracle
amisha120 May 25, 2021
6e996b7
Updated oracle contract and tests
amisha120 May 25, 2021
aa66caf
Added test for function giving expected out amount
amisha120 May 25, 2021
490c7f3
Moved Oracle to converter base
amisha120 May 28, 2021
bbefe6f
updated v1 pool deployment
amisha120 May 28, 2021
673c39d
Added function to get latest answer
amisha120 May 31, 2021
bb58d36
Added test for latest answer
amisha120 May 31, 2021
8832f65
Added oracle to liquidity v1 pool converter
amisha120 Jun 8, 2021
72ed50e
Added deployment script with oracle
amisha120 Jun 8, 2021
c3061f4
modified config file structure
amisha120 Jun 8, 2021
43a9b75
Modified addConverter script for oracle
amisha120 Jun 8, 2021
25035f8
Added pool upgrader script
amisha120 Jun 8, 2021
8663842
Added sample upgrader config file
amisha120 Jun 8, 2021
aae8d0b
Updated README
amisha120 Jun 8, 2021
7b52790
Added latest price function in oracle
amisha120 Jun 10, 2021
89f5f8c
Add changes as per audit review
amisha120 Jun 14, 2021
274d5bb
Added script to execute transaction from multisig
amisha120 Jun 15, 2021
1e00650
Commented multisig execute function
amisha120 Jun 16, 2021
20b89bd
Add multisig contract
amisha120 Jun 21, 2021
5fdd2bf
Updated script for pool upgrade
amisha120 Jun 21, 2021
61d8756
Refactored code
amisha120 Jun 23, 2021
4951824
Updated script after test deployment
amisha120 Jun 24, 2021
b82bd5f
Added script to transfer ownership
amisha120 Jun 29, 2021
cb81ed8
Mainnet Multisig and Converter Address Added
remedcu Jun 30, 2021
9126562
Merge pull request #44 from DistributedCollective/multisig-pool-owner…
Jul 1, 2021
97b915c
Merge branch 'development' into v1-pool-oracle
amisha120 Jul 12, 2021
b2fa7bc
Updated README
amisha120 Jul 12, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ solidity/build/Test*

workspace.code-workspace
.env
yarn.lock
yarn.lock
96 changes: 96 additions & 0 deletions hardhat.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
const { task } = require("hardhat/config");

require("@nomiclabs/hardhat-ganache");
require("@nomiclabs/hardhat-truffle5");
require("@nomiclabs/hardhat-ethers");
require("@nomiclabs/hardhat-web3");
require("hardhat-contract-sizer"); //yarn run hardhat size-contracts
require("solidity-coverage"); // $ npx hardhat coverage
require("hardhat-log-remover");
require('hardhat-docgen');

// This is a sample Hardhat task. To learn how to create your own go to
// https://hardhat.org/guides/create-task.html
/// this is for use with ethers.js
task("accounts", "Prints the list of accounts", async () => {
const accounts = await ethers.getSigners();

for (const account of accounts.address) {
const wallet = ethers.Wallet.fromMnemonic("test test test test test test test test test test test junk", "m/44'/60'/0'/0");

console.log(account);
}
});

/*task("accounts", "Prints accounts", async (_, { web3 }) => {
console.log();
console.log(await web3.eth.getAccounts());
});*/

// You need to export an object to set up your config
// Go to https://hardhat.org/config/ to learn more

/**
* @type import('hardhat/config').HardhatUserConfig
*/
/**/

module.exports = {
solidity: {
version: "0.4.26",
settings: {
optimizer: {
enabled: true,
runs: 200,
},
},
},
contractSizer: {
alphaSort: false,
runOnCompile: false,
disambiguatePaths: false,
},
networks: {
hardhat: {},
rskPublicTestnet: {
url: "https://public-node.testnet.rsk.co/",
accounts: { mnemonic: "brownie", count: 10 },
network_id: 31,
confirmations: 4,
gasMultiplier: 1.25,
//timeout: 20000, // increase if needed; 20000 is the default value
//allowUnlimitedContractSize, //EIP170 contrtact size restriction temporal testnet workaround
},
rskPublicMainnet: {
url: "https://public-node.rsk.co/",
network_id: 30,
//timeout: 20000, // increase if needed; 20000 is the default value
},
rskSovrynTestnet: {
url: "https://testnet.sovryn.app/rpc",
accounts: { mnemonic: "brownie", count: 10 },
network_id: 31,
confirmations: 4,
gasMultiplier: 1.25,
//timeout: 20000, // increase if needed; 20000 is the default value
//allowUnlimitedContractSize, //EIP170 contrtact size restriction temporal testnet workaround
},
rskSovrynMainnet: {
url: "https://mainnet.sovryn.app/rpc",
network_id: 30,
//timeout: 20000, // increase if needed; 20000 is the default value
},
},
paths: {
sources: "./solidity/contracts",
tests: "./solidity/test/",
},
mocha: {
timeout: 800000,
grep: "^(?!.*; using Ganache).*",
},
docgen: {
path: './docs',
clear: true
}
};
Loading