Fix rate limit check (#1332)

* fixes * fix rate limit and up version numbers
Snowfork · Nov 18, 2024 · 6ef492c · 6ef492c
1 parent 26fd3ac
commit 6ef492c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/web/packages/api/package.json b/web/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@snowbridge/api",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "description": "Snowbridge API client",
   "license": "Apache-2.0",
   "repository": {

diff --git a/web/packages/api/src/subscan.ts b/web/packages/api/src/subscan.ts
@@ -50,12 +50,12 @@ export const createApi = (baseUrl: string, apiKey: string, options = { limit: 1
             redirect: "follow",
         }
 
-        if (rateLimit.retryAfter !== null && rateLimit.retryAfter > 0) {
-            console.log("Being rate limited", rateLimit)
+        if (rateLimit.remaining === 0 && rateLimit.retryAfter !== null && rateLimit.retryAfter > 0) {
+            console.log("Being rate limited: retryAfter", rateLimit)
             await sleepMs(rateLimit.retryAfter * 1000)
         }
         if (rateLimit.remaining === 0 && rateLimit.reset !== null && rateLimit.reset > 0) {
-            console.log("Being rate limited", rateLimit)
+            console.log("Being rate limited: reset", rateLimit)
             await sleepMs(rateLimit.reset * 1000)
         }
 

diff --git a/web/packages/api/src/toEthereum.ts b/web/packages/api/src/toEthereum.ts
@@ -111,10 +111,6 @@ export const validateSend = async (
 ): Promise<SendValidationResult> => {
     const options = { ...ValidateOptionDefaults, ...validateOptions }
     const {
-        ethereum,
-        ethereum: {
-            contracts: { gateway },
-        },
         polkadot: {
             api: { assetHub, bridgeHub, relaychain, parachains },
         },
@@ -218,11 +214,8 @@ export const validateSend = async (
             message: "Asset balance insufficient for transfer.",
         })
 
-    const [bridgeStatus] = await Promise.all([
-        bridgeStatusInfo(context),
-        ethereum.api.getNetwork(),
-        gateway.isTokenRegistered(tokenAddress),
-    ])
+    const bridgeStatus = await bridgeStatusInfo(context);
+
     const bridgeOperational = bridgeStatus.toEthereum.operatingMode.outbound === "Normal"
     const lightClientLatencyIsAcceptable =
         bridgeStatus.toEthereum.latencySeconds < options.acceptableLatencyInSeconds

diff --git a/web/packages/contract-types/package.json b/web/packages/contract-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@snowbridge/contract-types",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "description": "Snowbridge contract type bindings",
   "license": "Apache-2.0",
   "repository": {

diff --git a/web/packages/contracts/package.json b/web/packages/contracts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@snowbridge/contracts",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "description": "Snowbridge contract source and abi.",
   "license": "Apache-2.0",
   "repository": {