(Feature) Enable proxy for both strategies #1024

vbaranov · 2018-07-06T19:59:35Z

Closes #1022
Closes #957
Closes #1025

The last PR to enable Proxy contracts.

Proxies registry smart-contract was deployed for Ropsten
Exec-id is eliminated. Instead, proxy address is used.
./exec-id query param => ./addr query param
registryExec.exec(...) => ...proxy.exec(...)
all getters ...idx => ...proxy

dennis00010011b · 2018-07-08T14:09:26Z

@vbaranov
MInted-Manage page: incorrect maxCap for whitelist

dennis00010011b · 2018-07-08T14:40:04Z

@vbaranov
Dutch-Manage page: link to crowdsale page is broken

dennis00010011b · 2018-07-08T15:05:06Z

@vbaranov
Dutch with whitelist-Contribution page: error when whitelisted investor contributes
Proxy addresses:
0x8bc98fe870d28090a2e309d3ef6f55dd1c6ff2f8 ,Ropsten
0xa81262b49c8178ff95aa9441687dbdb46f8cc500,Ropsten
dutch_proxy.log

vbaranov · 2018-07-09T10:41:41Z

@dennis00010011b

MInted-Manage page: incorrect maxCap for whitelist

Fixed

Dutch-Manage page: link to crowdsale page is broken
Dutch with whitelist-Contribution page: error when whitelisted investor contributes

I cannot repeat both of them. Could you provide steps to reproduce?

dennis00010011b · 2018-07-09T12:53:21Z

@vbaranov

Dutch-Manage page: link to crowdsale page is broken

Steps for reproduce:

Create dutch crowdsale with any parameters
Open manage page as an owner
Click link Crowdsale page that located below button Finalize
Expected result: crowdsale page should contains actual info about crowdsale
Actual result: link leads to empty page
Proxy:0xde9b82a5860e6e5bea78d1ae0d6cbaa485489878, Ropsten

dennis00010011b · 2018-07-09T12:58:28Z

@vbaranov

Dutch with whitelist-Contribution page: error when whitelisted investor contributes

Still reproducible. Steps:

Create dutch crowdsale with one whitelisted address
Wait until crowdsale starts
Set whitelisted account in metamask
Buy allowed amount: fill out field contribute with value more than minCap and click button contribute
Proxy:0xde9b82a5860e6e5bea78d1ae0d6cbaa485489878 , Ropsten

vbaranov · 2018-07-09T13:36:16Z

@dennis00010011b

Dutch-Manage page: link to crowdsale page is broken

Steps for reproduce:

Create dutch crowdsale with any parameters
Open manage page as an owner
Click link Crowdsale page that located below button Finalize
Expected result: crowdsale page should contains actual info about crowdsale
Actual result: link leads to empty page
Proxy:0xde9b82a5860e6e5bea78d1ae0d6cbaa485489878, Ropsten

ah, makes sense now, thanks, fixed.

Dutch with whitelist-Contribution page: error when whitelisted investor contributes

Could you post log from Chrome developer console? I still cannot reproduce the issue

dennis00010011b · 2018-07-09T13:41:46Z

@vbaranov
dutch-contr.log

vbaranov · 2018-07-09T14:02:41Z

@dennis00010011b I've added handling of gas estimation for buy function. Please, let me know the results of new test.

dennis00010011b · 2018-07-09T14:23:28Z

@vbaranov
Dutch: Incorrect amount passes to Metamask. Investor can't buy, any contribution's transaction is failed(but owner still can modify whitelist).

Failed transactions
https://ropsten.etherscan.io/tx/0x717c30172cd2affafd4aa6f844f9dac9d6a14dacb0bd338a58377e8990e16d0b

https://ropsten.etherscan.io/tx/0xb5aa7bdd0f8185b0024b20ab0d9fb5538339cc4fb4be2ccb07956ba065c3e9e6

