90 upgradable contracts

.github/workflows/deploy_badge.yml

@@ -71,7 +71,7 @@ permissions:
 env:
   COMPILED_SOURCE: ./build/CarbonableBadge.json
   PROTOSTAR_TOML_FILE: ./protostar.toml
-  PROTOSTAR_VERSION: 0.7.0
+  PROTOSTAR_VERSION: 0.8.1
 
 jobs:
   deploy:

.github/workflows/deploy_minter.yml

@@ -121,7 +121,7 @@ permissions:
 env:
   COMPILED_SOURCE: ./build/CarbonableMinter.json
   PROTOSTAR_TOML_FILE: ./protostar.toml
-  PROTOSTAR_VERSION: 0.7.0
+  PROTOSTAR_VERSION: 0.8.1
 
 jobs:
   deploy:

.github/workflows/deploy_project.yml

@@ -72,7 +72,7 @@ permissions:
 env:
   COMPILED_SOURCE: ./build/CarbonableProject.json
   PROTOSTAR_TOML_FILE: ./protostar.toml
-  PROTOSTAR_VERSION: 0.7.0
+  PROTOSTAR_VERSION: 0.8.1
 
 jobs:
   deploy:

.github/workflows/test.yml

@@ -3,7 +3,7 @@ name: CI Tests
 on: [push, pull_request, pull_request_target]
 
 env:
-  PROTOSTAR_VERSION: 0.7.0
+  PROTOSTAR_VERSION: 0.8.1
 
 jobs:
   protostar-tests:

.github/workflows/transfer_ownership.yml

@@ -73,7 +73,7 @@ permissions:
 env:
   PROJECT_ABI: ./build/CarbonableProject_abi.json
   PROTOSTAR_TOML_FILE: ./protostar.toml
-  PROTOSTAR_VERSION: 0.7.0
+  PROTOSTAR_VERSION: 0.8.1
 
 jobs:
   transfer:

.gitignore

@@ -4,6 +4,7 @@
 # Python
 __pycache__
 env
+.env
 
 # starknet 
 node.json

protostar.toml

@@ -1,5 +1,5 @@
 [project]
-protostar-version = "0.7.0"
+protostar-version = "0.8.1"
 lib-path = "lib"
 cairo-path = ["./lib/cairopen_contracts/src", "./lib/cairo_contracts/src", "./lib/bal7hazar_contracts/src", "src"]
 
@@ -9,15 +9,26 @@ CarbonableProject = ["src/project/project.cairo"]
 CarbonableMinter = ["src/mint/minter.cairo"]
 CarbonableYielder = ["src/farm/yielder.cairo"]
 CarbonableOffseter = ["src/farm/offseter.cairo"]
+CarbonableProxy = ["src/proxy/proxy.cairo"]
 
 [test]
 target = ["tests"]
 
-[profile.devnet.deploy]
+[profile.devnet.project]
 gateway-url = "http://127.0.0.1:5050/"
 
-[profile.testnet.deploy]
+[profile.testnet.project]
 network = "testnet"
+private-key-path = "./.env"
+account-address = "0x063675fa1ecea10063722e61557ed7f49ed2503d6cdd74f4b31e9770b473650c"
+block-explorer = "starkscan"
 
-[profile.mainnet.deploy]
+[profile.testnet2.project]
+gateway-url="https://alpha4-2.starknet.io"
+chain-id=1536727068981429685321
+private-key-path = "./.env"
+account-address = "0x063675fa1ecea10063722e61557ed7f49ed2503d6cdd74f4b31e9770b473650c"
+block-explorer = "starkscan"
+
+[profile.mainnet.project]
 network = "mainnet"

scripts/configs/testnet.config

@@ -2,19 +2,19 @@
 ACCOUNT=carbonable
 WALLET=starkware.starknet.wallets.open_zeppelin.OpenZeppelinAccount
 
-# ERC-1155 settings
-ERC1155_URI="ipfs://bafybeid3s2i3rjqdxeaoi2du7r3yev4n25uzbwla7nyj5v22rwdl7lfvz4"
-ERC1155_NAME="Carbonable ERC-1155 Test"
+# Carbonable Badge Settings
+BADGE_URI="ipfs://bafybeid3s2i3rjqdxeaoi2du7r3yev4n25uzbwla7nyj5v22rwdl7lfvz4"
+BADGE_NAME="Carbonable Badge Test"
 
