Merge pull request #666 from blockscout/contract-fixes

contract fixes

lib/csp/getCspPolicy.ts

@@ -12,7 +12,11 @@ const KEY_WORDS = {
   UNSAFE_EVAL: '\'unsafe-eval\'',
 };
 
-const MAIN_DOMAINS = [ `*.${ appConfig.host }`, appConfig.host ];
+const MAIN_DOMAINS = [
+  `*.${ appConfig.host }`,
+  appConfig.host,
+  appConfig.visualizeApi.endpoint,
+].filter(Boolean);
 // eslint-disable-next-line no-restricted-properties
 const REPORT_URI = process.env.SENTRY_CSP_REPORT_URI;
 
@@ -49,7 +53,9 @@ function makePolicyMap() {
 
   return {
     'default-src': [
-      KEY_WORDS.NONE,
+      // KEY_WORDS.NONE,
+      // temporarily, see if warnings for "/_next/static/chunks/8861-ad3efb7f624b7bc1.js" go away
+      ...MAIN_DOMAINS,
     ],
 
     'connect-src': [
@@ -78,6 +84,9 @@ function makePolicyMap() {
       'wss://*.bridge.walletconnect.org',
       'wss://www.walletlink.org',
 
+      // RPC providers
+      'https://infragrid.v.network',
+
       // github (spec for api-docs page)
       'raw.githubusercontent.com',
     ],
@@ -103,6 +112,7 @@ function makePolicyMap() {
       // reCAPTCHA from google
       'https://www.google.com/recaptcha/api.js',
       'https://www.gstatic.com',
+      'https://translate.google.com',
       '\'sha256-FDyPg8CqqIpPAfGVKx1YeKduyLs0ghNYWII21wL+7HM=\'',
     ],
 
@@ -113,6 +123,9 @@ function makePolicyMap() {
       // google fonts
       'fonts.googleapis.com',
 
+      // reCAPTCHA from google
+      'https://www.gstatic.com',
+
       // yes, it is unsafe as it stands, but
       // - we cannot use hashes because all styles are generated dynamically
       // - we cannot use nonces since we are not following along SSR path
@@ -151,6 +164,10 @@ function makePolicyMap() {
 
       // token's media
       'ipfs.io',
+
+      // reCAPTCHA from google
+      'https://translate.google.com',
+      'https://www.gstatic.com',
     ],
 
     'font-src': [

ui/address/contract/ContractMethodCallable.tsx

@@ -137,7 +137,7 @@ const ContractMethodCallable = <T extends SmartContractMethod>({ data, onSubmit,
           { isWrite ? 'Write' : 'Query' }
         </Button>
       </chakra.form>
-      { 'outputs' in data && data.outputs.length > 0 && (
+      { 'outputs' in data && !isWrite && data.outputs.length > 0 && (
         <Flex mt={ 3 }>
           <Icon as={ arrowIcon } boxSize={ 5 } mr={ 1 }/>
           <Text>{ data.outputs.map(({ type }) => type).join(', ') }</Text>

ui/address/contract/ContractMethodConstant.tsx

@@ -7,7 +7,9 @@ import type { SmartContractMethodOutput } from 'types/api/contract';
 
 import appConfig from 'configs/app/config';
 import { WEI } from 'lib/consts';
+import Address from 'ui/shared/address/Address';
 import AddressLink from 'ui/shared/address/AddressLink';
+import CopyToClipboard from 'ui/shared/CopyToClipboard';
 
 interface Props {
   data: SmartContractMethodOutput;
@@ -34,7 +36,12 @@ const ContractMethodStatic = ({ data }: Props) => {
 
   const content = (() => {
     if (data.type === 'address' && data.value) {
-      return <AddressLink type="address" hash={ data.value }/>;
+      return (
+        <Address>
+          <AddressLink type="address" hash={ data.value }/>
+          <CopyToClipboard text={ data.value }/>
+        </Address>
+      );
     }
 
     return <chakra.span wordBreak="break-all">({ data.type }): { value }</chakra.span>;

ui/contractVerification/ContractVerificationForm.tsx

@@ -84,10 +84,9 @@ const ContractVerificationForm = ({ method: methodFromQuery, config, hash }: Pro
       status: 'success',
       variant: 'subtle',
       isClosable: true,
-      onCloseComplete: () => {
-        router.push({ pathname: '/address/[hash]', query: { hash, tab: 'contract' } }, undefined, { shallow: true });
-      },
     });
+
+    router.push({ pathname: '/address/[hash]', query: { hash, tab: 'contract' } }, undefined, { shallow: false });
   }, [ hash, router, setError, toast ]);
 
   const handleSocketError = React.useCallback(() => {