Fix testnet

README.md

@@ -15,12 +15,13 @@ Make sure that you have the required dependencies installed:
 - [node.js](https://nodejs.org/en/) - version 16
 - [Yarn](https://classic.yarnpkg.com/en/docs/install) - version 1.22.0 or later
 
-This repository is a monorepo consisting of four projects:
+This repository is a monorepo consisting of five projects:
 
 - `packages/backend` - [README.md](./packages/backend/README.md)
 - `packages/frontend`
 - `packages/crypto`
 - `packages/encoding`
+- `packages/testnet` - [README.md](./packages/testnet/README.md)
 
 ## Setup
 

packages/backend/src/api/controllers/ForcedActionController.ts

@@ -93,7 +93,7 @@ export class ForcedActionController {
       return { type: 'not found', content: 'Position does not belong to user' }
     }
 
-    const content = renderNewSpotForcedWithdrawPage({
+    const content = renderNewPerpetualForcedActionPage({
       user,
       starkExAddress: this.starkExAddress,
       positionOrVaultId: positionId,

packages/backend/src/api/controllers/ForcedTradeOfferController.ts

@@ -100,10 +100,7 @@ export class ForcedTradeOfferController {
     })
 
     const content = renderOfferAndForcedTradePage({
-      user: {
-        starkKey: userA.starkKey,
-        address: userA.ethAddress,
-      },
+      user,
       offerId: id.toString(),
       transactionHash: offer.accepted?.transactionHash,
       maker,

packages/backend/src/api/controllers/utils/offerForms.ts

@@ -26,8 +26,8 @@ export function getAcceptForm(
 ): AcceptForm | undefined {
   const isAcceptable = !offer.accepted && !offer.cancelledAt
   const shouldRenderForm = isAcceptable && user.positionId !== offer.positionIdA
-  const submissionExpirationTime = Timestamp(
-    BigInt(Math.floor(Date.now() + THREE_DAYS_IN_MILLIS))
+  const submissionExpirationTime = Timestamp.roundDownToHours(
+    Timestamp(Math.floor(Date.now() + THREE_DAYS_IN_MILLIS))
   )
   if (!shouldRenderForm) {
     return undefined

packages/frontend/src/scripts/forced-actions/forcedActionForm.ts

@@ -1,5 +1,5 @@
-import { initPerpetualForcedActionForm } from './perpetualForcedActionForm'
-import { initSpotForcedWithdrawalForm } from './spotForcedWithdrawalForm'
+import { initPerpetualForcedActionForm } from './perpetual/perpetualForcedActionForm'
+import { initSpotForcedWithdrawalForm } from './spot/spotForcedWithdrawalForm'
 
 export function initForcedActionForms() {
   initPerpetualForcedActionForm()

packages/frontend/src/scripts/forced-actions/getFormElements.ts → packages/frontend/src/scripts/forced-actions/perpetual/getFormElements.ts

@@ -1,4 +1,4 @@
-import { FormId } from '../../view/pages/forced-actions/components/form/ids'
+import { FormId } from '../../../view/pages/forced-actions/components/form/ids'
 
 export type FormElements = ReturnType<typeof getFormElements>
 

packages/frontend/src/scripts/forced-actions/perpetual/offer/acceptForm.ts

@@ -0,0 +1,39 @@
+import {
+  deserializeAcceptedData,
+  deserializeCreateOfferData,
+} from '@explorer/shared'
+import { EthereumAddress } from '@explorer/types'
+
+import { ACCEPT_OFFER_FORM_ID } from '../../../../view/pages/transaction/components/AcceptOfferForm'
+import { Api } from '../../../peripherals/api'
+import { Wallet } from '../../../peripherals/wallet'
+
+export function initAcceptOfferForm() {
+  const form = document.querySelector<HTMLFormElement>(
+    `.${ACCEPT_OFFER_FORM_ID}`
+  )
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+  form?.addEventListener('submit', async (e) => {
+    e.preventDefault()
+    const { address, offer, offerId, accepted } = getFormData(form)
+
+    const signature = await Wallet.signOfferAccept(address, offer, accepted)
+    await Api.acceptOffer(offerId, accepted, signature)
+    window.location.reload()
+  })
+}
+
+function getFormData(form: HTMLFormElement) {
+  const { address, offer, offerId, accepted } = form.dataset
+
+  if (!address || !offer || !offerId || !accepted) {
+    throw new Error('Invalid data')
+  }
+
+  return {
+    address: EthereumAddress(address),
+    offer: deserializeCreateOfferData(offer),
+    offerId: Number(offerId),
+    accepted: deserializeAcceptedData(accepted),
+  }
+}

packages/frontend/src/scripts/forced-actions/perpetual/offer/cancelForm.ts

@@ -0,0 +1,33 @@
+import { EthereumAddress } from '@explorer/types'
+
+import { CANCEL_OFFER_FORM_ID } from '../../../../view/pages/transaction/components/CancelOfferForm'
+import { Api } from '../../../peripherals/api'
+import { Wallet } from '../../../peripherals/wallet'
+
+export function initCancelOfferForm() {
+  const form = document.querySelector<HTMLFormElement>(
+    `.${CANCEL_OFFER_FORM_ID}`
+  )
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+  form?.addEventListener('submit', async (e) => {
+    e.preventDefault()
+    const { address, offerId } = getFormData(form)
+
+    const signature = await Wallet.signOfferCancel(address, offerId)
+    await Api.cancelOffer(offerId, signature)
+    window.location.reload()
+  })
+}
+
+function getFormData(form: HTMLFormElement) {
+  const { address, offerId } = form.dataset
+
+  if (!address || !offerId) {
+    throw new Error('Invalid data')
+  }
+
+  return {
+    address: EthereumAddress(address),
+    offerId: Number(offerId),
+  }
+}

packages/frontend/src/scripts/forced-actions/perpetual/offer/finalizeForm.ts

@@ -0,0 +1,41 @@
+import { deserializeFinalizeOfferData } from '@explorer/shared'
+import { EthereumAddress } from '@explorer/types'
+
+// eslint-disable-next-line no-restricted-imports
+import { FINALIZE_OFFER_FORM_ID } from '../../../../view/pages/transaction/components/FinalizeOfferForm'
+import { Api } from '../../../peripherals/api'
+import { Wallet } from '../../../peripherals/wallet'
+
+export function initFinalizeForm() {
+  const form = document.querySelector<HTMLFormElement>(
+    `.${FINALIZE_OFFER_FORM_ID}`
+  )
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+  form?.addEventListener('submit', async (e) => {
+    e.preventDefault()
+    const { address, offer, offerId, perpetualAddress } = getFormData(form)
+
+    const hash = await Wallet.sendPerpetualForcedTradeTransaction(
+      address,
+      offer,
+      perpetualAddress
+    )
+    await Api.submitPerpetualForcedTrade(offerId, hash)
+    window.location.reload()
+  })
+}
+
+function getFormData(form: HTMLFormElement) {
+  const { address, offer, offerId, perpetualAddress } = form.dataset
+
+  if (!address || !offer || !offerId || !perpetualAddress) {
+    throw new Error('Invalid data')
+  }
+
+  return {
+    address: EthereumAddress(address),
+    offer: deserializeFinalizeOfferData(offer),
+    offerId: Number(offerId),
+    perpetualAddress: EthereumAddress(perpetualAddress),
+  }
+}

packages/frontend/src/scripts/forced-actions/perpetualForcedActionForm.ts → packages/frontend/src/scripts/forced-actions/perpetual/perpetualForcedActionForm.ts

@@ -1,5 +1,5 @@
-import { FormId } from '../../view/pages/forced-actions/components/form/ids'
-import { NewForcedActionFormProps } from '../../view/pages/forced-actions/NewForcedActionFormProps'
+import { FormId } from '../../../view/pages/forced-actions/components/form/ids'
+import { NewForcedActionFormProps } from '../../../view/pages/forced-actions/NewForcedActionFormProps'
 import { FormElements, getFormElements } from './getFormElements'
 import { getInitialState, nextFormState } from './state'
 import { submit } from './submit'
@@ -39,7 +39,8 @@ export function initPerpetualForcedActionForm() {
     )
   }
 
-  submitButton.addEventListener('click', () => {
+  submitButton.addEventListener('click', (e) => {
+    e.preventDefault()
     if (!state || !state.canSubmit) {
       throw new Error('Programmer error: Submit button should be disabled')
     }

packages/frontend/src/scripts/forced-actions/state.ts → packages/frontend/src/scripts/forced-actions/perpetual/state.ts

@@ -1,7 +1,7 @@
 import { AssetId } from '@explorer/types'
 
-import { formatCurrencyInput } from '../../utils/formatting/formatCurrencyInput'
-import { NewForcedActionFormProps } from '../../view/pages/forced-actions/NewForcedActionFormProps'
+import { formatCurrencyInput } from '../../../utils/formatting/formatCurrencyInput'
+import { NewForcedActionFormProps } from '../../../view/pages/forced-actions/NewForcedActionFormProps'
 import { FormAction, FormState } from './types'
 import { getFormType, parseCurrencyInput } from './utils'
 

packages/frontend/src/scripts/forced-actions/submit.ts → packages/frontend/src/scripts/forced-actions/perpetual/submit.ts

@@ -1,8 +1,8 @@
 import { CreateOfferData } from '@explorer/shared'
 import { AssetId } from '@explorer/types'
 
-import { Api } from '../peripherals/api'
-import { Wallet } from '../peripherals/wallet'
+import { Api } from '../../peripherals/api'
+import { Wallet } from '../../peripherals/wallet'
 import { FormState } from './types'
 import { isBuyable } from './utils'
 
@@ -25,7 +25,7 @@ async function submitExit(state: FormState) {
   )
 
   await Api.submitPerpetualForcedWithdrawal(hash)
-  window.location.href = `/forced/${hash.toString()}`
+  window.location.href = `/transactions/${hash.toString()}`
 }
 
 async function submitOffer(state: FormState) {
@@ -38,8 +38,11 @@ async function submitOffer(state: FormState) {
     isABuyingSynthetic: isBuyable(state.assetId, state.balance),
   }
 
-  const signature = await Wallet.signCreate(state.props.user.address, offer)
+  const signature = await Wallet.signOfferCreate(
+    state.props.user.address,
+    offer
+  )
 
   const offerId = await Api.createOffer(offer, signature)
-  window.location.href = `/forced/offers/${offerId}`
+  window.location.href = `/offers/${offerId}`
 }

packages/frontend/src/scripts/forced-actions/types.ts → packages/frontend/src/scripts/forced-actions/perpetual/types.ts

@@ -1,6 +1,6 @@
 import { AssetId } from '@explorer/types'
 
-import { NewForcedActionFormProps } from '../../view/pages/forced-actions/NewForcedActionFormProps'
+import { NewForcedActionFormProps } from '../../../view/pages/forced-actions/NewForcedActionFormProps'
 
 export interface FormState {
   props: NewForcedActionFormProps

packages/frontend/src/scripts/forced-actions/utils.ts → packages/frontend/src/scripts/forced-actions/perpetual/utils.ts

@@ -1,6 +1,6 @@
 import { AssetId } from '@explorer/types'
 
-import { PositionAssetEntry } from '../../view'
+import { PositionAssetEntry } from '../../../view'
 import { FormState } from './types'
 
 export function getAsset(

packages/frontend/src/scripts/forced-actions/spotForcedWithdrawalForm.ts → packages/frontend/src/scripts/forced-actions/spot/spotForcedWithdrawalForm.ts

@@ -1,9 +1,9 @@
 import { AssetHash } from '@explorer/types'
 
-import { NewForcedActionFormProps } from '../../view/pages/forced-actions/NewForcedActionFormProps'
-import { SpotForcedWithdrawalFormId } from '../../view/pages/forced-actions/NewSpotForcedWithdrawalPage'
-import { Api } from '../peripherals/api'
-import { Wallet } from '../peripherals/wallet'
+import { NewForcedActionFormProps } from '../../../view/pages/forced-actions/NewForcedActionFormProps'
+import { SpotForcedWithdrawalFormId } from '../../../view/pages/forced-actions/NewSpotForcedWithdrawalPage'
+import { Api } from '../../peripherals/api'
+import { Wallet } from '../../peripherals/wallet'
 
 export function initSpotForcedWithdrawalForm() {
   const form = document.getElementById(SpotForcedWithdrawalFormId)

packages/frontend/src/scripts/index.ts

@@ -1,9 +1,9 @@
 import { USE_NEW_DESIGN } from '../utils/constants'
 import { initCountdownTimer } from './countdownTimer'
 import { initForcedActionForms } from './forced-actions/forcedActionForm'
+import { initForcedTradeOfferForms } from './forced-actions/perpetual/offer'
 import { initImageFallback } from './imageFallback'
 import { initMetamask } from './metamask'
-import { initForcedTradeOfferForms } from './offer'
 // eslint-disable-next-line no-restricted-imports
 import { initAcceptOfferForm } from './old/offer/acceptForm'
 // eslint-disable-next-line no-restricted-imports