From e6548999f4bff1ebf9a0ca8737c53b79f1069070 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 28 Sep 2022 13:00:21 +0200
Subject: [PATCH] add sync action in udapp

---
 .../remix-ide/src/app/files/foundry-handle.js |  2 +-
 .../remix-ide/src/app/files/hardhat-handle.js |  2 +-
 .../remix-ide/src/app/files/truffle-handle.js |  2 +-
 .../run-tab/src/lib/actions/deploy.ts         | 12 +++
 .../remix-ui/run-tab/src/lib/actions/index.ts |  5 +-
 .../src/lib/components/contractDropdownUI.tsx | 12 ++-
 libs/remix-ui/run-tab/src/lib/run-tab.tsx     |  4 +-
 libs/remix-ui/run-tab/src/lib/types/index.ts  |  1 +
 .../run-tab/src/lib/types/run-tab.d.ts        |  1 +
 libs/remixd/src/services/hardhatClient.ts     | 76 ++++++++++---------
 package.json                                  |  2 +-
 11 files changed, 77 insertions(+), 42 deletions(-)

diff --git a/apps/remix-ide/src/app/files/foundry-handle.js b/apps/remix-ide/src/app/files/foundry-handle.js
index 3d9091f6fc..cf20f03e79 100644
--- a/apps/remix-ide/src/app/files/foundry-handle.js
+++ b/apps/remix-ide/src/app/files/foundry-handle.js
@@ -5,7 +5,7 @@ const profile = {
   name: 'foundry',
   displayName: 'Foundry',
   url: 'ws://127.0.0.1:65525',
-  methods: [],
+  methods: ['sync'],
   description: 'Using Remixd daemon, allow to access foundry API',
   kind: 'other',
   version: packageJson.version
diff --git a/apps/remix-ide/src/app/files/hardhat-handle.js b/apps/remix-ide/src/app/files/hardhat-handle.js
index e9e8b770ef..7b64f489dc 100644
--- a/apps/remix-ide/src/app/files/hardhat-handle.js
+++ b/apps/remix-ide/src/app/files/hardhat-handle.js
@@ -5,7 +5,7 @@ const profile = {
   name: 'hardhat',
   displayName: 'Hardhat',
   url: 'ws://127.0.0.1:65522',
-  methods: ['compile'],
+  methods: ['compile', 'sync'],
   description: 'Using Remixd daemon, allow to access hardhat API',
   kind: 'other',
   version: packageJson.version
diff --git a/apps/remix-ide/src/app/files/truffle-handle.js b/apps/remix-ide/src/app/files/truffle-handle.js
index 8ef51ffcd1..bdeed78592 100644
--- a/apps/remix-ide/src/app/files/truffle-handle.js
+++ b/apps/remix-ide/src/app/files/truffle-handle.js
@@ -5,7 +5,7 @@ const profile = {
   name: 'truffle',
   displayName: 'truffle',
   url: 'ws://127.0.0.1:65524',
-  methods: ['compile'],
+  methods: ['compile', 'sync'],
   description: 'Using Remixd daemon, allow to access truffle API',
   kind: 'other',
   version: packageJson.version
diff --git a/libs/remix-ui/run-tab/src/lib/actions/deploy.ts b/libs/remix-ui/run-tab/src/lib/actions/deploy.ts
index caf8e6de8a..31ddc10d0f 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/deploy.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/deploy.ts
@@ -244,6 +244,18 @@ export const getContext = (plugin: RunTab) => {
   return plugin.blockchain.context()
 }
 
+export const syncContractsInternal = async (plugin: RunTab) => {
+  if (await plugin.call('manager', 'isActive', 'truffle')) {
+    plugin.call('truffle', 'sync')
+  }
+  if (await plugin.call('manager', 'isActive', 'hardhat')) {
+    plugin.call('hardhat', 'sync')
+  } 
+  if (await plugin.call('manager', 'isActive', 'foundry')) {
+    plugin.call('foundry', 'sync')
+  }
+}
+
 export const runTransactions = (
   plugin: RunTab,
   dispatch: React.Dispatch<any>,
diff --git a/libs/remix-ui/run-tab/src/lib/actions/index.ts b/libs/remix-ui/run-tab/src/lib/actions/index.ts
index f61de6ebd8..88ab644592 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/index.ts
@@ -6,7 +6,7 @@ import { createNewBlockchainAccount, fillAccountsList, setExecutionContext, sign
 import { clearInstances, clearPopUp, removeInstance, setAccount, setGasFee, setMatchPassphrasePrompt, 
   setNetworkNameFromProvider, setPassphrasePrompt, setSelectedContract, setSendTransactionValue, setUnit, 
   updateBaseFeePerGas, updateConfirmSettings, updateGasPrice, updateGasPriceStatus, updateMaxFee, updateMaxPriorityFee, updateScenarioPath } from './actions'
-import { createInstance, getContext, getFuncABIInputs, getSelectedContract, loadAddress, runTransactions, updateInstanceBalance } from './deploy'
+import { createInstance, getContext, getFuncABIInputs, getSelectedContract, loadAddress, runTransactions, updateInstanceBalance, syncContractsInternal } from './deploy'
 import { CompilerAbstract as CompilerAbstractType } from '@remix-project/remix-solidity-ts'
 import { ContractData, FuncABI } from "@remix-project/core-plugin"
 import { DeployMode, MainnetPrompt } from '../types'
@@ -60,4 +60,5 @@ export const runScenario = (liveMode: boolean, gasEstimationPrompt: (msg: string
 export const setScenarioPath = (path: string) => updateScenarioPath(dispatch, path)
 export const getFuncABIValues = (funcABI: FuncABI) => getFuncABIInputs(plugin, funcABI)
 export const setNetworkName = (networkName: string) => setNetworkNameFromProvider(dispatch, networkName)
-export const updateSelectedContract = (contractName) => setSelectedContract(dispatch, contractName)
\ No newline at end of file
+export const updateSelectedContract = (contractName) => setSelectedContract(dispatch, contractName)
+export const syncContracts = () => syncContractsInternal(plugin)
\ No newline at end of file
diff --git a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
index 224785890c..03ade973ae 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
@@ -5,6 +5,7 @@ import { ContractData, FuncABI } from '@remix-project/core-plugin'
 import * as ethJSUtil from 'ethereumjs-util'
 import { ContractGUI } from './contractGUI'
 import { deployWithProxyMsg, upgradeWithProxyMsg } from '@remix-ui/helper'
+import { OverlayTrigger, Tooltip } from 'react-bootstrap'
 
 export function ContractDropdownUI (props: ContractDropdownProps) {
   const [abiLabel, setAbiLabel] = useState<{
@@ -229,7 +230,16 @@ export function ContractDropdownUI (props: ContractDropdownProps) {
     <div className="udapp_container" data-id="contractDropdownContainer">
       <div className='d-flex justify-content-between'>
         <label className="udapp_settingsLabel">Contract</label>
-        { Object.keys(props.contracts.contractList).length > 0 && compilationSource !== '' && <label data-id="udappCompiledBy">Compiled by {compilationSource} </label> }
+        { Object.keys(props.contracts.contractList).length > 0 && compilationSource !== '' && <label data-id="udappCompiledBy">Compiled by {compilationSource} </label>  }
+        <OverlayTrigger placement={'right'} overlay={
+              <Tooltip className="text-nowrap" id="info-sync-compiled-contract">
+                <span>Remix is currently connected to an external framework. Click here to import contract compiled from that framework.</span>
+              </Tooltip>
+            }>
+            <i className="fa fa-refresh" aria-hidden="true" onClick={() => {
+              props.syncContracts()
+            }}></i>
+        </OverlayTrigger>
       </div>
       <div className="udapp_subcontainer">
        <select ref={contractsRef} value={currentContract} onChange={handleContractChange} className="udapp_contractNames custom-select" disabled={contractOptions.disabled} title={contractOptions.title} style={{ display: loadType === 'abi' && !isContractFile(currentFile) ? 'none' : 'block' }}>
diff --git a/libs/remix-ui/run-tab/src/lib/run-tab.tsx b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
index 1ad855434c..05d82ea0f2 100644
--- a/libs/remix-ui/run-tab/src/lib/run-tab.tsx
+++ b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
@@ -26,7 +26,8 @@ import {
   executeTransactions, loadFromAddress,
   storeNewScenario, runScenario,
   setScenarioPath, getFuncABIValues,
-  setNetworkName, updateSelectedContract
+  setNetworkName, updateSelectedContract,
+  syncContracts
 } from './actions'
 import './css/run-tab.css'
 import { PublishToStorage } from '@remix-ui/publish-to-storage'
@@ -221,6 +222,7 @@ export function RunTabUI (props: RunTabProps) {
             passphrase={runTab.passphrase}
           />
           <ContractDropdownUI
+            syncContracts={syncContracts}
             exEnvironment={runTab.selectExEnv}
             contracts={runTab.contracts}
             getSelectedContract={fetchSelectedContract}
diff --git a/libs/remix-ui/run-tab/src/lib/types/index.ts b/libs/remix-ui/run-tab/src/lib/types/index.ts
index f3c57f136a..67210c3bc7 100644
--- a/libs/remix-ui/run-tab/src/lib/types/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/index.ts
@@ -139,6 +139,7 @@ export interface ContractDropdownProps {
     isSuccessful: boolean,
     error: string
   },
+  syncContracts: () => void,
   getSelectedContract: (contractName: string, compiler: CompilerAbstract) => ContractData,
   modal: (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void,
   passphrase: string,
diff --git a/libs/remix-ui/run-tab/src/lib/types/run-tab.d.ts b/libs/remix-ui/run-tab/src/lib/types/run-tab.d.ts
index cecdbe121d..62cbdb26f1 100644
--- a/libs/remix-ui/run-tab/src/lib/types/run-tab.d.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/run-tab.d.ts
@@ -36,6 +36,7 @@ export class RunTab extends ViewPlugin {
     onReady(api: any): void;
     onInitDone(): void;
     recorder: Recorder;
+    // syncContracts(): void
 }
 import { ViewPlugin } from "@remixproject/engine-web/lib/view";
 import { Blockchain } from "./blockchain";
diff --git a/libs/remixd/src/services/hardhatClient.ts b/libs/remixd/src/services/hardhatClient.ts
index 0984baa811..dd55305a97 100644
--- a/libs/remixd/src/services/hardhatClient.ts
+++ b/libs/remixd/src/services/hardhatClient.ts
@@ -12,10 +12,11 @@ export class HardhatClient extends PluginClient {
   currentSharedFolder: string
   watcher: chokidar.FSWatcher
   warnLog: boolean
+  buildPath: string
 
   constructor (private readOnly = false) {
     super()
-    this.methods = ['compile']
+    this.methods = ['compile', 'sync']
   }
 
   setWebSocket (websocket: WS): void {
@@ -28,6 +29,7 @@ export class HardhatClient extends PluginClient {
 
   sharedFolder (currentSharedFolder: string): void {
     this.currentSharedFolder = currentSharedFolder
+    this.buildPath = utils.absolutePath('artifacts/build-info', this.currentSharedFolder)
     this.listenOnHardhatCompilation()
   }
 
@@ -58,47 +60,53 @@ export class HardhatClient extends PluginClient {
     })
   }
 
-  listenOnHardhatCompilation () {
-    try {
-      const buildPath = utils.absolutePath('artifacts/build-info', this.currentSharedFolder)
-      this.watcher = chokidar.watch(buildPath, { depth: 0, ignorePermissionErrors: true, ignoreInitial: true })
-
-      const compilationResult = {
-        input: {},
-        output: {
-          contracts: {},
-          sources: {}
-        },
-        solcVersion: null
-      }
-      const processArtifact = async () => {
-        const folderFiles = await fs.readdir(buildPath)
-        // name of folders are file names
-        for (const file of folderFiles) {
-          if (file.endsWith('.json')) {
-            console.log('processing hardhat artifact', file)
-            const path = join(buildPath, file)
-            const content = await fs.readFile(path, { encoding: 'utf-8' })
-            await this.feedContractArtifactFile(content, compilationResult)
-          }
-        }
-        if (!this.warnLog) {
-          // @ts-ignore
-          this.call('terminal', 'log', 'receiving compilation result from hardhat')
-          this.warnLog = true
-        }
-        this.emit('compilationFinished', '', { sources: compilationResult.input }, 'soljson', compilationResult.output, compilationResult.solcVersion)      
+  private async processArtifact () {
+    const folderFiles = await fs.readdir(this.buildPath)
+    const compilationResult = {
+      input: {},
+      output: {
+        contracts: {},
+        sources: {}
+      },
+      solcVersion: null
+    }
+    // name of folders are file names
+    for (const file of folderFiles) {
+      if (file.endsWith('.json')) {
+        console.log('processing hardhat artifact', file)
+        const path = join(this.buildPath, file)
+        const content = await fs.readFile(path, { encoding: 'utf-8' })
+        await this.feedContractArtifactFile(content, compilationResult)
       }
+    }
+    if (!this.warnLog) {
+      // @ts-ignore
+      this.call('terminal', 'log', 'receiving compilation result from hardhat')
+      this.warnLog = true
+    }
+    this.emit('compilationFinished', '', { sources: compilationResult.input }, 'soljson', compilationResult.output, compilationResult.solcVersion)      
+  }
 
-      this.watcher.on('change', () => processArtifact())
-      this.watcher.on('add', () => processArtifact())
+  listenOnHardhatCompilation () {
+    try {
+      this.watcher = chokidar.watch(this.buildPath, { depth: 0, ignorePermissionErrors: true, ignoreInitial: true })
+      
+      this.watcher.on('change', () => this.processArtifact())
+      this.watcher.on('add', () => this.processArtifact())
       // process the artifact on activation
-      processArtifact()
+      this.processArtifact()
     } catch (e) {
       console.log(e)
     }    
   }
 
+  async sync () {
+    console.log('syncing from hardhat')
+    this.processArtifact()
+    // @ts-ignore
+    this.call('terminal', 'log', 'synced with hardhat')
+  }
+
   async feedContractArtifactFile (artifactContent, compilationResultPart) {
     const contentJSON = JSON.parse(artifactContent)
     compilationResultPart.solcVersion = contentJSON.solcVersion
diff --git a/package.json b/package.json
index c172c25b7d..27172152a4 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "nightwatch_local_search": "yarn run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/search.test.js --env=chromeDesktop",
     "nightwatch_local_providers": "yarn run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/providers.test.js --env=chromeDesktop",
     "onchange": "onchange apps/remix-ide/build/app.js -- npm-run-all lint",
-    "remixd": "nx build remixd && chmod +x dist/libs/remixd/src/bin/remixd.js && dist/libs/remixd/src/bin/remixd.js -s ./apps/remix-ide/contracts --remix-ide http://127.0.0.1:8080",
+    "remixd": "nx build remixd && chmod +x dist/libs/remixd/src/bin/remixd.js && dist/libs/remixd/src/bin/remixd.js -s /home/yann/tmp/projectB --remix-ide http://127.0.0.1:8080",
     "selenium": "selenium-standalone start",
     "selenium-install": "selenium-standalone install",
     "sourcemap": "exorcist --root ../ apps/remix-ide/build/app.js.map > apps/remix-ide/build/app.js",