feat: Use new cross chain transaction

decentraland · Mar 7, 2024 · 4ae64c5 · 4ae64c5
1 parent 8c00e7c
commit 4ae64c5
Show file tree

Hide file tree

Showing 14 changed files with 187 additions and 240 deletions.
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
diff --git a/webapp/package.json b/webapp/package.json
@@ -22,7 +22,7 @@
     "dcl-catalyst-commons": "^9.0.1",
     "decentraland-connect": "^6.2.0",
     "decentraland-crypto-fetch": "^1.0.3",
-    "decentraland-dapps": "file:../../decentraland-dapps/decentraland-dapps-3.0.5-development.tgz",
+    "decentraland-dapps": "^19.0.0",
     "decentraland-transactions": "^2.3.0",
     "decentraland-ui": "^5.8.0",
     "ethers": "^5.6.8",

diff --git a/webapp/src/config/env/dev.json b/webapp/src/config/env/dev.json
@@ -44,6 +44,7 @@
   "SUBGRAPH_WORKER": "https://subgraph.decentraland.zone",
   "SENTRY_DSN": "https://1dc401149e1c819b8477565c9cdd9b70@o4504361728212992.ingest.sentry.io/4505743351676928",
   "SQUID_API_URL": "https://testnet.v2.api.squidrouter.com/",
+  "SQUID_RETRY_DELAY": "3000",
   "DCL_LISTS_SERVER": "https://dcl-lists.decentraland.zone",
   "AUTH_URL": "/auth",
   "WERT_URL": "https://sandbox.wert.io",

diff --git a/webapp/src/config/env/prod.json b/webapp/src/config/env/prod.json
@@ -44,6 +44,7 @@
   "SUBGRAPH_WORKER": "https://subgraph.decentraland.org",
   "SENTRY_DSN": "https://1dc401149e1c819b8477565c9cdd9b70@o4504361728212992.ingest.sentry.io/4505743351676928",
   "SQUID_API_URL": "https://apiplus.squidrouter.com/api",
+  "SQUID_RETRY_DELAY": "3000",
   "DCL_LISTS_SERVER": "https://dcl-lists.decentraland.org",
   "AUTH_URL": "/auth",
   "WERT_URL": "https://widget.wert.io",

diff --git a/webapp/src/config/env/stg.json b/webapp/src/config/env/stg.json
@@ -44,6 +44,7 @@
   "SUBGRAPH_WORKER": "https://subgraph.decentraland.today",
   "SENTRY_DSN": "https://1dc401149e1c819b8477565c9cdd9b70@o4504361728212992.ingest.sentry.io/4505743351676928",
   "SQUID_API_URL": "https://apiplus.squidrouter.com/api",
+  "SQUID_RETRY_DELAY": "3000",
   "DCL_LISTS_SERVER": "https://dcl-lists.decentraland.org",
   "AUTH_URL": "/auth",
   "WERT_URL": "https://widget.wert.io",

diff --git a/webapp/src/modules/ens/sagas.spec.ts b/webapp/src/modules/ens/sagas.spec.ts
@@ -9,10 +9,7 @@ import {
   getSigner,
   getConnectedProvider
 } from 'decentraland-dapps/dist/lib/eth'
-import {
-  TRANSACTION_ACTION_FLAG,
-  waitForTx
-} from 'decentraland-dapps/dist/modules/transaction/utils'
+import { waitForTx } from 'decentraland-dapps/dist/modules/transaction/utils'
 import { Wallet } from 'decentraland-dapps/dist/modules/wallet/types'
 import { closeModal } from 'decentraland-dapps/dist/modules/modal/actions'
 import { ensSaga } from './sagas'
@@ -22,7 +19,6 @@ import {
   claimNameFailure,
   claimNameTransactionSubmitted,
   claimNameRequest,
-  CLAIM_NAME_TRANSACTION_SUBMITTED,
   claimNameCrossChainRequest,
   claimNameCrossChainFailure,
   claimNameCrossChainSuccess
@@ -287,19 +283,12 @@ describe('ENS Saga', () => {
       mockTransaction = {
         hash: '0xTransactionHash'
       } as ethers.ContractTransaction
-      mockAction = {
-        type: CLAIM_NAME_TRANSACTION_SUBMITTED,
-        payload: {
-          [TRANSACTION_ACTION_FLAG]: {
-            chainId: mockWallet.chainId,
-            hash: mockTransaction.hash,
-            payload: {
-              address: mockWallet.address,
-              subdomain: mockName
-            }
-          }
-        }
-      }
+      mockAction = claimNameTransactionSubmitted(
+        mockName,
+        mockWallet.address,
+        ChainId.ARBITRUM_MAINNET,
+        mockTransaction.hash
+      )
       mockTokenId = BigNumber.from(1)
       dclRegistrarContract = { address: '0xAnAddress' }
       mockENS = {

diff --git a/webapp/src/modules/ens/sagas.ts b/webapp/src/modules/ens/sagas.ts
@@ -5,10 +5,8 @@ import {
   getSigner
 } from 'decentraland-dapps/dist/lib/eth'
 import { Provider, Wallet } from 'decentraland-dapps/dist/modules/wallet/types'
-import {
-  TRANSACTION_ACTION_FLAG,
-  waitForTx
-} from 'decentraland-dapps/dist/modules/transaction/utils'
+import { waitForTx } from 'decentraland-dapps/dist/modules/transaction/utils'
+import { TRANSACTION_ACTION_FLAG } from 'decentraland-dapps/dist/modules/transaction/types'
 import { t } from 'decentraland-dapps/dist/modules/translation'
 import { closeModal } from 'decentraland-dapps/dist/modules/modal/actions'
 import { DCLController } from '../../contracts'