Code

V2 final#121

Code

Merged

neokry merged 122 commits intomainourzora/nouns-protocol:mainfrom v2-audit-minourzora/nouns-protocol:v2-audit-minCopy head branch name to clipboardMar 9, 2024

+3,388-653

Commits

Commits on Jul 18, 2023

• Update manager to support multiple implementation contracts

  neokry

  committed
  a7f3cc5

  Copy full SHA for a7f3cc5

Commits on Jul 19, 2023

• Add validation to implementation addresses

  neokry

  committed
  6dce92e

  Copy full SHA for 6dce92e

• Adds new manager tests

  neokry

  committed
  682d317

  Copy full SHA for 682d317

• Add reserve system

  neokry

  committed
  3749ef8

  Copy full SHA for 3749ef8

Commits on Jul 24, 2023

• Add new type of metadata renderer

  neokry

  committed
  67d8f8e

  Copy full SHA for 67d8f8e

Commits on Jul 31, 2023

• Simplify media metadata renderer

  neokry

  committed
  72b1225

  Copy full SHA for 72b1225

• Start media metadata tests

  neokry

  committed
  2f6a1af

  Copy full SHA for 2f6a1af

Commits on Aug 2, 2023

• Add more tests and refactor params

  neokry

  committed
  b037360

  Copy full SHA for b037360

• Add batch delegate by sig ERC1271

  neokry

  committed
  8911005

  Copy full SHA for 8911005

Commits on Aug 4, 2023

• Add batch delegate with sig tests

  neokry

  committed
  acd49fd

  Copy full SHA for acd49fd

Commits on Aug 7, 2023

• Fix typo

  neokry

  committed
  1b2bad0

  Copy full SHA for 1b2bad0

• Fix if statement formatting and impl type comment

  neokry

  committed
  921c5f2

  Copy full SHA for 921c5f2

• Fix formatting

  neokry

  committed
  ff754ea

  Copy full SHA for ff754ea

• Merge branch 'v2-generic-manager' into v2-claim-system

  neokry

  committed
  588a9de

  Copy full SHA for 588a9de

• Change reservedUntilTokenId to public

  neokry

  committed
  49ce083

  Copy full SHA for 49ce083

• Fix formatting

  neokry

  committed
  94fb9c0

  Copy full SHA for 94fb9c0

• Merge branch 'v2-generic-manager' into v2-media-metadata-renderer

  neokry

  committed
  07b0e66

  Copy full SHA for 07b0e66

• Fix formatting

  neokry

  committed
  7961187

  Copy full SHA for 7961187

• Merge branch 'v2-generic-manager' into batch-delegate-with-sig

  neokry

  committed
  fc955a8

  Copy full SHA for fc955a8

• Fix formatting

  neokry

  committed
  cf04f56

  Copy full SHA for cf04f56

Commits on Aug 8, 2023

• Add partial soulbound token

  neokry

  committed
  2c66f21

  Copy full SHA for 2c66f21

• Merge branch 'v2-claim-system' into v2-partial-soulbound-token

  neokry

  committed
  0c97a1c

  Copy full SHA for 0c97a1c

• Finish partial soulbound implementation

  neokry

  committed
  c52a9e3

  Copy full SHA for c52a9e3

Commits on Aug 17, 2023

• Update storage layout

  neokry

  committed
  f3841bb

  Copy full SHA for f3841bb

• Merge branch 'v2-generic-manager' into v2-claim-system

  neokry

  committed
  c2064ce

  Copy full SHA for c2064ce

• Update token storage layout

  neokry

  committed
  f650fbf

  Copy full SHA for f650fbf

• Merge branch 'v2-generic-manager' into v2-media-metadata-renderer

  neokry

  committed
  a0daa73

  Copy full SHA for a0daa73

• Merge branch 'v2-generic-manager' into batch-delegate-with-sig

  neokry

  committed
  cf3eaa3

  Copy full SHA for cf3eaa3

• Fix flaking test

  neokry

  committed
  5942d1a

  Copy full SHA for 5942d1a

Commits on Aug 18, 2023

• Add unit tests

  neokry

  committed
  f6fa780

  Copy full SHA for f6fa780

