Merge pull request #211 from NethermindEth/starknet-abi-forms

integrate starknet abi form
NethermindEth · Dec 4, 2023 · aa18a6a · aa18a6a
2 parents 885aa0b + 214c253
commit aa18a6a
Show file tree

Hide file tree

Showing 7 changed files with 294 additions and 771 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1 @@
+scarb 2.3.1
diff --git a/plugin/package.json b/plugin/package.json
@@ -27,6 +27,7 @@
     "react-dom": "^18.2.0",
     "react-icons": "^4.10.1",
     "starknet": "5.19.5",
+    "starknet-abi-forms": "^0.1.3",
     "vite-plugin-svgr": "^4.0.0",
     "web-vitals": "^2.1.4",
     "yup": "^1.2.0"

diff --git a/plugin/pnpm-lock.yaml b/plugin/pnpm-lock.yaml
diff --git a/plugin/src/features/Deployment/index.tsx b/plugin/src/features/Deployment/index.tsx
@@ -90,19 +90,6 @@ const Deployment: React.FC<DeploymentProps> = ({ setActiveTab }) => {
   }, [selectedContract])
 
   const deploy = async (calldata: BigNumberish[]): Promise<void> => {
-    // if (
-    //   env === 'wallet' &&
-    //   starknetWindowObject !== null &&
-    //   starknetWindowObject.id === 'argentX'
-    // ) {
-    //   await remixClient.call(
-    //     'notification' as any,
-    //     'toast',
-    //     `⚠️ You are connected to ${starknetWindowObject.id} wallet, please use the Braavos wallet instead!`
-    //   )
-    //   // return
-    // }
-
     setIsDeploying(true)
     remixClient.emit('statusChanged', {
       key: 'loading',
@@ -134,6 +121,10 @@ const Deployment: React.FC<DeploymentProps> = ({ setActiveTab }) => {
             )} already has been declared, proceeding to deployment...`
           )
         } catch (error) {
+          await remixClient.call('terminal', 'log', {
+            value: `------------------------ Declaring contract: ${selectedContract.name} ------------------------`,
+            type: 'info'
+          })
           const declareResponse = await account.declare({
             contract: selectedContract.sierra,
             classHash: selectedContract.classHash,
@@ -143,6 +134,10 @@ const Deployment: React.FC<DeploymentProps> = ({ setActiveTab }) => {
             value: JSON.stringify(declareResponse, null, 2),
             type: 'info'
           })
+          await remixClient.call('terminal', 'log', {
+            value: `---------------------- End Declaring contract: ${selectedContract.name} ----------------------`,
+            type: 'info'
+          })
           updatedTransactions = [
             {
               type: 'declare',
@@ -155,7 +150,19 @@ const Deployment: React.FC<DeploymentProps> = ({ setActiveTab }) => {
           ]
           setTransactions(updatedTransactions)
           classHash = declareResponse.class_hash
-          await account.waitForTransaction(declareResponse.transaction_hash)
+          await remixClient.call('terminal', 'log', {
+            value: `--------------------- Getting declare contract: ${selectedContract.name} tx receipt --------------------`,
+            type: 'info'
+          })
+          const txReceipt = await account.waitForTransaction(declareResponse.transaction_hash)
+          await remixClient.call('terminal', 'log', {
+            value: JSON.stringify(txReceipt, null, 2),
+            type: 'info'
+          })
+          await remixClient.call('terminal', 'log', {
+            value: `--------------------- End getting declare contract: ${selectedContract.name} tx receipt ------------------`,
+            type: 'info'
+          })
         }
       } catch (error) {
         if (error instanceof Error) {
@@ -172,15 +179,26 @@ const Deployment: React.FC<DeploymentProps> = ({ setActiveTab }) => {
 
       setDeployStatus('Deploying...')
 
+      await remixClient.call('terminal', 'log', {
+        value: `------------------------ Deploying contract: ${selectedContract.name} ------------------------`,
+        type: 'info'
+      })
+
       const deployResponse = await account.deployContract({
         classHash: classHash ?? selectedContract.classHash,
         constructorCalldata: calldata
       })
+
       await remixClient.call('terminal', 'log', {
         value: JSON.stringify(deployResponse, null, 2),
         type: 'info'
       })
 
+      await remixClient.call('terminal', 'log', {
+        value: `---------------------- End Deploying contract: ${selectedContract.name} ----------------------`,
+        type: 'info'
+      })
+
       setTransactions([
         {
           type: 'deploy',
@@ -191,7 +209,23 @@ const Deployment: React.FC<DeploymentProps> = ({ setActiveTab }) => {
         },
         ...updatedTransactions
       ])
-      await account.waitForTransaction(deployResponse.transaction_hash)
+
+      await remixClient.call('terminal', 'log', {
+        value: `--------------------- Getting deploy contract: ${selectedContract.name} tx receipt --------------------`,
+        type: 'info'
+      })
+
+      const txReceipt = await account.waitForTransaction(deployResponse.transaction_hash)
+      await remixClient.call('terminal', 'log', {
+        value: JSON.stringify(txReceipt, null, 2),
+        type: 'info'
+      })
+
+      await remixClient.call('terminal', 'log', {
+        value: `--------------------- End getting deploy contract: ${selectedContract.name} tx receipt ------------------`,
+        type: 'info'
+      })
+
       setDeployStatus('done')
       setActiveTab('interaction')
       setContractDeployment(selectedContract, deployResponse.contract_address)
@@ -200,7 +234,6 @@ const Deployment: React.FC<DeploymentProps> = ({ setActiveTab }) => {
         type: 'success',
         title: `Contract ${selectedContract?.name} deployed!`
       })
-      // setContractAsDeployed(selectedContract as Contract);
     } catch (error) {
       setDeployStatus('error')
       if (error instanceof Error) {
@@ -236,7 +269,6 @@ const Deployment: React.FC<DeploymentProps> = ({ setActiveTab }) => {
     } else {
       setNotEnoughInputs(false)
       const calldata = getFormattedCalldata()
-      // setFinalCallData(calldata)
       handleDeploy(calldata)
     }
   }