Merge #3911

3911: Version the plutus scripts r=newhoggy a=newhoggy Move all plutus scripts to under the `v1` directory. New Babbage scripts will use scripts under the `v2` directory. If it's possible for a script to run in both Alonzo and Babbage, they will be able to use the corresponding script that is built with the correct version of plutus language by choosing the directory. `example-txin-locking-plutus-script.sh` modified to run against both Alonzo and Babbage. Scripts were generated by IntersectMBO/plutus-apps#482 Co-authored-by: John Ky <john.ky@iohk.io>
IntersectMBO · May 26, 2022 · 5f36f86 · 5f36f86
2 parents b07949e + cea73d3
commit 5f36f86
Show file tree

Hide file tree

Showing 29 changed files with 209 additions and 116 deletions.
diff --git a/scripts/babbage/mkfiles.sh b/scripts/babbage/mkfiles.sh
@@ -36,7 +36,7 @@ SECURITY_PARAM=10
 NUM_SPO_NODES=3
 INIT_SUPPLY=10020000000
 START_TIME="$(${DATE} -d "now + 30 seconds" +%s)"
-ROOT=test
+ROOT=example
 mkdir -p "${ROOT}"
 
 cat > "${ROOT}/byron.genesis.spec.json" <<EOF
@@ -83,10 +83,10 @@ cardano-cli byron genesis genesis \
 # SPOs in the ShelleyGenesis
 
 
-cp scripts/babbage/alonzo-babbage-test-genesis.json test/genesis.alonzo.spec.json
+cp scripts/babbage/alonzo-babbage-test-genesis.json "${ROOT}/genesis.alonzo.spec.json"
 
-cp configuration/defaults/byron-mainnet/configuration.yaml ${ROOT}/
-$SED -i ${ROOT}/configuration.yaml \
+cp configuration/defaults/byron-mainnet/configuration.yaml "${ROOT}/"
+$SED -i "${ROOT}/configuration.yaml" \
      -e 's/Protocol: RealPBFT/Protocol: Cardano/' \
      -e '/Protocol/ aPBftSignatureThreshold: 0.6' \
      -e 's/minSeverity: Info/minSeverity: Debug/' \
@@ -97,22 +97,24 @@ $SED -i ${ROOT}/configuration.yaml \
      -e 's/LastKnownBlockVersion-Major: 0/LastKnownBlockVersion-Major: 6/' \
      -e 's/LastKnownBlockVersion-Minor: 2/LastKnownBlockVersion-Minor: 0/'
 
-  echo "TestShelleyHardForkAtEpoch: 0" >> ${ROOT}/configuration.yaml
-  echo "TestAllegraHardForkAtEpoch: 0" >> ${ROOT}/configuration.yaml
-  echo "TestMaryHardForkAtEpoch: 0" >> ${ROOT}/configuration.yaml
-  echo "TestAlonzoHardForkAtEpoch: 0" >> ${ROOT}/configuration.yaml
-  echo "TestBabbageHardForkAtEpoch: 0" >> ${ROOT}/configuration.yaml
-  echo "TestEnableDevelopmentHardForkEras: True" >> ${ROOT}/configuration.yaml
-  echo "TestEnableDevelopmentNetworkProtocols: True" >> ${ROOT}/configuration.yaml
+  echo "TestShelleyHardForkAtEpoch: 0" >> "${ROOT}/configuration.yaml"
+  echo "TestAllegraHardForkAtEpoch: 0" >> "${ROOT}/configuration.yaml"
+  echo "TestMaryHardForkAtEpoch: 0" >> "${ROOT}/configuration.yaml"
+  echo "TestAlonzoHardForkAtEpoch: 0" >> "${ROOT}/configuration.yaml"
+  echo "TestBabbageHardForkAtEpoch: 0" >> "${ROOT}/configuration.yaml"
+  echo "TestEnableDevelopmentHardForkEras: True" >> "${ROOT}/configuration.yaml"
+  echo "TestEnableDevelopmentNetworkProtocols: True" >> "${ROOT}/configuration.yaml"
 
 # Copy the cost mode
 
 
 cardano-cli genesis create-staked --genesis-dir "${ROOT}" \
   --testnet-magic "${NETWORK_MAGIC}" \
   --gen-pools 3 \