-# ERC-721 settings
-ERC721_NAME="Carbonable ERC-721 Test"
-ERC721_SYMBOL=CET
-ERC721_URI="ipfs://bafybeihfuraj3mqqhn73ly2eap3ovxyu6ilasrmxpdg4hz7giul4hgr7zy"
+# Carbonable Project Settings
+PROJECT_NAME="Carbonable Project Test"
+PROJECT_SYMBOL=CARB
+PROJECT_URI="ipfs://bafybeigfdn34lppjksypyvmkeeim5536e77oj4jfsh62lbom2zu643rxbm"
 
-# Minter settings
-PAYMENT_TOKEN_ADDRESS=0x07394cbe418daa16e42b87ba67372d4ab4a5df0b05c6e554d158458ce245bc10
-PUBLIC_SALE_OPEN=1
-MAX_BUY_PER_TX=5
-UNIT_PRICE="10 0"
-MAX_SUPPLY_FOR_MINT="10 0"
-RESERVED_SUPPLY_FOR_MINT="3 0"
+# Carbonable Minter Settings
+PAYMENT_TOKEN_ADDRESS=0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7
+MINTER_PUBLIC_SALE_OPEN=1
+MINTER_MAX_BUY_PER_TX=5
+MINTER_UNIT_PRICE="10 0"
+MINTER_MAX_SUPPLY_FOR_MINT="10 0"
+MINTER_RESERVED_SUPPLY_FOR_MINT="3 0"

scripts/configs/testnet2.config

@@ -0,0 +1,20 @@
+# Global settings
+ACCOUNT=carbonable
+WALLET=starkware.starknet.wallets.open_zeppelin.OpenZeppelinAccount
+
+# Carbonable Badge Settings
+BADGE_URI="ipfs://bafybeid3s2i3rjqdxeaoi2du7r3yev4n25uzbwla7nyj5v22rwdl7lfvz4"
+BADGE_NAME="Carbonable Badge Test"
+
+# Carbonable Project Settings
+PROJECT_NAME="Carbonable Project Test"
+PROJECT_SYMBOL=CARB
+PROJECT_URI="ipfs://bafybeigfdn34lppjksypyvmkeeim5536e77oj4jfsh62lbom2zu643rxbm"
+
+# Carbonable Minter Settings
+PAYMENT_TOKEN_ADDRESS=0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7
+MINTER_PUBLIC_SALE_OPEN=1
+MINTER_MAX_BUY_PER_TX=5
+MINTER_UNIT_PRICE="10 0"
+MINTER_MAX_SUPPLY_FOR_MINT="10 0"
+MINTER_RESERVED_SUPPLY_FOR_MINT="3 0"

scripts/deploy_project.sh → scripts/deploy_protocol.sh

