Skip to content

Commit 8e479fb

Browse files
pabloruiz55pabloruiz55
authored
Merge branch 'master' into CPSTL-patch-4
2 parents baff0b6 + 968ca2c commit 8e479fb

File tree

4 files changed

+38
-92
lines changed

4 files changed

+38
-92
lines changed

‎CLI/commands/common/common_functions.js‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,8 @@ module.exports = {
9393

9494
let block = await web3.eth.getBlock("latest");
9595
let networkGasLimit = block.gasLimit;
96-
97-
try {
98-
let gas = Math.round(factor * (await action.estimateGas({ from: from.address, value: value})));
99-
if (gas > networkGasLimit) gas = networkGasLimit;
100-
} catch(exception) {
101-
gas = networkGasLimit;
102-
}
96+
let gas = Math.round(factor * (await action.estimateGas({ from: from.address, value: value})));
97+
if (gas > networkGasLimit) gas = networkGasLimit;
10398

10499
console.log(chalk.black.bgYellowBright(`---- Transaction executed: ${action._method.name} - Gas limit provided: ${gas} ----`));
105100

‎README.md‎

Lines changed: 33 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -74,101 +74,51 @@ The CLI is for users that want to easily walkthrough all the details of an STO i
7474

7575
# Setting up Polymath Core
7676

77-
### v2.0.0 MAINNET
78-
79-
----------------------- Polymath Network Smart Contracts: -----------------------
80-
PolymathRegistry: 0xdfabf3e4793cd30affb47ab6fa4cf4eef26bbc27
81-
SecurityTokenRegistry (Proxy): 0x240f9f86b1465bf1b8eb29bc88cbf65573dfdd97
82-
ModuleRegistry (Proxy): 0x4566d68ea96fc2213f2446f0dd0f482146cee96d
83-
FeatureRegistry: 0xa3eacb03622bf1513880892b7270d965f693ffb5
84-
85-
ETHOracle: 0x60055e9a93aae267da5a052e95846fa9469c0e7a
86-
POLYOracle: 0x52cb4616E191Ff664B0bff247469ce7b74579D1B
87-
88-
STFactory: 0x47da34f192d3fd946fd6ce7494e9eedf171a1208
89-
GeneralTransferManagerFactory: 0xdc95598ef2bbfdb66d02d5f3eea98ea39fbc8b26
90-
GeneralPermissionManagerFactory: 0xf0aa1856360277c60052d6095c5b787b01388cdd
91-
92-
CappedSTOFactory: 0x77d89663e8819023a87bfe2bc9baaa6922c0e57c
93-
USDTieredSTOFactory: 0x5a3a30bddae1f857a19b1aed93b5cdb3c3da809a
94-
USDTieredSTOProxyFactory: 0x4965930872da851dc81275b142920de3c976de74
95-
96-
CountTransferManagerFactory: 0xd9fd7e34d6e2c47a69e02131cf8554d52c3445d5
97-
PercentageTransferManagerFactory: 0xe6267a9c0a227d21c95b782b1bd32bb41fc3b43b
98-
ManualApprovalTransferManagerFactory: 0xda89fe5b254c04e2ee10d5acb24ed72f1d60ceed
99-
EtherDividendCheckpointFactory: 0x968c74c52f15b2de323eca8c677f6c9266bfefd6
100-
ERC20DividendCheckpointFactory: 0x82f9f1ab41bacb1433c79492e54bf13bccd7f9ae
101-
---------------------------------------------------------------------------------
102-
103-
New SecurityTokenRegistry 0x538136ed73011a766bf0a126a27300c3a7a2e6a6
104-
(fixed bug with getTickersByOwner())
105-
106-
107-
### v2.0.0 KOVAN
108-
109-
New Kovan PolyTokenFaucet: 0xb347b9f5b56b431b2cf4e1d90a5995f7519ca792
110-
111-
----------------------- Polymath Network Smart Contracts: -----------------------
112-
PolymathRegistry: 0x5b215a7d39ee305ad28da29bf2f0425c6c2a00b3
113-
SecurityTokenRegistry (Proxy): 0x91110c2f67e2881a8540417be9eadf5bc9f2f248
114-
ModuleRegistry (Proxy): 0xde6d19d7a68d453244227b6ccc5d8e6c2314627a
115-
FeatureRegistry: 0x8967a7cfc4b455398be2356cd05cd43b7a39697e
116-
117-
ETHOracle: 0xCE5551FC9d43E9D2CC255139169FC889352405C8
118-
POLYOracle: 0x461d98EF2A0c7Ac1416EF065840fF5d4C946206C
119-
120-
STFactory: 0x22f56100c6f18b656dbf1b156334206326fc672a
121-
GeneralTransferManagerFactory: 0x650e9507e983077d6f822472a7dcc37626d55c7f
122-
GeneralPermissionManagerFactory: 0xbf0bd6305b523ce055baa6dfaa9676d6b9e6090b
123-
124-
CappedSTOFactory: 0xa4a24780b93a378eb25ec4bfbf93bc8e79d7eeeb
125-
USDTieredSTOFactory: 0x9106d7fbbd2996ef787913876341d0070cbdfc95
126-
USDTieredSTOProxyFactory: 0xb004ff6893b95dc8a19b9e09b2920a44a609bae3
127-
128-
CountTransferManagerFactory: 0xc7cf0c1ddc85c18672951f9bfeb7163ecc8f0e2f
129-
PercentageTransferManagerFactory: 0xfea5fcb254bcb4ada0f86903ff822d6372325cb1
130-
ManualApprovalTransferManagerFactory: 0x8e96e7199b9ba096d666033f058ebb0050786baf
131-
EtherDividendCheckpointFactory: 0x18ae137fc6581e121f3d37ed85c423dbc3c9b964
132-
ERC20DividendCheckpointFactory: 0x8c724a1504643e02bb02b23cdd414da637872c80
133-
---------------------------------------------------------------------------------
134-
135-
136-
137-
13877
## Mainnet
13978

140-
### v1.3.0 (TORO Release)
79+
### v2.0.0
14180

14281
| Contract | Address |
14382
| ---------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
144-
| TickerRegistry: | [0xc31714e6759a1ee26db1d06af1ed276340cd4233](https://etherscan.io/address/0xc31714e6759a1ee26db1d06af1ed276340cd4233) |
145-
| SecurityTokenRegistry: | [0xef58491224958d978facf55d2120c55a24516b98](https://etherscan.io/address/0xef58491224958d978facf55d2120c55a24516b98) |
146-
| ModuleRegistry: | [0x31d85fffd7e38bd42d2ae0409ac149e3ef0fd92c](https://etherscan.io/address/0x31d85fffd7e38bd42d2ae0409ac149e3ef0fd92c) |
147-
| Polymath Registry: | [0x06595656b93ce14834f0d22b7bbda4382d5ab510](https://etherscan.io/address/0x06595656b93ce14834f0d22b7bbda4382d5ab510) |
148-
| CappedSTOFactory: | [0x2aa1b133f464ac08f66c2f702581d014e4603d31](https://etherscan.io/address/0x2aa1b133f464ac08f66c2f702581d014e4603d31) |
149-
| EthDividendsCheckpointFactory: | [0x0da7ed8789348ac40937cf6ae8ff521eee43816c](https://etherscan.io/address/0x0da7ed8789348ac40937cf6ae8ff521eee43816c) |
150-
| ERC20 Dividends Checkpoint Factory: | [0x6950096964b7adae34d5a3d1792fe73afbe9ddbc](https://etherscan.io/address/0x6950096964b7adae34d5a3d1792fe73afbe9ddbc) |
151-
| General Permission Manager Factory: | [0xeba0348e243f2de2f1687060f9c795ac279c66af](https://etherscan.io/address/0xeba0348e243f2de2f1687060f9c795ac279c66af) |
152-
| Count Transfer Manager Factory: | [0xa662a05647a8e713be1bed193c094805d20471ff](https://etherscan.io/address/0xa662a05647a8e713be1bed193c094805d20471ff) |
153-
| Percentage Transfer Manager Factory: | [0x3870ee581a0528d24a6216311fcfa78f95a00593](https://etherscan.io/address/0x3870ee581a0528d24a6216311fcfa78f95a00593) |
83+
| SecurityTokenRegistry (Proxy): | [0x240f9f86b1465bf1b8eb29bc88cbf65573dfdd97](https://etherscan.io/address/0x240f9f86b1465bf1b8eb29bc88cbf65573dfdd97) |
84+
| ModuleRegistry (Proxy): | [0x4566d68ea96fc2213f2446f0dd0f482146cee96d](https://etherscan.io/address/0x4566d68ea96fc2213f2446f0dd0f482146cee96d) |
85+
| Polymath Registry: | [0xdfabf3e4793cd30affb47ab6fa4cf4eef26bbc27](https://etherscan.io/address/0xdfabf3e4793cd30affb47ab6fa4cf4eef26bbc27) |
86+
| Feature Registry: | [0xa3eacb03622bf1513880892b7270d965f693ffb5](https://etherscan.io/address/0xa3eacb03622bf1513880892b7270d965f693ffb5) |
87+
| ETHOracle: | [0x60055e9a93aae267da5a052e95846fa9469c0e7a](https://etherscan.io/address/0x60055e9a93aae267da5a052e95846fa9469c0e7a) |
88+
| POLYOracle: | [0x52cb4616E191Ff664B0bff247469ce7b74579D1B](https://etherscan.io/address/0x52cb4616E191Ff664B0bff247469ce7b74579D1B) |
89+
| General Transfer Manager Factory: | [0xdc95598ef2bbfdb66d02d5f3eea98ea39fbc8b26](https://etherscan.io/address/0xdc95598ef2bbfdb66d02d5f3eea98ea39fbc8b26) |
90+
| General Permission Manager Factory: | [0xf0aa1856360277c60052d6095c5b787b01388cdd](https://etherscan.io/address/0xf0aa1856360277c60052d6095c5b787b01388cdd) |
91+
| CappedSTOFactory: | [0x77d89663e8819023a87bfe2bc9baaa6922c0e57c](https://etherscan.io/address/0x77d89663e8819023a87bfe2bc9baaa6922c0e57c) |
92+
| USDTieredSTO Factory: | [0x5a3a30bddae1f857a19b1aed93b5cdb3c3da809a](https://etherscan.io/address/0x5a3a30bddae1f857a19b1aed93b5cdb3c3da809a) |
93+
| EthDividendsCheckpointFactory: | [0x968c74c52f15b2de323eca8c677f6c9266bfefd6](https://etherscan.io/address/0x968c74c52f15b2de323eca8c677f6c9266bfefd6) |
94+
| ERC20 Dividends Checkpoint Factory: | [0x82f9f1ab41bacb1433c79492e54bf13bccd7f9ae](https://etherscan.io/address/0x82f9f1ab41bacb1433c79492e54bf13bccd7f9ae) |
95+
| Count Transfer Manager Factory: | [0xd9fd7e34d6e2c47a69e02131cf8554d52c3445d5](https://etherscan.io/address/0xd9fd7e34d6e2c47a69e02131cf8554d52c3445d5) |
96+
| Percentage Transfer Manager Factory: | [0xe6267a9c0a227d21c95b782b1bd32bb41fc3b43b](https://etherscan.io/address/0xe6267a9c0a227d21c95b782b1bd32bb41fc3b43b) |
97+
| Manual Approval Transfer Manager Factory: | [0xda89fe5b254c04e2ee10d5acb24ed72f1d60ceed](https://etherscan.io/address/0xe6267a9c0a227d21c95b782b1bd32bb41fc3b43b) |
15498

15599

156100
## KOVAN
157101

158-
### v1.3.0 (TORO Release)
102+
### v2.0.0
103+
New Kovan PolyTokenFaucet: 0xb347b9f5b56b431b2cf4e1d90a5995f7519ca792
159104

160105
| Contract | Address |
161106
| ---------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
162-
| TickerRegistry: | [0xc9af1d88fe48c8a6aa8677a29a89b0a6ae78f5a8](https://kovan.etherscan.io/address/0xc9af1d88fe48c8a6aa8677a29a89b0a6ae78f5a8) |
163-
| SecurityTokenRegistry: | [0xced6e4ec2ac5425743bf4edf4d4e476120b8fc72](https://kovan.etherscan.io/address/0xced6e4ec2ac5425743bf4edf4d4e476120b8fc72) |
164-
| ModuleRegistry: | [0x961913dcbe2f36176bf25774337f3277796820eb](https://kovan.etherscan.io/address/0x961913dcbe2f36176bf25774337f3277796820eb) |
165-
| Polymath Registry: | [0x05a6519e49e34239f78167abf293d94dae61b299](https://kovan.etherscan.io/address/0x05a6519e49e34239f78167abf293d94dae61b299) |
166-
| CappedSTOFactory: | [0xde4f3cfb6b214e60c4e69e6dfc95ede3c4e3d709](https://kovan.etherscan.io/address/0xde4f3cfb6b214e60c4e69e6dfc95ede3c4e3d709) |
167-
| EthDividendsCheckpointFactory: | [0x870a07d45b0f4c5653fc29a4cb0697a01e0224b1](https://kovan.etherscan.io/address/0x870a07d45b0f4c5653fc29a4cb0697a01e0224b1) |
168-
| ERC20 Dividends Checkpoint Factory: | [0x7e823f5df6ed1bb6cc005c692febc6aedf3b8889](https://kovan.etherscan.io/address/0x7e823f5df6ed1bb6cc005c692febc6aedf3b8889) |
169-
| General Permission Manager Factory: | [0x6f5fec2934a34d2e2374042cca6505f1c87ef79b](https://kovan.etherscan.io/address/0x6f5fec2934a34d2e2374042cca6505f1c87ef79b) |
170-
| Count Transfer Manager Factory: | [0xb540b6fa752a91c7e7834523172309e543a99a06](https://kovan.etherscan.io/address/0xb540b6fa752a91c7e7834523172309e543a99a06) |
171-
| Percentage Transfer Manager Factory: | [0xfe908f07e6db57aa6bbd8374e59aac86b60374b0](https://kovan.etherscan.io/address/0xfe908f07e6db57aa6bbd8374e59aac86b60374b0) |
107+
| SecurityTokenRegistry (Proxy): | [0xbefb81114d532bddddc724af20c3516fa75f0afb](https://kovan.etherscan.io/address/0xbefb81114d532bddddc724af20c3516fa75f0afb) |
108+
| ModuleRegistry (Proxy): | [0x0fac8d8cce224eead73c1187df96570aa80a568b](https://kovan.etherscan.io/address/0x0fac8d8cce224eead73c1187df96570aa80a568b) |
109+
| Polymath Registry: | [0x9903e7b5acfe5fa9713771a8d861eb1df8cd7046](https://kovan.etherscan.io/address/0x9903e7b5acfe5fa9713771a8d861eb1df8cd7046) |
110+
| Feature Registry: | [0xa8f85006fdacb3d59ffae564c05433f0c949e911](https://kovan.etherscan.io/address/0xa8f85006fdacb3d59ffae564c05433f0c949e911) |
111+
| ETHOracle: | [0xCE5551FC9d43E9D2CC255139169FC889352405C8](https://kovan.etherscan.io/address/0xCE5551FC9d43E9D2CC255139169FC889352405C8) |
112+
| POLYOracle: | [0x461d98EF2A0c7Ac1416EF065840fF5d4C946206C](https://kovan.etherscan.io/address/0x461d98EF2A0c7Ac1416EF065840fF5d4C946206C) |
113+
| General Transfer Manager Factory: | [0xfe7e2bb6c200d5222c82d0f8fecca5f8fe4ab8ce](https://kovan.etherscan.io/address/0xfe7e2bb6c200d5222c82d0f8fecca5f8fe4ab8ce) |
114+
| General Permission Manager Factory: | [0xde5eaa8d73f43fc5e7badb203f03ecae2b29bd92](https://kovan.etherscan.io/address/0xde5eaa8d73f43fc5e7badb203f03ecae2b29bd92) |
115+
| CappedSTOFactory: | [0xe14d7dd044cc6cfe37548b6791416c59f19bfc0d](https://kovan.etherscan.io/address/0xe14d7dd044cc6cfe37548b6791416c59f19bfc0d) |
116+
| USDTieredSTO Factory: | [0xf9f0bb9f868d411dd9a9511a79d172449e3c15f5](https://kovan.etherscan.io/address/0xf9f0bb9f868d411dd9a9511a79d172449e3c15f5) |
117+
| EthDividendsCheckpointFactory: | [0x2861425ba5abbf50089c473b28f6c40a8ea5262a](https://kovan.etherscan.io/address/0x2861425ba5abbf50089c473b28f6c40a8ea5262a) |
118+
| ERC20 Dividends Checkpoint Factory: | [0xbf9495550417feaacc43f86d2244581b6d688431](https://kovan.etherscan.io/address/0xbf9495550417feaacc43f86d2244581b6d688431) |
119+
| Count Transfer Manager Factory: | [0x3c3c1f40ae2bdca82b90541b2cfbd41caa941c0e](https://kovan.etherscan.io/address/0x3c3c1f40ae2bdca82b90541b2cfbd41caa941c0e) |
120+
| Percentage Transfer Manager Factory: | [0x8cd00c3914b2967a8b79815037f51c76874236b8](https://kovan.etherscan.io/address/0x8cd00c3914b2967a8b79815037f51c76874236b8) |
121+
| Manual Approval Transfer Manager Factory: | [0x19288e00a1f507b9c03570668854da533d398395](https://kovan.etherscan.io/address/0x19288e00a1f507b9c03570668854da533d398395) |
172122

173123

174124

‎audit reports/Polymath Core 2.0.0 Audit Report .pdf‎

153 KB
Binary file not shown.

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "polymath-core",
3-
"version": "1.4.0",
3+
"version": "2.0.0",
44
"description": "Polymath Network Core Smart Contracts",
55
"main": "truffle.js",
66
"directories": {
@@ -29,8 +29,9 @@
2929
"flatten-mocks": "sol-merger './contracts/mocks/*.sol' ./flat/mocks",
3030
"flatten-oracles": "sol-merger './contracts/oracles/*.sol' ./flat/oracles",
3131
"flatten-proxies": "sol-merger './contracts/proxy/*.sol' ./flat/proxy",
32+
"flatten-proxyFactories": "sol-merger './contracts/modules/STO/ProxyFactory/*.sol' ./flat/modules/STO/proxy",
3233
"flatten": "sol-merger './contracts/*.sol' ./flat",
33-
"flatten-all": "npm run flatten-modules && npm run flatten-token && npm run flatten-mocks && npm run flatten-oracles && npm run flatten-proxies && npm run flatten",
34+
"flatten-all": "npm run flatten-modules && npm run flatten-token && npm run flatten-mocks && npm run flatten-oracles && npm run flatten-proxies && npm run flatten && npm run flatten-proxyFactories",
3435
"ethereum-bridge": "node_modules/.bin/ethereum-bridge -H localhost:8545 -a 9 --dev",
3536
"st20generator": "node demo/ST20Generator",
3637
"pretty": "prettier --write --print-width 140 --tab-width 4 \"**/*.js\""

0 commit comments

Comments
 (0)