Code

Add ERC1363 implementation#4631

Code

Merged

Amxx merged 96 commits intoOpenZeppelin:masterOpenZeppelin/openzeppelin-contracts:masterfrom vittominacori:feat/eip1363-v5.xvittominacori/zeppelin-solidity:feat/eip1363-v5.xCopy head branch name to clipboardJan 24, 2024

+1,227-215

Commits

Commits on Sep 27, 2023

• Add ERC1363 contracts

  vittominacori

  committed
  84fe15d

  Copy full SHA for 84fe15d

• Add ERC1363 tests

  vittominacori

  committed
  67d6fcd

  Copy full SHA for 67d6fcd

• Add changeset

  vittominacori

  committed
  4cbb703

  Copy full SHA for 4cbb703

• Improve documentation

  vittominacori

  committed
  fdd322b

  Copy full SHA for fdd322b

• Add ERC1363Holder

  vittominacori

  committed
  f8bd003

  Copy full SHA for f8bd003

• Update changeset

  vittominacori

  committed
  381387c

  Copy full SHA for 381387c

Commits on Sep 29, 2023

• Merge branch 'master' of https://github.com/OpenZeppelin/openzeppelin-contracts into feat/eip1363-v5.x

  vittominacori

  committed
  83baa53

  Copy full SHA for 83baa53

• Move mint out of test behavior and rename const to avoid confusion

  vittominacori

  committed
  a07c77c

  Copy full SHA for a07c77c

Commits on Oct 5, 2023

• migrate Ownable tests to ethers

  Amxx

  committed
  cf3c377

  Copy full SHA for cf3c377

• fix lint

  Amxx

  committed
  673ff79

  Copy full SHA for 673ff79

• Update hardhat.config.js

  Amxx

  authored
  c9b4e8d

  Copy full SHA for c9b4e8d

• add Ownable2Step

  Amxx

  committed
  c46a45e

  Copy full SHA for c46a45e

• remove deploy helper

  Amxx

  committed
  328a344

  Copy full SHA for 328a344

• add deprecation notices

  Amxx

  committed
  7c12232

  Copy full SHA for 7c12232

• up

  Amxx

  committed
  517ad87

  Copy full SHA for 517ad87

• up

  Amxx

  committed
  9002e5f

  Copy full SHA for 9002e5f

Commits on Oct 6, 2023

• Merge branch 'master' of https://github.com/OpenZeppelin/openzeppelin-contracts into feat/eip1363-v5.x

  vittominacori

  committed
  16731a9

  Copy full SHA for 16731a9

• Rename wrong file

  vittominacori

  committed
  89ab4c9

  Copy full SHA for 89ab4c9

• remove .address when doing ethers call that support addressable

  Amxx

  committed
  74558f8

  Copy full SHA for 74558f8

• Update pragma to 0.8.20

  vittominacori

  committed
  0e6e84c

  Copy full SHA for 0e6e84c

Commits on Oct 10, 2023

• Fix flaky test in ERC2981.behavior

  ernestognw

  committed
  9ea2db1

  Copy full SHA for 9ea2db1

• Update test/access/Ownable.test.js

  Amxx

  authored
  fd7100a

  Copy full SHA for fd7100a

• Update test/access/Ownable.test.js

  Show description for 1a9a046
  

  Amxx

  and

  ernestognw

  authored
  1a9a046

  Copy full SHA for 1a9a046

• Fix lint

  ernestognw

  committed
  b569ca8

  Copy full SHA for b569ca8

• Fix upgradeable tests

  ernestognw

  committed
  b24fec4

  Copy full SHA for b24fec4

• redesign signers/fixture

  Amxx

  committed
  5e96021

  Copy full SHA for 5e96021

• Fix vanilla tests by overriding require and readArtifact with sync and async functions respectively

  ernestognw

  committed
  f382329

  Copy full SHA for f382329

• Revert "redesign signers/fixture"

  Show description for 95be46d
  Amxx

  committed
  95be46d

  Copy full SHA for 95be46d

• Optimize ethers.getSigners call by passing a promise to use within fixtures

  ernestognw

  committed
  55b0406

  Copy full SHA for 55b0406

Commits on Oct 11, 2023

• Slice ethers accounts

  ernestognw

  committed
  e45e482

  Copy full SHA for e45e482

• rename

  Amxx

  committed
  b391c2f

  Copy full SHA for b391c2f

• override hre.ethers.getSigners

  Amxx

  committed
  74bab81

  Copy full SHA for 74bab81

