Post-review updates.

Added hooks-guard-call-non-const checker doc, updated hooks-guard-in-for doc.
2023-01-09 10:57:10 +01:00 · 2023-01-05 16:09:36 +01:00
24 changed files with 2037 additions and 4282 deletions
--- a/.env.example
+++ b/.env.example
@@ -5,8 +5,7 @@ GITHUB_ID=""
 NEXT_PUBLIC_COMPILE_API_ENDPOINT="http://localhost:9000/api/build"
 NEXT_PUBLIC_COMPILE_API_BASE_URL="http://localhost:9000"
 NEXT_PUBLIC_LANGUAGE_SERVER_API_ENDPOINT="ws://localhost:9000/language-server/c"
-NEXT_PUBLIC_TESTNET_URL="hooks-testnet-v3.xrpl-labs.com"
-NEXT_PUBLIC_DEBUG_STREAM_URL="hooks-testnet-v3-debugstream.xrpl-labs.com"
-NEXT_PUBLIC_EXPLORER_URL="hooks-testnet-v3-explorer.xrpl-labs.com"
-NEXT_PUBLIC_NETWORK_ID="21338"
-NEXT_PUBLIC_SITE_URL="http://localhost:3000"
+NEXT_PUBLIC_TESTNET_URL="hooks-testnet-v2.xrpl-labs.com"
+NEXT_PUBLIC_DEBUG_STREAM_URL="hooks-testnet-v2-debugstream.xrpl-labs.com"
+NEXT_PUBLIC_EXPLORER_URL="hooks-testnet-v2-explorer.xrpl-labs.com"
+NEXT_PUBLIC_SITE_URL=http://localhost:3000
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,3 @@ yarn-error.log*
 # vercel
 .vercel
 .vscode
-
-# yarn
-.yarnrc.yml
-.yarn/
--- a/components/Accounts.tsx
+++ b/components/Accounts.tsx
@@ -33,7 +33,6 @@ import { addFunds } from '../state/actions/addFaucetAccount'
 import { deleteHook } from '../state/actions/deployHook'
 import { capitalize } from '../utils/helpers'
 import { deleteAccount } from '../state/actions/deleteAccount'
