v0.2.1 (#217)

* added english auction

* Added placeholder Pinata API keys. (#208)

* Auction and fixed price contracts (#213)

* feat: Commit contracts/ changes from fixed-price and auction work

This commit moves changes merged from emmanuel/fixed-price sale as well
as eli/english-auction into a clean branch on top of develop.

* chore: Update yarn.lock

* token_metadata_map -> token_info

* recompile contracts

Co-authored-by: Philip Diaz <[email protected]>

* fix(doc): Update README with correct Pinata apiSecret field (#214)

* feat: Originate contract via minter-sdk contracts/bin/ code (#215)

* feat: Originate contract via minter-sdk contracts/bin/ code

* feat: Use public minter-sdk raw content url

* refactor: Update bootstrap-contracts-config script with clearer functions

* chore: Remove star imports from bootstrap-contracts-config

* updated shield to reflect version

README.md

@@ -1,6 +1,6 @@
 ![OpenMinter header](/docs/assets/minterhead.png)
 
-[![](https://img.shields.io/badge/license-MIT-brightgreen)](LICENSE) [![](https://img.shields.io/badge/Docker-20.10.x-blue)](https://www.docker.com/) [![](https://img.shields.io/badge/version-v0.2.0-orange)](https://github.com/tqtezos/minter)
+[![](https://img.shields.io/badge/license-MIT-brightgreen)](LICENSE) [![](https://img.shields.io/badge/Docker-20.10.x-blue)](https://www.docker.com/) [![](https://img.shields.io/badge/version-v0.2.1-orange)](https://github.com/tqtezos/minter)
 
 ## Notice
 
@@ -77,7 +77,7 @@ type Config = {
   },
   pinata?: {
     apiKey: string,
-    secretKey: string
+    apiSecret: string
   },
   contracts?: {
     nftFaucet?: string
@@ -91,11 +91,11 @@ administrator during contract origination:
 
 ```json
 {
-	"rpc": "http://localhost:8732",
-	"admin": {
-		"address": "tz1YPSCGWXwBdTncK2aCctSZAXWvGsGwVJqU",
-		"secret": "edsk3RFgDiCt7tWB2oe96w1eRw72iYiiqZPLu9nnEY23MYRp2d8Kkx"
-	}
+  "rpc": "http://localhost:8732",
+  "admin": {
+    "address": "tz1YPSCGWXwBdTncK2aCctSZAXWvGsGwVJqU",
+    "secret": "edsk3RFgDiCt7tWB2oe96w1eRw72iYiiqZPLu9nnEY23MYRp2d8Kkx"
+  }
 }
 ```
 

bin/init-dev

@@ -4,10 +4,7 @@ set -e
 
 source ${BASH_SOURCE%/*}/setup-env
 
-pushd $PROJECT_ROOT_DIR/contracts && yarn install ; popd
-
 # pushd $PROJECT_ROOT_DIR/client && yarn install ; popd
-#
 # pushd $PROJECT_ROOT_DIR/server && yarn install ; popd
 
 $PROJECT_ROOT_DIR/bin/build-dev-images

bin/start

@@ -36,7 +36,7 @@ docker stack deploy \
 ENV_START_SCRIPT=$PROJECT_ROOT_DIR/bin/${ENV_NAME}/start
 [ -f $ENV_START_SCRIPT ] && $ENV_START_SCRIPT
 
-pushd $PROJECT_ROOT_DIR/contracts && yarn run bootstrap ; popd
+pushd $PROJECT_ROOT_DIR; yarn bootstrap ; popd
 
 docker stack deploy -c $UI_STACK_FILE $STACK_NAME
 docker stack deploy -c $API_SERVER_STACK_FILE $STACK_NAME

config/minter.mainnet.example.json

@@ -1,6 +1,6 @@
 {
 	"rpc": "https://mainnet-tezos.giganode.io",
-  "network": "mainnet",
+        "network": "mainnet",
 	"bcd": {
 		"api": "https://api.better-call.dev",
 		"gui": "https://better-call.dev"
@@ -9,5 +9,9 @@
 		"address": "<YOUR_TZ_PUBLIC_ADDRESS_HERE>",
 		"secret": "<YOUR_TZ_PRIVATE_KEY_HERE>"
 	},
+	"pinata": {
+		"apiKey": "<YOUR_PINATA_API_KEY_HERE>",
+		"apiSecret": "<YOUR_PINATA_API_SECRET_HERE>"
+	},
 	"contracts": {}
 }