Skip to content

Commit

Permalink
Experimental to Develop 20221206 (#95)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
3 people authored Dec 7, 2022
1 parent 6d4986b commit 7db6ca2
Show file tree
Hide file tree
Showing 361 changed files with 4,759 additions and 87,272 deletions.
1 change: 1 addition & 0 deletions DEPLOYMENT_SALT_HISTORY.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
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
2 changes: 1 addition & 1 deletion abi/experimental/Admin.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/Base64.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[]
[]
2 changes: 1 addition & 1 deletion abi/experimental/Bytes.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[]
[]
2 changes: 1 addition & 1 deletion abi/experimental/CollectionURI.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
"stateMutability": "view",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/CrossChainMessageInterface.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,4 @@
"stateMutability": "payable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/CxipERC721.json
Original file line number Diff line number Diff line change
Expand Up @@ -241,4 +241,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/CxipERC721Proxy.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/ECDSA.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[]
[]
2 changes: 1 addition & 1 deletion abi/experimental/EIP712.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[]
[]
2 changes: 1 addition & 1 deletion abi/experimental/ERC1155H.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/ERC1271.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
"stateMutability": "view",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/ERC165.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
"stateMutability": "view",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/ERC20.json
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/ERC20Burnable.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/ERC20H.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/ERC20Metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@
"stateMutability": "view",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/ERC20Mock.json
Original file line number Diff line number Diff line change
Expand Up @@ -639,4 +639,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/ERC20Permit.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/ERC20Receiver.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/ERC20Safer.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/ERC721.json
Original file line number Diff line number Diff line change
Expand Up @@ -265,4 +265,4 @@
"stateMutability": "payable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/ERC721Enumerable.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@
"stateMutability": "view",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/ERC721H.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/ERC721Metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@
"stateMutability": "view",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/ERC721TokenReceiver.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/Faucet.json
Original file line number Diff line number Diff line change
Expand Up @@ -221,4 +221,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/GenericH.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/Holograph.json
Original file line number Diff line number Diff line change
Expand Up @@ -322,4 +322,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographBridge.json
Original file line number Diff line number Diff line change
Expand Up @@ -403,4 +403,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographBridgeInterface.json
Original file line number Diff line number Diff line change
Expand Up @@ -314,4 +314,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographBridgeProxy.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographERC20.json
Original file line number Diff line number Diff line change
Expand Up @@ -913,4 +913,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographERC20Interface.json
Original file line number Diff line number Diff line change
Expand Up @@ -661,4 +661,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographERC721.json
Original file line number Diff line number Diff line change
Expand Up @@ -925,4 +925,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographERC721Interface.json
Original file line number Diff line number Diff line change
Expand Up @@ -653,4 +653,4 @@
"stateMutability": "payable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographFactory.json
Original file line number Diff line number Diff line change
Expand Up @@ -284,4 +284,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographFactoryInterface.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographFactoryProxy.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographGeneric.json
Original file line number Diff line number Diff line change
Expand Up @@ -395,4 +395,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographGenericInterface.json
Original file line number Diff line number Diff line change
Expand Up @@ -191,4 +191,4 @@
"stateMutability": "view",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographGenesis.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@
"stateMutability": "view",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographInterface.json
Original file line number Diff line number Diff line change
Expand Up @@ -233,4 +233,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographInterfaces.json
Original file line number Diff line number Diff line change
Expand Up @@ -337,4 +337,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographInterfacesInterface.json
Original file line number Diff line number Diff line change
Expand Up @@ -248,4 +248,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographOperator.json
Original file line number Diff line number Diff line change
Expand Up @@ -755,4 +755,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographOperatorInterface.json
Original file line number Diff line number Diff line change
Expand Up @@ -666,4 +666,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographOperatorProxy.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographRegistry.json
Original file line number Diff line number Diff line change
Expand Up @@ -400,4 +400,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographRegistryInterface.json
Original file line number Diff line number Diff line change
Expand Up @@ -311,4 +311,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographRegistryProxy.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographRoyalties.json
Original file line number Diff line number Diff line change
Expand Up @@ -594,4 +594,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographRoyaltiesInterface.json
Original file line number Diff line number Diff line change
Expand Up @@ -424,4 +424,4 @@
"stateMutability": "view",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographTreasury.json
Original file line number Diff line number Diff line change
Expand Up @@ -192,4 +192,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographTreasuryInterface.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[]
[]
2 changes: 1 addition & 1 deletion abi/experimental/HolographTreasuryProxy.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographUtilityToken.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/Holographable.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abi/experimental/HolographedERC1155.json
Original file line number Diff line number Diff line change
Expand Up @@ -558,4 +558,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
Loading

0 comments on commit 7db6ca2

Please sign in to comment.