vbaranov · 2018-07-09T15:02:56Z

@dennis00010011b do you have the same problem in 2.0 branch? if yes, please open a separate issue.

I repeated all steps:

Create dutch crowdsale with one whitelisted address
Wait until crowdsale starts
Set whitelisted account in metamask
Buy allowed amount: fill out field contribute with value more than minCap and click button contribute

and error doesn't exist for me. If error still exists for you please record a video.

dennis00010011b · 2018-07-09T15:08:20Z

@vbaranov

Dutch with whitelist-Contribution page: error when whitelisted investor contributes

This issue was fixed with last commit . Instead I can't buy from Dutch crowdsale #1024 (comment)

dennis00010011b · 2018-07-09T15:20:39Z

@vbaranov
https://drive.google.com/open?id=1eMDZSXSugpLLoSRa5IpvMZZX3Lefza3u
dutch-meta.log
Proxy address: 0x70989912ccdd685b13a27c4c567438149efeb77d , ropsten

Crowdsale parameters (one more whitelist account was added later )
{
"name": "scenarioDutchRopsten.json",
"ticker": "test",
"decimals": 10,
"totalSupply":100,
"walletAddress":"0x56B2e3C3cFf7f3921Dc2e0F8B8e20d1eEc29216b",
"gasprice":100,
"tiers":[
{
"isWhitelisted":true,
"startDate": "360000",
"startTime": "360000",
"endDate":"72000000",
"endTime":"72000000",
"minCap":11,
"minRate":1000,
"maxRate":10000,
"supply": 100,
"whitelist":[{
"address": "0xDb0E42Ee8fDaAd8A7f295f447F71A1480c98a373",
"min": 50,
"max": 150
} ]
}]
}

dennis00010011b

Tested, no issues were found

vbaranov · 2018-07-10T14:15:51Z

@dennis00010011b I have fixed #1025 also. Please test it again.

dennis00010011b · 2018-07-11T08:08:26Z

@vbaranov
Tested it . No issues were found

vbaranov · 2018-07-12T16:46:05Z

@fernandomg looking forward to your review.

fernandomg

PR is working fine. All the suggested changes are in order to preserve consistency in the code.

fernandomg · 2018-07-12T23:27:05Z

src/components/contribute/index.js

