Merge branch 'bidwithcomment' of https://github.com/EricDevito/nouns-…

…monorepo into bidwithcomment

.github/workflows/contract-deployment.yaml

@@ -2,7 +2,7 @@ name: Contracts CD
 
 on:
   release:
-    types: 
+    types:
       - created
 
 jobs:
@@ -11,13 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 14.x
+      - name: Use Node.js 16.x
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
       - name: Install Yarn
         run: npm install -g yarn
-      - run: yarn 
+      - run: yarn
       - run: yarn build
       - name: Run contract tests
         run: |
@@ -26,40 +26,3 @@ jobs:
       - name: Uninstall Yarn
         if: always()
         run: npm uninstall -g yarn
-  build_and_deploy:
-    name: Build and Deploy
-    needs: build_and_test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js 14.x
-        uses: actions/setup-node@v1
-        with:
-          node-version: 14.x
-      - name: Install Yarn
-        run: npm install -g yarn
-      - run: yarn 
-      - run: yarn build
-      - name: Deploy contract to Rinkeby
-        env:
-          INFURA_PROJECT_ID: ${{ secrets.INFURA_PROJECT_ID }}
-          MNEMONIC: ${{ secrets.MNEMONIC }}
-        run: |
-          cd packages/nouns-contracts
-          npx hardhat deploy-ci --network rinkeby
-      - name: Verify contract on Etherscan
-        env:
-          INFURA_PROJECT_ID: ${{ secrets.INFURA_PROJECT_ID }}
-          ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY }}
-        run: |
-          cd packages/nouns-contracts
-          echo "Giving Etherscan time to index"
-          sleep 60 # This could be replaced by polling etherscan on that address, wait for non-404
-          npx hardhat verify --network rinkeby `cat logs/deploy.json| jq -r '.contractAddress'`
-      - name: Look here for contract info
-        run: |
-          cd packages/nouns-contracts
-          echo "Contract deployed on Rinkeby to `cat logs/deploy.json| jq -r '.contractAddress'`"
-      - name: Uninstall Yarn
-        if: always()
-        run: npm uninstall -g yarn

.github/workflows/contracts.yaml

@@ -1,6 +1,7 @@
 name: Contracts CI
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - master
@@ -22,10 +23,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
-      - name: Use Node.js 14.x
+      - name: Use Node.js 16.x
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
       - name: Install Yarn
         run: npm install -g yarn
       - run: yarn
@@ -49,4 +50,4 @@ jobs:
       - name: Run Forge tests
         run: |
           cd packages/nouns-contracts
-          forge test -vvv --ffi
+          forge test -vvv --ffi --nmc 'MainnetForkTest'

.github/workflows/node.yaml

@@ -6,14 +6,14 @@ on:
       - master
   pull_request:
     branches:
-      - "**"
+      - '**'
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}
@@ -22,7 +22,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - name: Install Yarn
         run: npm install -g yarn
-      - run: yarn 
+      - run: yarn
       - run: yarn build
       - name: Uninstall Yarn
         if: always()

.github/workflows/subgraph-test.yaml

@@ -19,10 +19,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
-      - name: Use Node.js 14.x
+      - name: Use Node.js 16.x
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
       - name: Install Yarn
         run: npm install -g yarn
       - run: yarn

Dockerfile.bots

@@ -1,4 +1,4 @@
-FROM node:14
+FROM node:16
 
 WORKDIR /app
 

netlify.toml

@@ -10,6 +10,10 @@
   REACT_APP_CHAIN_ID = "5"
   REACT_APP_ENABLE_HISTORY = "true"
 
+[context.branch-deploy]
+  REACT_APP_CHAIN_ID = "11155111"
+  REACT_APP_ENABLE_HISTORY = "true"
+
 [context.deploy-preview.environment]
   REACT_APP_CHAIN_ID = "1"
   REACT_APP_ENABLE_HISTORY = "true"

package.json

@@ -8,7 +8,7 @@
     "clean": "lerna run --parallel clean",
     "prepare": "lerna run prepare --scope=@nouns/{assets,contracts,sdk}",
     "lint": "eslint 'packages/**/*.ts' --fix",
