Merge remote-tracking branch 'origin/master' into sparrowDom/balancer…

…-composable-st-pool

brownie/world.py

@@ -57,6 +57,7 @@ def load_contract(name, address):
 vault_value_checker = load_contract('vault_value_checker', VAULT_VALUE_CHECKER)
 oeth_vault_value_checker = load_contract('vault_value_checker', OETH_VAULT_VALUE_CHECKER)
 dripper = load_contract('dripper', DRIPPER)
+oeth_dripper = load_contract('dripper', OETH_DRIPPER)
 harvester = load_contract('harvester', HARVESTER)
 ousd_usdt = load_contract('ousd_usdt', OUSD_USDT)
 v2router = load_contract('v2router', UNISWAP_V2_ROUTER)
@@ -415,19 +416,40 @@ def nice_contract_address(address):
 
 
 def show_governance_action(i, to, sig, data):
-  print("{}) {}".format(i+1, nice_contract_address(to)))
-  print("     "+ORANGE+sig+ENDC)
-  # print("Post Sig Data: ", data)
-  if re.match(".*\(\)", sig):
-    return
-  stypes = re.split(",|\)|\(", sig)[1:-1]
-  decodes = abi.decode_abi(stypes, data)
-  for j in range(0, len(stypes)):
-    v = decodes[j]
-    if stypes[j] == "address":
-      print(" >> ", nice_contract_address(v))
-    else:
-      print(" >> ", ORANGE+str(v)+ENDC)
+    print("{}) {}".format(i+1, nice_contract_address(to)))
+    print("     "+ORANGE+sig+ENDC)
+    # print("Post Sig Data: ", data)
+    if re.match(".*\(\)", sig):
+        return
+
+    split_sig = re.split("^[^\(]*", sig)[1]
+    split_sig = re.split(",|\)$|^\(", split_sig)[1:-1]
+
+    stypes = []
+    nested_struct = []
+    nested = False
+    for s in split_sig:
+        if s.startswith("("):
+            stypes.append([s[1:]])
+            nested = True
+        elif s.endswith(")"):
+            stypes[len(stypes) - 1].append(s[:-1])
+            stypes[len(stypes) - 1] = "({})".format(",".join(stypes[len(stypes) - 1]))
+            nested = False
+        elif nested:
+            stypes[len(stypes) - 1].append(s)
+        else:
+            stypes.append(s)
+
+    decodes = abi.decode_abi(stypes, data)
+    for j in range(0, len(stypes)):
+        v = decodes[j]
+        if stypes[j] == "address":
+            print(" >> ", nice_contract_address(v))
+        elif stypes[j] == "bytes":
+            print(" >> ", v.hex())
+        else:
+            print(" >> ", ORANGE+str(v)+ENDC)
 
 def to_gnosis_json(txs):
     main = {

contracts/deploy/081_upgrade_harvester.js

@@ -12,8 +12,10 @@ module.exports = deploymentWithGovernanceProposal(
     forceDeploy: false,
     // forceSkip: true,
     reduceQueueTime: true,
-    deployerIsProposer: true,
+    deployerIsProposer: false,
     executeGasLimit: 30000000,
+    proposalId:
+      "70744121595007528818249644545963691097758184661168820806929451960448344720141",
   },
   async ({ deployWithConfirmation, ethers, getTxOpts }) => {
     const { timelockAddr } = await getNamedAccounts();
@@ -40,6 +42,12 @@ module.exports = deploymentWithGovernanceProposal(
       cOETHHarvesterProxy.address
     );
 
+    const cOETHDripperProxy = await ethers.getContract("OETHDripperProxy");
+    const cOETHDripper = await ethers.getContractAt(
+      "OETHDripper",
+      cOETHDripperProxy.address
+    );
+
     // Deployer Actions
     // ----------------
 
@@ -309,6 +317,12 @@ module.exports = deploymentWithGovernanceProposal(
             ),
           ],
         },
+        // 12. Change Drip duration to 14 days for OETH Dripper
+        {
+          contract: cOETHDripper,
+          signature: "setDripDuration(uint256)",
+          args: [14 * 24 * 60 * 60], // 14 days
+        },
       ],
     };
   }

contracts/deployments/mainnet/.migrations.json

@@ -72,5 +72,6 @@
   "074_upgrade_oeth_oracle_router": 1693458035,
   "075_oeth_amo_upgrade": 1694089115,
   "077_balancer_rETH_WETH": 1695843949,
-  "080_upgrade_buyback": 1698732191
+  "080_upgrade_buyback": 1698732191,
+  "081_upgrade_harvester": 1701171179
 }