Skip to content

Commit 015982c

Browse files
committed
default public/private key format : PUB_K1_pubkeydata, PVT_K1_privatekeydata
1 parent fc3dc61 commit 015982c

File tree

13 files changed

+246
-309
lines changed

13 files changed

+246
-309
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ endif()
4848
set( CLI_CLIENT_EXECUTABLE_NAME infra-cli )
4949
set( NODE_EXECUTABLE_NAME infra-node )
5050
set( KEY_STORE_EXECUTABLE_NAME infra-keystore )
51-
set( LAUNCHER_EXECUTABLE_NAME yoslauncher )
52-
set( ABI_GENERATOR_EXECUTABLE_NAME yosabigen )
53-
set( BLOCKLOG_EXECUTABLE_NAME yosblocklog )
51+
set( LAUNCHER_EXECUTABLE_NAME infra-launcher )
52+
set( ABI_GENERATOR_EXECUTABLE_NAME infra-abigen )
53+
set( BLOCKLOG_EXECUTABLE_NAME infra-blocklog )
5454
set( CUSTOM_URL_SCHEME "gcs" )
5555
set( INSTALLER_APP_ID "68ad7005-8eee-49c9-95ce-9eed97e5b347" )
5656

Docker/config.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ producer-name = infrasys
140140
# KEY:<data> is a string form of a valid InfraBlockchain private key which maps to the provided public key
141141
#
142142
# KEYSTORE:<data> is the URL where infra-keystore is available and the appropriate wallet(s) are unlocked (eosio::producer_plugin)
143-
signature-provider = YOS7qFXz5bvLYphF8S8XXTYgExnN2hXRBSMHTXs8oartApBx5upR3=KEY:YPV_5J7MF5bWVzjLczmVFMwiRjD5TVBG1o8UELy4jkaikXETbaMHZSb
143+
signature-provider = PUB_K1_73E1bUPyVMTb7gjvvhk3bhR1YnKi6TtzgJUL3Ykea8QGU1ZLfR=KEY:PVT_K1_VwEM9o5KsqdLs5jgHucBcE3PFbu1kk3fH2wbjRGve4QPzvScR
144144

145145
# Limits the maximum time (in milliseconds) that is allowd for sending blocks to a keystore provider for signing (eosio::producer_plugin)
146146
keystore-provider-timeout = 5

contracts/yosemite.card.ytoken/yosemite_card_ytoken_sample_transactions.sh

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
#### Yosemite Card Yosemite Token contract sample transactions
55

6-
$INFRA_CLI wallet import --private-key YPV_5Jz2zynNXzVrGtzu3BZE8AocZV9xfGuK1YtmyJhN8ydYaDhofVK
7-
$INFRA_CLI create account infrasys ycard.usd.yt YOS7v5xx9FHYEtaqUVHetLLyS6buGMpj4L9NDBpUjYUWACnvggcyt -p infrasys@active --txfee-payer infrasys
6+
$INFRA_CLI wallet import --private-key PVT_K1_r2nv6dJvB3pQyxSh5JkXyLaKrVkh9NDYAA1H9HAQmj6eCWGM6
7+
$INFRA_CLI create account infrasys ycard.usd.yt PUB_K1_7nn2nbvyuCspiCt5nQp5Kx5GJKKoSLmsAPTdY9Yua34PcYVCYT -p infrasys@active --txfee-payer infrasys
88

9-
$INFRA_CLI wallet import --private-key YPV_5KJwxh2LyXU4yDmQHoyhsZX8hXgcs4quCYW6feasGx3ew8qbgxL
10-
$INFRA_CLI create account infrasys ycard.users YOS65muvcG3YCXA1NDKiSocpBhLtqZpfYVGjQKveT8fnhCnqppX6s -p infrasys@active --txfee-payer infrasys
9+
$INFRA_CLI wallet import --private-key PVT_K1_d1mjQrD3BtnMbmgeUQX5oc5XwJRVUgJNY65MpZJTS6D6D1ucp
10+
$INFRA_CLI create account infrasys ycard.users PUB_K1_5zWk8fvNugYJ9noncZkKcAnmfeojbBqc9F8X1j9FYdMPstcqLk -p infrasys@active --txfee-payer infrasys
1111

1212
sleep 2
13-
$INFRA_CLI set contract ycard.usd.yt $YOSEMITE_CONTRACTS_DIR/yosemite.card.ytoken/ -p ycard.usd.yt@active --txfee-payer infrasys
13+
$INFRA_CLI set contract ycard.usd.yt $INFRABLOCKCHAIN_CONTRACTS_DIR/yosemite.card.ytoken/ -p ycard.usd.yt@active --txfee-payer infrasys
1414
sleep 2
1515