• Merge branch 'v2-claim-system' into v2-partial-soulbound-token

  neokry

  committed
  952096c

  Copy full SHA for 952096c

• Fix token names

  neokry

  committed
  517841d

  Copy full SHA for 517841d

Commits on Aug 31, 2023

• Add protocol rewards

  neokry

  committed
  09fd03c

  Copy full SHA for 09fd03c

• Merge branch 'v2-generic-manager' into v2-audit

  neokry

  committed
  d9c23c9

  Copy full SHA for d9c23c9

• Merge branch 'v2-claim-system' into v2-audit

  neokry

  committed
  9feb9c1

  Copy full SHA for 9feb9c1

• Merge branch 'batch-delegate-with-sig' into v2-audit

  neokry

  committed
  298029c

  Copy full SHA for 298029c

• Merge branch 'v2-partial-soulbound-token' into v2-audit

  neokry

  committed
  a2ff616

  Copy full SHA for a2ff616

• Merge branch 'v2-protocol-rewards' into v2-audit

  neokry

  committed
  bf19e4e

  Copy full SHA for bf19e4e

• Merge branch 'v2-media-metadata-renderer' into v2-audit

  neokry

  committed
  dee9d1d

  Copy full SHA for dee9d1d

Commits on Sep 4, 2023

• Fix merge issues

  neokry

  committed
  d6efffc

  Copy full SHA for d6efffc

• Fix merge issues

  neokry

  committed
  0005906

  Copy full SHA for 0005906

Commits on Sep 11, 2023

• Adds collection plus minter and merkle reserve minter

  neokry

  committed
  7d8c979

  Copy full SHA for 7d8c979

• Merge branch 'v2-new-minters' of https://github.com/ourzora/nouns-protocol into v2-new-minters

  neokry

  committed
  f55b32a

  Copy full SHA for f55b32a

• Fix storage layout

  neokry

  committed
  7cc5bdc

  Copy full SHA for 7cc5bdc

Commits on Sep 12, 2023

• Fix smaller issues

  neokry

  committed
  4805ee0

  Copy full SHA for 4805ee0

• Break out collection plus parameters

  neokry

  committed
  b77830d

  Copy full SHA for b77830d

• Remove unused struct and document params

  neokry

  committed
  f660035

  Copy full SHA for f660035

• Fix comments

  neokry

  committed
  ff84134

  Copy full SHA for ff84134

• Merge branch 'v2-protocol-rewards' into v2-audit

  neokry

  committed
  540ae61

  Copy full SHA for 540ae61

Commits on Sep 13, 2023

• Small metadata fixes

  neokry

  committed
  81643b8

  Copy full SHA for 81643b8

Commits on Sep 14, 2023

• Improve documentation

  neokry

  committed
  91f73a4

  Copy full SHA for 91f73a4

• Document init params

  neokry

  committed
  9db2c59

  Copy full SHA for 9db2c59

Commits on Sep 15, 2023

• Update coments

  neokry

  committed
  ee2e551

  Copy full SHA for ee2e551

• Allow minters to be set and initilized on token initilization

  neokry

  committed
  a3f9dac

  Copy full SHA for a3f9dac

• Add more comments to minters

  neokry

  committed
  77940d9

  Copy full SHA for 77940d9

Commits on Sep 20, 2023

• Add PartialMirrorToken and ERC721 redeem minter

  neokry

  committed
  f5a9450

  Copy full SHA for f5a9450

Commits on Sep 21, 2023

• Interface changes + allow auction contract to change founders rewards

  neokry

  committed
  b17e75e

  Copy full SHA for b17e75e

• Adds get token to mirror

  neokry

  committed
  26034ff

  Copy full SHA for 26034ff

Commits on Sep 27, 2023

• Add scripts and ERC165

  neokry

  committed
  5cfa504

  Copy full SHA for 5cfa504

Commits on Sep 28, 2023

• Interface and address changes

  neokry

  committed
  32db938

  Copy full SHA for 32db938

Commits on Oct 16, 2023

• fix typo

  neokry

  committed
  99c7d71

  Copy full SHA for 99c7d71

