Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(launchpad): add contract and deps #1315

Merged
merged 35 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
8f6362b
feat: add nft-launchpad contract and deps
WaDadidou Oct 18, 2024
78c8971
fix: temporary allow push mnemonic
WaDadidou Oct 18, 2024
b0aca03
fix: disallow push mnemonic
WaDadidou Oct 18, 2024
fb4cbb2
fix: Cargo.toml
WaDadidou Oct 18, 2024
9199111
wip: two contracts scripts
WaDadidou Oct 20, 2024
9026282
chore: add script deploNftLaunchpad
WaDadidou Oct 27, 2024
bbdc11b
chore: remove comment
WaDadidou Oct 27, 2024
4f11bd6
chore: remove unued row from .gitignore
WaDadidou Oct 28, 2024
8e25b21
chore: remove unused file
WaDadidou Oct 28, 2024
26317e4
make generate
WaDadidou Oct 28, 2024
aa5cbd7
chore: new nft-launchpad contract instantiation
WaDadidou Oct 28, 2024
a5e7f20
fix: features gen
WaDadidou Oct 28, 2024
94f2de2
chore: launchpad scripst: remove unused arg, fix instantiate
WaDadidou Nov 1, 2024
415a7b4
fix: launchpad: plug data in contract
WaDadidou Nov 1, 2024
6c4f925
chore: update .gitattributes
WaDadidou Nov 1, 2024
1238cdb
chore(launchpad): remove script usage from deploy teritori ecosystem …
WaDadidou Nov 3, 2024
e11c4a1
chore: make a Collection peroperty mandatory
WaDadidou Nov 3, 2024
b025338
fix(launchpad): set launchpad_admin as mandatory in Config, fix usage…
WaDadidou Nov 4, 2024
419b918
chore(launchpad): make generate
WaDadidou Nov 4, 2024
975e22d
fix(launchpad): fix multitest, remove unused error
WaDadidou Nov 4, 2024
c0f49d8
chore(launchpad): make generate to fix features.gen.go after rebase
WaDadidou Nov 5, 2024
5eb4431
fix(launchpad): enhance contract
WaDadidou Nov 6, 2024
b6c1751
chore(launchpad): make generate
WaDadidou Nov 6, 2024
e60a7bf
chore(launchpad): change feature name
WaDadidou Nov 7, 2024
6b03eda
chore(launchpad): remove unused exports
WaDadidou Nov 7, 2024
59af3a3
chore(launchpad): modify contract
WaDadidou Nov 7, 2024
b7f91f6
fix(launchpad): feature usage in script
WaDadidou Nov 7, 2024
d22f1c1
Merge remote-tracking branch 'origin/main' into feat-nft-launchpad-co…
WaDadidou Nov 7, 2024
4bdc594
chore(launchpad): make generate
WaDadidou Nov 7, 2024
14f4a9a
fix(launchapd): deployNftLaunchpad.ts fix
WaDadidou Nov 7, 2024
963b839
chore(launchpad): Set admin anf nft_code_id as mandatory.
WaDadidou Nov 8, 2024
4ba5107
chore(launchpad): make generate
WaDadidou Nov 8, 2024
43ed58f
chore(launchpad): cargo fmt
WaDadidou Nov 10, 2024
e304360
chore(launchpad): cargo fmt from root
WaDadidou Nov 10, 2024
027513e
Merge branch 'main' into feat-nft-launchpad-contract
n0izn0iz Nov 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@
/packages/evm-contracts-clients/**/*.ts linguist-generated
/.expo-shared/assets.json linguist-generated
*.gno linguist-language=Go
/rust/**/schema/raw/**/*.json linguist-generated
/rust/apipb/src/**/*.rs linguist-generated
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ temp/
# rust
/target/
artifacts
rust/cw-contracts/*/target

# cypress
cypress/screenshots
76 changes: 76 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,7 @@ schemars = "0.8.16"
serde = { version = "1.0.197", features = ["derive"] }
thiserror = "1.0.57"
sylvia = "0.9.3"
prost = "0.12.3"
prost = "0.12.3"
apipb = { version = "0.1.0", path = "rust/apipb" }
nft-tr721 = { version = "0.2.0", path = "rust/cw-contracts/nft-tr721" }
nft-launchpad = { version = "0.2.0", path = "rust/cw-contracts/nft-launchpad" }
31 changes: 30 additions & 1 deletion go/pkg/networks/features.gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

const (
FeatureTypeNFTMarketplace = FeatureType("NFTMarketplace")
FeatureTypeNFTLaunchpad = FeatureType("NFTLaunchpad")
FeatureTypeCosmWasmNFTLaunchpad = FeatureType("CosmWasmNFTLaunchpad")
FeatureTypeNameService = FeatureType("NameService")
FeatureTypeSwap = FeatureType("Swap")
FeatureTypeBurnTokens = FeatureType("BurnTokens")
Expand Down Expand Up @@ -63,6 +63,29 @@ func (nb *NetworkBase) GetFeatureCosmWasmNFTsBurner() (*FeatureCosmWasmNFTsBurne
return feature.(*FeatureCosmWasmNFTsBurner), nil
}

type FeatureCosmWasmNFTLaunchpad struct {
*FeatureBase
LaunchpadContractAddress string `json:"launchpadContractAddress"`
DefaultMintDenom string `json:"defaultMintDenom"`
LaunchpadEndpoint string `json:"launchpadEndpoint"`
CodeId float64 `json:"codeId"`
NftTr721CodeId float64 `json:"nftTr721CodeId"`
}

var _ Feature = &FeatureCosmWasmNFTLaunchpad{}

func (f FeatureCosmWasmNFTLaunchpad) Type() FeatureType {
return FeatureTypeCosmWasmNFTLaunchpad
}

func (nb *NetworkBase) GetFeatureCosmWasmNFTLaunchpad() (*FeatureCosmWasmNFTLaunchpad, error) {
feature, err := nb.GetFeature(FeatureTypeCosmWasmNFTLaunchpad)
if err != nil {
return nil, err
}
return feature.(*FeatureCosmWasmNFTLaunchpad), nil
}

type FeatureGnoProjectManager struct {
*FeatureBase
ProjectsManagerPkgPath string `json:"projectsManagerPkgPath"`
Expand Down Expand Up @@ -141,6 +164,12 @@ func UnmarshalFeature(b []byte) (Feature, error) {
return nil, errors.Wrap(err, "failed to unmarshal feature CosmWasmNFTsBurner")
}
return &f, nil
case FeatureTypeCosmWasmNFTLaunchpad:
var f FeatureCosmWasmNFTLaunchpad
if err := json.Unmarshal(b, &f); err != nil {
return nil, errors.Wrap(err, "failed to unmarshal feature CosmWasmNFTLaunchpad")
}
return &f, nil
case FeatureTypeGnoProjectManager:
var f FeatureGnoProjectManager
if err := json.Unmarshal(b, &f); err != nil {
Expand Down
18 changes: 13 additions & 5 deletions networks.json
Original file line number Diff line number Diff line change
Expand Up @@ -3880,7 +3880,7 @@
"features": [
"NFTMarketplace",
"RiotP2E",
"NFTLaunchpad",
"CosmWasmNFTLaunchpad",
"NFTBridge"
],
"currencies": [
Expand Down Expand Up @@ -3926,7 +3926,7 @@
"features": [
"NFTMarketplace",
"RiotP2E",
"NFTLaunchpad",
"CosmWasmNFTLaunchpad",
"NFTBridge"
],
"currencies": [
Expand Down Expand Up @@ -11427,7 +11427,7 @@
"UPP",
"NameService",
"BurnTokens",
"NFTLaunchpad",
"CosmWasmNFTLaunchpad",
"NFTMarketplaceLeaderboard",
"CosmWasmNFTsBurner"
],
Expand Down Expand Up @@ -11524,7 +11524,7 @@
"UPP",
"NameService",
"BurnTokens",
"NFTLaunchpad",
"CosmWasmNFTLaunchpad",
"RiotP2E",
"NFTMarketplaceLeaderboard"
],
Expand Down Expand Up @@ -11602,7 +11602,7 @@
"UPP",
"NameService",
"BurnTokens",
"NFTLaunchpad",
"CosmWasmNFTLaunchpad",
"CosmWasmPremiumFeed",
"NFTMarketplaceLeaderboard",
"CosmWasmNFTsBurner"
Expand All @@ -11621,6 +11621,14 @@
"type": "NFTMarketplace",
"cwAddressListCodeId": 63,
"cwAddressListContractAddress": "tori1x72plnprsjnmszylmdm3cnvu5h6u55fyf0pe02lye9p6q2ws05ps33qmft"
},
{
"type": "CosmWasmNFTLaunchpad",
"launchpadContractAddress": "tori1te7ku4de0k4rl8lhyuvpmhygaq7k7vy5zpsjq9y638efxsnx3aaqck2utf",
"launchpadEndpoint": "https://dapp-backend.testnet.teritori.com",
"nftTr721CodeId": 60,
"codeId": 71,
"defaultMintDenom": "utori"
}
],
"currencies": [
Expand Down
136 changes: 136 additions & 0 deletions packages/contracts-clients/nft-launchpad/NftLaunchpad.client.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading