Merge branch 'master' of https://github.com/ethereum/remix-project into signmacosdesktop

9 months ago · 046ae9d2bc
parent 7805dbe199 7ac04e041d
commit 046ae9d2bc
5 changed files with 34 additions and 39 deletions
--- a/.github/workflows/pr-reminder.yml
+++ b/.github/workflows/pr-reminder.yml
@ -2,7 +2,7 @@ name: PRs reviews reminder

 on:
  schedule:
-    - cron: "0 8-17/8 * * 1-5"
+    - cron: "0 8 * * 1-5"
  workflow_dispatch:

 jobs:
--- a/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
@ -7,12 +7,13 @@ import { UniversalDappUI } from './universalDappUI'

 export function InstanceContainerUI(props: InstanceContainerProps) {
  const { instanceList } = props.instances
-  const env = useRef()
+  const enableSave = useRef(false)

  useEffect(() => {
    const fetchSavedContracts = async () => {
-      env.current = await props.plugin.call('blockchain', 'getProvider')
-      if(env.current && env.current === 'injected') {
+      if (props.plugin.REACT_API.selectExEnv && props.plugin.REACT_API.selectExEnv.startsWith('vm-')) enableSave.current = false
+      else enableSave.current = true
+      if (enableSave.current) {
        const allSavedContracts = localStorage.getItem('savedContracts')
        if (allSavedContracts) {
          await props.plugin.call('udapp', 'clearAllSavedInstances')
@ -27,7 +28,7 @@ export function InstanceContainerUI(props: InstanceContainerProps) {
      }
    }
    fetchSavedContracts()
-  }, [props.plugin.REACT_API.networkName])
+  }, [props.plugin.REACT_API.selectExEnv, props.plugin.REACT_API.networkName])

  const clearInstance = () => {
    props.clearInstances()
@ -35,7 +36,7 @@ export function InstanceContainerUI(props: InstanceContainerProps) {

  return (
    <div className="udapp_instanceContainer mt-3 border-0 list-group-item">
-      { env.current && env.current === 'injected' ? (
+      { enableSave.current ? (
        <div className="d-flex justify-content-between align-items-center pl-2">
          <CustomTooltip placement="top-start" tooltipClasses="text-nowrap" tooltipId="deployAndRunClearInstancesTooltip" tooltipText={<FormattedMessage id="udapp.tooltipText6" />}>
            <label className="udapp_deployedContracts">
@ -43,7 +44,7 @@ export function InstanceContainerUI(props: InstanceContainerProps) {
            </label>
          </CustomTooltip>
        </div>) : null }
-      { env.current && env.current === 'injected' ? (
+      { enableSave.current ? (
        props.savedInstances.instanceList.length > 0 ? (
          <div>
            {' '}
--- a/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
@ -1,5 +1,5 @@
 // eslint-disable-next-line no-use-before-define
-import React, {useEffect, useState, useRef} from 'react'
+import React, {useEffect, useState} from 'react'
 import {FormattedMessage, useIntl} from 'react-intl'
 import {UdappProps} from '../types'
 import {FuncABI} from '@remix-project/core-plugin'
@ -23,7 +23,6 @@ export function UniversalDappUI(props: UdappProps) {
  const [calldataValue, setCalldataValue] = useState<string>('')
  const [evmBC, setEvmBC] = useState(null)
  const [instanceBalance, setInstanceBalance] = useState(0)
-  const env = useRef()

  const getVersion = () => window.location.href.split('=')[5].split('+')[0].split('-')[1]

@ -58,13 +57,6 @@ export function UniversalDappUI(props: UdappProps) {
    }
  }, [props.instance.balance])

-  useEffect(() => {
-    const getEnv = async () => {
-      env.current = await props.plugin.call('blockchain', 'getProvider')
-    }
-    getEnv()
-  }, [])
-
  const sendData = () => {
    setLlIError('')
    const fallback = txHelper.getFallbackInterface(contractABI)
@ -272,7 +264,7 @@ export function UniversalDappUI(props: UdappProps) {
          <div className="btn" style={{padding: '0.15rem'}}>
            <CopyToClipboard tip={intl.formatMessage({id: 'udapp.copy'})} content={address} direction={'top'} />
          </div>
-          { !props.isSavedContract && env.current === 'injected' ? ( <div className="btn" style={{padding: '0.15rem', marginLeft: '-0.5rem'}}>
+          { props.isSavedContract || !(props.plugin.REACT_API.selectExEnv && props.plugin.REACT_API.selectExEnv.startsWith('vm-')) ? ( <div className="btn" style={{padding: '0.15rem', marginLeft: '-0.5rem'}}>
            <CustomTooltip placement="top" tooltipClasses="text-nowrap" tooltipId="udapp_udappSaveTooltip" tooltipText={<FormattedMessage id="udapp.tooltipText14" />}>
              <i className="far fa-save p-2" aria-hidden="true" data-id="universalDappUiUdappSave" onClick={saveContract}></i>
            </CustomTooltip>
@ -292,7 +284,7 @@ export function UniversalDappUI(props: UdappProps) {
          { props.isSavedContract && props.instance.savedOn ? (
            <div className="d-flex" data-id="instanceContractSavedOn">
              <label>
-                <b><FormattedMessage id="udapp.savedOn" />:</b> {(new Date(props.instance.savedOn)).toUTCString()}
+                <b><FormattedMessage id="udapp.savedOn" />:</b> {(new Date(props.instance.savedOn)).toLocaleString()}
              </label>
            </div>
          ) : null }
--- a/libs/remix-ws-templates/src/script-templates/sindri/sindri.json
+++ b/libs/remix-ws-templates/src/script-templates/sindri/sindri.json
@ -5,5 +5,5 @@
  "circuitType": "circom",
  "curve": "bn254",
  "provingScheme": "groth16",
-  "witnessCompiler": "c++"
+  "witnessCompiler": "wasm"
 }
--- a/yarn.lock
+++ b/yarn.lock
@ -13274,22 +13274,14 @@ es-to-primitive@^1.2.1:
    is-date-object "^1.0.1"
    is-symbol "^1.0.2"

-es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50:
-  version "0.10.53"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1"
-  integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==
-  dependencies:
-    es6-iterator "~2.0.3"
-    es6-symbol "~3.1.3"
-    next-tick "~1.0.0"
-
-es5-ext@^0.10.53, es5-ext@^0.10.61, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
-  version "0.10.62"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.62.tgz#5e6adc19a6da524bf3d1e02bbc8960e5eb49a9a5"
-  integrity sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==
+es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@^0.10.61, es5-ext@^0.10.62, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
+  version "0.10.63"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.63.tgz#9c222a63b6a332ac80b1e373b426af723b895bd6"
+  integrity sha512-hUCZd2Byj/mNKjfP9jXrdVZ62B8KuA/VoK7X8nUh5qT+AxDmcbvZz041oDVZdbIN1qW6XY9VDNwzkvKnZvK2TQ==
  dependencies:
    es6-iterator "^2.0.3"
    es6-symbol "^3.1.3"
+    esniff "^2.0.1"
    next-tick "^1.1.0"

 es6-error@^4.0.1, es6-error@^4.1.1:
@ -13297,7 +13289,7 @@ es6-error@^4.0.1, es6-error@^4.1.1:
  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
  integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==

-es6-iterator@^2.0.1, es6-iterator@^2.0.3, es6-iterator@~2.0.3:
+es6-iterator@^2.0.1, es6-iterator@^2.0.3:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
@ -13318,7 +13310,7 @@ es6-promisify@^5.0.0:
  dependencies:
    es6-promise "^4.0.3"

-es6-symbol@^3.1.1, es6-symbol@^3.1.3, es6-symbol@~3.1.3:
+es6-symbol@^3.1.1, es6-symbol@^3.1.3:
  version "3.1.3"
  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
@ -13635,6 +13627,16 @@ eslint@^8.26.0:
    strip-json-comments "^3.1.0"
    text-table "^0.2.0"

+esniff@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/esniff/-/esniff-2.0.1.tgz#a4d4b43a5c71c7ec51c51098c1d8a29081f9b308"
+  integrity sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==
+  dependencies:
+    d "^1.0.1"
+    es5-ext "^0.10.62"
+    event-emitter "^0.3.5"
+    type "^2.7.2"
+
 espree@^9.6.0:
  version "9.6.0"
  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.0.tgz#80869754b1c6560f32e3b6929194a3fe07c5b82f"
@ -21551,11 +21553,6 @@ next-tick@1, next-tick@^1.1.0:
  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
  integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==

-next-tick@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
-  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
-
 nice-try@^1.0.4:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@ -28546,6 +28543,11 @@ type@^2.5.0:
  resolved "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz#0a2e78c2e77907b252abe5f298c1b01c63f0db3d"
  integrity sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==

+type@^2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
+  integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
+
 typed-array-buffer@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60"