Use feature rpc for EnableAmendment

src/containers/Transactions/test/SimpleTab.test.tsx

@@ -9,23 +9,36 @@ import { SimpleTab } from '../SimpleTab'
 import summarize from '../../../rippled/lib/txSummary'
 import i18n from '../../../i18n/testConfig'
 import { expectSimpleRowText } from '../../shared/components/Transaction/test'
+import SocketContext from '../../shared/SocketContext'
+import MockWsClient from '../../test/mockWsClient'
 import { queryClient } from '../../shared/QueryClient'
 
 describe('SimpleTab container', () => {
+  let client
   const createWrapper = (tx, width = 1200) =>
     mount(
       <Router>
         <QueryClientProvider client={queryClient}>
           <I18nextProvider i18n={i18n}>
-            <SimpleTab
-              data={{ processed: tx, summary: summarize(tx, true).details }}
-              width={width}
-            />
+            <SocketContext.Provider value={client}>
+              <SimpleTab
+                data={{ processed: tx, summary: summarize(tx, true).details }}
+                width={width}
+              />
+            </SocketContext.Provider>
           </I18nextProvider>
         </QueryClientProvider>
       </Router>,
     )
 
+  beforeEach(() => {
+    client = new MockWsClient()
+  })
+
+  afterEach(() => {
+    client.close()
+  })
+
   it('renders EnableAmendment without crashing', () => {
     const wrapper = createWrapper(EnableAmendment)
     wrapper.unmount()

src/containers/shared/amendmentUtils.ts

@@ -1,14 +1,9 @@
-import { sha512 } from '@xrplf/isomorphic/sha512'
-import { hexToBytes, bytesToHex, stringToHex } from '@xrplf/isomorphic/utils'
 import axios from 'axios'
 
 import { localizeDate } from './utils'
 
-const cachedAmendmentIDs: any = {}
 let cachedRippledVersions: any = {}
 
-const ACTIVE_AMENDMENT_REGEX = /^\s*REGISTER_F[A-Z]+\s*\((\S+),\s*.*$/
-const RETIRED_AMENDMENT_REGEX = /^ .*retireFeature\("(\S+)"\)[,;].*$/
 const TIME_ZONE = 'UTC'
 const DATE_OPTIONS = {
   hour: 'numeric',
@@ -31,42 +26,6 @@ export function getExpectedDate(date: string, language: string) {
   )
 }
 
-async function fetchAmendmentNames() {
-  const response = await axios.get(
-    'https://raw.githubusercontent.com/XRPLF/rippled/develop/src/libxrpl/protocol/Feature.cpp',
-  )
-  const text = response.data
-
-  const amendmentNames: string[] = []
-  text.split('\n').forEach((line: string) => {
-    const name = line.match(ACTIVE_AMENDMENT_REGEX)
-    if (name) {
-      amendmentNames.push(name[1])
-    } else {
-      const name2 = line.match(RETIRED_AMENDMENT_REGEX)
-      name2 && amendmentNames.push(name2[1])
-    }
-  })
-  return amendmentNames
-}
-
-function sha512Half(bytes: Uint8Array) {
-  return bytesToHex(sha512(bytes)).slice(0, 64)
-}
-
-export async function nameOfAmendmentID(id: string) {
-  if (cachedAmendmentIDs[id]) {
-    return cachedAmendmentIDs[id]
-  }
-  // The Amendment ID is the hash of the Amendment name
-  const amendmentNames = await fetchAmendmentNames()
-  amendmentNames.forEach((name) => {
-    cachedAmendmentIDs[sha512Half(hexToBytes(stringToHex(name)))] = name
-  })
-
-  return cachedAmendmentIDs[id]
-}
-
 async function fetchMinRippledVersions() {
   const response = await axios.get(
     'https://raw.githubusercontent.com/XRPLF/xrpl-dev-portal/master/resources/known-amendments.md',

src/containers/shared/components/Transaction/EnableAmendment/Simple.tsx

@@ -1,15 +1,13 @@
-import { useEffect, useState } from 'react'
+import { useContext, useEffect, useState } from 'react'
 import { useLanguage } from '../../../hooks'
 import { SimpleRow } from '../SimpleRow'
 import { TransactionSimpleProps } from '../types'
 import { EnableAmendment } from './types'
-import {
-  getExpectedDate,
-  getRippledVersion,
-  nameOfAmendmentID,
-} from '../../../amendmentUtils'
+import { getExpectedDate, getRippledVersion } from '../../../amendmentUtils'
 import { AMENDMENT_ROUTE } from '../../../../App/routes'
 import { RouteLink } from '../../../routing'
+import SocketContext from '../../../SocketContext'
+import { getFeature } from '../../../../../rippled/lib/rippled'
 
 const states = {
   loading: 'Loading',
@@ -22,31 +20,21 @@ export const Simple = ({ data }: TransactionSimpleProps<EnableAmendment>) => {
     name: states.loading,
     minRippledVersion: states.loading,
   })
+  const rippledSocket = useContext(SocketContext)
 
   useEffect(() => {
-    nameOfAmendmentID(data.instructions.Amendment).then((name: string) => {
-      if (name) {
-        getRippledVersion(name).then((rippledVersion) => {
-          if (rippledVersion) {
-            setAmendmentDetails({
-              name,
-              minRippledVersion: rippledVersion,
-            })
-          } else {
-            setAmendmentDetails({
-              name,
-              minRippledVersion: states.unknown,
-            })
-          }
-        })
-      } else {
+    const amendmentId = data.instructions.Amendment
+    getFeature(rippledSocket, amendmentId).then((feature) => {
+      const name =
+        feature && feature[amendmentId] ? feature[amendmentId].name : ''
+      getRippledVersion(name).then((rippledVersion) => {
         setAmendmentDetails({
-          name: states.unknown,
-          minRippledVersion: states.unknown,
+          name: name || states.unknown,
+          minRippledVersion: rippledVersion || states.unknown,
         })
-      }
+      })
     })
-  }, [data.instructions.Amendment])
+  }, [data.instructions.Amendment, rippledSocket])
 
   let amendmentStatus = states.unknown
   let expectedDate: string | null = states.unknown

src/containers/shared/components/Transaction/EnableAmendment/test/EnableAmendmentSimple.test.tsx

@@ -6,11 +6,11 @@ import { Simple } from '../Simple'
 import mockEnableAmendmentWithEnabled from './mock_data/EnableAmendmentWithEnabled.json'
 import mockEnableAmendmentWithMinority from './mock_data/EnableAmendmentWithMinority.json'
 import mockEnableAmendmentWithMajority from './mock_data/EnableAmendmentWithMajority.json'
-import {
-  getRippledVersion,
-  nameOfAmendmentID,
-} from '../../../../amendmentUtils'
+import mockFeatureExpandedSignerList from './mock_data/FeatureExpandedSignerList.json'
+import mockFeatureNegativeUNL from './mock_data/FeatureNegativeUNL.json'
+import { getRippledVersion } from '../../../../amendmentUtils'
 import { flushPromises } from '../../../../../test/utils'
+import { getFeature } from '../../../../../../rippled/lib/rippled'
 
 const createWrapper = createSimpleWrapperFactory(Simple, i18n)
 
@@ -21,22 +21,35 @@ jest.mock('../../../../amendmentUtils', () => {
     __esModule: true,
     ...originalModule,
     getRippledVersion: jest.fn(),
-    nameOfAmendmentID: jest.fn(),
+  }
+})
+
+jest.mock('../../../../../../rippled/lib/rippled', () => {
+  const originalModule = jest.requireActual(
+    '../../../../../../rippled/lib/rippled',
+  )
+
+  return {
+    __esModule: true,
+    ...originalModule,
+    getFeature: jest.fn(),
   }
 })
 
 const mockedGetRippledVersion = getRippledVersion as jest.MockedFunction<
   typeof getRippledVersion
 >
-const mockedNameOfAmendmentID = nameOfAmendmentID as jest.MockedFunction<
-  typeof nameOfAmendmentID
->
+
+const mockedGetFeature = getFeature as jest.MockedFunction<typeof getFeature>
 
 describe('EnableAmendment: Simple', () => {
+  afterEach(() => {
+    mockedGetFeature.mockReset()
+  })
   it('renders tx that causes an amendment to loose majority', async () => {
     mockedGetRippledVersion.mockImplementation(() => Promise.resolve('v1.9.1'))
-    mockedNameOfAmendmentID.mockImplementation(() =>
-      Promise.resolve('ExpandedSignerList'),
+    mockedGetFeature.mockImplementation(() =>
+      Promise.resolve(mockFeatureExpandedSignerList),
     )
     const wrapper = createWrapper(mockEnableAmendmentWithMinority)
     expectSimpleRowLabel(wrapper, 'name', 'Amendment Name')
@@ -58,8 +71,8 @@ describe('EnableAmendment: Simple', () => {
 
   it('renders tx that causes an amendment to gain majority', async () => {
     mockedGetRippledVersion.mockImplementation(() => Promise.resolve('v1.9.1'))
-    mockedNameOfAmendmentID.mockImplementation(() =>
-      Promise.resolve('ExpandedSignerList'),
+    mockedGetFeature.mockImplementation(() =>
+      Promise.resolve(mockFeatureExpandedSignerList),
     )
     const wrapper = createWrapper(mockEnableAmendmentWithMajority)
     expectSimpleRowLabel(wrapper, 'name', 'Amendment Name')
@@ -86,8 +99,8 @@ describe('EnableAmendment: Simple', () => {
 
   it('renders tx that enables an amendment', async () => {
     mockedGetRippledVersion.mockImplementation(() => Promise.resolve('v1.7.3'))
-    mockedNameOfAmendmentID.mockImplementation(() =>
-      Promise.resolve('NegativeUNL'),
+    mockedGetFeature.mockImplementation(() =>
+      Promise.resolve(mockFeatureNegativeUNL),
     )
     const wrapper = createWrapper(mockEnableAmendmentWithEnabled)
     expectSimpleRowLabel(wrapper, 'name', 'Amendment Name')
@@ -108,7 +121,7 @@ describe('EnableAmendment: Simple', () => {
 
   it('renders tx that cannot determine version or name', async () => {
     mockedGetRippledVersion.mockImplementation(() => Promise.resolve(''))
-    mockedNameOfAmendmentID.mockImplementation(() => Promise.resolve(''))
+    mockedGetFeature.mockImplementation(() => Promise.resolve(null))
     const wrapper = createWrapper(mockEnableAmendmentWithEnabled)
     expectSimpleRowLabel(wrapper, 'name', 'Amendment Name')
     expectSimpleRowText(wrapper, 'name', 'Loading')
@@ -124,8 +137,8 @@ describe('EnableAmendment: Simple', () => {
 
   it('renders tx that cannot determine version', async () => {
     mockedGetRippledVersion.mockImplementation(() => Promise.resolve(''))
-    mockedNameOfAmendmentID.mockImplementation(() =>
-      Promise.resolve('NegativeUNL'),
+    mockedGetFeature.mockImplementation(() =>
+      Promise.resolve(mockFeatureNegativeUNL),
     )
     const wrapper = createWrapper(mockEnableAmendmentWithEnabled)
     expectSimpleRowLabel(wrapper, 'name', 'Amendment Name')
@@ -142,7 +155,7 @@ describe('EnableAmendment: Simple', () => {
 
   it('renders tx that cannot determine name', async () => {
     mockedGetRippledVersion.mockImplementation(() => Promise.resolve('v1.7.3'))
-    mockedNameOfAmendmentID.mockImplementation(() => Promise.resolve(''))
+    mockedGetFeature.mockImplementation(() => Promise.resolve(null))
     const wrapper = createWrapper(mockEnableAmendmentWithEnabled)
     expectSimpleRowLabel(wrapper, 'name', 'Amendment Name')
     expectSimpleRowText(wrapper, 'name', 'Loading')
@@ -153,6 +166,6 @@ describe('EnableAmendment: Simple', () => {
     wrapper.update()
 
     expectSimpleRowText(wrapper, 'name', 'Unknown')
-    expectSimpleRowText(wrapper, 'version', 'Unknown')
+    expectSimpleRowText(wrapper, 'version', 'v1.7.3')
   })
 })

src/containers/shared/components/Transaction/EnableAmendment/test/mock_data/FeatureExpandedSignerList.json

@@ -0,0 +1,7 @@
+{
+  "B2A4DB846F0891BF2C76AB2F2ACC8F5B4EC64437135C6E56F3F859DE5FFD5856": {
+    "enabled": false,
+    "name": "ExpandedSignerList",
+    "supported": true
+  }
+}

src/containers/shared/components/Transaction/EnableAmendment/test/mock_data/FeatureNegativeUNL.json

@@ -0,0 +1,7 @@
+{
+  "B4E4F5D2D6FB84DF7399960A732309C9FD530EAE5941838160042833625A6076": {
+    "enabled": false,
+    "name": "NegativeUNL",
+    "supported": true
+  }
+}