Release/develop to testnet 20221207 (#96)

* Merge experimental * Experimental to Develop 20221206 (#95) * Improvement/ HOLO 595 Enforce prettier / lint run on protocol (#81) * prettier and eslint setup to run action * fixed command on prettier action * fixed command on prettier action and package.json * fixed command on prettier action * Remove unknown prettier options * husky prepush check for linting and prettier * added husky prepare on package.json * fixed husky prepare on package.json * fixed husky pre-push Co-authored-by: Alexander <alexanderattar@gmail.com> * Add solhint config and fix prettier config (#83) * Feature/HOLO-604: implementing critical issue fixes (#84) * fixing critical issues * implemented suggestions * Featuer/HOLO-605: C4 medium risk fixes (#88) * init * fixes * enforcing msgSender on all source contract calls * fixing typo * fixing tests * test fixes and prettier * royatlies patch * removing unused library * Feature/adding generic contract type (#85) * fixing critical issues * adding generic contract type * implemented suggestions * merging latest from experimental branch * adding withdraw andmsgSender protection * adding withdraw andmsgSender protection * prettier * fixing typo * assembly memory fix * combined generic contract pr * deployments * deployments * adding support for `asciihex` compiler function * adding comments and fixing missed check * Feature/holo 613 rename pa1d to royalty (#90) * name change * Quick minor updates * Update reverts to use new ROYALTIES format * fix to test Co-authored-by: Vitto <admin@vitto.io> * royalties hotfix (#91) * royalties change * develop env deployments of royalties hotfix * Feature/holo 612 royalty smart contract improvements (#93) * First pass at royalty contract improvements * Second pass on royalty improvements from C4 audit * Remove broken check * Minor check and comments added * Remove check for greater than 10000 tokens for ERC20s in royalties * Add usage notes for payout functions * Add logic to allow setting a slot to use either transfer or call * Add handling for code-423n4/2022-10-holograph-findings#456 * Fix tests by passing proper init code * Add dev note on _callOptionalReturn * Limit payout addresses to 10 * Add test for max addresses * Improvement/holo 614 royalties smart contracts tests (#86) * royalties distribution * removed comments Co-authored-by: Alexander <alexanderattar@gmail.com> * cleanup * check send amount on ethPayouts Co-authored-by: Natalie Bravo <natalie.bravo@outlook.com> Co-authored-by: Vitto <admin@vitto.io> * Feature/HOLO-642: Implement Super Cold Storage logic into protocol (#92) * clean * implementing the super-cold-storage-signer * cleanup * Latest deployments 20221206 * Add external deployments back * Roll back to ff5b4ee due to incorrect deployment process on experimental env * Add latest deployments 20221206 Wed Dec 7 03:08:37 UTC 2022 Co-authored-by: Natalie Bravo <natalie.bravo@outlook.com> Co-authored-by: ACC01ADE <admin@vitto.io> * Add latest develop deployments Wed Dec 7 17:57:20 UTC 2022 * Add latest develop deployments Wed Dec 7 17:57:20 UTC 2022 Co-authored-by: Natalie Bravo <natalie.bravo@outlook.com> Co-authored-by: ACC01ADE <admin@vitto.io>
holographxyz · Dec 8, 2022 · 786aef1 · 786aef1
1 parent 5230d81
commit 786aef1
Show file tree

Hide file tree

Showing 504 changed files with 20,986 additions and 53,615 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,2 @@
+node_modules
+typechain-types
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,11 @@
+{
+  "parser": "@typescript-eslint/parser",
+  "extends": ["prettier"],
+  "plugins": ["prettier"],
+  "env": {
+    "node": true
+  },
+  "rules": {
+    "prettier/prettier": "error"
+  }
+}
diff --git a/.github/workflows/enforce_eslint.yml b/.github/workflows/enforce_eslint.yml
@@ -0,0 +1,32 @@
+name: 'Enforce Linter'
+
+on:
+  push:
+    branches:
+      - main
+      - testnet
+      - develop
+      - experimental
+  pull_request:
+    branches:
+      - main
+      - testnet
+      - develop
+      - experimental
+
+jobs:
+  run-linter:
+    name: Run linter
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v3
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '18.4.0'
+      - name: Install dependencies
+        run: yarn install
+      - name: Lint Check
+        run: yarn lint
diff --git a/.github/workflows/enforce_prettier.yml b/.github/workflows/enforce_prettier.yml
@@ -0,0 +1,34 @@
+name: 'Enforce prettier'
+
+on:
+  push:
+    branches:
+      - main
+      - testnet
+      - develop
+      - experimental
+  pull_request:
+    branches:
+      - main
+      - testnet
+      - develop
+      - experimental
+
+jobs:
+  prettier:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          ref: ${{ github.head_ref }}
+          # Make sure the value of GITHUB_TOKEN will not be persisted in repo's config
+          persist-credentials: false
+
+      - name: Prettify code
+        uses: creyD/prettier_action@v4.2
+        with:
+          prettier_options: --check deploy/**/*.ts test/**/*.ts scripts/**/*.ts
+          dry: True
diff --git a/.husky/pre-push b/.husky/pre-push
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+yarn lint
+yarn prettier:check
diff --git a/.prettierrc b/.prettierrc
@@ -1,21 +1,4 @@
 {
-  "prettier.printWidth": 120,
-  "prettier.tabWidth": 2,
-  "prettier.useTabs": false,
-  "prettier.semi": true,
-  "prettier.singleQuote": true,
-  "prettier.quoteProps": "as-needed",
-  "prettier.trailingComma": "es5",
-  "prettier.bracketSpacing": true,
-  "prettier.bracketSameLine": true,
-  "prettier.arrowParens": "always",
-  "prettier.requirePragma": false,
-  "prettier.insertPragma": false,
-  "prettier.proseWrap": "preserve",
-  "prettier.htmlWhitespaceSensitivity": "css",
-  "prettier.endOfLine": "lf",
-  "prettier.embeddedLanguageFormatting": "off",
-  "prettier.ignorePath": ".gitignore",
   "printWidth": 120,
   "tabWidth": 2,
   "useTabs": false,
@@ -34,7 +17,7 @@
   "embeddedLanguageFormatting": "off",
   "overrides":
     [
-      { "files": "*.prettierrc", "options": { "singleQuote": false } },
+      { "files": "*.prettierrc", "options": { "singleQuote": false, "trailingComma": "none" } },
       { "files": "*.js", "options": { "singleQuote": true } },
       { "files": "*.ts", "options": { "singleQuote": true } },
       {
@@ -46,8 +29,8 @@
             "useTabs": false,
             "singleQuote": false,
             "bracketSpacing": false,
-            "explicitTypes": "always",
-          },
-      },
-    ],
+            "explicitTypes": "always"
+          }
+      }
+    ]
 }
