Merge branch 'develop' into move_eth_utils_to_evm

smartcontractkit · Dec 19, 2023 · 1d624c3 · 1d624c3
2 parents 30cf8c6 + 0e5b219
commit 1d624c3
Show file tree

Hide file tree

Showing 45 changed files with 972 additions and 256 deletions.
diff --git a/.github/workflows/automation-load-tests.yml b/.github/workflows/automation-load-tests.yml
@@ -22,6 +22,10 @@ on:
         description: TestInputs
         required: false
         type: string
+      ConfigOverride:
+        description: ConfigOverride
+        required: false
+        type: string
       slackMemberID:
         description: Notifies test results (Not your @)
         required: true
@@ -43,6 +47,7 @@ jobs:
       SLACK_API_KEY: ${{ secrets.QA_SLACK_API_KEY }}
       SLACK_CHANNEL: C03KJ5S7KEK
       TEST_INPUTS: ${{ inputs.TestInputs }}
+      CONFIG_OVERRIDE: ${{ inputs.ConfigOverride }}
       CHAINLINK_ENV_USER: ${{ github.actor }}
       REF_NAME: ${{ github.head_ref || github.ref_name }}
     steps:

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -407,8 +407,6 @@ jobs:
             pyroscope_env: ci-smoke-vrf-evm-simulated
           - name: vrfv2
             nodes: 1
-            run: -run TestVRFv2MultipleSendingKeys
-            file: vrfv2            
             os: ubuntu-latest
             pyroscope_env: ci-smoke-vrf2-evm-simulated
           - name: vrfv2plus

diff --git a/.github/workflows/live-testnet-tests.yml b/.github/workflows/live-testnet-tests.yml
@@ -10,7 +10,7 @@
 name: Live Testnet Tests
 on:
   schedule:
-    - cron: "0 0 * * *" # Run every Sunday at midnight
+    - cron: "0 5 * * *" # Run every Sunday at midnight EST
   push:
     tags:
       - "*"
@@ -144,7 +144,7 @@ jobs:
       id-token: write
       contents: read
     runs-on: ubuntu-latest
-    needs: [sepolia-smoke-tests, bsc-testnet-tests, optimism-sepolia-smoke-tests, arbitrum-sepolia-smoke-tests, base-goerli-smoke-tests, base-sepolia-smoke-tests, polygon-mumbai-smoke-tests, avalanche-fuji-smoke-tests, fantom-testnet-smoke-tests, celo-alfajores-smoke-tests, scroll-sepolia-smoke-tests, linea-goerli-smoke-tests]
+    needs: [sepolia-smoke-tests, bsc-testnet-tests, optimism-sepolia-smoke-tests, arbitrum-sepolia-smoke-tests, base-goerli-smoke-tests, base-sepolia-smoke-tests, polygon-mumbai-smoke-tests, avalanche-fuji-smoke-tests, fantom-testnet-smoke-tests, celo-alfajores-smoke-tests, linea-goerli-smoke-tests]
     steps:
       - name: Debug Result
         run: echo ${{ join(needs.*.result, ',') }}
@@ -205,7 +205,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        network: [Sepolia, Optimism Sepolia, Arbitrum Sepolia, Base Goerli, Base Sepolia, Polygon Mumbai, Avalanche Fuji, Fantom Testnet, Celo Alfajores, Scroll Sepolia, Linea Goerli, BSC Testnet]
+        network: [Sepolia, Optimism Sepolia, Arbitrum Sepolia, Base Goerli, Base Sepolia, Polygon Mumbai, Avalanche Fuji, Fantom Testnet, Celo Alfajores, Linea Goerli, BSC Testnet]
     steps:
       - name: Get Results
         id: test-results
@@ -775,8 +775,10 @@ jobs:
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
           QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
-      
+
   scroll-sepolia-smoke-tests:
+    # TODO: Disabled until bug TT-767 is fixed
+    if: false
     environment: integration
     permissions:
       checks: write

diff --git a/contracts/src/v0.8/automation/testhelpers/SimpleLogUpkeepCounter.sol b/contracts/src/v0.8/automation/testhelpers/SimpleLogUpkeepCounter.sol
@@ -4,6 +4,12 @@ pragma solidity 0.8.6;
 
 import {ILogAutomation, Log} from "../interfaces/ILogAutomation.sol";
 
