Merge pull request #2965 from smartcontractkit/feature/#172815482-med…

…ian-gas-limit

test flux aggregator default oracle gas limits

core/internal/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt

@@ -1,5 +1,5 @@
 GETH_VERSION: 1.9.12
-flux_aggregator_wrapper: ../../../evm-contracts/abi/v0.6/FluxAggregator.json f1e5411a1c2c97a2f14a986f158a752bb3a13cb410ffdd674a8dba1afb53cf67
+flux_aggregator_wrapper: ../../../evm-contracts/abi/v0.6/FluxAggregator.json 20e1368b958a1f79f1159b7fd6344bc5b2d6954f181ad39c6b67461357fe76f8
 link_token_interface: ./generation/../../../../evm-test-helpers/src/LinkToken.json a16bfa4690d25769959dd59034f03d101a46ecbf7e774a57ca6874f8352c8568
 solidity_request_id: ../../../evm-contracts/abi/v0.6/VRFRequestIDBaseTestHelper.json f0216e71d1bfeb6f85efe231e3ba9e751fb23b04b2a0d233b5edbd010d9488ec
 solidity_verifier_wrapper: ../../../evm-contracts/abi/v0.6/VRFTestHelper.json 1b1736395f3b4c1fb90eab2fcadd0529a0f093ccb279fda1d0759a7164ef5674

evm-contracts/src/v0.6/dev/FluxAggregator.sol

@@ -81,7 +81,7 @@ contract FluxAggregator is AggregatorInterface, Owned {
    * funds without the owner's intervention.)
    */
   uint256 constant private RESERVE_ROUNDS = 2;
-  uint256 constant private MAX_ORACLE_COUNT = 42;
+  uint256 constant private MAX_ORACLE_COUNT = 77;
 
   uint32 private reportingRoundId;
   uint32 internal latestRoundId;

evm-contracts/test/v0.6/FluxAggregator.test.ts

@@ -3,9 +3,9 @@ import {
   helpers as h,
   matchers,
   setup,
+  wallet,
 } from '@chainlink/test-helpers'
 import { assert } from 'chai'
-import { randomBytes } from 'crypto'
 import { ethers } from 'ethers'
 import { FluxAggregatorFactory } from '../../ethers/v0.6/FluxAggregatorFactory'
 import { FluxAggregatorTestHelperFactory } from '../../ethers/v0.6/FluxAggregatorTestHelperFactory'
@@ -1052,23 +1052,75 @@ describe('FluxAggregator', () => {
       })
     })
 
-    const limit = 42
+    const limit = 77
     describe(`when adding more than ${limit} oracles`, () => {
-      it('reverts', async () => {
+      let oracles: ethers.Wallet[]
+
+      beforeEach(async () => {
+        oracles = []
+        for (let i = 0; i < limit; i++) {
+          const account = await wallet.createWallet(provider, i + 100)
+          await personas.Default.sendTransaction({
+            to: account.address,
+            value: h.toWei('0.01'),
+          })
+          oracles.push(account)
+        }
+
         await link.transfer(
           aggregator.address,
           paymentAmount.mul(limit).mul(reserveRounds),
         )
         await aggregator.updateAvailableFunds()
 
+        let addresses = oracles.slice(0, 50).map(o => o.address)
+        await aggregator
+          .connect(personas.Carol)
+          .addOracles(addresses, addresses, 1, 50, rrDelay)
+        // add in two transactions to avoid gas limit issues
+        addresses = oracles.slice(50, 100).map(o => o.address)
+        await aggregator
+          .connect(personas.Carol)
+          .addOracles(addresses, addresses, 1, oracles.length, rrDelay)
+      })
+
+      it('not use too much gas', async () => {
+        let tx: any
+        assert.deepEqual(
+          // test adveserial quickselect algo
+          [2, 4, 6, 8, 10, 12, 14, 16, 1, 9, 5, 11, 3, 13, 7, 15],
+          adverserialQuickselectList(16),
+        )
+        const inputs = adverserialQuickselectList(limit)
         for (let i = 0; i < limit; i++) {
-          const minMax = i + 1
-          const fakeAddress = h.addHexPrefix(randomBytes(20).toString('hex'))
+          tx = await aggregator.connect(oracles[i]).submit(nextRound, inputs[i])
+        }
+        assert(!!tx)
+        if (tx) {
+          const receipt = await tx.wait()
+          assert.isAbove(400_000, receipt.gasUsed.toNumber())
+        }
+      })
 
-          await aggregator
-            .connect(personas.Carol)
-            .addOracles([fakeAddress], [fakeAddress], minMax, minMax, rrDelay)
+      function adverserialQuickselectList(len: number): number[] {
+        const xs: number[] = []
+        const pi: number[] = []
+        for (let i = 0; i < len; i++) {
+          pi[i] = i
+          xs[i] = 0
+        }
+
+        for (let l = len; l > 0; l--) {
+          const pivot = Math.floor((l - 1) / 2)
+          xs[pi[pivot]] = l
+          const temp = pi[l - 1]
+          pi[l - 1] = pi[pivot]
+          pi[pivot] = temp
         }
+        return xs
+      }
+
+      it('reverts when another oracle is added', async () => {
         await matchers.evmRevert(
           aggregator
             .connect(personas.Carol)