• unify coding style/naming between env-contracts.js and env-artifacts.js

  Amxx

  committed
  98e5ecd

  Copy full SHA for 98e5ecd

Commits on Oct 12, 2023

• Attempt to fix tests by avoid overriding this in Truffle require

  ernestognw

  committed
  4db1800

  Copy full SHA for 4db1800

• Revert "Attempt to fix tests by avoid overriding this in Truffle require"

  Show description for 0a8a69d
  Amxx

  committed
  0a8a69d

  Copy full SHA for 0a8a69d

• Merge branch 'master' into test/migration/ownable

  Amxx

  authored
  ec3bfc5

  Copy full SHA for ec3bfc5

• Force compile on upgradeable and coverage workflows

  Amxx

  committed
  5d5a150

  Copy full SHA for 5d5a150

Commits on Oct 13, 2023

• use cached getSigners() in fixtures

  Amxx

  committed
  300fa1e

  Copy full SHA for 300fa1e

• use describe instead of contract for ethers test that don't need the snapshot

  Amxx

  committed
  ae4381e

  Copy full SHA for ae4381e

Commits on Oct 16, 2023

• add enviornment sanity check

  Amxx

  committed
  b02770e

  Copy full SHA for b02770e

• skip signer slice when running coverage

  Amxx

  committed
  4e6a1ca

  Copy full SHA for 4e6a1ca

• up

  Amxx

  committed
  69b91a0

  Copy full SHA for 69b91a0

Commits on Oct 17, 2023

• Move non standardized error definition to the implementation file

  Show description for 5162e98
  Amxx

  committed
  5162e98

  Copy full SHA for 5162e98

• Add "relaxed" helpers for ERC1363 in SafeERC20

  Amxx

  committed
  2668934

  Copy full SHA for 2668934

• Merge branch 'test/migration/ownable' into feat/eip1363-v5.x

  Amxx

  committed
  5b84827

  Copy full SHA for 5b84827

• Merge branch 'master' of https://github.com/OpenZeppelin/openzeppelin-contracts into feat/eip1363-v5.x

  vittominacori

  committed
  da0d4ff

  Copy full SHA for da0d4ff

• rewrite tests using ethers

  Amxx

  committed
  f269fa7

  Copy full SHA for f269fa7

• Merge branch 'master' into feat/eip1363-v5.x

  Amxx

  committed
  8a4cae5

  Copy full SHA for 8a4cae5

• Remove ERC1363 Spender and Receiver interface from introspection test

  vittominacori

  committed
  46858a7

  Copy full SHA for 46858a7

• addapt erc165 verification to ethers

  Amxx

  committed
  c07c414

  Copy full SHA for c07c414

• Add a test to check that events are emitted

  vittominacori

  committed
  24e8e89

  Copy full SHA for 24e8e89

• minor fixes

  Amxx

  committed
  f781db4

  Copy full SHA for f781db4

• Merge branch 'feat/eip1363-v5.x' of https://github.com/vittominacori/zeppelin-solidity into feat/eip1363-v5.x

  Amxx

  committed
  17b697b

  Copy full SHA for 17b697b

• migrate ERC1363Holder test to ethers + lint:fix

  Amxx

  committed
  80930e8

  Copy full SHA for 80930e8

• improve SupportInterface.behavior.js

  Amxx

  committed
  a844207

  Copy full SHA for a844207

• codespell

  Amxx

  committed
  178ff7d

  Copy full SHA for 178ff7d

• test SafeERC20 relaxed functions

  Amxx

  committed
  34a7a8d

  Copy full SHA for 34a7a8d

• fix lint

  Amxx

  committed
  7fde72d

  Copy full SHA for 7fde72d

• Apply suggestions from code review

  Show description for 5ec39cb
  

  Amxx

  and

  ernestognw

  authored
  5ec39cb

  Copy full SHA for 5ec39cb

• remove ERC1363Holder

  Amxx

  committed
  eb0fb78

  Copy full SHA for eb0fb78

• add changeset

  Amxx

  committed
  b893eec

  Copy full SHA for b893eec

Commits on Oct 18, 2023

• Fix documentation reference

  vittominacori

  committed
  e137121

  Copy full SHA for e137121

Commits on Oct 20, 2023

• Use external instead of public in mock (as it is in interface)

  vittominacori

  committed
  07bdbfd

  Copy full SHA for 07bdbfd

Commits on Oct 26, 2023

• Typo

  vittominacori

  committed
  4440345

  Copy full SHA for 4440345

Commits on Oct 27, 2023

