v1.14.2

starknet-io · Jun 19, 2023 · 672e512 · 672e512
1 parent 13e794f
commit 672e512
Show file tree

Hide file tree

Showing 11 changed files with 198 additions and 54 deletions.
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "npkill": "^0.10.0",
     "prettier": "^2.8.4",
     "sort-package-json": "^2.4.1",
-    "turbo": "1.9.3"
+    "turbo": "1.10.3"
   },
   "packageManager": "[email protected]",
   "engines": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/turbo.json b/turbo.json
@@ -1 +1,125 @@
-{"globalEnv":["npm_package_name","npm_package_version"],"pipeline":{"@starkgate/web#lint":{"outputs":[],"cache":true,"dependsOn":[],"inputs":[],"outputMode":"full","env":["NETLIFY"],"persistent":false},"build":{"outputs":["dist/**"],"cache":true,"dependsOn":["^build","prebuild"],"inputs":[],"outputMode":"full","env":[],"persistent":false},"clean":{"outputs":[],"cache":true,"dependsOn":[],"inputs":[],"outputMode":"full","env":[],"persistent":false},"dev":{"outputs":[],"cache":false,"dependsOn":[],"inputs":[],"outputMode":"full","env":[],"persistent":true},"format":{"outputs":[],"cache":true,"dependsOn":[],"inputs":[],"outputMode":"full","env":[],"persistent":false},"lint":{"outputs":[],"cache":true,"dependsOn":["^lint"],"inputs":[],"outputMode":"full","env":[],"persistent":false},"pack":{"outputs":[],"cache":true,"dependsOn":["build","lint","test"],"inputs":[],"outputMode":"full","env":[],"persistent":false},"prebuild":{"outputs":[],"cache":true,"dependsOn":[],"inputs":[],"outputMode":"full","env":[],"persistent":false},"test":{"outputs":[],"cache":true,"dependsOn":["build"],"inputs":[],"outputMode":"full","env":[],"persistent":false}},"remoteCache":{}}
+{
+  "globalEnv": [
+    "npm_package_name",
+    "npm_package_version"
+  ],
+  "globalPassThroughEnv": null,
+  "globalDotEnv": null,
+  "pipeline": {
+    "@starkgate/web#lint": {
+      "outputs": [],
+      "cache": true,
+      "dependsOn": [],
+      "inputs": [],
+      "outputMode": "full",
+      "persistent": false,
+      "env": [
+        "NETLIFY"
+      ],
+      "passThroughEnv": null,
+      "dotEnv": null
+    },
+    "build": {
+      "outputs": [
+        "dist/**"
+      ],
+      "cache": true,
+      "dependsOn": [
+        "^build",
+        "prebuild"
+      ],
+      "inputs": [],
+      "outputMode": "full",
+      "persistent": false,
+      "env": [],
+      "passThroughEnv": null,
+      "dotEnv": null
+    },
+    "clean": {
+      "outputs": [],
+      "cache": true,
+      "dependsOn": [],
+      "inputs": [],
+      "outputMode": "full",
+      "persistent": false,
+      "env": [],
+      "passThroughEnv": null,
+      "dotEnv": null
+    },
+    "dev": {
+      "outputs": [],
+      "cache": false,
+      "dependsOn": [],
+      "inputs": [],
+      "outputMode": "full",
+      "persistent": true,
+      "env": [],
+      "passThroughEnv": null,
+      "dotEnv": null
+    },
+    "format": {
+      "outputs": [],
+      "cache": true,
+      "dependsOn": [],
+      "inputs": [],
+      "outputMode": "full",
+      "persistent": false,
+      "env": [],
+      "passThroughEnv": null,
+      "dotEnv": null
+    },
+    "lint": {
+      "outputs": [],
+      "cache": true,
+      "dependsOn": [
+        "^lint"
+      ],
+      "inputs": [],
+      "outputMode": "full",
+      "persistent": false,
+      "env": [],
+      "passThroughEnv": null,
+      "dotEnv": null
+    },
+    "pack": {
+      "outputs": [],
+      "cache": true,
+      "dependsOn": [
+        "build",
+        "lint",
+        "test"
+      ],
+      "inputs": [],
+      "outputMode": "full",
+      "persistent": false,
+      "env": [],
+      "passThroughEnv": null,
+      "dotEnv": null
+    },
+    "prebuild": {
+      "outputs": [],
+      "cache": true,
+      "dependsOn": [],
+      "inputs": [],
+      "outputMode": "full",
+      "persistent": false,
+      "env": [],
+      "passThroughEnv": null,
+      "dotEnv": null
+    },
+    "test": {
+      "outputs": [],
+      "cache": true,
+      "dependsOn": [
+        "build"
+      ],
+      "inputs": [],
+      "outputMode": "full",
+      "persistent": false,
+      "env": [],
+      "passThroughEnv": null,
+      "dotEnv": null
+    }
+  },
+  "remoteCache": {}
+}
diff --git a/workspace/apps/starkgate/shared/src/tokens.ts b/workspace/apps/starkgate/shared/src/tokens.ts
@@ -69,11 +69,11 @@ export const Tokens = {
       symbol: 'rETH',
       decimals: 18,
       bridgeAddress: {
-        [ChainType.L1.MAIN]: '',
+        [ChainType.L1.MAIN]: '0xcf58536D6Fab5E59B654228a5a4ed89b13A876C2',
         [ChainType.L1.GOERLI]: '0xD2ef821C56B20a7451dbbEd1ec003De6C44F8dC0'
       },
       tokenAddress: {
-        [ChainType.L1.MAIN]: '',
+        [ChainType.L1.MAIN]: '0xae78736Cd615f374D3085123A210448E74Fc6393',
         [ChainType.L1.GOERLI]: '0x178E141a0E3b34152f73Ff610437A7bf9B83267A'
       }
     },