+    try {
+      estimatedGas = await method.estimateGas(opts)
+    } catch (e) {
+      console.log(e)


logger.error instead

fernandomg · 2018-07-12T23:31:55Z

src/components/crowdsale/utils.js

    let tokensSold = await getTokensSold(...params).call()
+    console.log('tokensSold:', tokensSold)


logger.log (I'm the logger police 👮‍♂️)

fernandomg · 2018-07-12T23:37:01Z

src/components/crowdsale/utils.js

+      crowdsaleStatus.time_remaining = crowdsaleStatus.time_remaining || crowdsaleStatus[4]
+      const tokens_remaining = crowdsaleStatus.tokens_remaining || crowdsaleStatus[5]
+      const _isCrowdsaleFull = await isCrowdsaleFull(...params).call()
+      const max_sellable = _isCrowdsaleFull.max_sellable || _isCrowdsaleFull[1]


I'm curious, why in some cases you use the array lookup for the value as an alternative, and in other cases just go with the object key lookup like in?:

https://github.com/poanetwork/token-wizard/pull/1024/files#diff-5c25cfce1eba8feb7668398c93446a0bR118

const wei_raised = crowdsaleInfo.wei_raised

I use the array lookup because Proxy getters return only arrays. In the line, that you provided, array lookup wasn't made because it was made earlier in this line:

token-wizard/src/components/crowdsale/utils.js

Line 98 in 4ec3c88

crowdsaleInfo.wei_raised = crowdsaleInfo[0]

fernandomg · 2018-07-12T23:52:13Z

src/components/stepFour/utils.js

+  return [
+    () => {
+      logger.log('###trackProxy:###')
+      console.log('contractStore:', contractStore)


logger.log

fernandomg · 2018-07-12T23:53:34Z

src/components/stepFour/utils.js

+        toJS(contractStore.ProxiesRegistry.abi),
+        contractStore.ProxiesRegistry.addr
+      )
+      console.log('contractStore[crowdsaleStore.proxyName].addr:', contractStore[crowdsaleStore.proxyName].addr)


logger.log

fernandomg · 2018-07-13T03:58:10Z

src/utils/blockchainHelpers.js

@@ -344,6 +344,46 @@ async function getAllApplicationsInstances() {
  return Promise.all(whenCrowdsales).then(crowdsales => crowdsales.filter(crowdsale => crowdsale !== null))
 }

+async function getOwnerApplicationsInstancesForProxy() {


May I suggest you a refactor for this method?

As suggested in this SO Answer, the way to go is with a map. I used a reduce to enforce the order, having the ability to list from newer to older the crowdsales created.

async function getOwnerApplicationsInstancesForProxy() { const { web3 } = web3Store const proxiesRegistryContract = await attachToSpecificCrowdsaleContract('ProxiesRegistry') const accounts = await web3.eth.getAccounts() const execIDs = await proxiesRegistryContract.methods.getCrowdsalesForUser(accounts[0]).call() const { abi } = contractStore.MintedCappedProxy const mintedCapped = process.env[`${REACT_PREFIX}MINTED_CAPPED_APP_NAME`].toLowerCase() const dutchAuction = process.env[`${REACT_PREFIX}DUTCH_APP_NAME`].toLowerCase() return Promise.all( execIDs.reduce((promise, execID) => { return promise.then(async () => { try { const contractInstance = await attachToContract(abi, execID) const contractAppName = await contractInstance.methods.app_name.call() const appName = removeTrailingNUL(web3.utils.toAscii(contractAppName)).toLowerCase() if (appName.includes(mintedCapped) || appName.includes(dutchAuction)) { return { appName, execID } } } catch (error) { logger.error(error) } }) }, Promise.resolve()) )

@fernandomg Unfortunately, such refactor won't work because return doesn't return an iterable object:

I've implemented all useful and working parts from your suggestion. Thanks for sharing. Let's return to the final refactor of getOwnerApplicationsInstancesForProxy function in a separate PR.

vbaranov added 5 commits July 5, 2018 23:15

Enable proxy at deployment

629abfc

Merge remote-tracking branch 'origin/2.0' into proxy-finalize

bffb104

Support display of QR for Proxy case

0ce061c

Enable Proxy

ccafb9a

merge with 2.0

ea7af7d

vbaranov added awaiting for review affects e2e tests labels Jul 6, 2018

vbaranov requested review from fernandomg and dennis00010011b July 6, 2018 19:59

ghost assigned vbaranov Jul 6, 2018

Fix: display max cap of whitelisted item at management page

4599ab0

vbaranov added 2 commits July 9, 2018 14:04

Update DutchProxy ABI: getCrowdsaleUniqueBuyers method is returned back

45bc31a

move Proxy provider address to .env

4d8070d

fix link from management page to crowdsale page

a650a8d

Handle gas estimation for buy function

b88b5bb

fix for estimatedGas for buy constant

26b286e

dennis00010011b approved these changes Jul 9, 2018

View reviewed changes

vbaranov added 2 commits July 10, 2018 15:46

update of Ropsten address of proxies registry

8e1894f

whitelists max limits fix

eb5302f

vbaranov changed the title ~~(2.0) Enable proxy for both strategies~~ (Fix) Enable proxy for both strategies Jul 10, 2018

Update of Proxies Registry source code

4ec3c88

vbaranov changed the title ~~(Fix) Enable proxy for both strategies~~ (Feature) Enable proxy for both strategies Jul 10, 2018

dennis00010011b mentioned this pull request Jul 11, 2018

adapt to proxi-finalize poanetwork/token-wizard-test-automation#56

Merged

fernandomg approved these changes Jul 13, 2018

View reviewed changes

vbaranov added 2 commits July 13, 2018 14:01

Reviewer suggestions are implemented

32b69a2

Update of submodules

6772136

vbaranov merged commit 2f3a1ba into 2.0 Jul 13, 2018

ghost removed the awaiting for review label Jul 13, 2018

vbaranov deleted the proxy-finalize branch July 13, 2018 11:13

fernandomg mentioned this pull request Jul 14, 2018

(Refactor) Of method getOwnerApplicationsInstancesForProxy #1046

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(Feature) Enable proxy for both strategies #1024

(Feature) Enable proxy for both strategies #1024

vbaranov commented Jul 6, 2018 •

edited

dennis00010011b commented Jul 8, 2018 •

edited

dennis00010011b commented Jul 8, 2018 •

edited

dennis00010011b commented Jul 8, 2018 •

edited

vbaranov commented Jul 9, 2018

dennis00010011b commented Jul 9, 2018 •

edited

dennis00010011b commented Jul 9, 2018 •

edited

vbaranov commented Jul 9, 2018

dennis00010011b commented Jul 9, 2018

vbaranov commented Jul 9, 2018

dennis00010011b commented Jul 9, 2018 •

edited

vbaranov commented Jul 9, 2018

dennis00010011b commented Jul 9, 2018

dennis00010011b commented Jul 9, 2018 •

edited

dennis00010011b left a comment

vbaranov commented Jul 10, 2018 •

edited

dennis00010011b commented Jul 11, 2018

vbaranov commented Jul 12, 2018

fernandomg left a comment

fernandomg Jul 12, 2018

vbaranov Jul 13, 2018

fernandomg Jul 12, 2018

vbaranov Jul 13, 2018

fernandomg Jul 12, 2018

vbaranov Jul 13, 2018

fernandomg Jul 12, 2018

vbaranov Jul 13, 2018

fernandomg Jul 12, 2018

vbaranov Jul 13, 2018

fernandomg Jul 13, 2018

vbaranov Jul 13, 2018

		let tokensSold = await getTokensSold(...params).call()
		console.log('tokensSold:', tokensSold)

(Feature) Enable proxy for both strategies #1024

(Feature) Enable proxy for both strategies #1024

Conversation

vbaranov commented Jul 6, 2018 • edited

dennis00010011b commented Jul 8, 2018 • edited

dennis00010011b commented Jul 8, 2018 • edited

dennis00010011b commented Jul 8, 2018 • edited

vbaranov commented Jul 9, 2018

dennis00010011b commented Jul 9, 2018 • edited

dennis00010011b commented Jul 9, 2018 • edited

vbaranov commented Jul 9, 2018

dennis00010011b commented Jul 9, 2018

vbaranov commented Jul 9, 2018

dennis00010011b commented Jul 9, 2018 • edited

vbaranov commented Jul 9, 2018

dennis00010011b commented Jul 9, 2018

dennis00010011b commented Jul 9, 2018 • edited

dennis00010011b left a comment

Choose a reason for hiding this comment

vbaranov commented Jul 10, 2018 • edited

dennis00010011b commented Jul 11, 2018

vbaranov commented Jul 12, 2018

fernandomg left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vbaranov commented Jul 6, 2018 •

edited

dennis00010011b commented Jul 8, 2018 •

edited

dennis00010011b commented Jul 8, 2018 •

edited

dennis00010011b commented Jul 8, 2018 •

edited

dennis00010011b commented Jul 9, 2018 •

edited

dennis00010011b commented Jul 9, 2018 •

edited

dennis00010011b commented Jul 9, 2018 •

edited

dennis00010011b commented Jul 9, 2018 •

edited

vbaranov commented Jul 10, 2018 •

edited