Code

Remove ERC1155 hooks#3876

Code

Merged

Amxx merged 31 commits intoOpenZeppelin:next-v5.0OpenZeppelin/openzeppelin-contracts:next-v5.0from JulissaDantes:refactor/erc1155-mint-transfer-burnJulissaDantes/openzeppelin-contracts:refactor/erc1155-mint-transfer-burnCopy head branch name to clipboardJan 10, 2023

+79-193

Commits

Commits on Dec 1, 2022

• update _safeTransferFrom

  JulissaDantes

  committed
  3a66f1f

  Copy full SHA for 3a66f1f

• update tests

  JulissaDantes

  committed
  7a69513

  Copy full SHA for 7a69513

• Remove hooks

  JulissaDantes

  committed
  422224e

  Copy full SHA for 422224e

Commits on Dec 5, 2022

• update extensions

  JulissaDantes

  committed
  e505779

  Copy full SHA for e505779

Commits on Dec 13, 2022

• Update mocks

  JulissaDantes

  committed
  79884e6

  Copy full SHA for 79884e6

• Introduce _update and _updateBatch

  JulissaDantes

  committed
  96467b7

  Copy full SHA for 96467b7

• Add changelog entry

  JulissaDantes

  committed
  293d0ee

  Copy full SHA for 293d0ee

• Update test

  JulissaDantes

  committed
  f84a858

  Copy full SHA for f84a858

Commits on Dec 16, 2022

• Merge branch 'next-v5.0' into refactor/erc1155-mint-transfer-burn

  JulissaDantes

  committed
  ba79c16

  Copy full SHA for ba79c16

Commits on Dec 19, 2022

• update extension

  JulissaDantes

  committed
  0eb70ac

  Copy full SHA for 0eb70ac

• Merge branch 'master' into next-v5.0

  JulissaDantes

  committed
  21279a9

  Copy full SHA for 21279a9

• Merge branch 'next-v5.0' into refactor/erc1155-mint-transfer-burn

  JulissaDantes

  committed
  4469254

  Copy full SHA for 4469254

• fix post merge error

  JulissaDantes

  committed
  bd0f915

  Copy full SHA for bd0f915

• update changelog

  JulissaDantes

  committed
  11a8d92

  Copy full SHA for 11a8d92

Commits on Dec 20, 2022

• Remove updateBatch

  JulissaDantes

  committed
  7c8b929

  Copy full SHA for 7c8b929

• Update ERC1155

  JulissaDantes

  committed
  a9799ae

  Copy full SHA for a9799ae

• Merge branch 'next-v5.0' into refactor/erc1155-mint-transfer-burn

  JulissaDantes

  authored
  b21c37d

  Copy full SHA for b21c37d

Commits on Dec 27, 2022

• Check non zero address as attribute

  JulissaDantes

  committed
  4e513b6

  Copy full SHA for 4e513b6

• Merge branch 'refactor/erc1155-mint-transfer-burn' of https://github.com/JulissaDantes/openzeppelin-contracts into refactor/erc1155-mint-transfer-burn

  JulissaDantes

  committed
  de3ad93

  Copy full SHA for de3ad93

Commits on Jan 6, 2023

• Update contracts/token/ERC1155/ERC1155.sol

  Show description for 48080eb
  

  JulissaDantes

  and

  Amxx

  authored
  48080eb

  Copy full SHA for 48080eb

• Update contracts/token/ERC1155/ERC1155.sol

  Show description for c1ee9ce
  

  JulissaDantes

  and

  Amxx

  authored
  c1ee9ce

  Copy full SHA for c1ee9ce

• update test error message

  JulissaDantes

  committed
  93345da

  Copy full SHA for 93345da

• Resolve conflicts

  JulissaDantes

  committed
  da263d6

  Copy full SHA for da263d6

• run lint

  JulissaDantes

  committed
  8b11286

  Copy full SHA for 8b11286

• fix lint

  Amxx

  committed
  d248351

  Copy full SHA for d248351

Commits on Jan 9, 2023

• Update contracts/mocks/ERC1155PausableMock.sol

  Show description for 826e2ed
  

  JulissaDantes

  and

  Amxx

  authored
  826e2ed

  Copy full SHA for 826e2ed

• Update contracts/mocks/ERC1155SupplyMock.sol

  Show description for 0061bb7
  

  JulissaDantes

  and

  Amxx

  authored
  0061bb7

  Copy full SHA for 0061bb7

• Update package-lock.json

  Show description for 4b040e2
  

  JulissaDantes

  and

  Amxx

  authored
  4b040e2

  Copy full SHA for 4b040e2

• Update contracts/token/ERC1155/ERC1155.sol

  Show description for c338f9c
  

  JulissaDantes

  and

  frangio

  authored
  c338f9c

  Copy full SHA for c338f9c

• Update contracts/token/ERC1155/ERC1155.sol

  Show description for 943993c
  

  JulissaDantes

  and

  frangio

  authored
  943993c

  Copy full SHA for 943993c

• Update contracts/token/ERC1155/ERC1155.sol

  Show description for 276a20f
  

  JulissaDantes

  and

  frangio

  authored
  276a20f

  Copy full SHA for 276a20f