diff --git a/README.md b/README.md index b778c23..d9347ae 100644 --- a/README.md +++ b/README.md @@ -5,13 +5,13 @@ | [Teia Marketplace (v1)](python/contracts/teiaMarketplace_v1.py) | [KT1PHubm9HtyQEJ4BBpMTVomq6mhbfNZ9z5w](https://tzkt.io/KT1PHubm9HtyQEJ4BBpMTVomq6mhbfNZ9z5w) | Audited | | [Multisig Wallet / mini-DAO (v1)](python/contracts/multisigWallet_v1.py) | [KT1PKBTVmdxfgkFvSeNUQacYiEFsPBw16B4P](https://tzkt.io/KT1PKBTVmdxfgkFvSeNUQacYiEFsPBw16B4P) | Audited | | [Core Team multisig](python/contracts/daoMultisig.py) | [KT1J9FYz29RBQi1oGLw8uXyACrzXzV1dHuvb](https://tzkt.io/KT1J9FYz29RBQi1oGLw8uXyACrzXzV1dHuvb) | Deployed | +| [DAO token](python/contracts/daoToken.py) | [KT1QrtA753MSv8VGxkDrKKyJniG5JtuHHbtV](https://tzkt.io/KT1QrtA753MSv8VGxkDrKKyJniG5JtuHHbtV) | Deployed | +| [DAO token distributor](python/contracts/daoTokenDrop.py) | [KT1NrfV4e2qWqFrnrKyPTJth5wq2KP9VyBei](https://tzkt.io/KT1NrfV4e2qWqFrnrKyPTJth5wq2KP9VyBei) | Deployed | | [Extended FA1.2 token](python/contracts/fa12.py) | | Prototype | | [Extended FA2 token](python/contracts/fa2.py) | | Prototype | | [Extended FA2 token minter](python/contracts/minter.py) | | Prototype | | [Marketplace for the extended FA2 token](python/contracts/marketplace.py) | | Prototype | | [Artists collaboration](python/contracts/artistsCollaboration.py) | | Prototype | -| [DAO token](python/contracts/daoToken.py) | | Prototype | -| [DAO token distributor](python/contracts/daoTokenDrop.py) | | Prototype | | [DAO governance](python/contracts/daoGovernance.py) | | Prototype | | [DAO treasury](python/contracts/daoTreasury.py) | | Prototype | | [DAO representatives](python/contracts/representatives.py) | | Prototype | diff --git a/metadata/daoToken.json b/metadata/daoToken.json index 8dfa2ae..3fb873a 100644 --- a/metadata/daoToken.json +++ b/metadata/daoToken.json @@ -2,7 +2,7 @@ "name": "Teia DAO FA2 token contract", "description": "DAO token contract used in the Teia DAO", "version": "1.0.0", - "authors": [ "Teia Community " ], + "authors": [ "Teia Community " ], "homepage": "https://teia.art", "source": { "tools": [ "SmartPy 0.16.0" ], "location": "https://github.com/teia-community/teia-smart-contracts/blob/main/python/contracts/daoToken.py" }, "license": { "name": "MIT", "details": "The MIT License" }, diff --git a/metadata/daoTokenDrop.json b/metadata/daoTokenDrop.json index fd2b558..f605ad9 100644 --- a/metadata/daoTokenDrop.json +++ b/metadata/daoTokenDrop.json @@ -1,10 +1,11 @@ { - "name": "Teia DAO token distribution contract prototype", - "description": "Prototy token distribution contract used for the Teia DAO", + "name": "Teia DAO token distribution contract", + "description": "Token distribution contract used for the Teia DAO", "version": "1.0.0", "authors": [ "Teia Community " ], "homepage": "https://teia.art", "source": { "tools": [ "SmartPy 0.16.0" ], "location": "https://github.com/teia-community/teia-smart-contracts/blob/main/python/contracts/daoTokenDrop.py" }, + "license": { "name": "MIT", "details": "The MIT License" }, "interfaces": [ "TZIP-016" ], "errors": [ { "error": { "string": "DROP_NOT_ADMIN" }, "expansion": { "string": "The account that executed the entry point is not the contract administrator" }, "languages": [ "en" ] }, diff --git a/python/contracts/daoToken.py b/python/contracts/daoToken.py index 035bdd4..6dd2751 100644 --- a/python/contracts/daoToken.py +++ b/python/contracts/daoToken.py @@ -560,8 +560,8 @@ def token_metadata(self, token_id): sp.add_compilation_target("daoToken", DAOToken( administrator=sp.address("tz1RssrimWo3B8TpCajiNjqBD3MfhUwEgxod"), - metadata=sp.utils.metadata_of_url("ipfs://QmbmLBSisoZYXr7F7nFBeZMYUmf2Vnd4QKP77FyHPTdWMX"), - token_metadata=sp.utils.bytes_of_string("ipfs://Qmf63CUkCGjJWM8YKsp8XDiauPVhVEdArmozrjzTtKhd8z"), - initial_owner=sp.address("KT1StiWr1bqAfu7y1pLUkUC8zhwLmHpvJuJ7"), + metadata=sp.utils.metadata_of_url("ipfs://QmeXpWrkHZSth2gsM1c6tPZe61RKSERexqmm3okgGZxZ2F"), + token_metadata=sp.utils.bytes_of_string("ipfs://QmaQywJXcjWZKT3Gu2n15A3ip4q2Y79WghGG2dFxxtYgNV"), + initial_owner=sp.address("KT1NrfV4e2qWqFrnrKyPTJth5wq2KP9VyBei"), supply=8000000000000, max_share=400000000000)) diff --git a/python/contracts/daoTokenDrop.py b/python/contracts/daoTokenDrop.py index f842d73..1339e90 100644 --- a/python/contracts/daoTokenDrop.py +++ b/python/contracts/daoTokenDrop.py @@ -320,8 +320,8 @@ def claimed_tokens(self, address): sp.add_compilation_target("daoTokenDrop", DAOTokenDrop( administrator=sp.address("tz1RssrimWo3B8TpCajiNjqBD3MfhUwEgxod"), - metadata=sp.utils.metadata_of_url("ipfs://QmNhC5Uucwh8TRfzL8xxo2y7RbJVkShuVr8dXCfoFoVCZ5"), + metadata=sp.utils.metadata_of_url("ipfs://QmVgckZRYgAMw6RqEHv4hZvJ1kqVYJ2qxRZQj6T6uFVTub"), token=sp.address("KT1RJ6PbjHpwc3M5rw5s2Nbmefwbuwbdxton"), treasury=sp.address("KT1J9FYz29RBQi1oGLw8uXyACrzXzV1dHuvb"), merkle_root=sp.bytes("0x09b3bfe2615514519988b05eb69b9cb69383ed9e060bec3693a3fc8801dbf2b3"), - expiration_date=sp.timestamp_from_utc(2023, 11, 22, 23, 59, 59))) + expiration_date=sp.timestamp_from_utc(2023, 11, 20, 23, 59, 59)))