-  --supply-delegated 100000000000 \
-  --gen-stake-delegs 3
+  --supply 1000000000000 \
+  --supply-delegated 1000000000000 \
+  --gen-stake-delegs 3 \
+  --gen-utxo-keys 3
 
 SPO_NODES="node-spo1 node-spo2 node-spo3"
 
@@ -134,12 +136,12 @@ mv "${ROOT}/byron-gen-command/genesis.json" "${ROOT}/genesis/byron/genesis-wrong
 mv "${ROOT}/genesis.alonzo.json" "${ROOT}/genesis/shelley/genesis.alonzo.json"
 mv "${ROOT}/genesis.json" "${ROOT}/genesis/shelley/genesis.json"
 
-jq --raw-output '.protocolConsts.protocolMagic = 42' test/genesis/byron/genesis-wrong.json > test/genesis/byron/genesis.json
+jq --raw-output '.protocolConsts.protocolMagic = 42' "${ROOT}/genesis/byron/genesis-wrong.json" > "${ROOT}/genesis/byron/genesis.json"
 
 rm "${ROOT}/genesis/byron/genesis-wrong.json"
 
 
-$SED -i test/genesis/shelley/genesis.json \
+$SED -i "${ROOT}/genesis/shelley/genesis.json" \
     -e 's/"slotLength": 1/"slotLength": 0.1/' \
     -e 's/"activeSlotsCoeff": 5.0e-2/"activeSlotsCoeff": 0.1/' \
     -e 's/"securityParam": 2160/"securityParam": 10/' \
@@ -154,38 +156,38 @@ $SED -i test/genesis/shelley/genesis.json \
     -e 's/"tau": 0.0/"tau": 0.1/' \
     -e 's/"updateQuorum": 5/"updateQuorum": 2/'
 
-mv test/pools/vrf1.skey test/node-spo1/vrf.skey
-mv test/pools/vrf2.skey test/node-spo2/vrf.skey
-mv test/pools/vrf3.skey test/node-spo3/vrf.skey
+mv "${ROOT}/pools/vrf1.skey" "${ROOT}/node-spo1/vrf.skey"
+mv "${ROOT}/pools/vrf2.skey" "${ROOT}/node-spo2/vrf.skey"
+mv "${ROOT}/pools/vrf3.skey" "${ROOT}/node-spo3/vrf.skey"
 
-mv test/pools/opcert1.cert test/node-spo1/opcert.cert
-mv test/pools/opcert2.cert test/node-spo2/opcert.cert
-mv test/pools/opcert3.cert test/node-spo3/opcert.cert
+mv "${ROOT}/pools/opcert1.cert" "${ROOT}/node-spo1/opcert.cert"
+mv "${ROOT}/pools/opcert2.cert" "${ROOT}/node-spo2/opcert.cert"
+mv "${ROOT}/pools/opcert3.cert" "${ROOT}/node-spo3/opcert.cert"
 
-mv test/pools/kes1.skey test/node-spo1/kes.skey
-mv test/pools/kes2.skey test/node-spo2/kes.skey
-mv test/pools/kes3.skey test/node-spo3/kes.skey
+mv "${ROOT}/pools/kes1.skey" "${ROOT}/node-spo1/kes.skey"
+mv "${ROOT}/pools/kes2.skey" "${ROOT}/node-spo2/kes.skey"
+mv "${ROOT}/pools/kes3.skey" "${ROOT}/node-spo3/kes.skey"
 
 #Byron related
 
-mv "${ROOT}"/byron-gen-command/delegate-keys.000.key ${ROOT}/node-spo1/byron-delegate.key
-mv "${ROOT}"/byron-gen-command/delegate-keys.001.key ${ROOT}/node-spo2/byron-delegate.key
-mv "${ROOT}"/byron-gen-command/delegate-keys.002.key ${ROOT}/node-spo3/byron-delegate.key
+mv "${ROOT}/byron-gen-command/delegate-keys.000.key" "${ROOT}/node-spo1/byron-delegate.key"
+mv "${ROOT}/byron-gen-command/delegate-keys.001.key" "${ROOT}/node-spo2/byron-delegate.key"
+mv "${ROOT}/byron-gen-command/delegate-keys.002.key" "${ROOT}/node-spo3/byron-delegate.key"
 