+struct CheckData {
+  uint256 checkBurnAmount;
+  uint256 performBurnAmount;
+  bytes32 eventSig;
+}
+
 contract SimpleLogUpkeepCounter is ILogAutomation {
   event PerformingUpkeep(
     address indexed from,
@@ -14,6 +20,7 @@ contract SimpleLogUpkeepCounter is ILogAutomation {
     uint256 timeToPerform
   );
 
+  mapping(bytes32 => bool) public dummyMap; // used to force storage lookup
   uint256 public lastBlock;
   uint256 public previousPerformBlock;
   uint256 public initialBlock;
@@ -27,8 +34,27 @@ contract SimpleLogUpkeepCounter is ILogAutomation {
     counter = 0;
   }
 
-  function checkLog(Log calldata log, bytes memory) external view override returns (bool, bytes memory) {
-    return (true, abi.encode(log));
+  function _checkDataConfig(CheckData memory) external {}
+
+  function checkLog(Log calldata log, bytes calldata checkData) external view override returns (bool, bytes memory) {
+    (uint256 checkBurnAmount, uint256 performBurnAmount, bytes32 eventSig) = abi.decode(
+      checkData,
+      (uint256, uint256, bytes32)
+    );
+    uint256 startGas = gasleft();
+    bytes32 dummyIndex = blockhash(block.number - 1);
+    bool dummy;
+    // burn gas
+    if (checkBurnAmount > 0) {
+      while (startGas - gasleft() < checkBurnAmount) {
+        dummy = dummy && dummyMap[dummyIndex]; // arbitrary storage reads
+        dummyIndex = keccak256(abi.encode(dummyIndex, address(this)));
+      }
+    }
+    if (log.topics[2] == eventSig) {
+      return (true, abi.encode(log, checkData));
+    }
+    return (false, abi.encode(log, checkData));
   }
 
   function performUpkeep(bytes calldata performData) external override {
@@ -38,8 +64,22 @@ contract SimpleLogUpkeepCounter is ILogAutomation {
     lastBlock = block.number;
     counter = counter + 1;
     previousPerformBlock = lastBlock;
-    Log memory log = abi.decode(performData, (Log));
+    (Log memory log, bytes memory extraData) = abi.decode(performData, (Log, bytes));
     timeToPerform = block.timestamp - log.timestamp;
+    (uint256 checkBurnAmount, uint256 performBurnAmount, bytes32 eventSig) = abi.decode(
+      extraData,
+      (uint256, uint256, bytes32)
+    );
+    uint256 startGas = gasleft();
+    bytes32 dummyIndex = blockhash(block.number - 1);
+    bool dummy;
+    // burn gas
+    if (performBurnAmount > 0) {
+      while (startGas - gasleft() < performBurnAmount) {
+        dummy = dummy && dummyMap[dummyIndex]; // arbitrary storage reads
+        dummyIndex = keccak256(abi.encode(dummyIndex, address(this)));
+      }
+    }
     emit PerformingUpkeep(tx.origin, initialBlock, lastBlock, previousPerformBlock, counter, timeToPerform);
   }
 }
diff --git a/contracts/src/v0.8/tests/LogEmitter.sol b/contracts/src/v0.8/tests/LogEmitter.sol
@@ -5,6 +5,7 @@ contract LogEmitter {
   event Log1(uint256);
   event Log2(uint256 indexed);
   event Log3(string);
+  event Log4(uint256 indexed, uint256 indexed);
 
   function EmitLog1(uint256[] memory v) public {
     for (uint256 i = 0; i < v.length; i++) {
@@ -23,4 +24,10 @@ contract LogEmitter {
       emit Log3(v[i]);
     }
   }
+
+  function EmitLog4(uint256 v, uint256 w, uint256 c) public {
+    for (uint256 i = 0; i < c; i++) {
+      emit Log4(v, w);
+    }
+  }
 }
diff --git a/core/chains/evm/headtracker/head_broadcaster_test.go b/core/chains/evm/headtracker/head_broadcaster_test.go
@@ -12,8 +12,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
-	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
-
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox/mailboxtest"
 	commonhtrk "github.com/smartcontractkit/chainlink/v2/common/headtracker"
 	commonmocks "github.com/smartcontractkit/chainlink/v2/common/types/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
@@ -73,7 +72,7 @@ func TestHeadBroadcaster_Subscribe(t *testing.T) {
 
 	orm := headtracker.NewORM(db, logger, cfg.Database(), *ethClient.ConfiguredChainID())
 	hs := headtracker.NewHeadSaver(logger, orm, evmCfg.EVM(), evmCfg.EVM().HeadTracker())
-	mailMon := mailbox.NewMonitor(t.Name())
+	mailMon := mailboxtest.NewMonitor(t)
 	servicetest.Run(t, mailMon)
 	hb := headtracker.NewHeadBroadcaster(logger)
 	servicetest.Run(t, hb)

diff --git a/core/chains/evm/headtracker/head_tracker_test.go b/core/chains/evm/headtracker/head_tracker_test.go
@@ -23,6 +23,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox/mailboxtest"
 
 	commonmocks "github.com/smartcontractkit/chainlink/v2/common/types/mocks"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
@@ -994,7 +995,7 @@ func createHeadTracker(t *testing.T, ethClient evmclient.Client, config headtrac
 	lggr := logger.Test(t)
 	hb := headtracker.NewHeadBroadcaster(lggr)
 	hs := headtracker.NewHeadSaver(lggr, orm, config, htConfig)
-	mailMon := mailbox.NewMonitor(t.Name())
+	mailMon := mailboxtest.NewMonitor(t)
 	return &headTrackerUniverse{
 		mu:              new(sync.Mutex),
 		headTracker:     headtracker.NewHeadTracker(lggr, ethClient, config, htConfig, hb, hs, mailMon),
@@ -1009,7 +1010,7 @@ func createHeadTrackerWithNeverSleeper(t *testing.T, ethClient evmclient.Client,
 	lggr := logger.Test(t)
 	hb := headtracker.NewHeadBroadcaster(lggr)
 	hs := headtracker.NewHeadSaver(lggr, orm, evmcfg.EVM(), evmcfg.EVM().HeadTracker())
-	mailMon := mailbox.NewMonitor(t.Name())
+	mailMon := mailboxtest.NewMonitor(t)
 	ht := headtracker.NewHeadTracker(lggr, ethClient, evmcfg.EVM(), evmcfg.EVM().HeadTracker(), hb, hs, mailMon)
 	_, err := hs.Load(testutils.Context(t))
 	require.NoError(t, err)
@@ -1027,7 +1028,7 @@ func createHeadTrackerWithChecker(t *testing.T, ethClient evmclient.Client, conf
 	hb := headtracker.NewHeadBroadcaster(lggr)
 	hs := headtracker.NewHeadSaver(lggr, orm, config, htConfig)
 	hb.Subscribe(checker)
-	mailMon := mailbox.NewMonitor(t.Name())
+	mailMon := mailboxtest.NewMonitor(t)
 	ht := headtracker.NewHeadTracker(lggr, ethClient, config, htConfig, hb, hs, mailMon)
 	return &headTrackerUniverse{
 		mu:              new(sync.Mutex),

diff --git a/core/chains/evm/log/helpers_test.go b/core/chains/evm/log/helpers_test.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
-	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox/mailboxtest"
 
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
@@ -90,7 +90,7 @@ func newBroadcasterHelperWithEthClient(t *testing.T, ethClient evmclient.Client,
 	})
 	config := evmtest.NewChainScopedConfig(t, globalConfig)
 	lggr := logger.Test(t)
-	mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
+	mailMon := servicetest.Run(t, mailboxtest.NewMonitor(t))
 
 	db := pgtest.NewSqlxDB(t)
 	orm := log.NewORM(db, lggr, config.Database(), cltest.FixtureChainID)

diff --git a/core/chains/evm/log/integration_test.go b/core/chains/evm/log/integration_test.go
@@ -18,7 +18,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
-	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox/mailboxtest"
 
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
@@ -1326,7 +1326,7 @@ func TestBroadcaster_AppendLogChannel(t *testing.T) {
 	ch3 := make(chan types.Log)
 
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
-	mailMon := servicetest.RunHealthy(t, mailbox.NewMonitor(t.Name()))
+	mailMon := servicetest.RunHealthy(t, mailboxtest.NewMonitor(t))
 	lb := log.NewBroadcaster(nil, ethClient, nil, logger.Test(t), nil, mailMon)
 	chCombined := lb.ExportedAppendLogChannel(ch1, ch2)
 	chCombined = lb.ExportedAppendLogChannel(chCombined, ch3)

diff --git a/core/cmd/shell.go b/core/cmd/shell.go
@@ -154,7 +154,7 @@ func (n ChainlinkAppFactory) NewApplication(ctx context.Context, cfg chainlink.G
 	}
 
 	keyStore := keystore.New(db, utils.GetScryptParams(cfg), appLggr, cfg.Database())
-	mailMon := mailbox.NewMonitor(cfg.AppID().String())
+	mailMon := mailbox.NewMonitor(cfg.AppID().String(), appLggr.Named("Mailbox"))
 
 	dbListener := cfg.Database().Listener()
 	eventBroadcaster := pg.NewEventBroadcaster(cfg.Database().URL(), dbListener.MinReconnectInterval(), dbListener.MaxReconnectDuration(), appLggr, cfg.AppID())