Merge pull request #2040 from daostack/release

release 0.10.14
daostack · Aug 5, 2020 · 5d17f6b · 5d17f6b
2 parents 198520e + 7a3e1a0
commit 5d17f6b
Show file tree

Hide file tree

Showing 13 changed files with 112 additions and 33 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -8,7 +8,7 @@ assignees: ''
 ---
 
 **Describe the bug**
-A clear and concise description of what the bug is.
+A clear and concise description of the bug.
 
 **To Reproduce**
 Steps to reproduce the behavior:
@@ -20,6 +20,12 @@ Steps to reproduce the behavior:
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 
+**Alchemy Version Number**
+You may obtain the Alchemy version number as follows:
+
+1. Hover your mouse over the Alchemy logo image in the upper left corner of any page in Alchemy. Below the icon a tooltip will appear which will contain the Alchemy version number.
+2. In the tooltip, select the version number, copy it to your clipboard and paste it into this bug report.
+
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 0.10.14
+  - Features Added
+    - show raw calldata in proposal details for relevant plugins
+    - improve doc about adding GenericSchemes to Alchemy
+    - show the Alchemy package version as tooltip over the Alchemy header icon
+
+  - Bugs Fixed
+    - upgrade DaoCreator to fix a bug when creating a new DAO
+
 ## 0.10.13
   - Features Added
     - added support for awarding the DMG token

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alchemy-client",
-  "version": "0.10.13",
+  "version": "0.10.14",
   "description": "An app for collaborative networks (DAOs), based on the DAO stack.",
   "author": "DAOstack",
   "license": "GPL-3.0",
@@ -80,7 +80,7 @@
     "3box": "1.17.1",
     "@burner-wallet/burner-connect-provider": "^0.1.1",
     "@daostack/arc.js": "^0.2.70",
-    "@dorgtech/daocreator-ui": "^1.0.10",
+    "@dorgtech/daocreator-ui": "^1.0.13",
     "@fortawesome/fontawesome-svg-core": "^1.2.10",
     "@fortawesome/free-brands-svg-icons": "^5.6.1",
     "@fortawesome/react-fontawesome": "^0.1.3",

diff --git a/src/components/DaoCreator/index.tsx b/src/components/DaoCreator/index.tsx
@@ -48,6 +48,7 @@ class DaoCreator extends React.Component<IProps> {
             return await getWeb3Provider();
           }}
           noDAOstackLogo
+          redirectURL={process.env.BASE_URL}
         />
       </React.Suspense>
     );

diff --git a/src/components/Proposal/ProposalSummary/ProposalSummaryCO2ken.tsx b/src/components/Proposal/ProposalSummary/ProposalSummaryCO2ken.tsx
@@ -3,9 +3,10 @@ import { IProposalState } from "@daostack/arc.js";
 import BN = require("bn.js");
 import classNames from "classnames";
 import { GenericSchemeInfo } from "genericSchemeRegistry";
-import { formatTokens } from "lib/util";
+import { formatTokens, truncateWithEllipses } from "lib/util";
 import * as React from "react";
 import * as css from "./ProposalSummary.scss";
+import CopyToClipboard from "components/Shared/CopyToClipboard";
 
 interface IProps {
   genericSchemeInfo: GenericSchemeInfo;
@@ -16,6 +17,15 @@ interface IProps {
 
 export default class ProposalSummaryCO2ken extends React.Component<IProps, null> {
 
+  private rawCallData(proposal: IProposalState) {
+    return <>
+      <p>Raw call data:</p>
+      <pre>
+        { truncateWithEllipses(proposal.genericScheme.callData, 66) }<CopyToClipboard value={proposal.genericScheme.callData} />
+      </pre>
+    </>;
+  }
+
   public render(): RenderOutput {
     const { proposal, detailView, genericSchemeInfo, transactionModal } = this.props;
     let decodedCallData: any;
@@ -64,6 +74,7 @@ export default class ProposalSummaryCO2ken extends React.Component<IProps, null>
                     <a href={`https://cloudflare-ipfs.com/ipfs/${ipfsHashValue}`} target="_blank" rel="noopener noreferrer">{ipfsHashValue}</a>
                   </pre>
                 </div>
+                {this.rawCallData(proposal)}
               </div>
               : ""
             }
@@ -84,6 +95,7 @@ export default class ProposalSummaryCO2ken extends React.Component<IProps, null>
                 <pre>{-1}</pre>
                 It allows the the CO2ken contract to move DAI held by the DAO. This way, the DAO can offset its emissions by calling:
                 <pre>offsetCarbon()</pre>
+                {this.rawCallData(proposal)}
               </div>
               : ""
             }
@@ -100,6 +112,7 @@ export default class ProposalSummaryCO2ken extends React.Component<IProps, null>
                 Executing this proposal will call the function
                 <pre>{action.id}()</pre>
                 It transfers all the DAI stored in the CO2ken contract to the DAO.
+                {this.rawCallData(proposal)}
               </div>
               : ""
             }
@@ -122,6 +135,7 @@ export default class ProposalSummaryCO2ken extends React.Component<IProps, null>
                 <pre>
                   {formatTokens(new BN(value), field.unit, field.decimals)}
                 </pre>
+                {this.rawCallData(proposal)}
               </div>
               : ""
             }
