Code

Escrows#1014

Code

Merged

frangio merged 15 commits intoOpenZeppelin:masterOpenZeppelin/openzeppelin-contracts:masterfrom nventuro:feat/escrownventuro/openzeppelin-contracts:feat/escrowCopy head branch name to clipboardJul 3, 2018

+490-207

Commits

Commits on Jun 15, 2018

• Added basic Escrow

  nventuro

  committed
  2d2075a

  Copy full SHA for 2d2075a

• PullPayment now uses an Escrow, removing all trust from the contract

  nventuro

  committed
  b879f4c

  Copy full SHA for b879f4c

• Abstracted the Escrow tests to a behaviour

  nventuro

  committed
  48b64ce

  Copy full SHA for 48b64ce

• Added ConditionalEscrow

  nventuro

  committed
  3600240

  Copy full SHA for 3600240

• Added RefundableEscrow.

  nventuro

  committed
  fe63f2e

  Copy full SHA for fe63f2e

Commits on Jun 16, 2018

• RefundableCrowdsale now uses a RefundEscrow, removed RefundVault.

  nventuro

  committed
  3a33ffb

  Copy full SHA for 3a33ffb

Commits on Jun 18, 2018

• Merge branch 'master' into feat/escrow

  nventuro

  committed
  d389fd3

  Copy full SHA for d389fd3

• Renaming after code review.

  nventuro

  committed
  e01edb3

  Copy full SHA for e01edb3

• Added log test helper.

  nventuro

  committed
  5dfb9ce

  Copy full SHA for 5dfb9ce

• Now allowing empty deposits and withdrawals.

  nventuro

  committed
  6166248

  Copy full SHA for 6166248

• Style fixes.

  nventuro

  committed
  cd84c37

  Copy full SHA for cd84c37

• Minor review comments.

  nventuro

  committed
  dabb3d7

  Copy full SHA for dabb3d7

Commits on Jun 19, 2018

• Add Deposited and Withdrawn events, removed Refunded

  nventuro

  committed
  4422858

  Copy full SHA for 4422858

Commits on Jul 2, 2018

• The base Escrow is now Ownable, users of it (owners) must provide methods to access it.

  nventuro

  committed
  be8d65f

  Copy full SHA for be8d65f

Commits on Jul 3, 2018

• Merge branch 'master' into feat/escrow

  frangio

  authored
  597aba7

  Copy full SHA for 597aba7