-mv "${ROOT}"/byron-gen-command/delegation-cert.000.json ${ROOT}/node-spo1/byron-delegation.cert
-mv "${ROOT}"/byron-gen-command/delegation-cert.001.json ${ROOT}/node-spo2/byron-delegation.cert
-mv "${ROOT}"/byron-gen-command/delegation-cert.002.json ${ROOT}/node-spo3/byron-delegation.cert
+mv "${ROOT}/byron-gen-command/delegation-cert.000.json" "${ROOT}/node-spo1/byron-delegation.cert"
+mv "${ROOT}/byron-gen-command/delegation-cert.001.json" "${ROOT}/node-spo2/byron-delegation.cert"
+mv "${ROOT}/byron-gen-command/delegation-cert.002.json" "${ROOT}/node-spo3/byron-delegation.cert"
 
 
 
-echo 3001 > "${ROOT}"/node-spo1/port
-echo 3002 > "${ROOT}"/node-spo2/port
-echo 3003 > "${ROOT}"/node-spo3/port
+echo 3001 > "${ROOT}/node-spo1/port"
+echo 3002 > "${ROOT}/node-spo2/port"
+echo 3003 > "${ROOT}/node-spo3/port"
 
 # Make topology files
 # Make topology files
 #TODO generalise this over the N BFT nodes and pool nodes