@@ -146,6 +160,7 @@ export default class ProposalSummaryCO2ken extends React.Component<IProps, null>
                   { field.label }: {formatTokens(new BN(value), field.unit, field.decimals)}
                 </pre>
                 The value describes the amount of carbon tons the DAO wants to offset.
+                {this.rawCallData(proposal)}
               </div>
               : ""
             }
@@ -165,6 +180,7 @@ export default class ProposalSummaryCO2ken extends React.Component<IProps, null>
                 <pre>{action.id}()</pre>
                 with the new owner‘s address being
                 <pre>{decodedCallData.values[0]}</pre>
+                {this.rawCallData(proposal)}
               </div>
               : ""
             }

diff --git a/src/components/Proposal/ProposalSummary/ProposalSummaryDutchX.tsx b/src/components/Proposal/ProposalSummary/ProposalSummaryDutchX.tsx
@@ -3,9 +3,10 @@ import { IProposalState } from "@daostack/arc.js";
 import BN = require("bn.js");
 import classNames from "classnames";
 import { GenericSchemeInfo } from "genericSchemeRegistry";
-import { formatTokens, linkToEtherScan } from "lib/util";
+import { formatTokens, linkToEtherScan, truncateWithEllipses } from "lib/util";
 import * as React from "react";
 import * as css from "./ProposalSummary.scss";