• Update contracts/interfaces/IERC1363Spender.sol

  Show description for 3dff6e2
  

  vittominacori

  and

  Amxx

  authored
  3dff6e2

  Copy full SHA for 3dff6e2

• Merge branch 'master' of https://github.com/OpenZeppelin/openzeppelin-contracts into feat/eip1363-v5.x

  Show description for c2f27c8
  vittominacori

  committed
  c2f27c8

  Copy full SHA for c2f27c8

• Apply suggestions from code review

  Show description for 81d191f
  

  Amxx

  and

  ernestognw

  authored
  81d191f

  Copy full SHA for 81d191f

• test coverage

  Amxx

  committed
  c3fa314

  Copy full SHA for c3fa314

• lint

  Amxx

  committed
  09049d3

  Copy full SHA for 09049d3

Commits on Nov 14, 2023

• Merge branch 'master' of https://github.com/OpenZeppelin/openzeppelin-contracts into feat/eip1363-v5.x

  vittominacori

  committed
  0ac39e4

  Copy full SHA for 0ac39e4

Commits on Dec 8, 2023

• Merge branch 'master' of https://github.com/OpenZeppelin/openzeppelin-contracts into feat/eip1363-v5.x

  Show description for 341a687
  vittominacori

  committed
  341a687

  Copy full SHA for 341a687

Commits on Dec 15, 2023

• Merge branch 'master' into feat/eip1363-v5.x

  Amxx

  committed
  938a92b

  Copy full SHA for 938a92b

• re-enable shouldBehaveLikeERC20 + minor test cleanup

  Amxx

  committed
  924b50d

  Copy full SHA for 924b50d

• document the 1363 functions not passing the standardized tests

  Amxx

  committed
  7d5e66e

  Copy full SHA for 7d5e66e

• fix lint

  Amxx

  committed
  f0d3a17

  Copy full SHA for f0d3a17

Commits on Jan 2, 2024

• Merge branch 'master' into feat/eip1363-v5.x

  Amxx

  committed
  7629147

  Copy full SHA for 7629147

• fix merge

  Amxx

  committed
  8f7c2bf

  Copy full SHA for 8f7c2bf

• fix lint

  Amxx

  committed
  feb824e

  Copy full SHA for feb824e

• add notices

  Amxx

  committed
  af285c6

  Copy full SHA for af285c6

Commits on Jan 18, 2024

• Merge branch 'master' into feat/eip1363-v5.x

  Amxx

  committed
  08c8eff

  Copy full SHA for 08c8eff

• forge update

  Amxx

  committed
  d9cba07

  Copy full SHA for d9cba07

• Update .changeset/friendly-nails-push.md

  Amxx

  authored
  ed594f0

  Copy full SHA for ed594f0

• Merge branch 'master' into feat/eip1363-v5.x

  ernestognw

  committed
  72b0271

  Copy full SHA for 72b0271

• Optionally evaluate return value when calling ERC1363 using transferAndCallRelaxed

  ernestognw

  committed
  ab19eff

  Copy full SHA for ab19eff

• Apply review comments

  ernestognw

  committed
  5efabe6

  Copy full SHA for 5efabe6

Commits on Jan 19, 2024

• Update test/token/ERC20/utils/SafeERC20.test.js

  Show description for 07f1e4d
  

  Amxx

  and

  ernestognw

  authored
  07f1e4d

  Copy full SHA for 07f1e4d

• Update test/token/ERC20/utils/SafeERC20.test.js

  Show description for fb78a86
  

  Amxx

  and

  ernestognw

  authored
  fb78a86

  Copy full SHA for fb78a86

Commits on Jan 23, 2024

• check values

  Amxx

  committed
  8639885

  Copy full SHA for 8639885

• test SafeERC20 against non compliant ERC1363 tokens

  Amxx

  committed
  10f4d1d

  Copy full SHA for 10f4d1d

• lint

  Amxx

  committed
  327aca5

  Copy full SHA for 327aca5

• Nits

  ernestognw

  committed
  cba6a94

  Copy full SHA for cba6a94

• Add note for usdt-like approval requirements in approveAndCallRelaxed

  ernestognw

  committed
  6747cb8

  Copy full SHA for 6747cb8

• Moar nits

  ernestognw

  committed
  96551b0

  Copy full SHA for 96551b0

• Improve ERC1363 tests

  ernestognw

  committed
  54f06e7

  Copy full SHA for 54f06e7

• Fix codespell

  ernestognw

  committed
  12e2952

  Copy full SHA for 12e2952

Commits on Jan 24, 2024

• final cleanup (minimize changes)

  Amxx

  committed
  2c85474

  Copy full SHA for 2c85474