1616
$INFRA_CLI push action ycard.usd.yt settokenmeta '{"sym":"4,YTOKEN","url":"https://yosemitecardx.com","desc":"Yosemite Card Yosemite Token USD"}' -p ycard.usd.yt@active --txfee-payer infrasys
@@ -36,8 +36,8 @@ $INFRA_CLI push action ysmt.dusd.a issue '{"t":"ysmt.dusd.a","to":"ycard.usd.yt"
3636
$INFRA_CLI get token balance ysmt.dusd.a ycard.usd.yt
3737

3838

39-
$INFRA_CLI wallet import --private-key YPV_5JGCdjc2Mn439e6f1YEcEzniPtSBeSZPdnuz6vsUaZB7KV1SnpT
40-
$INFRA_CLI create account infrasys ycard.id.us YOS8HxRbGMAMUsukWXbF4MxRVwAqRoSoYQnnYaV34PBiJTwFbfXGd -p infrasys@active --txfee-payer infrasys
39+
$INFRA_CLI wallet import --private-key PVT_K1_2DgoXF9WARUKb6caFLLTALYvbdHjHTKnS4FFfxnLv49sDsQrFy
40+
$INFRA_CLI create account infrasys ycard.id.us PUB_K1_88E4kRrKvEaz9tfkAqeEmiyZLJPf5rb7psdTASHCNpWGHd9d9g -p infrasys@active --txfee-payer infrasys
4141

4242
$INFRA_CLI push action infrasys regidauth '{"identity_authority":"ycard.id.us","url":"https://yosemitecardx.com","location":1}' -p ycard.id.us@active --txfee-payer infrasys
4343
$INFRA_CLI push action infrasys authidauth '{"identity_authority":"ycard.id.us"}' -p infrasys@active --txfee-payer infrasys
@@ -55,10 +55,10 @@ sleep 2
5555

5656
#################################################
5757
### Yosemite Card User Account Setup
58-
$INFRA_CLI wallet import --private-key YPV_5KXuaLqsaniTc9qDJi851e1CBNjaEqUqoERyazRKUVBhwuCS8xr
59-
#$INFRA_CLI create account ycard.usd.yt ycarduseraaa YOS5HTxnZ6NZHKGjgZc6vK7bi6abtH7QEfEyu2rX1Lqm89mTyv2fk -p ycard.usd.yt@active --txfee-payer ycard.usd.yt
60-
$INFRA_CLI push action infrasys newaccount '{"creator":"ycard.usd.yt","name":"ycarduseraaa","owner":{"threshold":1,"keys":[{"key":"YOS5HTxnZ6NZHKGjgZc6vK7bi6abtH7QEfEyu2rX1Lqm89mTyv2fk","weight":1}],"accounts":[{"permission":{"actor":"ycard.id.us","permission":"active"},"weight":1}],"waits":[]},"active":{"threshold":1,"keys":[{"key":"YOS5HTxnZ6NZHKGjgZc6vK7bi6abtH7QEfEyu2rX1Lqm89mTyv2fk","weight":1}],"accounts":[],"waits":[]}}' -p ycard.usd.yt@active --txfee-payer ycard.usd.yt -v producer.c
61-
#$INFRA_CLI push action infrasys updateauth '{"account":"ycarduseraaa","permission":"owner","parent":"","auth":{"threshold":1,"keys":[{"key":"YOS5HTxnZ6NZHKGjgZc6vK7bi6abtH7QEfEyu2rX1Lqm89mTyv2fk","weight":1}],"accounts":[{"permission":{"actor":"ycard.id.us","permission":"active"},"weight":1}],"waits":[]}}' -p ycarduseraaa@owner --txfee-payer ycard.usd.yt
58+
$INFRA_CLI wallet import --private-key PVT_K1_TiDZHzPzZwimu36VGt3YjmWqcSkRa9BjkVtBa7Zr6mjKKgMsE
59+
#$INFRA_CLI create account ycard.usd.yt ycarduseraaa PUB_K1_7UPqYWRodQ1dhgCsgF4VnEi1mgcV4a6K7u95BrtTDoNCVXtFYT -p ycard.usd.yt@active --txfee-payer ycard.usd.yt
60+
$INFRA_CLI push action infrasys newaccount '{"creator":"ycard.usd.yt","name":"ycarduseraaa","owner":{"threshold":1,"keys":[{"key":"PUB_K1_7UPqYWRodQ1dhgCsgF4VnEi1mgcV4a6K7u95BrtTDoNCVXtFYT","weight":1}],"accounts":[{"permission":{"actor":"ycard.id.us","permission":"active"},"weight":1}],"waits":[]},"active":{"threshold":1,"keys":[{"key":"PUB_K1_7UPqYWRodQ1dhgCsgF4VnEi1mgcV4a6K7u95BrtTDoNCVXtFYT","weight":1}],"accounts":[],"waits":[]}}' -p ycard.usd.yt@active --txfee-payer ycard.usd.yt -v producer.c
61+
#$INFRA_CLI push action infrasys updateauth '{"account":"ycarduseraaa","permission":"owner","parent":"","auth":{"threshold":1,"keys":[{"key":"PUB_K1_7UPqYWRodQ1dhgCsgF4VnEi1mgcV4a6K7u95BrtTDoNCVXtFYT","weight":1}],"accounts":[{"permission":{"actor":"ycard.id.us","permission":"active"},"weight":1}],"waits":[]}}' -p ycarduseraaa@owner --txfee-payer ycard.usd.yt
6262