Commits on Oct 18, 2023

• Add new deployments

  neokry

  committed
  57c2543

  Copy full SHA for 57c2543

• refactor to keep manager types and reduce diff

  neokry

  committed
  8f46256

  Copy full SHA for 8f46256

Commits on Oct 19, 2023

• Refactor to simplify token types and move metadata folder

  neokry

  committed
  6178bdf

  Copy full SHA for 6178bdf

Commits on Oct 20, 2023

• Minor changes for reserve minter

  neokry

  committed
  b01e69a

  Copy full SHA for b01e69a

• Minimize diff

  neokry

  committed
  60a1c3e

  Copy full SHA for 60a1c3e

• Add deployer helper contracts

  neokry

  committed
  546ac01

  Copy full SHA for 546ac01

Commits on Oct 25, 2023

• Minor fixes related to testnet deployments

  neokry

  committed
  52272e2

  Copy full SHA for 52272e2

• start protocol rewards rework

  neokry

  committed
  3229ac2

  Copy full SHA for 3229ac2

• forge install: zora-protocol

  Show description for 526ace2
  neokry

  committed
  526ace2

  Copy full SHA for 526ace2

• finish protocol rewards rework

  neokry

  committed
  a165bab

  Copy full SHA for a165bab

• finish protocol rewards rework

  neokry

  committed
  5089876

  Copy full SHA for 5089876

Commits on Oct 26, 2023

• reduce diff

  neokry

  committed
  5164f20

  Copy full SHA for 5164f20

• minimize diff

  neokry

  committed
  4e8de50

  Copy full SHA for 4e8de50

• fix formatting diff

  neokry

  committed
  b0506e7

  Copy full SHA for b0506e7

• Allow deployment with custom metadata renderer

  neokry

  committed
  7bf36d5

  Copy full SHA for 7bf36d5

• Clean up types and names

  neokry

  committed
  f254dad

  Copy full SHA for f254dad

Commits on Oct 27, 2023

• Add builder fee to merkle minter

  neokry

  committed
  9f916c0

  Copy full SHA for 9f916c0

• Optimize storage structs

  neokry

  committed
  153dfe0

  Copy full SHA for 153dfe0

• add more comments

  neokry

  committed
  de3e3b0

  Copy full SHA for de3e3b0

• Add hard limits for protocol rewards. make setting renderer more generic

  neokry

  committed
  11028af

  Copy full SHA for 11028af

Commits on Oct 30, 2023

• Rework rewards to set at deploy time

  neokry

  committed
  fc365c0

  Copy full SHA for fc365c0

• Fix storage layout

  neokry

  committed
  18531cb

  Copy full SHA for 18531cb

• Document protocol rewards interface

  neokry

  committed
  3284e1c

  Copy full SHA for 3284e1c

Commits on Oct 31, 2023

• Fix protocol rewards optionality

  neokry

  committed
  0418136

  Copy full SHA for 0418136

Commits on Nov 1, 2023

• Allow reserve until tokenId to be updated

  neokry

  committed
  1f2214b

  Copy full SHA for 1f2214b

• Add event and comments

  neokry

  committed
  d324922

  Copy full SHA for d324922

Commits on Nov 2, 2023

• use protocol rewards in merkle minter

  neokry

  committed
  b9a3dfd

  Copy full SHA for b9a3dfd

Commits on Nov 3, 2023

• add new deploys

  neokry

  committed
  69cf40c

  Copy full SHA for 69cf40c

Commits on Nov 13, 2023

• Add alias helper

  neokry

  committed
  e63345c

  Copy full SHA for e63345c

Commits on Nov 16, 2023

• Add ownership renounced event

  neokry

  committed
  d209d77

  Copy full SHA for d209d77

Commits on Nov 20, 2023

• Fix test imports and flaking issues

  neokry

  committed
  e81cfce

  Copy full SHA for e81cfce

Commits on Dec 8, 2023

• Fix token allocation base tokenId issue

  neokry

  committed
  5f12ca4

  Copy full SHA for 5f12ca4

Commits on Dec 11, 2023

• Restricts merkle claims to only be used once

  neokry

  committed
  d46bac3

  Copy full SHA for d46bac3

