Disable Passive and Predictoor OCEAN distribution (#796)

* Remove dispense predictoor OCEAN flow

* Remove do_fund_predictoor_ocean_dispenser

* Remove the transfer funds part from dispense_passive

* Update cron to run at 00:10

* Update workflow and job name

* Remove dispense_passive

* Run checkpoint on Friday 00:10

* Remove other references of dispense passive

* Black

* Remove unused imports

* Update checkpoint_feedist.yml

* Checkpoint on friday

Author: trizin

.github/workflows/checkpoint_feedist.yml

@@ -3,6 +3,7 @@ name: Checkpoint FeeDistributor
 on:
   schedule:
     - cron: "0 0 * * 4"
+    - cron: "10 0 * * 5"
   workflow_dispatch:
 
 jobs:

.github/workflows/dispense_passive.yml

@@ -140,7 +140,6 @@ Now, you can use those networks simply by specifying a different chainid in `dft
 
 Happens via regularly-scheduled Github Actions:
 
-- Passive: [dispense_passive.yml](.github/workflows/dispense_passive.yml)
 - Active: [flow.yml](.github/workflows/flow.yml)
 
 More info: [README-crons-ops.md](README-crons-ops.md)

.github/workflows/dispense_predictoor_ocean.yml

@@ -27,7 +27,6 @@
   dftool predictoor_data START_DATE END_DATE CSV_DIR CHAINID --RETRIES
   dftool calc volume|predictoor CSV_DIR TOT_OCEAN START_DATE - from stakes/etc csvs (or predictoor/volume data csvs), output rewards
   dftool dispense_active CSV_DIR CHAINID --DFREWARDS_ADDR --TOKEN_ADDR --BATCH_NBR - from rewards, dispense funds
-  dftool dispense_passive CHAINID AMOUNT
   dftool nftinfo CSV_DIR CHAINID -- Query chain, output nft info csv
 
   dftool new_acct - generate new account

README.md

@@ -54,7 +54,6 @@
 )
 from df_py.util.retry import retry_function
 from df_py.util.vesting_schedule import (
-    get_active_reward_amount_for_week_eth,
     get_active_reward_amount_for_week_eth_by_stream,
 )
 from df_py.volume import csvs, queries
@@ -936,76 +935,6 @@ def do_chain_info():
     print(f"  # blocks: {block_number}")
 
 
-# ========================================================================
-@enforce_types
-def do_dispense_passive():
-    parser = argparse.ArgumentParser(description="Dispense passive rewards")
-    parser.add_argument("command", choices=["dispense_passive"])
-    parser.add_argument("CHAINID", type=chain_type, help=CHAINID_EXAMPLES)
-    parser.add_argument(
-        "AMOUNT",
-        type=float,
-        help="total amount of TOKEN to distribute (decimal, not wei)",
-    )
-    parser.add_argument(
-        "ST", type=valid_date_and_convert, help="week start date -- YYYY-MM-DD"
-    )
-
-    arguments = parser.parse_args()
-    print_arguments(arguments)
-
-    ADDRESS_FILE = _getAddressEnvvarOrExit()
-    record_deployed_contracts(ADDRESS_FILE, arguments.CHAINID)
-
-    amount = arguments.AMOUNT
-
-    if amount == 0:
-        start_date = arguments.ST
-        amount = get_active_reward_amount_for_week_eth(start_date)
-
-    feedist = FeeDistributor(arguments.CHAINID)
-    OCEAN = OCEAN_token(arguments.CHAINID)
-    web3 = networkutil.chain_id_to_web3(arguments.CHAINID)
-    retry_function(dispense.dispense_passive, 3, 60, web3, OCEAN, feedist, amount)
-
-    print("Dispensed passive rewards")
-
-
-# ========================================================================
-
-
-@enforce_types
-def do_fund_predictoor_ocean_dispenser():
-    parser = argparse.ArgumentParser(description="Dispense predictoor rewards")
-    parser.add_argument("command", choices=["fund_predictoor_ocean_dispenser"])
-    parser.add_argument("CHAINID", type=chain_type, help=CHAINID_EXAMPLES)
-    parser.add_argument("RECEIVER", type=str, help="Receiver address")
-    parser.add_argument(
-        "ST", type=valid_date_and_convert, help="week start date -- YYYY-MM-DD"
-    )
-    arguments = parser.parse_args()
-    print_arguments(arguments)
-    ADDRESS_FILE = _getAddressEnvvarOrExit()
-    record_deployed_contracts(ADDRESS_FILE, arguments.CHAINID)
-
-    OCEAN = OCEAN_token(arguments.CHAINID)
-    web3 = networkutil.chain_id_to_web3(arguments.CHAINID)
-
-    predictoor_budget_week = get_active_reward_amount_for_week_eth_by_stream(
-        arguments.ST, "predictoor", arguments.CHAINID
-    )
-
-    retry_function(
-        dispense.multisig_transfer_tokens,
-        3,
-        60,
-        web3,
-        OCEAN,
-        arguments.RECEIVER,
-        predictoor_budget_week,
-    )
-
-
 # ========================================================================
 @enforce_types
 def do_calculate_passive():

df_py/util/dftool_arguments.py

@@ -1,7 +1,7 @@
 import os
 
 # pylint: disable=logging-fstring-interpolation
-from typing import Dict, Optional, Union
+from typing import Dict, Optional
 
 from enforce_typing import enforce_types
 from web3.main import Web3
@@ -137,27 +137,6 @@ def approveAmt(amt):
     logger.info("dispense: done")
 
 
-@enforce_types
-def dispense_passive(web3, ocean, feedistributor, amount: Union[float, int]):
-    amount_wei = to_wei(amount)
-    transfer_data = ocean.contract.encodeABI(
-        fn_name="transfer", args=[feedistributor.address, amount_wei]
-    )
-
-    checkpoint_total_supply_data = feedistributor.contract.encodeABI(
-        fn_name="checkpoint_total_supply"
-    )
-    checkpoint_token_data = feedistributor.contract.encodeABI(
-        fn_name="checkpoint_token"
-    )
-
-    multisig_addr = chain_id_to_multisig_addr(web3.eth.chain_id)
-    send_multisig_tx(multisig_addr, web3, ocean.address, 0, transfer_data)
-
-    for data in [checkpoint_total_supply_data, checkpoint_token_data]:
-        send_multisig_tx(multisig_addr, web3, feedistributor.address, 0, data)
-
-
 @enforce_types
 def multisig_transfer_tokens(web3, ocean, receiver_address, amount):
     amount_wei = to_wei(amount)

df_py/util/dftool_module.py

@@ -7,7 +7,6 @@
 
 import pytest
 from enforce_typing import enforce_types
-from web3.main import Web3
 
 from df_py.predictoor.csvs import (
     load_predictoor_data_csv,
@@ -19,12 +18,10 @@
 )
 from df_py.predictoor.models import PredictContract
 from df_py.predictoor.predictoor_testutil import create_mock_responses
-from df_py.util import dftool_module, dispense, networkutil, oceantestutil, oceanutil
+from df_py.util import dftool_module, networkutil, oceantestutil, oceanutil
 from df_py.util.base18 import from_wei, to_wei
-from df_py.util.constants import PREDICTOOR_OCEAN_BUDGET
 from df_py.util.contract_base import ContractBase
 from df_py.util.dftool_module import do_predictoor_data
-from df_py.util.oceanutil import FeeDistributor, OCEAN_token
 from df_py.volume import csvs
 
 PREV, DFTOOL_ACCT = {}, None
@@ -716,52 +713,6 @@ def test_chain_info():
         dftool_module.do_chain_info()
 
 
-def test_dispense_passive():
-    sys_argv = [
-        "dftool",
-        "dispense_passive",
-        str(networkutil.DEV_CHAINID),
-        "0",
-        "2023-02-02",
-    ]
-
-    with patch.object(dftool_module, "retry_function") as mock:
-        with sysargs_context(sys_argv):
-            dftool_module.do_dispense_passive()
-
-    # pylint: disable=comparison-with-callable
-    assert mock.call_args[0][0] == dispense.dispense_passive
-    assert isinstance(mock.call_args[0][3], Web3)
-    assert mock.call_args[0][4].name() == "Ocean Token"
-    assert mock.call_args[0][4].address == OCEAN_token(networkutil.DEV_CHAINID).address
-    assert (
-        mock.call_args[0][5].address == FeeDistributor(networkutil.DEV_CHAINID).address
-    )
-    assert mock.call_args[0][6] == 0
-
-
-def test_dispense_predictoor():
-    sys_argv = [
-        "dftool",
-        "fund_predictoor_ocean_dispenser",
-        str(networkutil.DEV_CHAINID),
-        "0x0000000000000000000000000000000000000001",
-        "2023-11-20",
-    ]
-
-    with patch.object(dftool_module, "retry_function") as mock:
-        with sysargs_context(sys_argv):
-            dftool_module.do_fund_predictoor_ocean_dispenser()
-
-    # pylint: disable=comparison-with-callable
-    assert mock.call_args[0][0] == dispense.multisig_transfer_tokens
-    assert isinstance(mock.call_args[0][3], Web3)
-    assert mock.call_args[0][4].name() == "Ocean Token"
-    assert mock.call_args[0][4].address == OCEAN_token(networkutil.DEV_CHAINID).address
-    assert mock.call_args[0][5] == "0x0000000000000000000000000000000000000001"
-    assert mock.call_args[0][6] == PREDICTOOR_OCEAN_BUDGET
-
-
 @enforce_types
 def setup_function():
     global DFTOOL_ACCT

df_py/util/dispense.py

@@ -98,16 +98,6 @@ def test_batch_number(w3):
     assert df_rewards.claimable(accounts[batch_size + 2], token.address) == 0
 
 
-def test_dispense_passive(w3):
-    fee_distributor = oceanutil.FeeDistributor(networkutil.DEV_CHAINID)
-    OCEAN = oceanutil.OCEAN_token(networkutil.DEV_CHAINID)
-    with patch("df_py.util.dispense.chain_id_to_multisig_addr"):
-        with patch("df_py.util.dispense.send_multisig_tx") as mock:
-            dispense.dispense_passive(w3, OCEAN, fee_distributor, 1)
-
-    assert mock.call_count == 3
-
-
 def test_multisig_transfer_tokens(w3):
     OCEAN = oceanutil.OCEAN_token(networkutil.DEV_CHAINID)
     with patch("df_py.util.dispense.chain_id_to_multisig_addr"):