6363
$INFRA_CLI push action sys.identity setidinfo "{\"account\":\"ycarduseraaa\", \"identity_authority\":\"ycard.id.us\", \"type\":$(echo 'ibase=2; 0' | bc), \"kyc\":$(echo 'ibase=2; 1111' | bc), \"state\":$(echo 'ibase=2; 0' | bc), \"data\":\"\"}" -p ycard.id.us@active --txfee-payer ycard.id.us -v producer.a
6464

@@ -89,10 +89,10 @@ sleep 2
8989

9090
#################################################
9191
##### Yosemite Card Merchant Account Setup
92-
$INFRA_CLI wallet import --private-key YPV_5JkupiGwhRCEwPon9EKMgkjscthhkUsrQYkUHTAF1Xp2hBYYKEW
93-
#$INFRA_CLI create account ycard.usd.yt ycardshopaaa YOS7XVhCkoiyPUaGGXhCLP1TM2HQtptZxY83aNuSWiJNVd2Gwoxvg -p ycard.usd.yt@active --txfee-payer ycard.usd.yt
94-
$INFRA_CLI push action infrasys newaccount '{"creator":"ycard.usd.yt","name":"ycardshopaaa","owner":{"threshold":1,"keys":[{"key":"YOS7XVhCkoiyPUaGGXhCLP1TM2HQtptZxY83aNuSWiJNVd2Gwoxvg","weight":1}],"accounts":[{"permission":{"actor":"ycard.id.us","permission":"active"},"weight":1}],"waits":[]},"active":{"threshold":1,"keys":[{"key":"YOS7XVhCkoiyPUaGGXhCLP1TM2HQtptZxY83aNuSWiJNVd2Gwoxvg","weight":1}],"accounts":[],"waits":[]}}' -p ycard.usd.yt@active --txfee-payer ycard.usd.yt -v producer.c
95-
#$INFRA_CLI push action infrasys updateauth '{"account":"ycardshopaaa","permission":"owner","parent":"","auth":{"threshold":1,"keys":[{"key":"YOS7XVhCkoiyPUaGGXhCLP1TM2HQtptZxY83aNuSWiJNVd2Gwoxvg","weight":1}],"accounts":[{"permission":{"actor":"ycard.id.us","permission":"active"},"weight":1}],"waits":[]}}' -p ycardshopaaa@owner --txfee-payer ycard.usd.yt
92+
$INFRA_CLI wallet import --private-key PVT_K1_SMmDwJed8ZR4hVsMD7bJLYirKpesXtr9tDwnmF5hW15R8myWA
93+
#$INFRA_CLI create account ycard.usd.yt ycardshopaaa PUB_K1_7c2UjL57nCkxR8PWXzt3srpWEM1Cvv6JcAgwzJ6JtqMvQd52wZ -p ycard.usd.yt@active --txfee-payer ycard.usd.yt
94+
$INFRA_CLI push action infrasys newaccount '{"creator":"ycard.usd.yt","name":"ycardshopaaa","owner":{"threshold":1,"keys":[{"key":"PUB_K1_7c2UjL57nCkxR8PWXzt3srpWEM1Cvv6JcAgwzJ6JtqMvQd52wZ","weight":1}],"accounts":[{"permission":{"actor":"ycard.id.us","permission":"active"},"weight":1}],"waits":[]},"active":{"threshold":1,"keys":[{"key":"PUB_K1_7c2UjL57nCkxR8PWXzt3srpWEM1Cvv6JcAgwzJ6JtqMvQd52wZ","weight":1}],"accounts":[],"waits":[]}}' -p ycard.usd.yt@active --txfee-payer ycard.usd.yt -v producer.c
95+
#$INFRA_CLI push action infrasys updateauth '{"account":"ycardshopaaa","permission":"owner","parent":"","auth":{"threshold":1,"keys":[{"key":"PUB_K1_7c2UjL57nCkxR8PWXzt3srpWEM1Cvv6JcAgwzJ6JtqMvQd52wZ","weight":1}],"accounts":[{"permission":{"actor":"ycard.id.us","permission":"active"},"weight":1}],"waits":[]}}' -p ycardshopaaa@owner --txfee-payer ycard.usd.yt
9696

