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
19 changed files with 1881 additions and 3946 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/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
@@ -8,7 +8,6 @@ import { ref } from 'valtio'
 import estimateFee from '../../utils/estimateFee'
 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)
@@ -65,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
@@ -85,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,19 +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 || {}
  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/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/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