From ed9c6737998b391f8b81ce83814c9f86331bf1e5 Mon Sep 17 00:00:00 2001 From: logicalmechanism Date: Thu, 11 Jul 2024 14:35:30 -0700 Subject: [PATCH 1/2] minter uses a default random string now of 00112233445566778899aabbccddeeff --- config.json | 2 +- scripts/00_createScriptReferences.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index 5ab7e5a..569f0c6 100644 --- a/config.json +++ b/config.json @@ -9,5 +9,5 @@ "__comment4__": "The NEWM hot key", "hotKey": "f4a78bbff6d5e7e492915986abc495382247af659018451a25cec92c", "__comment5__": "A random bytestring", - "random": "00112233445566778899" + "random": "00112233445566778899aabbccddeeff" } \ No newline at end of file diff --git a/scripts/00_createScriptReferences.sh b/scripts/00_createScriptReferences.sh index b870d17..1918139 100755 --- a/scripts/00_createScriptReferences.sh +++ b/scripts/00_createScriptReferences.sh @@ -31,7 +31,8 @@ alltxin="" txin=$(jq -r --arg alltxin "" 'to_entries[] | select(.value.value | length < 2) | .key | . + $alltxin + " --tx-in"' ./tmp/reference_utxo.json) ref_tx_in=${txin::-8} -echo -e "\033[0;36mFirst UTxO: $ref_tx_in \033[0m" +echo -e "\033[0;36mFirst UTxO:\033[0m" +echo -e "\033[0;36m$ref_tx_in \033[0m" changeAmount=$(jq '[.. | objects | .lovelace] | add' ./tmp/reference_utxo.json) From 8c38f121431a421873727e48ee13c456cb279b62 Mon Sep 17 00:00:00 2001 From: logicalmechanism Date: Thu, 11 Jul 2024 15:09:19 -0700 Subject: [PATCH 2/2] e2e is good! this is prod ready --- config.json | 4 +- .../reference/backup-reference-datum.json | 4 +- .../reference/current-reference-datum.json | 59 ------------------- scripts/data/reference/reference-datum.json | 4 +- scripts/data/staking/delegate-redeemer.json | 2 +- scripts/storage/01_updateMetadata.sh | 9 +-- scripts/storage/02_removeMetadataUTxO.sh | 2 + 7 files changed, 14 insertions(+), 70 deletions(-) diff --git a/config.json b/config.json index 569f0c6..c089a46 100644 --- a/config.json +++ b/config.json @@ -1,7 +1,7 @@ { "__comment1__": "This is the starter token for the data reference contract", - "starterPid": "8c3fb67a73b7047a77f180f59c089ddf719584813efe6bc5e73a79e8", - "starterTkn": "5ca1ab1e000affab1e000ca11ab1e0005e77ab1e", + "starterPid": "b88cdb6d77bcb6ca9a227bab5d0b6a3b4a47960b41cbab4ede0c8b00", + "starterTkn": "6ca2a0f0d17ec1732611675702ba9672ab033a6bf7fffb1aaf35cf3caf8b5cc4", "__comment2__": "The change address for the starter token transaction", "starterChangeAddr": "addr_test1qrvnxkaylr4upwxfxctpxpcumj0fl6fdujdc72j8sgpraa9l4gu9er4t0w7udjvt2pqngddn6q4h8h3uv38p8p9cq82qav4lmp", "__comment3__": "This is the initial pool id for staking", diff --git a/scripts/data/reference/backup-reference-datum.json b/scripts/data/reference/backup-reference-datum.json index 84bdce3..d870f84 100644 --- a/scripts/data/reference/backup-reference-datum.json +++ b/scripts/data/reference/backup-reference-datum.json @@ -48,10 +48,10 @@ "constructor": 0, "fields": [ { - "bytes": "6ff4dc9f89baf7d1cde96e883b53a45bc8c437b870894275bf42994f" + "bytes": "8d04e53edaeaca5ad113e81362ba2c399f774fe3a4b20072e120e3cc" }, { - "bytes": "facbf8d949467b1d55f8e70ab3235c59ac9196c447bedcf043e03766" + "bytes": "c9b7469484c622864975a2252f5ff85a046a1add6046de7abf05b426" } ] } diff --git a/scripts/data/reference/current-reference-datum.json b/scripts/data/reference/current-reference-datum.json index 84bdce3..e69de29 100644 --- a/scripts/data/reference/current-reference-datum.json +++ b/scripts/data/reference/current-reference-datum.json @@ -1,59 +0,0 @@ -{ - "constructor": 0, - "fields": [ - { - "bytes": "f4a78bbff6d5e7e492915986abc495382247af659018451a25cec92c" - }, - { - "constructor": 0, - "fields": [ - { - "list": [ - { - "bytes": "d858ecf3e73e18bef8383a16e856778e033cfd1c8867c70dc9b68b42" - }, - { - "bytes": "10a20db9464d89dab407b3397e67facf83db8d442e601b627c0a351f" - }, - { - "bytes": "121ce13907d40c7a598d182ed751d39279cf30d50decb17151b3a587" - } - ] - }, - { - "int": 2 - } - ] - }, - { - "constructor": 0, - "fields": [ - { - "bytes": "1e3105f23f2ac91b3fb4c35fa4fe301421028e356e114944e902005b" - }, - { - "constructor": 0, - "fields": [ - { - "bytes": "8f7b0ce283a92df9a3b69ac0b8f10d8bc8bcf8fbd1fe72596ee8bd6c" - }, - { - "bytes": "" - } - ] - } - ] - }, - { - "constructor": 0, - "fields": [ - { - "bytes": "6ff4dc9f89baf7d1cde96e883b53a45bc8c437b870894275bf42994f" - }, - { - "bytes": "facbf8d949467b1d55f8e70ab3235c59ac9196c447bedcf043e03766" - } - ] - } - ] -} diff --git a/scripts/data/reference/reference-datum.json b/scripts/data/reference/reference-datum.json index 84bdce3..a35f3ef 100644 --- a/scripts/data/reference/reference-datum.json +++ b/scripts/data/reference/reference-datum.json @@ -48,10 +48,10 @@ "constructor": 0, "fields": [ { - "bytes": "6ff4dc9f89baf7d1cde96e883b53a45bc8c437b870894275bf42994f" + "bytes": "9716578e980be10a47ecb36a0a2c6a71e6142be10cdc15e1e286396a" }, { - "bytes": "facbf8d949467b1d55f8e70ab3235c59ac9196c447bedcf043e03766" + "bytes": "3106ac51de4266a08f73099f20627d8749bb7f495ffecd93b9f50cfe" } ] } diff --git a/scripts/data/staking/delegate-redeemer.json b/scripts/data/staking/delegate-redeemer.json index 628a393..bbe8ba5 100644 --- a/scripts/data/staking/delegate-redeemer.json +++ b/scripts/data/staking/delegate-redeemer.json @@ -2,7 +2,7 @@ "constructor": 1, "fields": [ { - "bytes": "facbf8d949467b1d55f8e70ab3235c59ac9196c447bedcf043e03766" + "bytes": "3106ac51de4266a08f73099f20627d8749bb7f495ffecd93b9f50cfe" } ] } diff --git a/scripts/storage/01_updateMetadata.sh b/scripts/storage/01_updateMetadata.sh index bfed52c..5f52014 100755 --- a/scripts/storage/01_updateMetadata.sh +++ b/scripts/storage/01_updateMetadata.sh @@ -27,10 +27,10 @@ asset="1 ${pid}.${tkn}" min_utxo=$(${cli} transaction calculate-min-required-utxo \ --babbage-era \ --protocol-params-file ../tmp/protocol.json \ - --tx-out-datum-embed-file ../data/storage/updated-metadata-datum.json \ + --tx-out-inline-datum-file ../data/storage/updated-metadata-datum.json \ --tx-out="${storage_script_address} + 5000000 + ${asset}" | tr -dc '0-9') - # --tx-out-inline-datum-file ../data/storage/updated-metadata-datum.json \ + # --tx-out-datum-embed-file ../data/storage/updated-metadata-datum.json \ script_address_out="${storage_script_address} + ${min_utxo} + ${asset}" echo "Update OUTPUT: "${script_address_out} @@ -101,12 +101,13 @@ fee=$(${cli} transaction build \ --spending-reference-tx-in-inline-datum-present \ --spending-reference-tx-in-redeemer-file ../data/storage/update-redeemer.json \ --tx-out="${script_address_out}" \ - --tx-out-datum-embed-file ../data/storage/updated-metadata-datum.json \ + --tx-out-inline-datum-file ../data/storage/updated-metadata-datum.json \ --required-signer-hash ${newm_pkh} \ --required-signer-hash ${collat_pkh} \ --testnet-magic ${testnet_magic}) - # --tx-out-inline-datum-file ../data/storage/updated-metadata-datum.json \ + # --spending-reference-tx-in-datum-file ../data/storage/updated-metadata-datum.json \ + # --tx-out-datum-embed-file ../data/storage/updated-metadata-datum.json \ IFS=':' read -ra VALUE <<< "${fee}" IFS=' ' read -ra fee <<< "${VALUE[1]}" diff --git a/scripts/storage/02_removeMetadataUTxO.sh b/scripts/storage/02_removeMetadataUTxO.sh index ec2bc90..748c1df 100755 --- a/scripts/storage/02_removeMetadataUTxO.sh +++ b/scripts/storage/02_removeMetadataUTxO.sh @@ -105,6 +105,8 @@ fee=$(${cli} transaction build \ --required-signer-hash ${collat_pkh} \ --testnet-magic ${testnet_magic}) + # --spending-reference-tx-in-datum-file ../data/storage/updated-metadata-datum.json \ + IFS=':' read -ra VALUE <<< "${fee}" IFS=' ' read -ra fee <<< "${VALUE[1]}" fee=${fee[1]}