Code

Merge cairo-2#760

Code

Merged

martriay merged 105 commits intomainOpenZeppelin/cairo-contracts:mainfrom cairo-2OpenZeppelin/cairo-contracts:cairo-2Copy head branch name to clipboardSep 29, 2023

+11,808-15,819

Commits

Commits on Jan 20, 2023

• fix: link (#545)

  ericnordelo

  authored
  331844d

  Copy full SHA for 331844d

Commits on Feb 18, 2023

• add submodule

  andrew-fleming

  committed
  b9ec20b

  Copy full SHA for b9ec20b

• update cairo

  andrew-fleming

  committed
  bb40124

  Copy full SHA for bb40124

• add Cargo and Makefile

  andrew-fleming

  committed
  a0c3157

  Copy full SHA for a0c3157

• update cairo

  andrew-fleming

  committed
  3a6e20d

  Copy full SHA for 3a6e20d

• add deps in cairo_project, create lib

  andrew-fleming

  committed
  96431de

  Copy full SHA for 96431de

• add presets

  andrew-fleming

  committed
  7b38706

  Copy full SHA for 7b38706

• add base lib

  andrew-fleming

  committed
  2fa00dd

  Copy full SHA for 2fa00dd

• add tests

  andrew-fleming

  committed
  f0036e7

  Copy full SHA for f0036e7

• remove old cairo lib and interface

  andrew-fleming

  committed
  8d781a8

  Copy full SHA for 8d781a8

• remove unused import

  andrew-fleming

  committed
  ae37b1c

  Copy full SHA for ae37b1c

• fix vars

  andrew-fleming

  committed
  da57a91

  Copy full SHA for da57a91

• change external funcs to snake case

  andrew-fleming

  committed
  fd42fdd

  Copy full SHA for fd42fdd

• remove unused import

  andrew-fleming

  committed
  1cb1252

  Copy full SHA for 1cb1252

Commits on Feb 21, 2023

• update cairo

  andrew-fleming

  committed
  f0330cd

  Copy full SHA for f0330cd

• add tests for externals

  andrew-fleming

  committed
  abc737a

  Copy full SHA for abc737a

• add bool assertions

  andrew-fleming

  committed
  4ca2620

  Copy full SHA for 4ca2620

Commits on Feb 22, 2023

• update cairo

  andrew-fleming

  committed
  8dd8ed3

  Copy full SHA for 8dd8ed3

• remove preset mods

  andrew-fleming

  committed
  091a29c

  Copy full SHA for 091a29c

• add IERC20 trait

  andrew-fleming

  committed
  1c866f2

  Copy full SHA for 1c866f2

• update cairo

  andrew-fleming

  committed
  3405063

  Copy full SHA for 3405063

• clean up test

  andrew-fleming

  committed
  8fe3c82

  Copy full SHA for 8fe3c82

Commits on Feb 23, 2023

• remove assertion

  andrew-fleming

  committed
  ad928bc

  Copy full SHA for ad928bc

• update cairo

  andrew-fleming

  committed
  d883eb5

  Copy full SHA for d883eb5

• simplify max_u256

  andrew-fleming

  committed
  543501b

  Copy full SHA for 543501b

• clarify error msg

  andrew-fleming

  committed
  2ecba91

  Copy full SHA for 2ecba91

Commits on Mar 3, 2023

• add erc165 + tests

  martriay

  committed
  6c3978b

  Copy full SHA for 6c3978b

• kickstart account module

  martriay

  committed
  60365c8

  Copy full SHA for 60365c8

Commits on Mar 7, 2023

• clean up python project. ready for rust/cairo1

  martriay

  committed
  be1e9df

  Copy full SHA for be1e9df

• rebase to cairo-1

  martriay

  committed
  c20fd02

  Copy full SHA for c20fd02

• re-structure project

  martriay

  committed
  bce2506

  Copy full SHA for bce2506

Commits on Mar 8, 2023

• re-structure project

  martriay

  committed
  35ede09

  Copy full SHA for 35ede09

• re-structure project

  martriay

  committed
  e55889a

  Copy full SHA for e55889a

• update makefile

  martriay

  committed
  9d5079c

  Copy full SHA for 9d5079c

• bump submodule

  martriay

  committed
  ae89fa5

  Copy full SHA for ae89fa5

Commits on Mar 28, 2023

• Update erc20 migration branch (#586)

  Show description for a54e98c
  

  4 peopleauthored
  a54e98c

  Copy full SHA for a54e98c

Commits on Mar 31, 2023

• Migrate security/initializable (#592)

  Show description for 91dcad3
  

  andrew-fleming

  and

  martriay

  authored
  91dcad3

  Copy full SHA for 91dcad3

• Use zeroable::zero() instead of contract_address_const::<0>() (#598)

  Show description for f48da2c
  Amxx

  authored
  f48da2c

  Copy full SHA for f48da2c

• Migrate security/pausable (#593)

  Show description for d671d4c
  

  andrew-fleming

  and

  martriay

  authored
  d671d4c

  Copy full SHA for d671d4c

Commits on Apr 18, 2023

• add utils and constants

  andrew-fleming

  committed
  e86bcd2

  Copy full SHA for e86bcd2

• Revert "add utils and constants"

  Show description for 42a160f
  andrew-fleming

  committed
  42a160f

  Copy full SHA for 42a160f

Commits on Apr 26, 2023

• Migrate ERC165 (#582)

  Show description for 598c232
  

  3 peopleauthored
  598c232

  Copy full SHA for 598c232

• Migrate constants (#611)

  Show description for b2624ee
  andrew-fleming

  authored
  b2624ee

  Copy full SHA for b2624ee

Commits on Apr 27, 2023

• Set up new CI (#599)

  Show description for 4a4bca9
  andrew-fleming

  authored
  4a4bca9

  Copy full SHA for 4a4bca9

Commits on Apr 28, 2023

• fix formatting (#613)

  andrew-fleming

  authored
  0962051

  Copy full SHA for 0962051

• Normalize error message style (#606)

  Show description for a1950ee
  andrew-fleming

  authored
  a1950ee

  Copy full SHA for a1950ee

• Add BoundedInt and internal macros, update cairo (#600)

  Show description for c29b45c
  

  andrew-fleming

  and

  Amxx

  authored
  c29b45c

  Copy full SHA for c29b45c

Commits on May 11, 2023

• Migrate ownable (#604)

  Show description for e48a682
  

  3 peopleauthored
  e48a682

  Copy full SHA for e48a682

Commits on May 19, 2023

• Migrate security/reentrancyguard (#590)

  Show description for 5f86f65
  

  3 peopleauthored
  5f86f65

  Copy full SHA for 5f86f65

• Migrate access control (#605)

  Show description for 897facb
  

  andrew-fleming

  and

  martriay

  authored
  897facb

  Copy full SHA for 897facb

Commits on May 23, 2023

• Migrate account (#620)

  Show description for 372de37
  

  4 peopleauthored
  372de37

  Copy full SHA for 372de37

Commits on May 30, 2023

• Migrate ERC721 (#619)

  Show description for d86eb73
  

  4 peopleauthored
  d86eb73

  Copy full SHA for d86eb73

Commits on Jul 2, 2023

• Dual interface dispatcher for ERC721 (#623)

  Show description for 62688e7
  

  martriay

  and

  ericnordelo

  authored
  62688e7

  Copy full SHA for 62688e7

• Replace ERC-165 with SRC-5 (Update Interface Ids) (#637)

  Show description for ba69328
  

  ericnordelo

  and

  andrew-fleming

  authored
  ba69328

  Copy full SHA for ba69328

Commits on Jul 3, 2023

• Fix conflicts from the dual721 and src5 merge (#641)

  Show description for 8534ec6
  andrew-fleming

  authored
  8534ec6

  Copy full SHA for 8534ec6

• Add camel support for ownable (#625)

  Show description for bc90bd5
  

  3 peopleauthored
  bc90bd5

  Copy full SHA for bc90bd5

Commits on Jul 5, 2023

• Add camel support for access control (#626)

  Show description for c8fa9f9
  

  3 peopleauthored
  c8fa9f9

  Copy full SHA for c8fa9f9

• erc20 dual dispatcher (#622)

  Show description for 3a8e3e7
  

  andrew-fleming

  and

  ericnordelo

  authored
  3a8e3e7

  Copy full SHA for 3a8e3e7

Commits on Jul 6, 2023

• Add UnwrapAndCast trait (#644)

  Show description for 6a1f729
  andrew-fleming

  authored
  6a1f729

  Copy full SHA for 6a1f729

Commits on Jul 8, 2023

• add test_dual721 mod (#648)

  andrew-fleming

  authored
  bbcb875

  Copy full SHA for bbcb875

Commits on Jul 10, 2023

• Update account interface (#646)

  Show description for 5a27baa
  

  ericnordelo

  and

  andrew-fleming

  authored
  5a27baa

  Copy full SHA for 5a27baa

Commits on Jul 12, 2023

• Add camel support for Account (#647)

  Show description for ba29133
  

  ericnordelo

  and

  andrew-fleming

  authored
  ba29133

  Copy full SHA for ba29133

• Add src5 dual dispatcher (#659)

  Show description for b44f7dc
  andrew-fleming

  authored
  b44f7dc

  Copy full SHA for b44f7dc

Commits on Jul 13, 2023

• Add dual case erc721 receiver (#649)

  Show description for 33dbd56
  

  andrew-fleming

  and

  ericnordelo

  authored
  33dbd56

  Copy full SHA for 33dbd56

• Add owner param to ownable initializer (#660)

  Show description for 65d03ae
  

  ericnordelo

  and

  andrew-fleming

  authored
  65d03ae

  Copy full SHA for 65d03ae

Commits on Jul 18, 2023

• Migrate SRC5 to Cairo 2 (#664)

  Show description for a863859
  ericnordelo

  authored
  a863859

  Copy full SHA for a863859

• Migrate initializable to cairo2 (#661)

  Show description for c4590b9
  

  andrew-fleming

  and

  ericnordelo

  authored
  c4590b9

  Copy full SHA for c4590b9

Commits on Jul 20, 2023

• Migrate Account to Cairo 2 (#666)

  Show description for f18fcdb
  ericnordelo

  authored
  f18fcdb

  Copy full SHA for f18fcdb

• Migrate pausable to cairo2 (#662)

  Show description for dc4a233
  

  andrew-fleming

  and

  ericnordelo

  authored
  dc4a233

  Copy full SHA for dc4a233

• Migrate reentrancyguard to cairo2 (#663)

  Show description for 27514b1
  

  andrew-fleming

  and

  ericnordelo

  authored
  27514b1

  Copy full SHA for 27514b1

Commits on Jul 21, 2023

• Migrate ERC721 to Cairo2 (#667)

  Show description for 8e10821
  ericnordelo

  authored
  8e10821

  Copy full SHA for 8e10821

• Migrate ownable to cairo2 (#665)

  Show description for a00a9d3
  

  andrew-fleming

  and

  ericnordelo

  authored
  a00a9d3

  Copy full SHA for a00a9d3

Commits on Jul 22, 2023

• Migrate ERC20 to Cairo 2 (#669)

  Show description for 0b40485
  ericnordelo

  authored
  0b40485

  Copy full SHA for 0b40485

• Migrate access control to cairo2 (#668)

  Show description for 4e64434
  

  andrew-fleming

  and

  ericnordelo

  authored
  4e64434

  Copy full SHA for 4e64434

Commits on Aug 4, 2023

• Migrate to Scarb for cairo-2 (#671)

  Show description for 79fe2db
  maciektr

  authored
  79fe2db

  Copy full SHA for 79fe2db

• Add spdx (#684)

  Show description for 177ad63
  andrew-fleming

  authored
  177ad63

  Copy full SHA for 177ad63

• feat: sort imports (#679)

  ericnordelo

  authored
  495ed8a

  Copy full SHA for 495ed8a

Commits on Aug 10, 2023

• Migrate upgrades (#603)

  Show description for c28c758
  

  3 peopleauthored
  c28c758

  Copy full SHA for c28c758

Commits on Aug 11, 2023

• Add testing for Ownable events (#675)

  Show description for f9c30da
  

  ericnordelo

  and

  martriay

  authored
  f9c30da

  Copy full SHA for f9c30da

• Add account events (#687)

  Show description for 457b98b
  

  3 peopleauthored
  457b98b

  Copy full SHA for 457b98b

Commits on Aug 15, 2023

• Add testing for AccessControl events (#674)

  Show description for 544ddac
  ericnordelo

  authored
  544ddac

  Copy full SHA for 544ddac

• Add testing for Pausable events (#676)

  Show description for 4473243
  

  3 peopleauthored
  4473243

  Copy full SHA for 4473243

• Add testing for ERC20 events (#677)

  Show description for e95def8
  

  3 peopleauthored
  e95def8

  Copy full SHA for e95def8

• Add mint to erc721 preset constructor (#700)

  Show description for 77089c1
  andrew-fleming

  authored
  77089c1

  Copy full SHA for 77089c1

Commits on Aug 16, 2023

• Add testing for ERC721 events (#678)

  Show description for 3e08fa6
  

  ericnordelo

  and

  andrew-fleming

  authored
  3e08fa6

  Copy full SHA for 3e08fa6

Commits on Aug 18, 2023

• Update README and fix scarb package (#688)

  Show description for 8307644
  

  martriay

  and

  andrew-fleming

  authored
  8307644

  Copy full SHA for 8307644

Commits on Aug 23, 2023

• Bump scarb and fix dual721 test context (#703)

  Show description for cece32b
  

  andrew-fleming

  and

  martriay

  authored
  cece32b

  Copy full SHA for cece32b

• add rc version (#708)

  martriay

  authored
  32f9974

  Copy full SHA for 32f9974

• remove unused imports (#707)

  andrew-fleming

  authored
  b40c35b

  Copy full SHA for b40c35b

Commits on Aug 24, 2023

• Upgrade Cairo version and Scarb version to latest releases (#712)

  Show description for fbdd759
  bal7hazar

  authored
  fbdd759

  Copy full SHA for fbdd759

Commits on Aug 28, 2023

• bump antora (#715)

  martriay

  authored
  05429e4

  Copy full SHA for 05429e4

Commits on Sep 8, 2023

• Add selector inline macro/fix tokenURI (#724)

  Show description for adac09f
  andrew-fleming

  authored
  adac09f

  Copy full SHA for adac09f

Commits on Sep 14, 2023

• fix: naming convention (#732)

  ericnordelo

  authored
  90be39f

  Copy full SHA for 90be39f

• feat: add Errors modules (#691)

  ericnordelo

  authored
  fcdd6d1

  Copy full SHA for fcdd6d1

Commits on Sep 15, 2023

• Update account docs (#709)

  Show description for 7373daa
  

  3 peopleauthored
  7373daa

  Copy full SHA for 7373daa

Commits on Sep 20, 2023

• Add Interface & Dispatchers docs (#730)

  Show description for cbb5bf5
  

  3 peopleauthored
  cbb5bf5

  Copy full SHA for cbb5bf5

• Update overview docs (#735)

  Show description for 4e388f5
  

  3 peopleauthored
  4e388f5

  Copy full SHA for 4e388f5

Commits on Sep 21, 2023

• remove underscore from name_ and symbol_ (#738)

  andrew-fleming

  authored
  a1b559c

  Copy full SHA for a1b559c

Commits on Sep 26, 2023

• Add prefixes to storage members (#743)

  Show description for 74eb4e8
  

  ericnordelo

  and

  andrew-fleming

  authored
  74eb4e8

  Copy full SHA for 74eb4e8

Commits on Sep 27, 2023

• Sanitizing for release. (#736)

  Show description for 420f320
  ericnordelo

  authored
  420f320

  Copy full SHA for 420f320

Commits on Sep 28, 2023

• Update Access Control docs (#719)

  Show description for a6731c3
  

  3 peopleauthored
  a6731c3

  Copy full SHA for a6731c3

Commits on Sep 29, 2023

• Add indexed keys to token events (#746)

  Show description for 2ac98be
  

  andrew-fleming

  and

  martriay

  authored
  2ac98be

  Copy full SHA for 2ac98be

• Update Introspection docs (#721)

  Show description for 4ce5309
  

  3 peopleauthored
  4ce5309

  Copy full SHA for 4ce5309

• Update upgrade docs (#731)

  Show description for fe695e4
  

  3 peopleauthored
  fe695e4

  Copy full SHA for fe695e4

• Merge branch 'main' into cairo-2

  martriay

  committed
  88c62e6

  Copy full SHA for 88c62e6