Commits on Dec 12, 2023

• Add governance delay

  neokry

  committed
  0980654

  Copy full SHA for 0980654

Commits on Dec 13, 2023

• Fix issue where rewards are incorrectly rounded

  neokry

  committed
  08d0868

  Copy full SHA for 08d0868

• Fix formatting

  neokry

  committed
  d42da20

  Copy full SHA for d42da20

• Fix formatting

  neokry

  committed
  06afa80

  Copy full SHA for 06afa80

• Add more tests

  neokry

  committed
  bb8a0fa

  Copy full SHA for bb8a0fa

• Fix token test formatting

  neokry

  committed
  2acc3be

  Copy full SHA for 2acc3be

• Add reserve test

  neokry

  committed
  7c7f5e8

  Copy full SHA for 7c7f5e8

• Update storage layout

  neokry

  committed
  91c37b7

  Copy full SHA for 91c37b7

Commits on Dec 27, 2023

• Fixes DOS vector for auctions

  neokry

  committed
  af59d0a

  Copy full SHA for af59d0a

• Add minimum metadata calls to migration deployer

  neokry

  committed
  d08a3b9

  Copy full SHA for d08a3b9

Commits on Dec 29, 2023

• Fix issue where batch merkle claims could be blocked

  neokry

  committed
  fc48915

  Copy full SHA for fc48915

Commits on Jan 2, 2024

• Merge pull request #122 from ourzora/v2-mitigration-fix-base-tokenId

  Show description for d5f6165
  neokry

  authored
  d5f6165

  Copy full SHA for d5f6165

• Merge pull request #123 from ourzora/v2-mitigations-auction-rounding-error

  Show description for bd2ec73
  neokry

  authored
  bd2ec73

  Copy full SHA for bd2ec73

• Merge pull request #124 from ourzora/v2-mitigrations-add-gov-timelock

  Show description for cb0da8d
  neokry

  authored
  cb0da8d

  Copy full SHA for cb0da8d

• Merge pull request #125 from ourzora/v2-migrations-fix-auction-dos

  Show description for 9686e8f
  neokry

  authored
  9686e8f

  Copy full SHA for 9686e8f

• Merge pull request #126 from ourzora/v2-mitigations-only-use-merkle-claim-once

  Show description for 5bd5dcc
  neokry

  authored
  5bd5dcc

  Copy full SHA for 5bd5dcc

• Merge pull request #127 from ourzora/v2-mitigations-fix-batch-merkle-claims

  Show description for cd579ff
  neokry

  authored
  cd579ff

  Copy full SHA for cd579ff

• Merge branch 'v2-mitigations-minimum-metadata-calls' into v2-audit-min

  neokry

  committed
  655402a

  Copy full SHA for 655402a

Commits on Jan 4, 2024

• update base goerli addreses

  neokry

  committed
  c66efff

  Copy full SHA for c66efff

Commits on Jan 15, 2024

• Add sepolia deployments

  neokry

  committed
  dbb1d37

  Copy full SHA for dbb1d37

Commits on Jan 17, 2024

• Add new deployment script

  neokry

  committed
  989291a

  Copy full SHA for 989291a

Commits on Jan 29, 2024

• Add reason to protocol rewards and improve upgrade script

  neokry

  committed
  48540bb

  Copy full SHA for 48540bb

• Merge branch 'sepolia-deploys' into v2-audit-min

  neokry

  committed
  ae2398f

  Copy full SHA for ae2398f

• Sepolia upgrade

  neokry

  committed
  2fc3c89

  Copy full SHA for 2fc3c89

Commits on Jan 30, 2024

• Deploy to L2s

  neokry

  committed
  84a4ba3

  Copy full SHA for 84a4ba3

Commits on Feb 1, 2024

• deploy testnet migration deployers

  neokry

  committed
  5b123be

  Copy full SHA for 5b123be

Commits on Feb 2, 2024

• final l1 deployments

  neokry

  committed
  9094316

  Copy full SHA for 9094316

Commits on Mar 8, 2024

• Fix founders rewards tests

  neokry

  committed
  760380d

  Copy full SHA for 760380d