Skip to content

Commit 1b3abcd

Browse files
0xmme0xmme
authored
Merge pull request #173 from moleculeprotocol/feat/bring-your-own-ipt
2 parents 0cc9189 + 20e8908 commit 1b3abcd

25 files changed

+1382
-507
lines changed

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@ jobs:
2525
- name: Install node dependencies
2626
run: yarn --frozen-lockfile
2727

28+
#todo: forge build --sizes
2829
- name: Run Forge build
2930
run: |
3031
forge --version
31-
forge build --sizes
32+
forge build
3233
id: build
3334

3435
- name: Run Forge tests

‎README.md‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,24 @@ IP-NFTs allow their users to tokenize intellectual property. This repo contains
1717
| Locking Crowdsale | [0xfbfd266bf3b49Db8746155AA318D4533Cc66DB26](https://etherscan.io/address/0xfbfd266bf3b49Db8746155AA318D4533Cc66DB26#code) | <a href="https://thirdweb.com/ethereum/0xfbfd266bf3b49Db8746155AA318D4533Cc66DB26?utm_source=contract_badge" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0xfbfd266bf3b49Db8746155AA318D4533Cc66DB26&theme=dark&chainId=1" alt="View contract" /></a> |
1818
| StakedLockingCrowdSale | [0x35Bce29F52f51f547998717CD598068Afa2B29B7](https://etherscan.io/address/0x35Bce29F52f51f547998717CD598068Afa2B29B7#code) | <a href="https://thirdweb.com/ethereum/0x35Bce29F52f51f547998717CD598068Afa2B29B7?utm_source=contract_badge" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0x35Bce29F52f51f547998717CD598068Afa2B29B7&theme=dark&chainId=1" alt="View contract" /></a> |
1919

20-
timelocked token implementation=0x625ed621d814645AA81C50c4f333D4a407576e8F
21-
20+
timelocked token implementation=0x625ed621d814645AA81C50c4f333D4a407576e8F
2221

2322
#### Subgraph
2423

2524
API: https://subgraph.satsuma-prod.com/742d8952ab24/molecule--4039244/ip-nft-mainnet/api
2625
Playground: https://subgraph.satsuma-prod.com/molecule--4039244/ip-nft-mainnet/playground
2726

28-
tokenizer implementation 1.3: 0x6517DD48908F4C1FF4eD74FfD780908241a3654C
27+
tokenizer implementation 1.4: 0x0d781edf9c75cf9136aac6600873d0a20a6dd43f
28+
tokenizer implementation 1.3: 0x6517DD48908F4C1FF4eD74FfD780908241a3654C
2929
tokenizer implementation 1.2: 0xE8701330F196FeFe415b28dAA767AB076F42557A
3030
tokenizer implementation 1.1: 0x9C70FA8c87D7e94Fd63eeCCcA657D5c4224a36f3
3131

32+
iptoken implementation 1.4: 0xd79fe2c4879b3a3d732df11294329a60cff3a0a9
3233
iptoken implementation 1.3: 0x89a14Be8f7824d4775053Edad0f2fA2d6767b72B
3334
iptoken implementation: 0x9E4fc6E6d1A64e3429aB852d3CB31AD7aa06997A
3435

36+
wrapped iptoken implementation: 0x0ca5f50a8a59a59ef8c8d610f5ebf99e41f1352f
37+
3538
ipnft implementation 2.4: 0x6B179Dffac5E190c670176606f552cB792847f80
3639

3740
#### Defender Relayer
@@ -42,18 +45,24 @@ Deprecated after migrating to Defender 2 (was 0x3D30452c48F2448764d5819a9A2b684A
4245

4346
### Sepolia
4447

45-
| Contract | Address | Explorer |
46-
| ------------------ | ------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
47-
| IPNFT | 0x152B444e60C526fe4434C721561a077269FcF61a | <a href="https://sepolia.etherscan.io/address/0x152B444e60C526fe4434C721561a077269FcF61a#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0x152B444e60C526fe4434C721561a077269FcF61a&theme=dark&chainId=1" alt="View contract" /></a> |
48-
| Swap | 0x9e4c638e703d0Af3a3B9eb488dE79A16d402698f | <a href="https://sepolia.etherscan.io/address/0x9e4c638e703d0Af3a3B9eb488dE79A16d402698f#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0x9e4c638e703d0Af3a3B9eb488dE79A16d402698f&theme=dark&chainId=1" alt="View contract" /></a> |
49-
| Authorizer | 0x7a9F3773352e4ee0Da6307Cd32C45fE89602129A | <a href="https://sepolia.etherscan.io/address/0x7a9F3773352e4ee0Da6307Cd32C45fE89602129A#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0x7a9F3773352e4ee0Da6307Cd32C45fE89602129A&theme=dark&chainId=1" alt="View contract" /></a> |
50-
| Terms Permissioner | 0xC05D649368d8A5e2E98CAa205d47795de5fCB599 | <a href="https://sepolia.etherscan.io/address/0xC05D649368d8A5e2E98CAa205d47795de5fCB599#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0xC05D649368d8A5e2E98CAa205d47795de5fCB599&theme=dark&chainId=1" alt="View contract" /></a> |
51-
| Tokenizer | 0xca63411FF5187431028d003eD74B57531408d2F9 | <a href="https://sepolia.etherscan.io/address/0xca63411FF5187431028d003eD74B57531408d2F9#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0xca63411FF5187431028d003eD74B57531408d2F9&theme=dark&chainId=1" alt="View contract" /></a> |
52-
| Crowdsale | 0x8cA737E2cdaE1Ceb332bEf7ba9eA711a3a2f8037 | <a href="https://sepolia.etherscan.io/address/0x8cA737E2cdaE1Ceb332bEf7ba9eA711a3a2f8037#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0x8cA737E2cdaE1Ceb332bEf7ba9eA711a3a2f8037&theme=dark&chainId=1" alt="View contract" /></a> |
53-
| Locking Crowdsale | 0x0Da77f361bB56f065Aa21647d885685eb7cAE10F | <a href="https://sepolia.etherscan.io/address/0x0Da77f361bB56f065Aa21647d885685eb7cAE10F#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0x0Da77f361bB56f065Aa21647d885685eb7cAE10F&theme=dark&chainId=1" alt="View contract" /></a> |
48+
| Contract | Address | Explorer |
49+
| ------------------ | ------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
50+
| IPNFT | 0x152B444e60C526fe4434C721561a077269FcF61a | <a href="https://sepolia.etherscan.io/address/0x152B444e60C526fe4434C721561a077269FcF61a#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0x152B444e60C526fe4434C721561a077269FcF61a&theme=dark&chainId=1" alt="View contract" /></a> |
51+
| Swap | 0x9e4c638e703d0Af3a3B9eb488dE79A16d402698f | <a href="https://sepolia.etherscan.io/address/0x9e4c638e703d0Af3a3B9eb488dE79A16d402698f#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0x9e4c638e703d0Af3a3B9eb488dE79A16d402698f&theme=dark&chainId=1" alt="View contract" /></a> |
52+
| Authorizer | 0x7a9F3773352e4ee0Da6307Cd32C45fE89602129A | <a href="https://sepolia.etherscan.io/address/0x7a9F3773352e4ee0Da6307Cd32C45fE89602129A#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0x7a9F3773352e4ee0Da6307Cd32C45fE89602129A&theme=dark&chainId=1" alt="View contract" /></a> |
53+
| Terms Permissioner | 0xC05D649368d8A5e2E98CAa205d47795de5fCB599 | <a href="https://sepolia.etherscan.io/address/0xC05D649368d8A5e2E98CAa205d47795de5fCB599#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0xC05D649368d8A5e2E98CAa205d47795de5fCB599&theme=dark&chainId=1" alt="View contract" /></a> |
54+
| Tokenizer | 0xca63411FF5187431028d003eD74B57531408d2F9 | <a href="https://sepolia.etherscan.io/address/0xca63411FF5187431028d003eD74B57531408d2F9#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0xca63411FF5187431028d003eD74B57531408d2F9&theme=dark&chainId=1" alt="View contract" /></a> |
55+
| Crowdsale | 0x8cA737E2cdaE1Ceb332bEf7ba9eA711a3a2f8037 | <a href="https://sepolia.etherscan.io/address/0x8cA737E2cdaE1Ceb332bEf7ba9eA711a3a2f8037#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0x8cA737E2cdaE1Ceb332bEf7ba9eA711a3a2f8037&theme=dark&chainId=1" alt="View contract" /></a> |
56+
| Locking Crowdsale | 0x0Da77f361bB56f065Aa21647d885685eb7cAE10F | <a href="https://sepolia.etherscan.io/address/0x0Da77f361bB56f065Aa21647d885685eb7cAE10F#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0x0Da77f361bB56f065Aa21647d885685eb7cAE10F&theme=dark&chainId=1" alt="View contract" /></a> |
5457
| Staked Crowdsale | 0xd1cE2EA7d3b0C9cAB025A4aD762FC00315141ad7 | <a href="https://sepolia.etherscan.io/address/0xd1cE2EA7d3b0C9cAB025A4aD762FC00315141ad7#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0xd1cE2EA7d3b0C9cAB025A4aD762FC00315141ad7&theme=dark&chainId=11155111" alt="View contract" /></a> |
5558

56-
timelocked token implementation=0xF8F79c1E02387b0Fc9DE0945cD9A2c06F127D851
59+
timelocked token implementation=0xF8F79c1E02387b0Fc9DE0945cD9A2c06F127D851
60+
61+
tokenizer implementation 1.4: 0x4166362c3b9fb7d43c79ae8668e4517799aed0e0
62+
63+
iptoken implementation 1.4: 0xacadd6dd9e7af053f42425a03f68da9920287d5b
64+
65+
wrapped iptoken implementation: 0xa3b844450e31e541e604217b11d48c111419a6a6
5766

5867
new SLCS with support for verifiable timelocks & distinctly configurable staking / locking periods: https://sepolia.etherscan.io/address/0x2d309CF13dC3872f9c9B1B06Ebf6F60caDe08d55#code
5968

@@ -100,18 +109,18 @@ VDAO_TOKEN_ADDRESS=0x19A3036b828bffB5E14da2659E950E76f8e6BAA2
100109

101110
---
102111

103-
### upgrading to Tokenizer 1.3
112+
### upgrading to Tokenizer 1.4
104113

105-
forge script --private-key=$PRIVATE_KEY --rpc-url=$RPC_URL script/prod/RolloutTokenizerV13.s.sol --broadcast
114+
forge script --private-key=$PRIVATE_KEY --rpc-url=$RPC_URL script/prod/RolloutTokenizerV14.s.sol --broadcast
106115

107-
// 0xTokenizer 0xNewImpl 0xNewTokenImpl
108-
cast send --rpc-url=$RPC_URL --private-key=$PRIVATE_KEY 0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e "upgradeToAndCall(address,bytes)" 0x70e0bA845a1A0F2DA3359C97E0285013525FFC49 0x84646c1f000000000000000000000000998abeb3e57409262ae5b751f60747921b33613e
116+
// 0xTokenizer (address, bytes)(0xNewImpl, 0xNewWrappedIPTokenImpl 0xNewIPTokenImpl)
117+
cast send --rpc-url=$RPC_URL --private-key=$PRIVATE_KEY 0x58EB89C69CB389DBef0c130C6296ee271b82f436 "upgradeToAndCall(address,bytes)" 0x4166362c3b9fb7d43c79ae8668e4517799aed0e0 0x8b3d19bb0000000000000000000000000ca5f50a8a59a59ef8c8d610f5ebf99e41f1352f000000000000000000000000d79fe2c4879b3a3d732df11294329a60cff3a0a9
109118

110119
### Timelocked Tokens
111120

112121
originally the "timelocked token" was an inline concept of the slcs. Timelock contracts weren't reusable among cs impls. This changes as of beginning of 2025. As a rather simple but not very elegant (and certainly not correct) solution we decided to "trust" external locking contracts so you can reuse them among crowdsale instances. This was needed for the VitaRNA crowdsale that's supposed to just support locks, no stakes - and hence required another crowdsale instance. During this upgrade we decided to externalize the timelock token template so upcoming instances can be verified on chain.
113122

114-
---
123+
---
115124

116125
## Prerequisites
117126

@@ -168,8 +177,8 @@ You need Docker.
168177

169178
#### Automatically
170179

171-
- `yarn localenv` sets up *everything*
172-
- use `./setupLocal.sh` to deploy all contracts. Add the optional `-f` or `--fixture` flag to also run the fixture scripts to tokenize one IPNFT or `-fx` to create two crowdsale instances.
180+
- `yarn localenv` sets up _everything_
181+
- use `./setupLocal.sh` to deploy all contracts. Add the optional `-f` or `--fixture` flag to also run the fixture scripts to tokenize one IPNFT or `-fx` to create two crowdsale instances.
173182

174183
#### Manual
175184

‎foundry.lock‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"lib/ERC721B": {
3+
"branch": {
4+
"name": "0.2.1",
5+
"rev": "254530019373cfb2aa3cb6e975768857f829823d"
6+
}
7+
},
8+
"lib/forge-std": {
9+
"rev": "87a2a0afc5fafd6297538a45a52ac19e71a84562"
10+
},
11+
"lib/openzeppelin-contracts": {
12+
"branch": {
13+
"name": "release-v4.8",
14+
"rev": "281550b71c3df9a83e6b80ceefc700852c287570"
15+
}
16+
},
17+
"lib/openzeppelin-contracts-upgradeable": {
18+
"rev": "43b82754979c35abcd3ccad7b795754146c62ade"
19+
},
20+
"lib/safe-contracts": {
21+
"branch": {
22+
"name": "v1.4.0",
23+
"rev": "e870f514ad34cd9654c72174d6d4a839e3c6639f"
24+
}
25+
},
26+
"lib/solidity-base64": {
27+
"rev": "537095980643f59e9e00b7b76d341bb9da438eaf"
28+
},
29+
"lib/solmate": {
30+
"branch": {
31+
"name": "v7",
32+
"rev": "ed67feda67b24fdeff8ad1032360f0ee6047ba0a"
33+
}
34+
},
35+
"lib/token-vesting-contract": {
36+
"rev": "b1f3e05bb6f07bec70d2b7b588d622c06f70ae39"
37+
}
38+
}

‎foundry.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ out = 'out'
44
libs = ['lib']
55
test = 'test'
66
solc_version = "0.8.18"
7+
optimizer = true
8+
optimizer_runs = 200
79
gas_reports = [
810
"IPNFT",
911
"IPNFTV2",
@@ -29,6 +31,7 @@ tab_width = 4
2931
quote_style = 'double'
3032
func_attrs_with_params_multiline = true
3133
override_spacing = false
34+
sort_imports = true
3235

3336
[rpc_endpoints]
3437
optimism = "https://optimism-goerli.infura.io/v3/${INFURA_KEY}"

‎script/DeployTokenizer.s.sol‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.18;
33

4-
import "forge-std/Script.sol";
5-
import "forge-std/console.sol";
4+
import { BioPriceFeed } from "../src/BioPriceFeed.sol";
65
import { IPNFT } from "../src/IPNFT.sol";
7-
import { Tokenizer } from "../src/Tokenizer.sol";
86
import { IPToken } from "../src/IPToken.sol";
9-
import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
10-
import { BioPriceFeed } from "../src/BioPriceFeed.sol";
117
import { IPermissioner, TermsAcceptedPermissioner } from "../src/Permissioner.sol";
8+
9+
import { TimelockedToken } from "../src/TimelockedToken.sol";
10+
import { Tokenizer } from "../src/Tokenizer.sol";
1211
import { CrowdSale } from "../src/crowdsale/CrowdSale.sol";
1312
import { StakedLockingCrowdSale } from "../src/crowdsale/StakedLockingCrowdSale.sol";
14-
import { TimelockedToken } from "../src/TimelockedToken.sol";
13+
import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
14+
import "forge-std/Script.sol";
15+
import "forge-std/console.sol";
1516

1617
contract DeployTokenizerInfrastructure is Script {
1718
function run() public {

‎script/dev/Ipnft.s.sol‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,13 @@ contract FixtureIpnft is CommonScript {
8585
function run() public {
8686
prepareAddresses();
8787

88-
uint256 tokenId = mintIpnft(bob, bob);
88+
uint256 token1Id = mintIpnft(bob, bob);
89+
uint256 token2Id = mintIpnft(bob, bob);
8990

9091
dealERC20(bob, 1000 ether, usdc);
9192
dealERC20(alice, 1000 ether, usdc);
9293

93-
uint256 listingId = createListing(bob, tokenId, 1 ether, usdc);
94+
uint256 listingId = createListing(bob, token1Id, 1 ether, usdc);
9495
//we're *NOT* accepting the listing here because of inconsistent listing ids on anvil
9596
//execute ApproveAndBuy.s.sol if you want to do that.
9697
console.log("listing id %s", listingId);

‎script/dev/Synthesizer.s.sol‎

Lines changed: 0 additions & 100 deletions
This file was deleted.

0 commit comments

Comments
 (0)