-    "format": "prettier --write 'packages/**/*.{ts(x)?,sol,md,css,json}' '!**/typechain/**'"
+    "format": "NODE_OPTIONS=--max_old_space_size=16384 prettier --write 'packages/**/*.{ts(x)?,sol,md,css,json}' '!**/typechain/**'"
   },
   "devDependencies": {
     "@types/chai": "^4.2.15",

packages/nouns-assets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nouns/assets",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "Nouns run-length encoded image data",
   "author": "Nounders",
   "homepage": "https://nouns.wtf",

packages/nouns-assets/src/image-data.json

@@ -924,6 +924,14 @@
       {
         "filename": "accessory-uroko",
         "data": "0x0015171f09038801000788010004880300058803000288050003880c000188060002880100048801000688010001880100038803000588030002880500038804000188070001880200028802000788010004880300058803000288050003880500"
+      },
+      {
+        "filename": "accessory-broken-heart",
+        "data": "0x0018141d0d010002590100025901000459010005590100035901000359010001590300015901000159050001590300"
+      },
+      {
+        "filename": "accessory-sweater",
+        "data": "0x0018171c09020c0100030c0100030c0100030c0600010c0300010c0300010c0300010c0300010c0300010c0100020c0100030c0100030c0100040c0300010c0300010c0300010c0100"
       }
     ],
     "heads": [
@@ -1894,6 +1902,38 @@
       {
         "filename": "head-wine-barrel",
         "data": "0x00031c1f0703000cd7090003850186028501860287018602870800038501860385018603870186028707000385018603850186038701860287060010d7050010d704000485018604850186048701860387030004850186048501860487018603870300048501860485018604870186038701d70200048501860485018604870186038703d704850186048501860487018603870200018a04850186048501860487018603870200018a12d70200018a12d70200018a010003850186048501860487018602870300018a010003870186048701860485018602850300018a020003850186038501860387018602870400018a02000ed70400018a1400018a1400018a1400018a1400018a1400018a1400018a1400018a1400018a1400018a1400018a1400018a"
+      },
+      {
+        "filename": "head-backpack",
+        "data": "0x00041a16050900043510000135040001350900127a0300047a0a8f047a0400107a0500026c017a0135087a0135017a026c0500027a016c0135086c0135016c027a040001b8107a01b8030001b8107a01b8030001b8107a010001b8010001b80100107a010001b8010001b80100107a010001b8010001b80100107a010001b8010001b80100037a0135087a0135037a010001b8010001b80100027a0135018f0135017a016c017a026c017a0135018f0135027a010002b80200027a0335027a016c037a0335027a010002b803000e7a020002b8010002b80e0001b8010001b8010001b8110001b80100"
+      },
+      {
+        "filename": "head-beanie",
+        "data": "0x00031914070600014e0100014e01250100014e0d00034e01250d00024e0125014e0125014e0b00014e0100024e02250d00064e0a000a4e07000c4e05000e4e04000e4e0300104e0200104e0200104e0200104e0200104e01000125014e0125014e0125014e0125014e0125014e0125014e0125014e0125014e0125014e0125014e0125014e0125014e0125014e0125014e0125014e01250124010201240102014e0125014e0125014e0125014e0125014e0125014e0125014e01250424014e0125014e0125014e0125014e0125014e0125014e0125014e0125014e0125014e0125014e"
+      },
+      {
+        "filename": "head-beluga",
+        "data": "0x00081c1404010c0300010c0a00060c0300020c0100020c04000e0c0100050c0100110c0200030c0100130c0100030c0100130c0100030c0100130c0100170c0100160c0300140c0400150c0400030c019e070c020f080c0400010c019e040c019e060c0c00040c019e0d0c0100"
+      },
+      {
+        "filename": "head-cotton-candy",
+        "data": "0x00021b14050a00015215000152150001521500015213000260015202600f000360016b0152016b03600900016002000360036b06600100016006000860016b0460016b016007001060030001600100116004001260016b0300136003001360016b0200016b1160016b0100026b0100016b116004001160016b0400016b0460036b0760026b0400016b0100036b0560076b09000c6b0100016b0300"
+      },
+      {
+        "filename": "head-curling-stone",
+        "data": "0x00041b140506000a4b0b000a4b0b00034b1200104b0500129703000f970202039702001197010202970100169758c816970100149702000397012401020124010201240c970300129706000e970400"
+      },
+      {
+        "filename": "head-fax-machine",
+        "data": "0x00031c1a0603000e020800010201000a020100010208000e02050009010602010001020500020101b1010101b1010101b102010802050009010602010001020500020101b1010101b1010101b10d010200120104b1020101b10f0104b1120104b1120104b1120104b1120104b1120104b1120104b10e01011e01010156010104b1140101620100020110b1020101620100020101b10e0001b102010162010003010e0003010162130001620100016213000162010001621300016201000162140001620200"
+      },
+      {
+        "filename": "head-satellite",
+        "data": "0x00061d14030d0001731300077301020573100006640a00023c0318010002430ae602470600023c0318010002430ae6024701000318043c0318010002430ae6024701000318043c0318010002430ae6024701000318023c0280047302430ae6024701000318043c0318010002430ae6024704730280023c0318010002430ae6024701000318043c0318010002430ae6024701000318043c0318010002430ae6024701000318023c07000c0e02000318023c060002430ae602470c0002430ae602470600"
+      },
+      {
+        "filename": "head-tiger",
+        "data": "0x000619140804240800032402000424080003240300051501240115012401150124041503000715012406150300021504c1031504c101150300021504c1031504c101150300021504c1031504c101150300021504c1031504c101150300031503c1031503c104150100032403c1031503c104240100031503c1031503c104150100032403c1042402c104240100031503c1042402c104150100032401c1022406c104240100031509c10415"
       }
     ],
     "glasses": [

packages/nouns-contracts/.gas-snapshot

@@ -0,0 +1,11 @@
+NounsDAOLogic_GasSnapshot_V2_propose:test_propose_longDescription() (gas: 528733)
+NounsDAOLogic_GasSnapshot_V2_propose:test_propose_shortDescription() (gas: 398388)
+NounsDAOLogic_GasSnapshot_V2_vote:test_castVoteWithReason() (gas: 83474)
+NounsDAOLogic_GasSnapshot_V2_vote:test_castVote_against() (gas: 82886)
+NounsDAOLogic_GasSnapshot_V2_vote:test_castVote_lastMinuteFor() (gas: 83459)
+NounsDAOLogic_GasSnapshot_V3_propose:test_propose_longDescription() (gas: 538195)
+NounsDAOLogic_GasSnapshot_V3_propose:test_propose_shortDescription() (gas: 404029)
+NounsDAOLogic_GasSnapshot_V3_vote:test_castVoteWithReason() (gas: 89809)
+NounsDAOLogic_GasSnapshot_V3_vote:test_castVote_against() (gas: 88733)
+NounsDAOLogic_GasSnapshot_V3_vote:test_castVote_lastMinuteFor() (gas: 112249)
+NounsDAOLogic_GasSnapshot_V3_voteDuringObjectionPeriod:test_castVote_duringObjectionPeriod_against() (gas: 88656)