-cat > ${ROOT}/node-spo1/topology.json <<EOF
+cat > "${ROOT}/node-spo1/topology.json" <<EOF
 {
    "Producers": [
      {
@@ -202,7 +204,7 @@ cat > ${ROOT}/node-spo1/topology.json <<EOF
  }
 EOF
 
-cat > ${ROOT}/node-spo2/topology.json <<EOF
+cat > "${ROOT}/node-spo2/topology.json" <<EOF
 {
    "Producers": [
      {
@@ -219,7 +221,7 @@ cat > ${ROOT}/node-spo2/topology.json <<EOF
  }
 EOF
 
-cat > ${ROOT}/node-spo3/topology.json <<EOF
+cat > "${ROOT}/node-spo3/topology.json" <<EOF
 {
    "Producers": [
      {
@@ -242,34 +244,37 @@ for NODE in ${SPO_NODES}; do
     echo "#!/usr/bin/env bash"
     echo ""
     echo "cardano-node run \\"
-    echo "  --config                          ${ROOT}/configuration.yaml \\"
-    echo "  --topology                        ${ROOT}/${NODE}/topology.json \\"
-    echo "  --database-path                   ${ROOT}/${NODE}/db \\"
+    echo "  --config                          '${ROOT}/configuration.yaml' \\"
+    echo "  --topology                        '${ROOT}/${NODE}/topology.json' \\"
+    echo "  --database-path                   '${ROOT}/${NODE}/db' \\"
     echo "  --socket-path                     '$(sprocket "${ROOT}/${NODE}/node.sock")' \\"
-    echo "  --shelley-kes-key                 ${ROOT}/${NODE}/kes.skey \\"
-    echo "  --shelley-vrf-key                 ${ROOT}/${NODE}/vrf.skey \\"
-    echo "  --byron-delegation-certificate    ${ROOT}/${NODE}/byron-delegation.cert \\"
-    echo "  --byron-signing-key               ${ROOT}/${NODE}/byron-delegate.key \\"
-    echo "  --shelley-operational-certificate ${ROOT}/${NODE}/opcert.cert \\"
-    echo "  --port                            $(cat ${ROOT}/${NODE}/port) \\"
-    echo "  | tee -a ${ROOT}/${NODE}/node.log"
-  ) > "${ROOT}"/${NODE}.sh
-
-  chmod a+x test/${NODE}.sh
-
-  echo "${ROOT}"/${NODE}.sh
+    echo "  --shelley-kes-key                 '${ROOT}/${NODE}/kes.skey' \\"
+    echo "  --shelley-vrf-key                 '${ROOT}/${NODE}/vrf.skey' \\"
+    echo "  --byron-delegation-certificate    '${ROOT}/${NODE}/byron-delegation.cert' \\"
+    echo "  --byron-signing-key               '${ROOT}/${NODE}/byron-delegate.key' \\"
+    echo "  --shelley-operational-certificate '${ROOT}/${NODE}/opcert.cert' \\"
+    echo "  --port                            $(cat "${ROOT}/${NODE}/port") \\"
+    echo "  | tee -a '${ROOT}/${NODE}/node.log'"
+  ) > "${ROOT}/${NODE}.sh"
+
+  chmod a+x "${ROOT}/${NODE}.sh"
+
+  echo "${ROOT}/${NODE}.sh"
 done
 
-echo "#!/usr/bin/env bash" > "${ROOT}"/all.sh
-echo "" >> "${ROOT}"/all.sh
+mkdir -p "${ROOT}/run"
+
+echo "#!/usr/bin/env bash" > "${ROOT}/run/all.sh"
+echo "" >> "${ROOT}/run/all.sh"
 
 for NODE in ${SPO_NODES}; do
-  echo "$ROOT/${NODE}.sh &" >> $ROOT/all.sh
+  echo "$ROOT/${NODE}.sh &" >> "${ROOT}/run/all.sh"
 done
-echo "" >> $ROOT/all.sh
-echo "wait" >> $ROOT/all.sh
+echo "" >> "${ROOT}/run/all.sh"
+echo "wait" >> "${ROOT}/run/all.sh"
 
-chmod a+x $ROOT/all.sh
+chmod a+x "${ROOT}/run/all.sh"
 
 echo "CARDANO_NODE_SOCKET_PATH=${ROOT}/node-spo1/node.sock "
 
+(cd "$ROOT"; ln -s node-spo1/node.sock main.sock)
diff --git a/scripts/byron-to-alonzo/mkfiles.sh b/scripts/byron-to-alonzo/mkfiles.sh
@@ -353,6 +353,21 @@ cardano-cli stake-address key-gen \
   --verification-key-file shelley/utxo-keys/utxo2-stake.vkey \
   --signing-key-file shelley/utxo-keys/utxo2-stake.skey
 
+# Create a symlink to all the payment keys in utxo-keys directory
+mkdir -p utxo-keys
+
+for x in $(find shelley/utxo-keys -type f); do
+  if cat "$x" | jq -e 'select(
+      false
+      or .type == "GenesisUTxOVerificationKey_ed25519"
+      or .type == "GenesisUTxOSigningKey_ed25519"
+      or .type == "PaymentSigningKeyShelley_ed25519"
+      or .type == "PaymentVerificationKeyShelley_ed25519"
+      )' > /dev/null; then
+    ln -sf "../$x" "utxo-keys/$(basename "$x")"
+  fi
+done
+
 echo "====================================================================="
 echo "Generated genesis keys and genesis files:"
 echo
@@ -680,3 +695,5 @@ elif [ "$1" = "shelley" ]; then
 else
   echo "Default yaml configuration applied."
 fi
+
+(cd "$ROOT"; ln -s node-bft1/node.sock main.sock)
diff --git a/scripts/lite/example-build-cmd.sh b/scripts/lite/example-build-cmd.sh
@@ -8,7 +8,7 @@ set -o pipefail
 export WORK="${WORK:-example/work}"
 export BASE="${BASE:-.}"
 export CARDANO_CLI="${CARDANO_CLI:-cardano-cli}"
-export CARDANO_NODE_SOCKET_PATH="${CARDANO_NODE_SOCKET_PATH:-example/node-bft1/node.sock}"
+export CARDANO_NODE_SOCKET_PATH="${CARDANO_NODE_SOCKET_PATH:-example/main.sock}"
 export TESTNET_MAGIC="${TESTNET_MAGIC:-42}"
 export UTXO_VKEY="${UTXO_VKEY:-example/shelley/utxo-keys/utxo1.vkey}"
 export UTXO_SKEY="${UTXO_SKEY:-example/shelley/utxo-keys/utxo1.skey}"

diff --git a/scripts/lite/split-txouts.sh b/scripts/lite/split-txouts.sh
@@ -9,7 +9,7 @@ set -eo pipefail
 export WORK="${WORK:-example/work}"
 export BASE="${BASE:-.}"
 export CARDANO_CLI="${CARDANO_CLI:-cardano-cli}"
-export CARDANO_NODE_SOCKET_PATH="${CARDANO_NODE_SOCKET_PATH:-example/node-bft1/node.sock}"
+export CARDANO_NODE_SOCKET_PATH="${CARDANO_NODE_SOCKET_PATH:-example/main.sock}"
 export TESTNET_MAGIC="${TESTNET_MAGIC:-42}"
 export UTXO_VKEY="${UTXO_VKEY:-example/shelley/utxo-keys/utxo1.vkey}"
 export UTXO_SKEY="${UTXO_SKEY:-example/shelley/utxo-keys/utxo1.skey}"

diff --git a/scripts/plutus/always-fails.sh b/scripts/plutus/always-fails.sh
@@ -8,18 +8,19 @@ set -o pipefail
 export WORK="${WORK:-example/work}"
 export BASE="${BASE:-.}"
 export CARDANO_CLI="${CARDANO_CLI:-cardano-cli}"
-export CARDANO_NODE_SOCKET_PATH="${CARDANO_NODE_SOCKET_PATH:-example/node-bft1/node.sock}"
+export CARDANO_NODE_SOCKET_PATH="${CARDANO_NODE_SOCKET_PATH:-example/main.sock}"
 export TESTNET_MAGIC="${TESTNET_MAGIC:-42}"
-export UTXO_VKEY="${UTXO_VKEY:-example/shelley/utxo-keys/utxo1.vkey}"
-export UTXO_SKEY="${UTXO_SKEY:-example/shelley/utxo-keys/utxo1.skey}"
+export UTXO_VKEY="${UTXO_VKEY:-example/utxo-keys/utxo1.vkey}"
+export UTXO_SKEY="${UTXO_SKEY:-example/utxo-keys/utxo1.skey}"
 export RESULT_FILE="${RESULT_FILE:-$WORK/result.out}"
+export PV=v1 # Plutus Script Version
 
 echo "Socket path: $CARDANO_NODE_SOCKET_PATH"
 echo "Socket path: $(pwd)"
 
 ls -al "$CARDANO_NODE_SOCKET_PATH"
 
-plutusscriptinuse="$BASE/scripts/plutus/scripts/always-fails.plutus"
+plutusscriptinuse="$BASE/scripts/plutus/scripts/$PV/always-fails.plutus"
 # This datum hash is the hash of the untyped 42
 scriptdatumhash="9e1199a988ba72ffd6e9c269cadb3b53b5f360ff99f112d9b2ee30c4d74ad88b"
 #ExUnits {exUnitsMem = 11300, exUnitsSteps = 45070000}))

diff --git a/scripts/plutus/example-txin-locking-plutus-script.sh b/scripts/plutus/example-txin-locking-plutus-script.sh
@@ -8,20 +8,37 @@ set -o pipefail
 export WORK="${WORK:-example/work}"
 export BASE="${BASE:-.}"
 export CARDANO_CLI="${CARDANO_CLI:-cardano-cli}"
-export CARDANO_NODE_SOCKET_PATH="${CARDANO_NODE_SOCKET_PATH:-example/node-bft1/node.sock}"
+export CARDANO_NODE_SOCKET_PATH="${CARDANO_NODE_SOCKET_PATH:-example/main.sock}"
 export TESTNET_MAGIC="${TESTNET_MAGIC:-42}"
-export UTXO_VKEY="${UTXO_VKEY:-example/shelley/utxo-keys/utxo1.vkey}"
-export UTXO_SKEY="${UTXO_SKEY:-example/shelley/utxo-keys/utxo1.skey}"
+export UTXO_VKEY="${UTXO_VKEY:-example/utxo-keys/utxo1.vkey}"
+export UTXO_SKEY="${UTXO_SKEY:-example/utxo-keys/utxo1.skey}"
 export RESULT_FILE="${RESULT_FILE:-$WORK/result.out}"
 
 echo "Socket path: $CARDANO_NODE_SOCKET_PATH"
 echo "Socket path: $(pwd)"
 
 ls -al "$CARDANO_NODE_SOCKET_PATH"
 
+export ERA="$($CARDANO_CLI query tip --testnet-magic $TESTNET_MAGIC | jq -r .era)"
+
+case $ERA in
+  Alonzo)
+    export ERA_FLAG="--alonzo-era"
+    export PV=v1 # Plutus Script Version
+    ;;
+  Babbage)
+    export ERA_FLAG="--babbage-era"
+    export PV=v2 # Plutus Script Version
+    ;;
+  *)
+    echo "Unsupported: $ERA"
+    exit 1
+    ;;
+esac
+
 if [ "$1" == "guessinggame" ]; then
  # NB: This plutus script uses a "typed" redeemer and "typed" datum.
- plutusscriptinuse="$BASE/scripts/plutus/scripts/custom-guess-42-datum-42.plutus"
+ plutusscriptinuse="$BASE/scripts/plutus/scripts/$PV/custom-guess-42-datum-42.plutus"
  # This datum hash is the hash of the typed 42
  scriptdatumhash="fcaa61fb85676101d9e3398a484674e71c45c3fd41b492682f3b0054f4cf3273"
  datumfilepath="$BASE/scripts/plutus/data/typed-42.datum"
@@ -30,7 +47,7 @@ if [ "$1" == "guessinggame" ]; then
  echo "Script at: $plutusscriptinuse"
 
 elif [ "$1" == "" ]; then
- plutusscriptinuse="$BASE/scripts/plutus/scripts/always-succeeds-spending.plutus"
+ plutusscriptinuse="$BASE/scripts/plutus/scripts/$PV/always-succeeds-spending.plutus"
  # This datum hash is the hash of the untyped 42
  scriptdatumhash="9e1199a988ba72ffd6e9c269cadb3b53b5f360ff99f112d9b2ee30c4d74ad88b"
  datumfilepath="$BASE/scripts/plutus/data/42.datum"
@@ -61,7 +78,7 @@ lovelaceattxindiv3=$(expr $lovelaceattxin / 3)
 $CARDANO_CLI query protocol-parameters --testnet-magic "$TESTNET_MAGIC" --out-file $WORK/pparams.json
 
 $CARDANO_CLI transaction build \
-  --alonzo-era \
+  $ERA_FLAG \
   --cardano-mode \
   --testnet-magic "$TESTNET_MAGIC" \
   --change-address "$utxoaddr" \
@@ -107,7 +124,7 @@ echo "Collateral"
 echo "$txinCollateral"
 
 $CARDANO_CLI transaction build \
-  --alonzo-era \
+  $ERA_FLAG \
   --cardano-mode \
   --testnet-magic "$TESTNET_MAGIC" \
   --change-address "$utxoaddr" \

diff --git a/scripts/plutus/script-context-equivalance-test.sh b/scripts/plutus/script-context-equivalance-test.sh
@@ -8,19 +8,20 @@ set -o pipefail
 export WORK="${WORK:-example/work}"
 export BASE="${BASE:-.}"
 export CARDANO_CLI="${CARDANO_CLI:-cardano-cli}"
-export CARDANO_NODE_SOCKET_PATH="${CARDANO_NODE_SOCKET_PATH:-example/node-bft1/node.sock}"
+export CARDANO_NODE_SOCKET_PATH="${CARDANO_NODE_SOCKET_PATH:-example/main.sock}"
 export TESTNET_MAGIC="${TESTNET_MAGIC:-42}"
-export UTXO_VKEY="${UTXO_VKEY:-example/shelley/utxo-keys/utxo1.vkey}"
-export UTXO_SKEY="${UTXO_SKEY:-example/shelley/utxo-keys/utxo1.skey}"
+export UTXO_VKEY="${UTXO_VKEY:-example/utxo-keys/utxo1.vkey}"
+export UTXO_SKEY="${UTXO_SKEY:-example/utxo-keys/utxo1.skey}"
 export RESULT_FILE="${RESULT_FILE:-$WORK/result.out}"
+export PV=v1 # Plutus Script Version
 
 echo "Socket path: $CARDANO_NODE_SOCKET_PATH"
 echo "Socket path: $(pwd)"
 
 ls -al "$CARDANO_NODE_SOCKET_PATH"
 
 # NB: This plutus script uses a "typed" redeemer and "typed" datum.
-plutusscriptinuse="$BASE/scripts/plutus/scripts/context-equivalance-test.plutus"
+plutusscriptinuse="$BASE/scripts/plutus/scripts/$PV/context-equivalance-test.plutus"
 # This datum hash is the hash of the typed 42
 scriptdatumhash="fcaa61fb85676101d9e3398a484674e71c45c3fd41b492682f3b0054f4cf3273"
 datumfilepath="$BASE/scripts/plutus/data/typed-42.datum"

diff --git a/scripts/plutus/script-context-equivalence-test-minting.sh b/scripts/plutus/script-context-equivalence-test-minting.sh
@@ -16,12 +16,14 @@ mkdir -p $work
 
 # Step 1 - Send ADA to token script owner
 export WORKD="${WORKD:-example/work}"
-export CARDANO_NODE_SOCKET_PATH="${CARDANO_NODE_SOCKET_PATH:-example/node-bft1/node.sock}"
+export CARDANO_NODE_SOCKET_PATH="${CARDANO_NODE_SOCKET_PATH:-example/main.sock}"
+export PV=v1 # Plutus Script Version
+
 mkdir -p "$WORKD"
-plutusscriptinuse=scripts/plutus/scripts/minting-context-equivalance-test.plutus
+plutusscriptinuse=scripts/plutus/scripts/$PV/minting-context-equivalance-test.plutus
 
-utxovkey=example/shelley/utxo-keys/utxo1.vkey
-utxoskey=example/shelley/utxo-keys/utxo1.skey
+utxovkey=example/utxo-keys/utxo1.vkey
+utxoskey=example/utxo-keys/utxo1.skey
 utxoaddr=$(cardano-cli address build --testnet-magic 42 --payment-verification-key-file $utxovkey)
 cardano-cli query utxo --address $utxoaddr --cardano-mode --testnet-magic 42 --out-file utxo.json
 txin=$(jq -r 'keys[]' utxo.json)

diff --git a/scripts/plutus/scripts/always-fails.plutus → ...pts/plutus/scripts/v1/always-fails.plutus b/scripts/plutus/scripts/always-fails.plutus → ...pts/plutus/scripts/v1/always-fails.plutus
diff --git a/...s/scripts/always-succeeds-spending.plutus → ...cripts/v1/always-succeeds-spending.plutus b/...s/scripts/always-succeeds-spending.plutus → ...cripts/v1/always-succeeds-spending.plutus
diff --git a/...pts/plutus/scripts/anyone-can-mint.plutus → .../plutus/scripts/v1/anyone-can-mint.plutus b/...pts/plutus/scripts/anyone-can-mint.plutus → .../plutus/scripts/v1/anyone-can-mint.plutus
diff --git a/...s/scripts/context-equivalance-test.plutus → ...cripts/v1/context-equivalance-test.plutus b/...s/scripts/context-equivalance-test.plutus → ...cripts/v1/context-equivalance-test.plutus
diff --git a/...s/scripts/custom-guess-42-datum-42.plutus → ...cripts/v1/custom-guess-42-datum-42.plutus b/...s/scripts/custom-guess-42-datum-42.plutus → ...cripts/v1/custom-guess-42-datum-42.plutus
diff --git a/scripts/plutus/scripts/guess-42-stake.plutus → ...s/plutus/scripts/v1/guess-42-stake.plutus b/scripts/plutus/scripts/guess-42-stake.plutus → ...s/plutus/scripts/v1/guess-42-stake.plutus
diff --git a/...s/minting-context-equivalance-test.plutus → ...1/minting-context-equivalance-test.plutus b/...s/minting-context-equivalance-test.plutus → ...1/minting-context-equivalance-test.plutus
diff --git a/scripts/plutus/scripts/v2/always-fails.plutus b/scripts/plutus/scripts/v2/always-fails.plutus
@@ -0,0 +1,5 @@
+{
+    "type": "PlutusScriptV2",
+    "description": "",
+    "cborHex": "4746010000222601"
+}