updated metadata, undo hardcoded gas settings for eth-mainnet (#2000)

d10r · web-flow · commit 0ed2d5cefc09 · 2024-08-08T12:14:18.000Z
diff --git a/packages/ethereum-contracts/ops-scripts/gov-upgrade-super-token-logic.js b/packages/ethereum-contracts/ops-scripts/gov-upgrade-super-token-logic.js
@@ -207,21 +207,22 @@ async function getTokensToBeUpgraded(sf, newSuperTokenLogic, skipList, pastSuper
                             `!!! [SKIP] SuperToken@${superToken.address} (${symbol}) alien previous logic ${superTokenLogic} - please manually check!`
                         );
                     } else {
+                        let adminAddr = ZERO_ADDRESS;
                         try {
-                            const adminAddr = await superToken.getAdmin();
-                            if (adminAddr !== ZERO_ADDRESS) {
-                                console.warn(
-                                    `!!! [SKIP] SuperToken@${superToken.address} admin override set to ${adminAddr}`
-                                );
-                            } else {
-                                console.log(
-                                    `SuperToken@${superToken.address} (${symbol}) logic needs upgrade from ${superTokenLogic}`
-                                );
-                                return superTokenAddress;
-                            }
+                            adminAddr = await superToken.getAdmin();
                         } catch(err) {
                             console.log("### failed to get admin addr:", err.message);
                         }
+                        if (adminAddr !== ZERO_ADDRESS) {
+                            console.warn(
+                                `!!! [SKIP] SuperToken@${superToken.address} admin override set to ${adminAddr}`
+                            );
+                        } else {
+                            console.log(
+                                `SuperToken@${superToken.address} (${symbol}) logic needs upgrade from ${superTokenLogic}`
+                            );
+                            return superTokenAddress;
+                        }
                     }
                 } else {
                     console.log(
diff --git a/packages/ethereum-contracts/truffle-config.js b/packages/ethereum-contracts/truffle-config.js
@@ -177,8 +177,6 @@ const E = (module.exports = {
         "eth-mainnet": {
             ...createNetworkDefaultConfiguration("eth-mainnet"),
             network_id: 1, // mainnet's id
-            maxPriorityFeePerGas: 200e6, // 0.2 gwei. The default of 2.5 gwei is overpaying
-            maxFeePerGas: 50e9,
         },
 
         "eth-sepolia": {
diff --git a/packages/metadata/CHANGELOG.md b/packages/metadata/CHANGELOG.md
@@ -3,7 +3,9 @@ All notable changes to the metadata will be documented in this file.
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-
+## [v1.4.1]
+### Changed
+- New & updated contracts on eth-mainnet
 
 ## [v1.4.0]
 ### Changed
diff --git a/packages/metadata/main/networks/list.cjs b/packages/metadata/main/networks/list.cjs
@@ -576,10 +576,12 @@ module.exports =
             "cfaV1": "0x2844c1BBdA121E9E43105630b9C8310e5c72744b",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0xbCF9cfA8Da20B591790dF27DE65C1254Bf91563d",
+            "gdaV1": "0xAAdBB3Eee3Bd080f5353d86DdF1916aCA3fAC842",
+            "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08",
             "superTokenFactory": "0x0422689cc4087b6B7280e0a7e7F655200ec86Ae1",
-            "superfluidLoader": "0x9775EEBdfF8AE845e7Ad3d1D04B85e6c6d284aCB",
+            "superfluidLoader": "0xcb05535bd212eCFC4B7b9db81d6C2C768b726776",
             "toga": "0x8B5a2CF69a56d7F8Fa027edcA23594cdDF544dDc",
-            "batchLiquidator": "0x554c06487bEc8c890A0345eb05a5292C1b1017Bd",
+            "batchLiquidator": "0x4eC223bef5D8cB609FC8Ee2e0ad43244C8e46A02",
             "flowScheduler": "0xAA0cD305eD020137E302CeCede7b18c0A05aCCDA",
             "vestingScheduler": "0x39D5cBBa9adEBc25085a3918d36D5325546C001B",
             "autowrap": {
diff --git a/packages/metadata/module/networks/list.js b/packages/metadata/module/networks/list.js
@@ -576,10 +576,12 @@ export default
             "cfaV1": "0x2844c1BBdA121E9E43105630b9C8310e5c72744b",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0xbCF9cfA8Da20B591790dF27DE65C1254Bf91563d",
+            "gdaV1": "0xAAdBB3Eee3Bd080f5353d86DdF1916aCA3fAC842",
+            "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08",
             "superTokenFactory": "0x0422689cc4087b6B7280e0a7e7F655200ec86Ae1",
-            "superfluidLoader": "0x9775EEBdfF8AE845e7Ad3d1D04B85e6c6d284aCB",
+            "superfluidLoader": "0xcb05535bd212eCFC4B7b9db81d6C2C768b726776",
             "toga": "0x8B5a2CF69a56d7F8Fa027edcA23594cdDF544dDc",
-            "batchLiquidator": "0x554c06487bEc8c890A0345eb05a5292C1b1017Bd",
+            "batchLiquidator": "0x4eC223bef5D8cB609FC8Ee2e0ad43244C8e46A02",
             "flowScheduler": "0xAA0cD305eD020137E302CeCede7b18c0A05aCCDA",
             "vestingScheduler": "0x39D5cBBa9adEBc25085a3918d36D5325546C001B",
             "autowrap": {
diff --git a/packages/metadata/networks.json b/packages/metadata/networks.json
@@ -574,10 +574,12 @@
             "cfaV1": "0x2844c1BBdA121E9E43105630b9C8310e5c72744b",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0xbCF9cfA8Da20B591790dF27DE65C1254Bf91563d",
+            "gdaV1": "0xAAdBB3Eee3Bd080f5353d86DdF1916aCA3fAC842",
+            "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08",
             "superTokenFactory": "0x0422689cc4087b6B7280e0a7e7F655200ec86Ae1",
-            "superfluidLoader": "0x9775EEBdfF8AE845e7Ad3d1D04B85e6c6d284aCB",
+            "superfluidLoader": "0xcb05535bd212eCFC4B7b9db81d6C2C768b726776",
             "toga": "0x8B5a2CF69a56d7F8Fa027edcA23594cdDF544dDc",
-            "batchLiquidator": "0x554c06487bEc8c890A0345eb05a5292C1b1017Bd",
+            "batchLiquidator": "0x4eC223bef5D8cB609FC8Ee2e0ad43244C8e46A02",
             "flowScheduler": "0xAA0cD305eD020137E302CeCede7b18c0A05aCCDA",
             "vestingScheduler": "0x39D5cBBa9adEBc25085a3918d36D5325546C001B",
             "autowrap": {
diff --git a/packages/metadata/package.json b/packages/metadata/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superfluid-finance/metadata",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Superfluid Metadata",
   "main": "main/index.cjs",
   "module": "module/index.js",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@superfluid-finance/metadata",`
`3`		`- "version": "1.4.0",`
	`3`	`+ "version": "1.4.1",`
`4`	`4`	`"description": "Superfluid Metadata",`
`5`	`5`	`"main": "main/index.cjs",`
`6`	`6`	`"module": "module/index.js",`