diff --git a/.solhint.json b/.solhint.json
@@ -0,0 +1,13 @@
+{
+  "extends": ["solhint:recommended"],
+  "rules": {
+    "prettier/prettier": "warn",
+    "avoid-throw": false,
+    "avoid-suicide": "error",
+    "avoid-sha3": "warn",
+    "no-inline-assembly": false,
+    "reason-string": false,
+    "compiler-version": false
+  },
+  "plugins": ["prettier"]
+}
diff --git a/DEPLOYMENT_SALT_HISTORY.txt b/DEPLOYMENT_SALT_HISTORY.txt
@@ -2,3 +2,5 @@
 2022-11-03T11:41:01+00:00 % Changed EXPERIMENTAL_DEPLOYMENT_SALT from 1000001 to 1000002
 2022-11-03T11:41:01+00:00 % Changed DEVELOP_DEPLOYMENT_SALT from 1000 to 1001
 2022-11-03T11:41:01+00:00 % Changed TESTNET_DEPLOYMENT_SALT from 0 to 1
+2022-12-07T02:31:49+00:00 % Changed EXPERIMENTAL_DEPLOYMENT_SALT from 1000002 to 1000003
+2022-12-07T16:51:11+00:00 % Changed DEVELOP_DEPLOYMENT_SALT from 1001 to 1002
diff --git a/abi/develop/Admin.json b/abi/develop/Admin.json
@@ -56,4 +56,4 @@
     "stateMutability": "nonpayable",
     "type": "function"
   }
-]
+]
diff --git a/abi/develop/Base64.json b/abi/develop/Base64.json
@@ -1 +1 @@
-[]
+[]
diff --git a/abi/develop/Bytes.json b/abi/develop/Bytes.json
@@ -1 +1 @@
-[]
+[]
diff --git a/abi/develop/CollectionURI.json b/abi/develop/CollectionURI.json
@@ -12,4 +12,4 @@
     "stateMutability": "view",
     "type": "function"
   }
-]
+]
diff --git a/abi/develop/CrossChainMessageInterface.json b/abi/develop/CrossChainMessageInterface.json
@@ -115,4 +115,4 @@
     "stateMutability": "payable",
     "type": "function"
   }