@@ -42,11 +42,12 @@ deploy_all_contracts() {
     [ ! -z $PROFILE ] && PROFILE_OPT="--profile $PROFILE"
 
     # Deploy ERC-721 token contract
-    if [ -z $ERC721_ADDRESS ]; then
-        erc721_name=$(str_to_hex "$ERC721_NAME")
-        erc721_symbol=$(str_to_hex "$ERC721_SYMBOL")
+    if [ -z $PROJECT_ADDRESS ]; then
+        project_name=$(str_to_hex "$PROJECT_NAME")
+        project_symbol=$(str_to_hex "$PROJECT_SYMBOL")
         log_info "Deploying ERC-721 contract..."
-        ERC721_ADDRESS=`send_transaction "protostar $PROFILE_OPT deploy ./build/CarbonableProject.json --inputs $erc721_name $erc721_symbol $ADMIN_ADDRESS" "$NETWORK"` || exit_error
+        PROJECT_CLASS_HASH=`send_transaction "protostar $PROFILE_OPT declare ./build/CarbonableProject.json --max-fee auto" "$NETWORK"` || exit_error
+        PROJECT_ADDRESS=`send_transaction "protostar $PROFILE_OPT deploy ./build/CarbonableProxy.json --max-fee auto --inputs $project_name $project_symbol $ADMIN_ADDRESS" "$NETWORK"` || exit_error
     fi
 
     # Deploy Minter contract

scripts/generate_metadata.sh

@@ -7,7 +7,7 @@ PARENT_DIR="$(dirname "$SOURCE_FILE")"
 
 ### GENERATION
 echo $TIMES
-for (( i=0; i<$TIMES; i++))
+for (( i=1; i<=$TIMES; i++))
 do
     cp $SOURCE_FILE $PARENT_DIR/$i.json
 done

scripts/starknet.sh

@@ -15,7 +15,7 @@ get_account_address() {
 get_network() {
     profile=$1
     protostar_toml_file=$2
-    network=$(grep profile.$profile $protostar_toml_file -A3 -m1 | sed -n 's@^.*[network=|gateway_url=]"\(.*\)".*$@\1@p')
+    network=$(grep profile.$profile $protostar_toml_file -A3 -m1 | sed -n 's@^.*[network =|gateway_url =]"\(.*\)".*$@\1@p')
     echo $(get_legacy_network "$network")
 }
 

src/farm/library.cairo

@@ -162,7 +162,7 @@ namespace CarbonableFarmer {
         let (contract_address) = get_contract_address();
         let (carbonable_project_address) = carbonable_project_address_.read();
         // [Check] Throws error if unknown token id
-        let (owner) = IERC721.ownerOf(  
+        let (owner) = IERC721.ownerOf(
             contract_address=carbonable_project_address, tokenId=token_id
         );
         with_attr error_message("CarbonableFarmer: token_id has not been registred") {
@@ -223,7 +223,7 @@ namespace CarbonableFarmer {
         alloc_locals;
 
         // [Security] Start reetrancy guard
-        ReentrancyGuard._start();
+        ReentrancyGuard.start();
 
         // [Check] Locked status
         let (status) = is_locked();
@@ -259,7 +259,7 @@ namespace CarbonableFarmer {
         registration_.write(token_id, caller);
 
         // [Security] End reetrancy guard
-        ReentrancyGuard._end();
+        ReentrancyGuard.end();
 
         return (success=TRUE,);
     }
@@ -270,7 +270,7 @@ namespace CarbonableFarmer {
         alloc_locals;
 
         // [Security] Start reetrancy guard
-        ReentrancyGuard._start();
+        ReentrancyGuard.start();
 
         // [Check] Locked status
         let (status) = is_locked();
@@ -306,7 +306,7 @@ namespace CarbonableFarmer {
         }
 
         // [Security] End reetrancy guard
-        ReentrancyGuard._end();
+        ReentrancyGuard.end();
 
         return (success=TRUE,);
     }

src/farm/offseter.cairo

@@ -8,17 +8,18 @@ from starkware.cairo.common.uint256 import Uint256
 
 // Project dependencies
 from openzeppelin.access.ownable.library import Ownable
+from openzeppelin.upgrades.library import Proxy
 
 // Local dependencies
 from src.farm.library import CarbonableFarmer
 
 //
-// Constructor
+// Initializer
 //
 
-@constructor
-func constructor{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
-    carbonable_project_address: felt, owner: felt
+@external
+func initializer{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
+    carbonable_project_address: felt, owner: felt, proxy_admin: felt
 ) {
     // Desc:
     //   Initialize the contract with the given parameters -
@@ -30,10 +31,52 @@ func constructor{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr
     // Explicit args:
     //   carbonable_project_address(felt): Address of the corresponding Carbonable project
     //   owner(felt): Owner address
+    //   proxy_admin(felt): Admin address
     // Returns:
     //   None
     CarbonableFarmer.initializer(carbonable_project_address);
     Ownable.initializer(owner);
+    Proxy.initializer(proxy_admin);
+    return ();
+}
+
+@view
+func getImplementationHash{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() -> (
+    implementation: felt
+) {
+    return Proxy.get_implementation_hash();
+}
+
+@view
+func getAdmin{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() -> (admin: felt) {
+    return Proxy.get_admin();
+}
+
+@external
+func upgrade{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
+    new_implementation: felt
+) {
+    // Desc:
+    //   Renounce ownership
+    // Implicit args:
+    //   syscall_ptr(felt*)
+    //   pedersen_ptr(HashBuiltin*)
+    //   range_check_ptr
+    // Returns:
+    //   None
+    // Explicit args:
+    //   new_implementation(felt): new contract implementation
+    // Raises:
+    //   caller: caller is not a contract admin
+    Proxy.assert_only_admin();
+    Proxy._set_implementation_hash(new_implementation);
+    return ();
+}
+
+@external
+func setAdmin{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(new_admin: felt) {
+    Proxy.assert_only_admin();
+    Proxy._set_admin(new_admin);
     return ();
 }