+import CopyToClipboard from "components/Shared/CopyToClipboard";
 
 interface IProps {
   genericSchemeInfo: GenericSchemeInfo;
@@ -16,6 +17,16 @@ interface IProps {
 
 export default class ProposalSummaryDutchX extends React.Component<IProps, null> {
 
+  private rawCallData(proposal: IProposalState) {
+    return <>
+      <p>Raw call data:</p>
+      <pre>
+        {truncateWithEllipses(proposal.genericScheme.callData, 66)}<CopyToClipboard value={proposal.genericScheme.callData} />
+      </pre>
+    </>;
+  }
+
+
   public render(): RenderOutput {
     const { proposal, detailView, genericSchemeInfo, transactionModal } = this.props;
     let decodedCallData: any;
@@ -57,6 +68,7 @@ export default class ProposalSummaryDutchX extends React.Component<IProps, null>
             { detailView ?
               <div className={css.summaryDetails}>
                 <div>{ action.fields[0].label}: <a href={linkToEtherScan(decodedCallData.values[0])} target="_blank" rel="noopener noreferrer">{decodedCallData.values[0]}</a></div>
+                {this.rawCallData(proposal)}
               </div>
               : ""
             }
@@ -73,6 +85,7 @@ export default class ProposalSummaryDutchX extends React.Component<IProps, null>
             { detailView ?
               <div className={css.summaryDetails}>
                 New oracle address: <a href={linkToEtherScan(decodedCallData.values[0])} target="_blank" rel="noopener noreferrer">{decodedCallData.values[0]}</a>
+                {this.rawCallData(proposal)}
               </div>
               : ""
             }
@@ -89,6 +102,7 @@ export default class ProposalSummaryDutchX extends React.Component<IProps, null>
             { detailView ?
               <div className={css.summaryDetails}>
                 New owner address: <a href={linkToEtherScan(decodedCallData.values[0])} target="_blank" rel="noopener noreferrer">{decodedCallData.values[0]}</a>
+                {this.rawCallData(proposal)}
               </div>
               : ""
             }
@@ -107,6 +121,7 @@ export default class ProposalSummaryDutchX extends React.Component<IProps, null>
                 <ul>
                   {decodedCallData.values[0].map((token: string) => <li key={token}><a href={linkToEtherScan(token)} target="_blank" rel="noopener noreferrer">{token}</a></li>)}
                 </ul>
+                {this.rawCallData(proposal)}
               </div>
               : ""
             }
@@ -126,6 +141,7 @@ export default class ProposalSummaryDutchX extends React.Component<IProps, null>
             </span>
             {detailView ?
               <div className={css.summaryDetails}>
+                {this.rawCallData(proposal)}
               </div>
               : ""
             }

diff --git a/src/components/Proposal/ProposalSummary/ProposalSummaryKnownGenericScheme.tsx b/src/components/Proposal/ProposalSummary/ProposalSummaryKnownGenericScheme.tsx
@@ -95,7 +95,7 @@ export default class ProposalSummary extends React.Component<IProps> {
         <div className={css.summaryDetails}>
           Executing this proposal will call the function:
           <pre>{decodedCallData.action.abi.name}
-        ({decodedCallData.action.abi.inputs.map(this.inputHtml)})
+            ({decodedCallData.action.abi.inputs.map(this.inputHtml)})
           </pre>
           with values: <pre>{
             decodedCallData.values.map((value: string | Array<string>) => {
@@ -114,6 +114,11 @@ export default class ProposalSummary extends React.Component<IProps> {
           <pre><a href={linkToEtherScan(proposal.genericScheme.contractToCall)}>{proposal.genericScheme.contractToCall}</a></pre>
           sending to contract:
           <pre className={sendsETH ? css.warning : ""}>{formatTokens(proposal.genericScheme.value)} ETH</pre>
+
+          Raw call data:
+          <pre>
+            {truncateWithEllipses(proposal.genericScheme.callData, 66)}<CopyToClipboard value={proposal.genericScheme.callData} />
+          </pre>
         </div>
         : ""
       }

diff --git a/src/components/Proposal/ProposalSummary/ProposalSummaryStandardBounties.tsx b/src/components/Proposal/ProposalSummary/ProposalSummaryStandardBounties.tsx
@@ -1,9 +1,10 @@
 import { IProposalState } from "@daostack/arc.js";
 import * as classNames from "classnames";
 import { GenericSchemeInfo } from "genericSchemeRegistry";
-import { linkToEtherScan } from "lib/util";
+import { linkToEtherScan, truncateWithEllipses } from "lib/util";
 import * as React from "react";
 import * as css from "./ProposalSummary.scss";
+import CopyToClipboard from "components/Shared/CopyToClipboard";
 
 const web3 = require("web3");
 
@@ -16,6 +17,15 @@ interface IProps {
 
 export default class ProposalSummaryStandardBounties extends React.Component<IProps, null> {
 
+  private rawCallData(proposal: IProposalState) {
+    return <>
+      <div>Raw call data:
+        {truncateWithEllipses(proposal.genericScheme.callData, 66)}<CopyToClipboard value={proposal.genericScheme.callData} />
+      </div>
+    </>;
+  }
+
+
   public render(): RenderOutput {
 
     const { proposal, detailView, genericSchemeInfo, transactionModal } = this.props;
@@ -70,6 +80,7 @@ export default class ProposalSummaryStandardBounties extends React.Component<IPr
                 <div>
                   Approver: <a href={linkToEtherScan(decodedCallData.values[2])} target="_blank" rel="noopener noreferrer">{decodedCallData.values[2]}</a>
                 </div>
+                {this.rawCallData(proposal)}
               </div>
             }
           </div>
@@ -91,6 +102,7 @@ export default class ProposalSummaryStandardBounties extends React.Component<IPr
                 <div>
                   Sender: <a href={linkToEtherScan(decodedCallData.values[0])} target="_blank" rel="noopener noreferrer">{decodedCallData.values[0]}</a>
                 </div>
+                {this.rawCallData(proposal)}
               </div>
             }
           </div>
@@ -122,6 +134,7 @@ export default class ProposalSummaryStandardBounties extends React.Component<IPr
                 <div>
                   Issuer ID: {decodedCallData.values[2]}
                 </div>
+                {this.rawCallData(proposal)}
               </div>
             }
           </div>
@@ -143,6 +156,7 @@ export default class ProposalSummaryStandardBounties extends React.Component<IPr
                 <div>
                   Issuer ID: {decodedCallData.values[2]}
                 </div>
+                {this.rawCallData(proposal)}
               </div>
             }
           </div>
@@ -164,6 +178,7 @@ export default class ProposalSummaryStandardBounties extends React.Component<IPr
                 <div>
                   Approver ID: {decodedCallData.values[3]}
                 </div>
+                {this.rawCallData(proposal)}
               </div>
             }
           </div>
@@ -211,6 +226,7 @@ export default class ProposalSummaryStandardBounties extends React.Component<IPr
                 <div>
                   Issuer ID: {decodedCallData.values[2]}
                 </div>
+                {this.rawCallData(proposal)}
               </div>
             }
           </div>
@@ -232,6 +248,7 @@ export default class ProposalSummaryStandardBounties extends React.Component<IPr
                 <div>
                   Issuer ID: {decodedCallData.values[2]}
                 </div>
+                {this.rawCallData(proposal)}
               </div>
             }
           </div>
@@ -253,6 +270,7 @@ export default class ProposalSummaryStandardBounties extends React.Component<IPr
                 <div>
                   Issuer ID: {decodedCallData.values[2]}
                 </div>
+                {this.rawCallData(proposal)}
               </div>
             }
           </div>
@@ -287,6 +305,7 @@ export default class ProposalSummaryStandardBounties extends React.Component<IPr
                 <div>
                   Bounty Details: <a href={`https://ipfs.io/ipfs/${decodedCallData.values[3]}`} target="_blank" rel="noopener noreferrer">{decodedCallData.values[3]}</a>
                 </div>
+                {this.rawCallData(proposal)}
               </ul>
             }
           </div>
@@ -318,6 +337,7 @@ export default class ProposalSummaryStandardBounties extends React.Component<IPr
                 <div>
                   Issuer ID: {decodedCallData.values[2]}
                 </div>
+                {this.rawCallData(proposal)}
               </div>
             }
           </div>
@@ -349,6 +369,7 @@ export default class ProposalSummaryStandardBounties extends React.Component<IPr
                 <div>
                   Issuer ID: {decodedCallData.values[2]}
                 </div>
+                {this.rawCallData(proposal)}
               </div>
             }
           </div>