9797
$INFRA_CLI push action sys.identity setidinfo "{\"account\":\"ycardshopaaa\", \"identity_authority\":\"ycard.id.us\", \"type\":$(echo 'ibase=2; 0' | bc), \"kyc\":$(echo 'ibase=2; 1101' | bc), \"state\":$(echo 'ibase=2; 0' | bc), \"data\":\"\"}" -p ycard.id.us@active --txfee-payer ycard.id.us -v producer.a
9898

@@ -205,10 +205,10 @@ $INFRA_CLI push action ycard.usd.yt usdredeemto '{"to":"ycardshopaaa","qty":"500
205205
#####################################################
206206
##### Yosemite Card Payment to a merchant who does not issue merchant-backed Yosemite Token
207207

208-
$INFRA_CLI wallet import --private-key YPV_5HtaMCXLonpjpk7ZsWncTKb2t4LpkveMTRKGaXW3Jd6D5g1b8ax
209-
#$INFRA_CLI create account ycard.usd.yt ycarduserbbb YOS8MTDtmS9zkYSzK6J5rNkuPrXBSfkvQTm9XF5vJjRsXxBcorbXw -p ycard.usd.yt@active --txfee-payer ycard.usd.yt
210-
$INFRA_CLI push action infrasys newaccount '{"creator":"ycard.usd.yt","name":"ycardshopbbb","owner":{"threshold":1,"keys":[{"key":"YOS8MTDtmS9zkYSzK6J5rNkuPrXBSfkvQTm9XF5vJjRsXxBcorbXw","weight":1}],"accounts":[{"permission":{"actor":"ycard.id.us","permission":"active"},"weight":1}],"waits":[]},"active":{"threshold":1,"keys":[{"key":"YOS8MTDtmS9zkYSzK6J5rNkuPrXBSfkvQTm9XF5vJjRsXxBcorbXw","weight":1}],"accounts":[],"waits":[]}}' -p ycard.usd.yt@active --txfee-payer ycard.usd.yt -v producer.c
211-
#$INFRA_CLI push action infrasys updateauth '{"account":"ycardshopbbb","permission":"owner","parent":"","auth":{"threshold":1,"keys":[{"key":"YOS8MTDtmS9zkYSzK6J5rNkuPrXBSfkvQTm9XF5vJjRsXxBcorbXw","weight":1}],"accounts":[{"permission":{"actor":"ycard.id.us","permission":"active"},"weight":1}],"waits":[]}}' -p ycardshopbbb@owner --txfee-payer ycard.usd.yt
208+
$INFRA_CLI wallet import --private-key PVT_K1_KDQQ5JmS9sCZRZFqJwttJQqjpGrv5KqiSZdAMump34sQJ66MB
209+
#$INFRA_CLI create account ycard.usd.yt ycarduserbbb PUB_K1_5FZrQjaDtifFxa45sKoPCJSsmp4kLuQKZU721HnjA17pchKVmX -p ycard.usd.yt@active --txfee-payer ycard.usd.yt
210+
$INFRA_CLI push action infrasys newaccount '{"creator":"ycard.usd.yt","name":"ycardshopbbb","owner":{"threshold":1,"keys":[{"key":"PUB_K1_5FZrQjaDtifFxa45sKoPCJSsmp4kLuQKZU721HnjA17pchKVmX","weight":1}],"accounts":[{"permission":{"actor":"ycard.id.us","permission":"active"},"weight":1}],"waits":[]},"active":{"threshold":1,"keys":[{"key":"PUB_K1_5FZrQjaDtifFxa45sKoPCJSsmp4kLuQKZU721HnjA17pchKVmX","weight":1}],"accounts":[],"waits":[]}}' -p ycard.usd.yt@active --txfee-payer ycard.usd.yt -v producer.c
211+
#$INFRA_CLI push action infrasys updateauth '{"account":"ycardshopbbb","permission":"owner","parent":"","auth":{"threshold":1,"keys":[{"key":"PUB_K1_5FZrQjaDtifFxa45sKoPCJSsmp4kLuQKZU721HnjA17pchKVmX","weight":1}],"accounts":[{"permission":{"actor":"ycard.id.us","permission":"active"},"weight":1}],"waits":[]}}' -p ycardshopbbb@owner --txfee-payer ycard.usd.yt
212212

213213
$INFRA_CLI push action sys.identity setidinfo "{\"account\":\"ycardshopbbb\", \"identity_authority\":\"ycard.id.us\", \"type\":$(echo 'ibase=2; 0' | bc), \"kyc\":$(echo 'ibase=2; 1101' | bc), \"state\":$(echo 'ibase=2; 0' | bc), \"data\":\"\"}" -p ycard.id.us@active --txfee-payer ycard.id.us -v producer.a
214214

0 commit comments

Comments
 (0)