-]
+]
diff --git a/abi/develop/CxipERC721.json b/abi/develop/CxipERC721.json
@@ -230,8 +230,15 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "withdraw",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "stateMutability": "payable",
     "type": "receive"
   }
-]
+]
diff --git a/abi/develop/CxipERC721Proxy.json b/abi/develop/CxipERC721Proxy.json
@@ -101,4 +101,4 @@
     "stateMutability": "payable",
     "type": "receive"
   }
-]
+]
diff --git a/abi/develop/ECDSA.json b/abi/develop/ECDSA.json
@@ -1 +1 @@
-[]
+[]
diff --git a/abi/develop/EIP712.json b/abi/develop/EIP712.json
@@ -1 +1 @@
-[]
+[]
diff --git a/abi/develop/ERC1155H.json b/abi/develop/ERC1155H.json
@@ -90,4 +90,4 @@
     "stateMutability": "payable",
     "type": "receive"
   }
-]
+]
diff --git a/abi/develop/ERC1271.json b/abi/develop/ERC1271.json
@@ -23,4 +23,4 @@
     "stateMutability": "view",
     "type": "function"
   }
-]
+]
diff --git a/abi/develop/ERC165.json b/abi/develop/ERC165.json
@@ -18,4 +18,4 @@
     "stateMutability": "view",
     "type": "function"
   }
-]
+]
diff --git a/abi/develop/ERC20.json b/abi/develop/ERC20.json
@@ -182,4 +182,4 @@
     "stateMutability": "nonpayable",
     "type": "function"
   }
-]
+]
diff --git a/abi/develop/ERC20Burnable.json b/abi/develop/ERC20Burnable.json
@@ -36,4 +36,4 @@
     "stateMutability": "nonpayable",
     "type": "function"
   }
-]
+]
diff --git a/abi/develop/ERC20H.json b/abi/develop/ERC20H.json
@@ -86,8 +86,15 @@
     "stateMutability": "pure",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "withdraw",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "stateMutability": "payable",
     "type": "receive"
   }
-]
+]
diff --git a/abi/develop/ERC20Metadata.json b/abi/develop/ERC20Metadata.json
@@ -38,4 +38,4 @@
     "stateMutability": "view",
     "type": "function"
   }
-]
+]
diff --git a/abi/develop/ERC20Mock.json b/abi/develop/ERC20Mock.json
@@ -639,4 +639,4 @@
     "stateMutability": "payable",
     "type": "receive"
   }
-]
+]
diff --git a/abi/develop/ERC20Permit.json b/abi/develop/ERC20Permit.json
@@ -74,4 +74,4 @@
     "stateMutability": "nonpayable",
     "type": "function"
   }
-]
+]
diff --git a/abi/develop/ERC20Receiver.json b/abi/develop/ERC20Receiver.json
@@ -33,4 +33,4 @@
     "stateMutability": "nonpayable",
     "type": "function"
   }
-]
+]
diff --git a/abi/develop/ERC20Safer.json b/abi/develop/ERC20Safer.json
@@ -115,4 +115,4 @@
     "stateMutability": "nonpayable",
     "type": "function"
   }
-]
+]
diff --git a/abi/develop/ERC721.json b/abi/develop/ERC721.json
@@ -265,4 +265,4 @@
     "stateMutability": "payable",
     "type": "function"
   }
-]
+]
diff --git a/abi/develop/ERC721Enumerable.json b/abi/develop/ERC721Enumerable.json
@@ -55,4 +55,4 @@
     "stateMutability": "view",
     "type": "function"
   }
-]
+]
diff --git a/abi/develop/ERC721H.json b/abi/develop/ERC721H.json
@@ -86,8 +86,15 @@
     "stateMutability": "pure",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "withdraw",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "stateMutability": "payable",
     "type": "receive"
   }
-]
+]
diff --git a/abi/develop/ERC721Metadata.json b/abi/develop/ERC721Metadata.json
@@ -44,4 +44,4 @@
     "stateMutability": "view",
     "type": "function"
   }
-]
+]
diff --git a/abi/develop/ERC721TokenReceiver.json b/abi/develop/ERC721TokenReceiver.json
@@ -33,4 +33,4 @@
     "stateMutability": "nonpayable",
     "type": "function"
   }
-]
+]
diff --git a/abi/develop/Faucet.json b/abi/develop/Faucet.json
@@ -221,4 +221,4 @@
     "stateMutability": "nonpayable",
     "type": "function"
   }
-]
+]