diff --git a/contracts/math/Math.sol b/contracts/math/Math.sol index 0292f5180..101b35d49 100644 --- a/contracts/math/Math.sol +++ b/contracts/math/Math.sol @@ -13,4 +13,9 @@ library Math { function min(uint256 _a, uint256 _b) internal pure returns (uint256) { return _a < _b ? _a : _b; } + + function average(uint256 _a, uint256 _b) internal pure returns (uint256) { + // (_a + _b) / 2 can overflow, so we distribute + return (_a / 2) + (_b / 2) + ((_a % 2 + _b % 2) / 2); + } } diff --git a/contracts/mocks/MathMock.sol b/contracts/mocks/MathMock.sol index 087ccf142..53f61a5f6 100644 --- a/contracts/mocks/MathMock.sol +++ b/contracts/mocks/MathMock.sol @@ -12,4 +12,8 @@ contract MathMock { function min(uint256 _a, uint256 _b) public pure returns (uint256) { return Math.min(_a, _b); } + + function average(uint256 _a, uint256 _b) public pure returns (uint256) { + return Math.average(_a, _b); + } } diff --git a/test/library/Math.test.js b/test/library/Math.test.js index ae1a16770..5076461b9 100644 --- a/test/library/Math.test.js +++ b/test/library/Math.test.js @@ -37,4 +37,28 @@ contract('Math', function () { result.should.be.bignumber.equal(min); }); }); + + describe('average', function () { + function bnAverage (a, b) { + return a.plus(b).div(2).truncated(); + } + + it('is correctly calculated with two odd numbers', async function () { + const a = new BigNumber(57417); + const b = new BigNumber(95431); + (await this.math.average(a, b)).should.be.bignumber.equal(bnAverage(a, b)); + }); + + it('is correctly calculated with two even numbers', async function () { + const a = new BigNumber(42304); + const b = new BigNumber(84346); + (await this.math.average(a, b)).should.be.bignumber.equal(bnAverage(a, b)); + }); + + it('is correctly calculated with one even and one odd number', async function () { + const a = new BigNumber(57417); + const b = new BigNumber(84346); + (await this.math.average(a, b)).should.be.bignumber.equal(bnAverage(a, b)); + }); + }); });