@@ -82,11 +82,11 @@ export const Tokens = {
       symbol: 'wstETH',
       decimals: 18,
       bridgeAddress: {
-        [ChainType.L1.MAIN]: '',
+        [ChainType.L1.MAIN]: '0x82596004A4566fB1E47886EA34fB94F695ea8d6c',
         [ChainType.L1.GOERLI]: '0x190c98506a5396A30CA759A139F3Fb59EF519A5D'
       },
       tokenAddress: {
-        [ChainType.L1.MAIN]: '',
+        [ChainType.L1.MAIN]: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
         [ChainType.L1.GOERLI]: '0x6320cD32aA674d2898A68ec82e869385Fc5f7E2f'
       }
     },
@@ -196,11 +196,11 @@ export const Tokens = {
         [ChainType.L2.GOERLI]: true
       },
       bridgeAddress: {
-        [ChainType.L2.MAIN]: '',
+        [ChainType.L2.MAIN]: '0x0078da8023b3c08e5a41540a34f7c385fd4f4540d5668f1be3ede0d3bb1b9d4d',
         [ChainType.L2.GOERLI]: '0x00214e168720c6eed858066bea070afa828512e83edcfc28846f0e87221f77f6'
       },
       tokenAddress: {
-        [ChainType.L2.MAIN]: '',
+        [ChainType.L2.MAIN]: '0x0319111a5037cbec2b3e638cc34a3474e2d2608299f3e62866e9cc683208c610',
         [ChainType.L2.GOERLI]: '0x002133188109385fedaac0b1bf9de1134e271b88efcd21e2ea0dac460639fbe2'
       }
     },
@@ -209,11 +209,11 @@ export const Tokens = {
       symbol: 'wstETH',
       decimals: 18,
       bridgeAddress: {
-        [ChainType.L2.MAIN]: '',
+        [ChainType.L2.MAIN]: '0x03073e7ab30ee00e2da9cf96e4a5490c8e00bdf018df1ff5f3679c30ef1cb014',
         [ChainType.L2.GOERLI]: '0x0399a6011b666888d647665fd65d6dcc7c2690c72d4c4454cae987f19f6ef609'
       },
       tokenAddress: {
-        [ChainType.L2.MAIN]: '',
+        [ChainType.L2.MAIN]: '0x05ef98e7dc5865f49bcec200df508d27669b3ef7f9d2439decd127350359f291',
         [ChainType.L2.GOERLI]: '0x0335bc6e1cf6d9527da4f8044c505906ad6728aeeddfba8d7000b01b32ffe66b'
       }
     },

diff --git a/workspace/apps/starkgate/shared/src/types.ts b/workspace/apps/starkgate/shared/src/types.ts
@@ -36,6 +36,7 @@ export type TransferLog = {
   l2TxStatus: TransactionStatus;
   l2TxTimestamp: number;
   fastWithdrawal?: boolean;
+  autoWithdrawal?: boolean;
   customData?: object;
 };
 
@@ -46,10 +47,12 @@ export const isPendingWithdrawal = ({
   l1TxHash,
   l2TxStatus,
   fastWithdrawal,
+  autoWithdrawal,
   customData
 }: TransferLog) => {
   return (
     isWithdrawal(type) &&
+    !autoWithdrawal &&
     !l1TxHash &&
     ((!fastWithdrawal && isOnChain(l2TxStatus)) || (fastWithdrawal && customData))
   );

diff --git a/workspace/apps/starkgate/web/CHANGELOG.md b/workspace/apps/starkgate/web/CHANGELOG.md
@@ -1,11 +1,20 @@
-## 1.14.0
+# @starkgate/web
+
+## 1.14.2
+
+### Patch Changes
+
+- 5f526da: Fixed an issue where users can still complete an auto withdrawal transaction on L1 by themselves and thus pay for the transaction twice.
+- 12a8fad: Enable rETH and wstETH on mainnet
 
 ## 1.14.1
 
 ### Patch Changes
 
 - 392c6d4: Fixed an issue where the auto withdrawal got stuck
 
+## 1.14.0
+
 ### Minor Changes
 
 - 78670c0: Add an option to Auto withdraw ERC20 tokens from Starknet to Ethereum