Skip to content

Commit b61650f

Browse files
authored
Merge pull request #1934 from oasisprotocol/mz/roflmarketEvents
Handle rofl market event details
2 parents c6025d1 + 6b2a45c commit b61650f

5 files changed

Lines changed: 111 additions & 8 deletions

File tree

.changelog/1934.bugfix.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Handle rofl market event details

src/app/components/RuntimeEvents/RuntimeEventDetails.tsx

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward'
2828
import MemoryIcon from '@mui/icons-material/Memory'
2929
import LanIcon from '@mui/icons-material/Lan'
3030
import LanOutlinedIcon from '@mui/icons-material/LanOutlined'
31+
import DeveloperBoard from '@mui/icons-material/DeveloperBoard'
32+
import DeveloperBoardOffIcon from '@mui/icons-material/DeveloperBoardOff'
3133
import { MethodIcon } from '../ConsensusTransactionMethod'
3234
import { TransactionLink } from '../Transactions/TransactionLink'
3335
import Tooltip from '@mui/material/Tooltip'
@@ -65,6 +67,25 @@ const getRuntimeEventMethodLabel = (t: TFunction, method: RuntimeEventType | und
6567
return t('runtimeEvent.roflAppRemoved')
6668
case RuntimeEventType.roflinstance_registered:
6769
return t('runtimeEvent.instanceRegistered')
70+
case RuntimeEventType.roflmarketprovider_created:
71+
return t('runtimeEvent.roflmarketProviderCreated')
72+
case RuntimeEventType.roflmarketprovider_updated:
73+
return t('runtimeEvent.roflmarketProviderUpdated')
74+
case RuntimeEventType.roflmarketprovider_removed:
75+
return t('runtimeEvent.roflmarketProviderRemoved')
76+
case RuntimeEventType.roflmarketinstance_created:
77+
return t('runtimeEvent.roflmarketMachineCreated')
78+
case RuntimeEventType.roflmarketinstance_updated:
79+
return t('runtimeEvent.roflmarketMachineUpdated')
80+
case RuntimeEventType.roflmarketinstance_accepted:
81+
return t('runtimeEvent.roflmarketMachineAccepted')
82+
case RuntimeEventType.roflmarketinstance_cancelled:
83+
return t('runtimeEvent.roflmarketMachineCancelled')
84+
case RuntimeEventType.roflmarketinstance_removed:
85+
return t('runtimeEvent.roflmarketMachineRemoved')
86+
case RuntimeEventType.roflmarketinstance_command_queued:
87+
return t('runtimeEvent.roflmarketMachineCommandQueued')
88+
6889
case undefined:
6990
return t('common.unknown')
7091
default:
@@ -107,6 +128,29 @@ export const EventTypeIcon: FC<{
107128
[RuntimeEventType.roflapp_removed]: <MethodIcon color="orange" icon={<MemoryIcon />} {...props} />,
108129
[RuntimeEventType.roflapp_updated]: <MethodIcon color="green" icon={<MemoryIcon />} {...props} />,
109130
[RuntimeEventType.roflinstance_registered]: <MethodIcon color="green" icon={<MemoryIcon />} {...props} />,
131+
[RuntimeEventType.roflmarketprovider_created]: (
132+
<MethodIcon color="green" icon={<DeveloperBoard />} {...props} />
133+
),
134+
[RuntimeEventType.roflmarketprovider_updated]: (
135+
<MethodIcon color="green" icon={<DeveloperBoard />} {...props} />
136+
),
137+
[RuntimeEventType.roflmarketprovider_removed]: (
138+
<MethodIcon color="orange" icon={<DeveloperBoardOffIcon />} {...props} />
139+
),
140+
[RuntimeEventType.roflmarketinstance_created]: (
141+
<MethodIcon color="green" icon={<DeveloperBoard />} {...props} />
142+
),
143+
[RuntimeEventType.roflmarketinstance_updated]: (
144+
<MethodIcon color="green" icon={<DeveloperBoard />} {...props} />
145+
),
146+
[RuntimeEventType.roflmarketinstance_accepted]: <MethodIcon icon={<DeveloperBoard />} {...props} />,
147+
[RuntimeEventType.roflmarketinstance_cancelled]: (
148+
<MethodIcon color="orange" icon={<DeveloperBoardOffIcon />} {...props} />
149+
),
150+
[RuntimeEventType.roflmarketinstance_removed]: (
151+
<MethodIcon color="orange" icon={<DeveloperBoardOffIcon />} {...props} />
152+
),
153+
[RuntimeEventType.roflmarketinstance_command_queued]: <MethodIcon icon={<DeveloperBoard />} {...props} />,
110154
}
111155

112156
return (
@@ -464,6 +508,42 @@ const RuntimeEventDetailsInner: FC<{
464508
</StyledDescriptionList>
465509
</div>
466510
)
511+
case RuntimeEventType.roflmarketprovider_created:
512+
case RuntimeEventType.roflmarketprovider_updated:
513+
case RuntimeEventType.roflmarketprovider_removed:
514+
return (
515+
<div>
516+
<EventTypeIcon eventType={event.type} />
517+
<StyledDescriptionList titleWidth={isMobile ? '100px' : '200px'}>
518+
<MaybeEventErrorLine event={event} />
519+
<dt>{t('common.address')}</dt>
520+
<dd>
521+
<AccountLink scope={scope} address={event.body.address} />
522+
</dd>
523+
</StyledDescriptionList>
524+
</div>
525+
)
526+
case RuntimeEventType.roflmarketinstance_created:
527+
case RuntimeEventType.roflmarketinstance_updated:
528+
case RuntimeEventType.roflmarketinstance_accepted:
529+
case RuntimeEventType.roflmarketinstance_cancelled:
530+
case RuntimeEventType.roflmarketinstance_removed:
531+
case RuntimeEventType.roflmarketinstance_command_queued:
532+
return (
533+
<div>
534+
<EventTypeIcon eventType={event.type} />
535+
<StyledDescriptionList titleWidth={isMobile ? '100px' : '200px'}>
536+
<MaybeEventErrorLine event={event} />
537+
<dt>{t('roflmarket.provider')}</dt>
538+
<dd>
539+
<AccountLink scope={scope} address={event.body.provider} />
540+
</dd>
541+
<dt>{t('roflmarket.machineId')}</dt>
542+
{/* oasis-sdk serializes roflmarket provider machines id as an array */}
543+
<dd>{JSON.stringify(event.body.id)}</dd>
544+
</StyledDescriptionList>
545+
</div>
546+
)
467547
default:
468548
exhaustedTypeWarning('Unexpected event type', event.type)
469549
return (

src/app/components/RuntimeTransactionMethod/index.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ const getRuntimeTransactionLabel = (t: TFunction, method: KnownRuntimeTxMethod)
5353
case 'roflmarket.ProviderRemove':
5454
return t('transactions.method.roflmarket.providerRemove')
5555
case 'roflmarket.InstanceCreate':
56-
return t('transactions.method.roflmarket.instanceCreate')
56+
return t('transactions.method.roflmarket.machineCreate')
5757
case 'roflmarket.InstanceTopUp':
58-
return t('transactions.method.roflmarket.instanceTopUp')
58+
return t('transactions.method.roflmarket.machineTopUp')
5959
case 'roflmarket.InstanceCancel':
60-
return t('transactions.method.roflmarket.instanceCancel')
60+
return t('transactions.method.roflmarket.machineCancel')
6161
case 'roflmarket.InstanceExecuteCmds':
62-
return t('transactions.method.roflmarket.instanceExecuteCmds')
62+
return t('transactions.method.roflmarket.machineExecuteCmds')
6363
default:
6464
exhaustedTypeWarning('Unknown runtime tx method', method)
6565
return method || t('common.unknown')

src/locales/en/translation.json

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -498,10 +498,10 @@
498498
"providerCreate": "ROFL Market Provider Create",
499499
"providerUpdate": "ROFL Market Provider Update",
500500
"providerRemove": "ROFL Market Provider Remove",
501-
"instanceCreate": "ROFL Market Instance Create",
502-
"instanceTopUp": "ROFL Market Instance Top Up",
503-
"instanceCancel": "ROFL Market Instance Cancel",
504-
"instanceExecuteCmds": "ROFL Market Instance Execute Commands"
501+
"machineCreate": "ROFL Market Machine Create",
502+
"machineTopUp": "ROFL Market Machine Top Up",
503+
"machineCancel": "ROFL Market Machine Cancel",
504+
"machineExecuteCmds": "ROFL Market Machine Execute Commands"
505505
},
506506
"vault": {
507507
"authorizeAction": "Vault: Authorize Action",
@@ -546,6 +546,15 @@
546546
"roflAppUpdated": "ROFL App Updated",
547547
"roflAppRemoved": "ROFL App Removed",
548548
"instanceRegistered": "ROFL Instance Registered",
549+
"roflmarketProviderCreated": "ROFL Market Provider Created",
550+
"roflmarketProviderUpdated": "ROFL Market Provider Updated",
551+
"roflmarketProviderRemoved": "ROFL Market Provider Removed",
552+
"roflmarketMachineCreated": "ROFL Market Machine Created",
553+
"roflmarketMachineUpdated": "ROFL Market Machine Updated",
554+
"roflmarketMachineAccepted": "ROFL Market Machine Accepted",
555+
"roflmarketMachineCancelled": "ROFL Market Machine Cancelled",
556+
"roflmarketMachineRemoved": "ROFL Market Machine Removed",
557+
"roflmarketMachineCommandQueued": "ROFL Market Command Queued",
549558
"evmLog": "EVM log message",
550559
"filter": {
551560
"all": "All events",
@@ -729,6 +738,10 @@
729738
"endorsingNodeId": "Endorsing node ID",
730739
"extraKeys": "Extra keys"
731740
},
741+
"roflmarket": {
742+
"provider": "Provider",
743+
"machineId": "Machine ID"
744+
},
732745
"search": {
733746
"placeholder": "Address, Block, Contract, Transaction hash, Token name, etc.",
734747
"error": {

src/oasis-nexus/generated/api.ts

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)