mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

update remix-dapp

Browse Source
pull/5222/head
drafish 7 months ago committed by yann300
parent a38d067060
commit c5c9f7c6f5
4 changed files with 110 additions and 212 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 30
      apps/remix-dapp/src/components/UiTerminal/Context.tsx
  2. 66
      apps/remix-dapp/src/components/UiTerminal/RenderKnownTransactions.tsx
  3. 192
      apps/remix-dapp/src/components/UniversalDappUI/index.tsx
  4. 34
      apps/remix-dapp/src/reducers/state.ts

30
apps/remix-dapp/src/components/UiTerminal/Context.tsx
Unescape View File

@ -20,35 +20,7 @@ const Context = ({ opts, provider }: { opts: any; provider: string }) => {
: data.transactionIndex;
const value = val ? typeConversion.toInt(val) : 0;
if (provider?.startsWith('vm')) {
return (
<div>
<span>
<span className="remix_ui_terminal_tx font-weight-bold mr-3">
[vm]
</span>
<div className="remix_ui_terminal_txItem">
<span className="font-weight-bold">from:</span> {from}
</div>
<div className="remix_ui_terminal_txItem">
<span className="font-weight-bold">to:</span> {to}
</div>
<div className="remix_ui_terminal_txItem">
<span className="font-weight-bold">value:</span> {value} wei
</div>
<div className="remix_ui_terminal_txItem">
<span className="font-weight-bold">data:</span> {input}
</div>
<div className="remix_ui_terminal_txItem">
<span className="font-weight-bold">logs:</span> {logs}
</div>
<div className="remix_ui_terminal_txItem">
<span className="font-weight-bold">hash:</span> {hash}
</div>
</span>
</div>
);
} else if (data.resolvedData) {
if (data.resolvedData) {
return (
<div>
<span>

66
apps/remix-dapp/src/components/UiTerminal/RenderKnownTransactions.tsx
Unescape View File

@ -35,39 +35,39 @@ const RenderKnownTransactions = ({
</div>
{showTableHash.includes(tx.hash)
? showTable(
{
hash: tx.hash,
status: receipt !== null ? receipt.status : null,
isCall: tx.isCall,
contractAddress: receipt.contractAddress,
blockHash: tx.blockHash,
blockNumber: tx.blockNumber,
data: tx,
from,
to,
gas: tx.gas,
input: tx.input,
'decoded input': resolvedData?.params
? JSON.stringify(
typeConversion.stringify(resolvedData.params),
null,
'\t'
)
: ' - ',
'decoded output': resolvedData?.decodedReturnValue
? JSON.stringify(
typeConversion.stringify(resolvedData.decodedReturnValue),
null,
'\t'
)
: ' - ',
logs,
val: tx.value,
transactionCost: tx.transactionCost,
executionCost: tx.executionCost,
},
showTableHash
)
{
hash: tx.hash,
status: receipt !== null ? receipt.status : null,
isCall: tx.isCall,
contractAddress: receipt.contractAddress,
blockHash: tx.blockHash,
blockNumber: tx.blockNumber,
data: tx,
from,
to,
gas: tx.gas,
input: tx.input,
'decoded input': resolvedData?.params
? JSON.stringify(
typeConversion.stringify(resolvedData.params),
null,
'\t'
)
: ' - ',
'decoded output': resolvedData?.decodedReturnValue
? JSON.stringify(
typeConversion.stringify(resolvedData.decodedReturnValue),
null,
'\t'
)
: ' - ',
logs,
val: tx.value,
transactionCost: tx.transactionCost,
executionCost: tx.executionCost,
},
showTableHash
)
: null}
</span>
);

192
apps/remix-dapp/src/components/UniversalDappUI/index.tsx
Unescape View File

@ -161,136 +161,61 @@ export function UniversalDappUI(props: any) {
return (
<div className="row m-0">
{containers
? containers.map((id: any) => {
return (
<div className="col-md" key={id}>
{items[id].map((funcId: any, index: any) => {
const funcABI = contractABI[funcId];
if (funcABI.type !== 'function') return null;
const isConstant =
{containers.map((id: any) => {
return (
<div className="col-md" key={id}>
{items[id].map((funcId: any, index: any) => {
const funcABI = contractABI[funcId];
if (funcABI.type !== 'function') return null;
const isConstant =
funcABI.constant !== undefined ? funcABI.constant : false;
const lookupOnly =
const lookupOnly =
funcABI.stateMutability === 'view' ||
funcABI.stateMutability === 'pure' ||
isConstant;
const inputs = getFuncABIInputs(funcABI);
return (
<div
className="p-2 bg-light mb-2"
data-id={`function${funcId}`}
key={funcId}
>
<div className="w-100 mb-2">
<div>
{funcABI.title && <h3 data-id={`functionTitle${funcId}`}>{funcABI.title}</h3>}
<ContractGUI
funcABI={funcABI}
clickCallBack={(
valArray: { name: string; type: string }[],
inputsValues: string
) => {
runTransaction(
lookupOnly,
funcABI,
valArray,
inputsValues,
funcId
);
}}
inputs={inputs}
lookupOnly={lookupOnly}
key={funcId}
/>
{funcABI.details && (
<div className="pt-2 udapp_intro" data-id={`functionInstructions${funcId}`}>
{funcABI.details}
</div>
)}
{lookupOnly && (
<div className="udapp_value" data-id="udapp_value">
<TreeView id="treeView">
{Object.keys(
instance.decodedResponse || {}
).map((key) => {
const funcIndex = funcId;
const response =
const inputs = getFuncABIInputs(funcABI);
return (
<div
className="p-2 bg-light mb-2"
data-id={`function${funcId}`}
key={funcId}
>
<div className="w-100 mb-2">
<div>
{funcABI.title && <h3 data-id={`functionTitle${funcId}`}>{funcABI.title}</h3>}
<ContractGUI
funcABI={funcABI}
clickCallBack={(
valArray: { name: string; type: string }[],
inputsValues: string
) => {
runTransaction(
lookupOnly,
funcABI,
valArray,
inputsValues,
funcId
);
}}
inputs={inputs}
lookupOnly={lookupOnly}
key={funcId}
/>
{funcABI.details && (
<div className="pt-2 udapp_intro" data-id={`functionInstructions${funcId}`}>
{funcABI.details}
</div>
)}
{lookupOnly && (
<div className="udapp_value" data-id="udapp_value">
<TreeView id="treeView">
{Object.keys(
instance.decodedResponse || {}
).map((key) => {
const funcIndex = funcId;
const response =
instance.decodedResponse[key];
return key === funcIndex
? Object.keys(response || {}).map(
(innerkey, _index) => {
return renderData(
instance.decodedResponse[key][
innerkey
],
response,
innerkey,
innerkey
);
}
)
: null;
})}
</TreeView>
</div>
)}
</div>
</div>
</div>
);
})}
</div>
);
})
: contractABI?.map((funcABI: any, index: any) => {
if (funcABI.type !== 'function') return null;
const isConstant =
funcABI.constant !== undefined ? funcABI.constant : false;
const lookupOnly =
funcABI.stateMutability === 'view' ||
funcABI.stateMutability === 'pure' ||
isConstant;
const inputs = getFuncABIInputs(funcABI);
return (
<div
key={index}
className={`instance d-block flex-column bg-transparent udapp_run-instance border-dark col-6`}
data-shared="universalDappUiInstance"
>
<div
className="p-2 bg-light mb-2"
data-id="universalDappUiContractActionWrapper"
>
<div className="w-100 mb-2">
<div>
<ContractGUI
funcABI={funcABI}
clickCallBack={(
valArray: { name: string; type: string }[],
inputsValues: string
) => {
runTransaction(
lookupOnly,
funcABI,
valArray,
inputsValues,
index
);
}}
inputs={inputs}
lookupOnly={lookupOnly}
key={index}
/>
{lookupOnly && (
<div className="udapp_value" data-id="udapp_value">
<TreeView id="treeView">
{Object.keys(instance.decodedResponse || {}).map(
(key) => {
const funcIndex = index.toString();
const response = instance.decodedResponse[key];
return key === funcIndex
? Object.keys(response || {}).map(
(innerkey, _index) => {
@ -305,17 +230,18 @@ export function UniversalDappUI(props: any) {
}
)
: null;
}
)}
</TreeView>
</div>
)}
})}
</TreeView>
</div>
)}
</div>
</div>
</div>
</div>
</div>
);
})}
);
})}
</div>
);
})}
</div>
);
}

34
apps/remix-dapp/src/reducers/state.ts
Unescape View File

@ -27,25 +27,25 @@ export const appInitialState: any = {
export const appReducer = (state = appInitialState, action: any): any => {
switch (action.type) {
case 'SET_INSTANCE':
return {
...state,
instance: { ...state.instance, ...action.payload },
};
case 'SET_INSTANCE':
return {
...state,
instance: { ...state.instance, ...action.payload },
};
case 'SET_SETTINGS':
return {
...state,
settings: { ...state.settings, ...action.payload },
};
case 'SET_SETTINGS':
return {
...state,
settings: { ...state.settings, ...action.payload },
};
case 'SET_TERMINAL':
return {
...state,
terminal: { ...state.terminal, ...action.payload },
};
case 'SET_TERMINAL':
return {
...state,
terminal: { ...state.terminal, ...action.payload },
};
default:
throw new Error();
default:
throw new Error();
}
};

Write Preview
Loading…
Cancel
Save