Skip to content
This repository was archived by the owner on Apr 30, 2024. It is now read-only.

Commit 2bbbbd0

Browse files
jdubparkkingster-willRamartiRaul
authored
Deploy script (#33)
* feat: foundry deploy script w/ hardhat wip * feat: fix foundry deploy script * feat: makefile abi & typechain * feat: hardhat scripts * fix: delete ignore folder * feat: script deployments and mocks * fix: package deps * fix: ignore folders * feat: deploy & revert scripts * feat: tagging module events (#26) * feat: main deploy configs & minor makefile change * additional deploy & post-deploy scripts * hardhat config * fix: deploy scripts for new interfaces & structs * merge main * fix: modify script for new merged main * fix: remove unused files & modify script/configs * Introducing Meta-Transaction Support to IPAccount with EIP712 Standard Signatures (#32) * Parameters (#31) * added transfer terms, refactored term checking * add param test * unused var test * fix policy needs transfer arguments * fix tests, addPolicy public only allow new policies * licenseData not provided when minting, it is a result * added activation * wip: license activation * rolled back license status * removed activation related code * stray activation method * stray event * stray errors * fix comment * fix comment * WIP * comment * fixes * WIP * WIP: fix identification of policy set by linking * refactor to compile * fix except integration * feat: integration test fix, remove local vars, add reverts on verification * fix: verifier interfaces, integration test fix, mock verifier fix, remove local var * fix: rename contract, add constructor param for mock verifier, formats, more base contract, test fixes * fix: rename vars and clean stack * feat: flexible MockParamVerifier, modify integration/unit test runs * Update contracts/interfaces/licensing/IMintParamVerifier.sol --------- Co-authored-by: Raul <[email protected]> Co-authored-by: Jongwon Park <[email protected]> * fix: remove lcov.info --------- Co-authored-by: kingster-will <[email protected]> Co-authored-by: Ramarti <[email protected]> Co-authored-by: Raul <[email protected]>
1 parent e2c1240 commit 2bbbbd0

File tree

16 files changed

+227
-714
lines changed

16 files changed

+227
-714
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,7 @@ typechain
3333
!./script/out
3434

3535
# hardhat-tenderly plugin
36-
deployments
36+
deployments
37+
38+
# converage
39+
lcov.info

Makefile

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,18 @@ snapshot :; forge snapshot
3333

3434
slither :; slither ./contracts
3535

36-
format :; npx prettier --write contracts/**/*.sol && npx prettier --write contracts/*.sol
36+
# glob doesn't work for nested folders, so we do it manually
37+
format:
38+
npx prettier --write contracts/*.sol
39+
npx prettier --write contracts/**/*.sol
40+
npx prettier --write contracts/**/**/*.sol
41+
npx prettier --write contracts/**/**/**/*.sol
42+
npx prettier --write contracts/**/**/**/**/*.sol
3743

3844
coverage:
3945
mkdir -p coverage
4046
forge coverage --report lcov --fork-url https://rpc.ankr.com/eth --fork-block-number 19042069
41-
lcov --remove lcov.info -o lcov.info 'test/*'
47+
lcov --remove lcov.info -o lcov.info 'test/*' 'script/*' 'contracts/mocks/*'
4248
genhtml lcov.info --output-dir coverage
4349

4450
abi:
@@ -71,6 +77,9 @@ anvil :; anvil -m 'test test test test test test test test test test test junk'
7177
deploy-main :; forge script script/foundry/deployment/Main.s.sol:Main --rpc-url ${RPC_URL} --broadcast --verify -vvvv
7278

7379
deploy-main-hh:
80+
npx hardhat run script/hardhat/deployment/00-deploy-main.ts --network ${NETWORK}
81+
82+
deploy-tenderly:
7483
rm -rf deployments/hardhat/*.json
7584
npx hardhat run script/hardhat/post-deployment/99-revert-chain.ts --network tenderly
76-
npx hardhat run script/hardhat/deployment/00-deploy-main.ts --network tenderly
85+
npx hardhat run script/hardhat/deployment/00-deploy-main.ts --network tenderly

contracts/modules/tagging/TaggingModule.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: UNLICENSED
22
// See https://github.com/storyprotocol/protocol-contracts/blob/main/StoryProtocol-AlphaTestingAgreement-17942166.3.pdf
33

4-
pragma solidity ^0.8.21;
4+
pragma solidity ^0.8.23;
55

66
import { ShortString, ShortStrings } from "@openzeppelin/contracts/utils/ShortStrings.sol";
77
import { ShortStringOps } from "contracts/utils/ShortStringOps.sol";

hardhat.config.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ const COINMARKETCAP_API_KEY = process.env.COINMARKETCAP_API_KEY || "key"
3535
const config: HardhatUserConfig = {
3636
solidity: {
3737
compilers: [
38-
{
39-
version: "0.8.18",
40-
},
4138
{
4239
version: "0.8.23",
4340
},

0 commit comments

Comments
 (0)