-import { xrplSend } from '../state/actions/xrpl-client'

 export const AccountDialog = ({
  activeAccountAddress,
@@ -302,7 +301,7 @@ const Accounts: FC<AccountProps> = props => {
    const fetchAccInfo = async () => {
      if (snap.clientStatus === 'online') {
        const requests = snap.accounts.map(acc =>
-          xrplSend({
+          snap.client?.send({
            id: `hooks-builder-req-info-${acc.address}`,
            command: 'account_info',
            account: acc.address
@@ -330,7 +329,7 @@ const Accounts: FC<AccountProps> = props => {
          }
        })
        const objectRequests = snap.accounts.map(acc => {
-          return xrplSend({
+          return snap.client?.send({
            id: `hooks-builder-req-objects-${acc.address}`,
            command: 'account_objects',
            account: acc.address
--- a/components/Dialog.tsx
+++ b/components/Dialog.tsx
@@ -15,7 +15,7 @@ const contentShow = keyframes({
  '100%': { opacity: 1 }
 })
 const StyledOverlay = styled(DialogPrimitive.Overlay, {
-  zIndex: 3000,
+  zIndex: 10000,
  backgroundColor: blackA.blackA9,
  position: 'fixed',
  inset: 0,
--- a/components/RunScript/index.tsx
+++ b/components/RunScript/index.tsx
@@ -21,7 +21,7 @@ import { saveFile } from '../../state/actions/saveFile'
 import { getErrors, getTags } from '../../utils/comment-parser'
 import toast from 'react-hot-toast'

-const generateHtmlTemplate = async (code: string, data?: Record<string, any>) => {
+const generateHtmlTemplate = (code: string, data?: Record<string, any>) => {
  let processString: string | undefined
  const process = { env: { NODE_ENV: 'production' } } as any
  if (data) {
@@ -29,10 +29,8 @@ const generateHtmlTemplate = async (code: string, data?: Record<string, any>) =>
      process.env[key] = data[key]
    })
  }
-
  processString = JSON.stringify(process)

-  const libs = (await import("xrpl-accountlib/dist/browser.hook-bundle.js")).default;
  return `
  <html>
  <head>
@@ -74,9 +72,7 @@ const generateHtmlTemplate = async (code: string, data?: Record<string, any>) =>

      window.addEventListener('error', windowErrorHandler);
    </script>
-    <script>
-      ${libs}
-    </script>
+
    <script type="module">
      ${code}
    </script>
@@ -104,7 +100,6 @@ const RunScript: React.FC<{ file: IFile }> = ({ file: { content, name } }) => {
  const [fields, setFields] = useState<Fields>({})
  const [iFrameCode, setIframeCode] = useState('')
  const [isDialogOpen, setIsDialogOpen] = useState(false)
-  const [isLoading, setIsLoading] = useState(false)

  const getFields = useCallback(() => {
    const inputTags = ['input', 'param', 'arg', 'argument']
@@ -132,31 +127,16 @@ const RunScript: React.FC<{ file: IFile }> = ({ file: { content, name } }) => {
    return fields
  }, [content])

-  const runScript = useCallback(async () => {
-    setIsLoading(true);
+  const runScript = useCallback(() => {
    try {
-      // Show loading toast only after 1 second, otherwise skip it.
-      let loaded = false
-      let toastId: string | undefined;
-      setTimeout(() => {
-        if (!loaded) {
-          toastId = toast.loading('Loading packages, may take a few seconds...', {
-            position: 'bottom-center',
-          })
-        }
-      }, 1000)
-
      let data: any = {}
      Object.keys(fields).forEach(key => {
        data[key] = fields[key].value
      })
-      const template = await generateHtmlTemplate(content, data)
+      const template = generateHtmlTemplate(content, data)
+
      setIframeCode(template)

-      loaded = true
-      if (toastId) {
-        toast.dismiss(toastId)
-      }
      state.scriptLogs = [{ type: 'success', message: 'Started running...' }]
    } catch (err) {
      state.scriptLogs = [
@@ -165,7 +145,6 @@ const RunScript: React.FC<{ file: IFile }> = ({ file: { content, name } }) => {
        { type: 'error', message: err?.message || 'Could not parse template' }
      ]
    }
-    setIsLoading(false);
  }, [content, fields, snap.scriptLogs])

  useEffect(() => {
@@ -195,11 +174,11 @@ const RunScript: React.FC<{ file: IFile }> = ({ file: { content, name } }) => {

  const isDisabled = Object.values(fields).some(field => field.required && !field.value)

-  const handleRun = useCallback(async () => {
+  const handleRun = useCallback(() => {
    if (isDisabled) return toast.error('Please fill in all the required fields.')

    state.scriptLogs = []
-    await runScript();
+    runScript()
    setIsDialogOpen(false)
  }, [isDisabled, runScript])

@@ -300,7 +279,7 @@ const RunScript: React.FC<{ file: IFile }> = ({ file: { content, name } }) => {
              <DialogClose asChild>
                <Button outline>Cancel</Button>
              </DialogClose>
-              <Button variant="primary" isDisabled={isDisabled || isLoading} isLoading={isLoading} onClick={handleRun}>
+              <Button variant="primary" isDisabled={isDisabled} onClick={handleRun}>
                Run script
              </Button>
            </Flex>
--- a/components/Select.tsx
+++ b/components/Select.tsx
@@ -38,8 +38,7 @@ const Select = forwardRef<any, Props>((props, ref) => {
        container: provided => {
          return {
            ...provided,
-            position: 'relative',
-            width: '100%'
+            position: 'relative'
          }
        },
        singleValue: provided => ({
--- a/components/Transaction/index.tsx
+++ b/components/Transaction/index.tsx
@@ -20,7 +20,6 @@ import { TxUI } from './ui'
 import { default as _estimateFee } from '../../utils/estimateFee'
 import toast from 'react-hot-toast'
 import { combineFlags, extractFlags, transactionFlags } from '../../state/constants/flags'
-import { SetHookData, toHex } from '../../utils/setHook'

 export interface TransactionProps {
  header: string
@@ -41,43 +40,20 @@ const Transaction: FC<TransactionProps> = ({ header, state: txState, ...props })

  const prepareOptions = useCallback(
    (state: Partial<TransactionState> = txState) => {
-      const {
-        selectedTransaction,
-        selectedDestAccount,
-        selectedAccount,
-        txFields,
-        selectedFlags,
-        hookParameters,
-        memos
-      } = state
+      const { selectedTransaction, selectedDestAccount, selectedAccount, txFields, selectedFlags } =
+        state

      const TransactionType = selectedTransaction?.value || null
      const Destination = selectedDestAccount?.value || txFields?.Destination
      const Account = selectedAccount?.value || null
      const Flags = combineFlags(selectedFlags?.map(flag => flag.value)) || txFields?.Flags
-      const HookParameters = Object.entries(hookParameters || {}).reduce<
-        SetHookData['HookParameters']
-      >((acc, [_, { label, value }]) => {
-        return acc.concat({
-          HookParameter: { HookParameterName: toHex(label), HookParameterValue: toHex(value) }
-        })
-      }, [])
-      const Memos = memos
-        ? Object.entries(memos).reduce<SetHookData['Memos']>((acc, [_, { format, data, type }]) => {
-            return acc?.concat({
-              Memo: { MemoData: toHex(data), MemoFormat: toHex(format), MemoType: toHex(type) }
-            })
-          }, [])
-        : undefined

      return prepareTransaction({
        ...txFields,
-        HookParameters,
        Flags,
        TransactionType,
        Destination,
-        Account,
-        Memos
+        Account
      })
    },
    [txState]
--- a/components/Transaction/ui.tsx
+++ b/components/Transaction/ui.tsx
@@ -1,4 +1,4 @@
-import { FC, ReactNode, useCallback, useEffect, useMemo, useState } from 'react'
+import { FC, useCallback, useEffect, useMemo, useState } from 'react'
 import Container from '../Container'
 import Flex from '../Flex'
 import Input from '../Input'
@@ -18,7 +18,6 @@ import { streamState } from '../DebugStream'
 import { Button } from '..'
 import Textarea from '../Textarea'
 import { getFlags } from '../../state/constants/flags'
-import { Plus, Trash } from 'phosphor-react'

 interface UIProps {
  setState: (pTx?: Partial<TransactionState> | undefined) => TransactionState | undefined
@@ -29,15 +28,8 @@ interface UIProps {

 export const TxUI: FC<UIProps> = ({ state: txState, setState, resetState, estimateFee }) => {
  const { accounts } = useSnapshot(state)
-  const {
-    selectedAccount,
-    selectedDestAccount,
-    selectedTransaction,
-    txFields,
-    selectedFlags,
-    hookParameters,
-    memos
-  } = txState
+  const { selectedAccount, selectedDestAccount, selectedTransaction, txFields, selectedFlags } =
+    txState

  const accountOptions: SelectOption[] = accounts.map(acc => ({
    label: acc.name,
@@ -118,7 +110,7 @@ export const TxUI: FC<UIProps> = ({ state: txState, setState, resetState, estima
    [selectedTransaction?.value]
  )

-  const richFields = ['TransactionType', 'Account', 'HookParameters', 'Memos']
+  const richFields = ['TransactionType', 'Account']
  if (fields.Destination !== undefined) {
    richFields.push('Destination')
  }
@@ -128,6 +120,7 @@ export const TxUI: FC<UIProps> = ({ state: txState, setState, resetState, estima
  }

  const otherFields = Object.keys(txFields).filter(k => !richFields.includes(k)) as [keyof TxFields]
+
  return (
    <Container
      css={{
@@ -137,41 +130,94 @@ export const TxUI: FC<UIProps> = ({ state: txState, setState, resetState, estima
      }}
    >
      <Flex column fluid css={{ height: '100%', overflowY: 'auto', pr: '$1' }}>
-        <TxField label="Transaction type">
+        <Flex
+          row
+          fluid
+          css={{
+            justifyContent: 'flex-end',
+            alignItems: 'center',
+            mb: '$3',
+            mt: '1px',
+            pr: '1px'
+          }}
+        >
+          <Text muted css={{ mr: '$3' }}>
+            Transaction type:{' '}
+          </Text>
          <Select
            instanceId="transactionsType"
            placeholder="Select transaction type"
            options={transactionsOptions}
            hideSelectedOptions
+            css={{ width: '70%' }}
            value={selectedTransaction}
            onChange={(tt: any) => handleChangeTxType(tt)}
          />
-        </TxField>
-        <TxField label="Account">
+        </Flex>
+        <Flex
+          row
+          fluid
+          css={{
+            justifyContent: 'flex-end',
+            alignItems: 'center',
+            mb: '$3',
+            pr: '1px'
+          }}
+        >
+          <Text muted css={{ mr: '$3' }}>
+            Account:{' '}
+          </Text>
          <Select
            instanceId="from-account"
            placeholder="Select your account"
+            css={{ width: '70%' }}
            options={accountOptions}
            value={selectedAccount}
            onChange={(acc: any) => handleSetAccount(acc)} // TODO make react-select have correct types for acc
          />
-        </TxField>
+        </Flex>
        {richFields.includes('Destination') && (
-          <TxField label="Destination account">
+          <Flex
+            row
+            fluid
+            css={{
+              justifyContent: 'flex-end',
+              alignItems: 'center',
+              mb: '$3',
+              pr: '1px'
+            }}
+          >
+            <Text muted css={{ mr: '$3', textAlign: 'end' }}>
+              Destination account:{' '}
+            </Text>
            <Select
              instanceId="to-account"
              placeholder="Select the destination account"
+              css={{ width: '70%' }}
              options={destAccountOptions}
              value={selectedDestAccount}
              isClearable
              onChange={(acc: any) => setState({ selectedDestAccount: acc })}
            />
-          </TxField>
+          </Flex>
        )}
        {richFields.includes('Flags') && (
-          <TxField label="Flags">
+          <Flex
+            row
+            fluid
+            css={{
+              justifyContent: 'flex-end',
+              alignItems: 'center',
+              mb: '$3',
+              pr: '1px'
+            }}
+          >
+            <Text muted css={{ mr: '$3' }}>
+              Flags:{' '}
+            </Text>
            <Select
              isClearable
+              css={{ width: '70%' }}
              instanceId="flags"
              placeholder="Select flags to apply"
              menuPosition="fixed"
@@ -183,7 +229,7 @@ export const TxUI: FC<UIProps> = ({ state: txState, setState, resetState, estima
                selectedFlags ? selectedFlags.length >= flagsOptions.length - 1 : false
              }
            />
-          </TxField>
+          </Flex>
        )}
        {otherFields.map(field => {
          let _value = txFields[field]
@@ -205,239 +251,93 @@ export const TxUI: FC<UIProps> = ({ state: txState, setState, resetState, estima
          let rows = isJson ? (value?.match(/\n/gm)?.length || 0) + 1 : undefined
          if (rows && rows > 5) rows = 5
          return (
-            <TxField key={field} label={field + (isXrp ? ' (XRP)' : '')}>
-              {isJson ? (
-                <Textarea
-                  rows={rows}
-                  value={value}
-                  spellCheck={false}
-                  onChange={switchToJson}
-                  css={{
-                    flex: 'inherit',
-                    resize: 'vertical'
-                  }}
-                />
-              ) : (
-                <Input
-                  type={isFee ? 'number' : 'text'}
-                  value={value}
-                  onChange={e => {
-                    if (isFee) {
-                      const val = e.target.value.replaceAll('.', '').replaceAll(',', '')
-                      handleSetField(field, val)
-                    } else {
-                      handleSetField(field, e.target.value)
-                    }
-                  }}
-                  onKeyPress={
-                    isFee
-                      ? e => {
-                          if (e.key === '.' || e.key === ',') {
-                            e.preventDefault()
-                          }
-                        }
-                      : undefined
-                  }
-                  css={{
-                    flex: 'inherit',
-                    '-moz-appearance': 'textfield',
-                    '&::-webkit-outer-spin-button': {
-                      '-webkit-appearance': 'none',
-                      margin: 0
-                    },
-                    '&::-webkit-inner-spin-button ': {
-                      '-webkit-appearance': 'none',
-                      margin: 0
-                    }
-                  }}
-                />
-              )}
-              {isFee && (
-                <Button
-                  size="xs"
-                  variant="primary"
-                  outline
-                  disabled={txState.txIsDisabled}
-                  isDisabled={txState.txIsDisabled}
-                  isLoading={feeLoading}
-                  css={{
-                    position: 'absolute',
-                    right: '$2',
-                    fontSize: '$xs',
-                    cursor: 'pointer',
-                    alignContent: 'center',
-                    display: 'flex'
-                  }}
-                  onClick={() => handleEstimateFee()}
-                >
-                  Suggest
-                </Button>
-              )}
-            </TxField>
-          )
-        })}
-        <TxField multiLine label="Hook parameters">
-          <Flex column fluid>
-            {Object.entries(hookParameters).map(([id, { label, value }]) => (
-              <Flex column key={id} css={{ mb: '$2' }}>
-                <Flex row>
-                  <Input
-                    placeholder="Parameter name"
-                    value={label}
-                    onChange={e => {
-                      setState({
-                        hookParameters: {
-                          ...hookParameters,
-                          [id]: { label: e.target.value, value }
-                        }
-                      })
+            <Flex column key={field} css={{ mb: '$2', pr: '1px' }}>
+              <Flex
+                row
+                fluid
+                css={{
+                  justifyContent: 'flex-end',
+                  alignItems: 'center',
+                  position: 'relative'
+                }}
+              >
+                <Text muted css={{ mr: '$3' }}>
+                  {field + (isXrp ? ' (XRP)' : '')}:{' '}
+                </Text>
+                {isJson ? (
+                  <Textarea
+                    rows={rows}
+                    value={value}
+                    spellCheck={false}
+                    onChange={switchToJson}
+                    css={{
+                      width: '70%',
+                      flex: 'inherit',
+                      resize: 'vertical'
                    }}
                  />
+                ) : (
                  <Input
-                    css={{ mx: '$2' }}
-                    placeholder="Value"
+                    type={isFee ? 'number' : 'text'}
                    value={value}
                    onChange={e => {
-                      setState({
-                        hookParameters: {
-                          ...hookParameters,
-                          [id]: { label, value: e.target.value }
-                        }
-                      })
+                      if (isFee) {
+                        const val = e.target.value.replaceAll('.', '').replaceAll(',', '')
+                        handleSetField(field, val)
+                      } else {
+                        handleSetField(field, e.target.value)
+                      }
+                    }}
+                    onKeyPress={
+                      isFee
+                        ? e => {
+                            if (e.key === '.' || e.key === ',') {
+                              e.preventDefault()
+                            }
+                          }
+                        : undefined
+                    }
+                    css={{
+                      width: '70%',
+                      flex: 'inherit',
+                      '-moz-appearance': 'textfield',
+                      '&::-webkit-outer-spin-button': {
+                        '-webkit-appearance': 'none',
+                        margin: 0
+                      },
+                      '&::-webkit-inner-spin-button ': {
+                        '-webkit-appearance': 'none',
+                        margin: 0
+                      }
                    }}
                  />
+                )}
+                {isFee && (
                  <Button
-                    onClick={() => {
-                      const { [id]: _, ...rest } = hookParameters
-                      setState({ hookParameters: rest })
+                    size="xs"
+                    variant="primary"
+                    outline
+                    disabled={txState.txIsDisabled}
+                    isDisabled={txState.txIsDisabled}
+                    isLoading={feeLoading}
+                    css={{
+                      position: 'absolute',
+                      right: '$2',
+                      fontSize: '$xs',
+                      cursor: 'pointer',
+                      alignContent: 'center',
+                      display: 'flex'
                    }}
-                    variant="destroy"
+                    onClick={() => handleEstimateFee()}
                  >
-                    <Trash weight="regular" size="16px" />
+                    Suggest
                  </Button>
-                </Flex>
+                )}
              </Flex>
-            ))}
-            <Button
-              outline
-              fullWidth
-              type="button"
-              onClick={() => {
-                const id = Object.keys(hookParameters).length
-                setState({
-                  hookParameters: { ...hookParameters, [id]: { label: '', value: '' } }
-                })
-              }}
-            >
-              <Plus size="16px" />
-              Add Hook Parameter
-            </Button>
-          </Flex>
-        </TxField>
-        <TxField multiLine label="Memos">
-          <Flex column fluid>
-            {Object.entries(memos).map(([id, memo]) => (
-              <Flex column key={id} css={{ mb: '$2' }}>
-                <Flex
-                  row
-                  css={{
-                    flexWrap: 'wrap',
-                    width: '100%',
-                  }}
-                >
-                  <Input
-                    placeholder="Memo type"
-                    value={memo.type}
-                    onChange={e => {
-                      setState({
-                        memos: {
-                          ...memos,
-                          [id]: { ...memo, type: e.target.value }
-                        }
-                      })
-                    }}
-                  />
-                  <Input
-                    placeholder="Data"
-                    css={{ mx: '$2' }}
-                    value={memo.data}
-                    onChange={e => {
-                      setState({
-                        memos: {
-                          ...memos,
-                          [id]: { ...memo, data: e.target.value }
-                        }
-                      })
-                    }}
-                  />
-                  <Input
-                    placeholder="Format"
-                    value={memo.format}
-                    onChange={e => {
-                      setState({
-                        memos: {
-                          ...memos,
-                          [id]: { ...memo, format: e.target.value }
-                        }
-                      })
-                    }}
-                  />
-                  <Button
-                    css={{ ml: '$2' }}
-                    onClick={() => {
-                      const { [id]: _, ...rest } = memos
-                      setState({ memos: rest })
-                    }}
-                    variant="destroy"
-                  >
-                    <Trash weight="regular" size="16px" />
-                  </Button>
-                </Flex>
-              </Flex>
-            ))}
-            <Button
-              outline
-              fullWidth
-              type="button"
-              onClick={() => {
-                const id = Object.keys(memos).length
-                setState({
-                  memos: { ...memos, [id]: { data: '', format: '', type: '' } }
-                })
-              }}
-            >
-              <Plus size="16px" />
-              Add Memo
-            </Button>
-          </Flex>
-        </TxField>
+            </Flex>
+          )
+        })}
      </Flex>
    </Container>
  )
 }
-
-export const TxField: FC<{ label: string; children: ReactNode; multiLine?: boolean }> = ({
-  label,
-  children,
-  multiLine = false
-}) => {
-  return (
-    <Flex
-      row
-      fluid
-      css={{
-        justifyContent: 'flex-end',
-        alignItems: multiLine ? 'flex-start' : 'center',
-        position: 'relative',
-        mb: '$3',
-        mt: '1px',
-        pr: '1px'
-      }}
-    >
-      <Text muted css={{ mr: '$3', mt: multiLine ? '$2' : 0 }}>
-        {label}:{' '}
-      </Text>
-      <Flex css={{ width: '70%', alignItems: 'center' }}>{children}</Flex>
-    </Flex>
-  )
-}
--- a/content/transactions.json
+++ b/content/transactions.json
@@ -245,14 +245,5 @@
      }
    },
    "Sequence": 12
-  },
-  {
-    "TransactionType": "Invoke",
-    "Fee": "12"
-  },
-  {
-    "TransactionType": "UriToken",
-    "Fee": "12",
-    "URI": "697066733A2F2F516D614374444B5A4656767666756676626479346573745A626851483744586831364354707631686F776D424779"
  }
 ]
--- a/next.config.js
+++ b/next.config.js
@@ -12,7 +12,7 @@ module.exports = {
      config.resolve.fallback.fs = false
    }
    config.module.rules.push({
-      test: [/\.md$/, /hook-bundle\.js$/],
+      test: /\.md$/,
      use: 'raw-loader'
    })
    return config
--- a/package.json
+++ b/package.json
@@ -8,8 +8,7 @@
    "start": "next start",
    "lint": "next lint",
    "format": "prettier --write .",
-    "postinstall": "patch-package && yarn run postinstall-postinstall",
-    "postinstall-postinstall": "./node_modules/.bin/browserify -r ripple-binary-codec -r ripple-keypairs -r ripple-address-codec -r ripple-secret-codec -r ./node_modules/xrpl-accountlib/dist/index.js:xrpl-accountlib -o node_modules/xrpl-accountlib/dist/browser.hook-bundle.js"
+    "postinstall": "patch-package"
  },
  "dependencies": {
    "@codingame/monaco-jsonrpc": "^0.3.1",
@@ -66,8 +65,8 @@
    "vscode-languageserver": "^7.0.0",
    "vscode-uri": "^3.0.2",
    "wabt": "^1.0.30",
-    "xrpl-accountlib": "^1.6.1",
-    "xrpl-client": "^2.0.2"
+    "xrpl-accountlib": "^1.5.2",
+    "xrpl-client": "^1.9.4"
  },
  "devDependencies": {
    "@types/dinero.js": "^1.9.0",
@@ -76,7 +75,6 @@
    "@types/lodash.xor": "^4.5.6",
    "@types/pako": "^1.0.2",
    "@types/react": "17.0.31",
-    "browserify": "^17.0.0",
    "eslint": "7.32.0",
    "eslint-config-next": "11.1.2",
    "raw-loader": "^4.0.2",
--- a/patches/ripple-binary-codec+1.4.2.patch
+++ b/patches/ripple-binary-codec+1.4.2.patch
--- a/raw-loader.d.ts
+++ b/raw-loader.d.ts
@@ -2,8 +2,3 @@ declare module '*.md' {
  const content: string
  export default content
 }
-
-declare module '*.hook-bundle.js' {
-  const content: string
-  export default content
-}
--- a/state/actions/deployHook.tsx
+++ b/state/actions/deployHook.tsx
@@ -6,9 +6,8 @@ import calculateHookOn, { TTS } from '../../utils/hookOnCalculator'
 import { Link } from '../../components'
 import { ref } from 'valtio'
 import estimateFee from '../../utils/estimateFee'
-import { SetHookData, toHex } from '../../utils/setHook'
+import { SetHookData } from '../../utils/setHook'
 import ResultLink from '../../components/ResultLink'
-import { xrplSend } from './xrpl-client'

 export const sha256 = async (string: string) => {
  const utf8 = new TextEncoder().encode(string)
@@ -18,6 +17,13 @@ export const sha256 = async (string: string) => {
  return hashHex
 }

+function toHex(str: string) {
+  var result = ''
+  for (var i = 0; i < str.length; i++) {
+    result += str.charCodeAt(i).toString(16)
+  }
+  return result.toUpperCase()
+}

 function arrayBufferToHex(arrayBuffer?: ArrayBuffer | null) {
  if (!arrayBuffer) {
@@ -58,6 +64,9 @@ export const prepareDeployHookTx = async (
  if (!activeFile?.compiledContent) {
    return
  }
+  if (!state.client) {
+    return
+  }
  const HookNamespace = (await sha256(data.HookNamespace)).toUpperCase()
  const hookOnValues: (keyof TTS)[] = data.Invoke.map(tt => tt.value)
  const { HookParameters } = data
@@ -78,184 +87,196 @@ export const prepareDeployHookTx = async (
  //     }
  //   }
  // });
-  if (typeof window === 'undefined') return
-  const tx = {
-    Account: account.address,
-    TransactionType: 'SetHook',
-    Sequence: account.sequence,
-    Fee: data.Fee,
-    NetworkID: process.env.NEXT_PUBLIC_NETWORK_ID,
-    Hooks: [
-      {
-        Hook: {
-          CreateCode: arrayBufferToHex(activeFile?.compiledContent).toUpperCase(),
-          HookOn: calculateHookOn(hookOnValues),
-          HookNamespace,
-          HookApiVersion: 0,
-          Flags: 1,
-          // ...(filteredHookGrants.length > 0 && { HookGrants: filteredHookGrants }),
-          ...(filteredHookParameters.length > 0 && {
-            HookParameters: filteredHookParameters
-          })
+  if (typeof window !== 'undefined') {
+    const tx = {
+      Account: account.address,
+      TransactionType: 'SetHook',
+      Sequence: account.sequence,
+      Fee: data.Fee,
+      Hooks: [
+        {
+          Hook: {
+            CreateCode: arrayBufferToHex(activeFile?.compiledContent).toUpperCase(),
+            HookOn: calculateHookOn(hookOnValues),
+            HookNamespace,
+            HookApiVersion: 0,
+            Flags: 1,
+            // ...(filteredHookGrants.length > 0 && { HookGrants: filteredHookGrants }),
+            ...(filteredHookParameters.length > 0 && {
+              HookParameters: filteredHookParameters
+            })
+          }
        }
-      }
-    ]
+      ]
+    }
+    return tx
  }
-  return tx
 }

-/*
- * Turns the wasm binary into hex string, signs the transaction and deploys it to Hooks testnet.
+/* deployHook function turns the wasm binary into
+ * hex string, signs the transaction and deploys it to
+ * Hooks testnet.
 */
 export const deployHook = async (account: IAccount & { name?: string }, data: SetHookData) => {
-  const activeFile = state.files[state.active]?.compiledContent
-    ? state.files[state.active]
-    : state.files.filter(file => file.compiledContent)[0]
-  state.deployValues[activeFile.name] = data
+  if (typeof window !== 'undefined') {
+    const activeFile = state.files[state.active]?.compiledContent
+      ? state.files[state.active]
+      : state.files.filter(file => file.compiledContent)[0]
+    state.deployValues[activeFile.name] = data
+    const tx = await prepareDeployHookTx(account, data)
+    if (!tx) {
+      return
+    }
+    if (!state.client) {
+      return
+    }
+    const keypair = derive.familySeed(account.secret)

-  const tx = await prepareDeployHookTx(account, data)
-  if (!tx) {
-    return
-  }
-  const keypair = derive.familySeed(account.secret)
-  const { signedTransaction } = sign(tx, keypair)
+    const { signedTransaction } = sign(tx, keypair)
+    const currentAccount = state.accounts.find(acc => acc.address === account.address)
+    if (currentAccount) {
+      currentAccount.isLoading = true
+    }
+    let submitRes

-  const currentAccount = state.accounts.find(acc => acc.address === account.address)
-  if (currentAccount) {
-    currentAccount.isLoading = true
-  }
-
-  let submitRes
-  try {
-    submitRes = await xrplSend({
-      command: 'submit',
-      tx_blob: signedTransaction
-    })
-
-    const txHash = submitRes.tx_json?.hash
-    const resultMsg = ref(
-      <>
-        [<ResultLink result={submitRes.engine_result} />] {submitRes.engine_result_message}{' '}
-        {txHash && (
-          <>
-            Transaction hash:{' '}
-            <Link
-              as="a"
-              href={`https://${process.env.NEXT_PUBLIC_EXPLORER_URL}/${txHash}`}
-              target="_blank"
-              rel="noopener noreferrer"
-            >
-              {txHash}
-            </Link>
-          </>
-        )}
-      </>
-    )
-    if (submitRes.engine_result === 'tesSUCCESS') {
-      state.deployLogs.push({
-        type: 'success',
-        message: 'Hook deployed successfully ✅'
+    try {
+      submitRes = await state.client?.send({
+        command: 'submit',
+        tx_blob: signedTransaction
      })
-      state.deployLogs.push({
-        type: 'success',
-        message: resultMsg
-      })
-    } else if (submitRes.engine_result) {
+
+      const txHash = submitRes.tx_json?.hash
+      const resultMsg = ref(
+        <>
+          [<ResultLink result={submitRes.engine_result} />] {submitRes.engine_result_message}{' '}
+          {txHash && (
+            <>
+              Transaction hash:{' '}
+              <Link
+                as="a"
+                href={`https://${process.env.NEXT_PUBLIC_EXPLORER_URL}/${txHash}`}
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                {txHash}
+              </Link>
+            </>
+          )}
+        </>
+      )
+      if (submitRes.engine_result === 'tesSUCCESS') {
+        state.deployLogs.push({
+          type: 'success',
+          message: 'Hook deployed successfully ✅'
+        })
+        state.deployLogs.push({
+          type: 'success',
+          message: resultMsg
+        })
+      } else if (submitRes.engine_result) {
+        state.deployLogs.push({
+          type: 'error',
+          message: resultMsg
+        })
+      } else {
+        state.deployLogs.push({
+          type: 'error',
+          message: `[${submitRes.error}] ${submitRes.error_exception}`
+        })
+      }
+    } catch (err) {
+      console.log(err)
      state.deployLogs.push({
        type: 'error',
-        message: resultMsg
-      })
-    } else {
-      state.deployLogs.push({
-        type: 'error',
-        message: `[${submitRes.error}] ${submitRes.error_exception}`
+        message: 'Error occurred while deploying'
      })
    }
-  } catch (err) {
-    console.error(err)
-    state.deployLogs.push({
-      type: 'error',
-      message: 'Error occurred while deploying'
-    })
+    if (currentAccount) {
+      currentAccount.isLoading = false
+    }
+    return submitRes
  }
-  if (currentAccount) {
-    currentAccount.isLoading = false
-  }
-  return submitRes
 }

 export const deleteHook = async (account: IAccount & { name?: string }) => {
+  if (!state.client) {
+    return
+  }
  const currentAccount = state.accounts.find(acc => acc.address === account.address)
  if (currentAccount?.isLoading || !currentAccount?.hooks.length) {
    return
  }
-  const tx = {
-    Account: account.address,
-    TransactionType: 'SetHook',
-    Sequence: account.sequence,
-    Fee: '100000',
-    NetworkID: process.env.NEXT_PUBLIC_NETWORK_ID,
-    Hooks: [
-      {
-        Hook: {
-          CreateCode: '',
-          Flags: 1
+  if (typeof window !== 'undefined') {
+    const tx = {
+      Account: account.address,
+      TransactionType: 'SetHook',
+      Sequence: account.sequence,
+      Fee: '100000',
+      Hooks: [
+        {
+          Hook: {
+            CreateCode: '',
+            Flags: 1
+          }
        }
-      }
-    ]
-  }
-  const keypair = derive.familySeed(account.secret)
-  try {
-    // Update tx Fee value with network estimation
-    const res = await estimateFee(tx, account)
-    tx['Fee'] = res?.base_fee || '1000'
-  } catch (err) {
-    console.error(err)
-  }
-  const { signedTransaction } = sign(tx, keypair)
-  if (currentAccount) {
-    currentAccount.isLoading = true
-  }
-  let submitRes
-  const toastId = toast.loading('Deleting hook...')
-  try {
-    submitRes = await xrplSend({
-      command: 'submit',
-      tx_blob: signedTransaction
-    })
+      ]
+    }

-    if (submitRes.engine_result === 'tesSUCCESS') {
-      toast.success('Hook deleted successfully ✅', { id: toastId })
-      state.deployLogs.push({
-        type: 'success',
-        message: 'Hook deleted successfully ✅'
-      })
-      state.deployLogs.push({
-        type: 'success',
-        message: `[${submitRes.engine_result}] ${submitRes.engine_result_message} Validated ledger index: ${submitRes.validated_ledger_index}`
-      })
-      currentAccount.hooks = []
-    } else {
-      toast.error(`${submitRes.engine_result_message || submitRes.error_exception}`, {
-        id: toastId
+    const keypair = derive.familySeed(account.secret)
+    try {
+      // Update tx Fee value with network estimation
+      const res = await estimateFee(tx, account)
+      tx['Fee'] = res?.base_fee ? res?.base_fee : '1000'
+    } catch (err) {
+      // use default value what you defined earlier
+      console.log(err)
+    }
+    const { signedTransaction } = sign(tx, keypair)
+
+    if (currentAccount) {
+      currentAccount.isLoading = true
+    }
+    let submitRes
+    const toastId = toast.loading('Deleting hook...')
+    try {
+      submitRes = await state.client.send({
+        command: 'submit',
+        tx_blob: signedTransaction
      })
+
+      if (submitRes.engine_result === 'tesSUCCESS') {
+        toast.success('Hook deleted successfully ✅', { id: toastId })
+        state.deployLogs.push({
+          type: 'success',
+          message: 'Hook deleted successfully ✅'
+        })
+        state.deployLogs.push({
+          type: 'success',
+          message: `[${submitRes.engine_result}] ${submitRes.engine_result_message} Validated ledger index: ${submitRes.validated_ledger_index}`
+        })
+        currentAccount.hooks = []
+      } else {
+        toast.error(`${submitRes.engine_result_message || submitRes.error_exception}`, {
+          id: toastId
+        })
+        state.deployLogs.push({
+          type: 'error',
+          message: `[${submitRes.engine_result || submitRes.error}] ${
+            submitRes.engine_result_message || submitRes.error_exception
+          }`
+        })
+      }
+    } catch (err) {
+      console.log(err)
+      toast.error('Error occurred while deleting hook', { id: toastId })
      state.deployLogs.push({
        type: 'error',
-        message: `[${submitRes.engine_result || submitRes.error}] ${
-          submitRes.engine_result_message || submitRes.error_exception
-        }`
+        message: 'Error occurred while deleting hook'
      })
    }
-  } catch (err) {
-    console.log(err)
-    toast.error('Error occurred while deleting hook', { id: toastId })
-    state.deployLogs.push({
-      type: 'error',
-      message: 'Error occurred while deleting hook'
-    })
+    if (currentAccount) {
+      currentAccount.isLoading = false
+    }
+    return submitRes
  }
-  if (currentAccount) {
-    currentAccount.isLoading = false
-  }
-  return submitRes
 }
--- a/state/actions/sendTransaction.ts
+++ b/state/actions/sendTransaction.ts
@@ -0,0 +1,66 @@
+import { derive, sign } from 'xrpl-accountlib'
+
+import state from '..'
+import type { IAccount } from '..'
+
+interface TransactionOptions {
+  TransactionType: string
+  Account?: string
+  Fee?: string
+  Destination?: string
+  [index: string]: any
+}
+interface OtherOptions {
+  logPrefix?: string
+}
+
+export const sendTransaction = async (
+  account: IAccount,
+  txOptions: TransactionOptions,
+  options?: OtherOptions
+) => {
+  if (!state.client) throw Error('XRPL client not initalized')
+
+  const { Fee = '1000', ...opts } = txOptions
+  const tx: TransactionOptions = {
+    Account: account.address,
+    Sequence: account.sequence,
+    Fee, // TODO auto-fillable default
+    ...opts
+  }
+  const { logPrefix = '' } = options || {}
+  try {
+    const signedAccount = derive.familySeed(account.secret)
+    const { signedTransaction } = sign(tx, signedAccount)
+    const response = await state.client.send({
+      command: 'submit',
+      tx_blob: signedTransaction
+    })
+    if (response.engine_result === 'tesSUCCESS') {
+      state.transactionLogs.push({
+        type: 'success',
+        message: `${logPrefix}[${response.engine_result}] ${response.engine_result_message}`
+      })
+    } else {
+      state.transactionLogs.push({
+        type: 'error',
+        message: `${logPrefix}[${response.error || response.engine_result}] ${
+          response.error_exception || response.engine_result_message
+        }`
+      })
+    }
+    const currAcc = state.accounts.find(acc => acc.address === account.address)
+    if (currAcc && response.account_sequence_next) {
+      currAcc.sequence = response.account_sequence_next
+    }
+  } catch (err) {
+    console.error(err)
+    state.transactionLogs.push({
+      type: 'error',
+      message:
+        err instanceof Error
+          ? `${logPrefix}Error: ${err.message}`
+          : `${logPrefix}Something went wrong, try again later`
+    })
+  }
+}
--- a/state/actions/sendTransaction.tsx
+++ b/state/actions/sendTransaction.tsx
@@ -4,7 +4,6 @@ import state from '..'
 import type { IAccount } from '..'
 import ResultLink from '../../components/ResultLink'
 import { ref } from 'valtio'
-import { xrplSend } from './xrpl-client'

 interface TransactionOptions {
  TransactionType: string
@@ -22,23 +21,20 @@ export const sendTransaction = async (
  txOptions: TransactionOptions,
  options?: OtherOptions
 ) => {
+  if (!state.client) throw Error('XRPL client not initalized')
+
  const { Fee = '1000', ...opts } = txOptions
  const tx: TransactionOptions = {
    Account: account.address,
    Sequence: account.sequence,
-    Fee,
-    NetworkID: process.env.NEXT_PUBLIC_NETWORK_ID,
+    Fee, // TODO auto-fillable default
    ...opts
  }
  const { logPrefix = '' } = options || {}
-  state.transactionLogs.push({
-    type: 'log',
-    message: `${logPrefix}${JSON.stringify(tx, null, 2)}`
-  })
  try {
    const signedAccount = derive.familySeed(account.secret)
    const { signedTransaction } = sign(tx, signedAccount)
-    const response = await xrplSend({
+    const response = await state.client.send({
      command: 'submit',
      tx_blob: signedTransaction
    })
--- a/state/actions/xrpl-client.ts
+++ b/state/actions/xrpl-client.ts
@@ -1,7 +0,0 @@
-import { XrplClient } from 'xrpl-client';
-import state from '..';
-
-export const xrplSend = async(...params: Parameters<XrplClient['send']>) => {
-    const client = await state.client.ready()
-    return client.send(...params);
-}
--- a/state/index.ts
+++ b/state/index.ts
@@ -78,7 +78,7 @@ export interface IState {
  splits: {
    [id: string]: SplitSize
  }
-  client: XrplClient
+  client: XrplClient | null
  clientStatus: 'offline' | 'online'
  mainModalOpen: boolean
  mainModalShowed: boolean
@@ -113,7 +113,7 @@ let initialState: IState = {
    tabSize: 2
  },
  splits: {},
-  client: undefined!, // set below only.
+  client: null,
  clientStatus: 'offline' as 'offline',
  mainModalOpen: false,
  mainModalShowed: false,
@@ -153,9 +153,9 @@ const state = proxy<IState>({
 })
 // Initialize socket connection
 const client = new XrplClient(`wss://${process.env.NEXT_PUBLIC_TESTNET_URL}`)
-state.client = ref(client);

 client.on('online', () => {
+  state.client = ref(client)
  state.clientStatus = 'online'
 })

--- a/state/transactions.ts
+++ b/state/transactions.ts
@@ -5,32 +5,17 @@ import state from '.'
 import { showAlert } from '../state/actions/showAlert'
 import { parseJSON } from '../utils/json'
 import { extractFlags, getFlags } from './constants/flags'
-import { fromHex } from '../utils/setHook'

 export type SelectOption = {
  value: string
  label: string
 }

-export type HookParameters = {
-  [key: string]: SelectOption
-}
-
-export type Memos = {
-  [key: string]: {
-    type: string
-    format: string
-    data: string
-  }
-}
-
 export interface TransactionState {
  selectedTransaction: SelectOption | null
  selectedAccount: SelectOption | null
  selectedDestAccount: SelectOption | null
  selectedFlags: SelectOption[] | null
-  hookParameters: HookParameters
-  memos: Memos
  txIsLoading: boolean
  txIsDisabled: boolean
  txFields: TxFields
@@ -39,11 +24,9 @@ export interface TransactionState {
  estimatedFee?: string
 }

-const commonFields = ['TransactionType', 'Account', 'Sequence', "HookParameters"] as const;
-
 export type TxFields = Omit<
  Partial<typeof transactionsData[0]>,
-  typeof commonFields[number]
+  'Account' | 'Sequence' | 'TransactionType'
 >

 export const defaultTransaction: TransactionState = {
@@ -51,8 +34,6 @@ export const defaultTransaction: TransactionState = {
  selectedAccount: null,
  selectedDestAccount: null,
  selectedFlags: null,
-  hookParameters: {},
-  memos: {},
  txIsLoading: false,
  txIsDisabled: false,
  txFields: {},
@@ -177,7 +158,7 @@ export const prepareState = (value: string, transactionType?: string) => {
    return
  }

-  const { Account, TransactionType, Destination, HookParameters, Memos, ...rest } = options
+  const { Account, TransactionType, Destination, ...rest } = options
  let tx: Partial<TransactionState> = {}
  const schema = getTxFields(transactionType)

@@ -207,22 +188,6 @@ export const prepareState = (value: string, transactionType?: string) => {
    tx.selectedTransaction = null
  }

-  if (HookParameters && HookParameters instanceof Array) {
-    tx.hookParameters = HookParameters.reduce<TransactionState["hookParameters"]>((acc, cur, idx) => {
-      const param = { label: fromHex(cur.HookParameter?.HookParameterName || ""), value: fromHex(cur.HookParameter?.HookParameterValue || "") }
-      acc[idx] = param;
-      return acc;
-    }, {})
-  }
-
-  if (Memos && Memos instanceof Array) {
-    tx.memos = Memos.reduce<TransactionState["memos"]>((acc, cur, idx) => {
-      const memo = { data: fromHex(cur.Memo?.MemoData || ""), type: fromHex(cur.Memo?.MemoType || ""), format: fromHex(cur.Memo?.MemoFormat || "") }
-      acc[idx] = memo;
-      return acc;
-    }, {})
-  }
-
  if (schema.Destination !== undefined) {
    const dest = state.accounts.find(acc => acc.address === Destination)
    if (dest) {
@@ -281,12 +246,12 @@ export const getTxFields = (tt?: string) => {
  if (!txFields) return {}

  let _txFields = Object.keys(txFields)
-    .filter(key => !commonFields.includes(key as any))
+    .filter(key => !['TransactionType', 'Account', 'Sequence'].includes(key))
    .reduce<TxFields>((tf, key) => ((tf[key as keyof TxFields] = (txFields as any)[key]), tf), {})
  return _txFields
 }

-export { transactionsData, commonFields }
+export { transactionsData }

 export const transactionsOptions = transactionsData.map(tx => ({
  value: tx.TransactionType,
--- a/utils/estimateFee.ts
+++ b/utils/estimateFee.ts
@@ -1,7 +1,6 @@
 import toast from 'react-hot-toast'
 import { derive, sign } from 'xrpl-accountlib'
-import { IAccount } from '../state'
-import { xrplSend } from '../state/actions/xrpl-client'
+import state, { IAccount } from '../state'

 const estimateFee = async (
  tx: Record<string, unknown>,
@@ -23,7 +22,7 @@ const estimateFee = async (
    const keypair = derive.familySeed(account.secret)
    const { signedTransaction } = sign(copyTx, keypair)

-    const res = await xrplSend({ command: 'fee', tx_blob: signedTransaction })
+    const res = await state.client?.send({ command: 'fee', tx_blob: signedTransaction })
    if (res && res.drops) {
      return res.drops
    }
--- a/utils/hookOnCalculator.ts
+++ b/utils/hookOnCalculator.ts
@@ -23,22 +23,23 @@ export const tts = {
  ttNFTOKEN_BURN: 26,
  ttNFTOKEN_CREATE_OFFER: 27,
  ttNFTOKEN_CANCEL_OFFER: 28,
-  ttNFTOKEN_ACCEPT_OFFER: 29,
-  ttINVOKE: 99,
+  ttNFTOKEN_ACCEPT_OFFER: 29
 }

 export type TTS = typeof tts

 const calculateHookOn = (arr: (keyof TTS)[]) => {
-  let s = '0x3e3ff5bf'
+  let start = '0x000000003e3ff5bf'
  arr.forEach(n => {
-    let v = BigInt(s)
-    v ^= BigInt(1) << BigInt(tts[n])
-    s = "0x" + v.toString(16)
+    let v = BigInt(start)
+    v ^= BigInt(1) << BigInt(tts[n as keyof TTS])
+    let s = v.toString(16)
+    let l = s.length
+    if (l < 16) s = '0'.repeat(16 - l) + s
+    s = '0x' + s
+    start = s
  })
-  s = s.replace('0x', '')
-  s = s.padStart(64, '0')
-  return s
+  return start.substring(2)
 }

 export default calculateHookOn
--- a/utils/libwabt.js
+++ b/utils/libwabt.js
--- a/utils/setHook.ts
+++ b/utils/setHook.ts
@@ -20,13 +20,6 @@ export type SetHookData = {
    }
    $metaData?: any
  }[]
-  Memos?: {
-    Memo: {
-      MemoType: string,
-      MemoData: string
-      MemoFormat: string
-    }
-  }[]
  // HookGrants: {
  //   HookGrant: {
  //     Authorize: string;
@@ -81,19 +74,3 @@ export const getInvokeOptions = (content?: string) => {

  return invokeOptions
 }
-
-export function toHex(str: string) {
-  var result = ''
-  for (var i = 0; i < str.length; i++) {
-    result += str.charCodeAt(i).toString(16)
-  }
-  return result.toUpperCase()
-}
-
-export function fromHex(hex: string) {
-  var str = ''
-  for (var i = 0; i < hex.length; i += 2) {
-    str += String.fromCharCode(parseInt(hex.substring(i, i + 2), 16))
-  }
-  return str
-}
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Mariusz Pilarek	9f868da636	Post-review updates.	2023-01-09 10:57:10 +01:00
Mariusz Pilarek	5794aebe47	Added hooks-guard-call-non-const checker doc, updated hooks-guard-in-for doc.	2023-01-05 16:09:36 +01:00