@cardano-sdk/e2e 0.33.2 → 0.34.0

package/docker-compose.yml

@@ -22,7 +22,8 @@ services:
     ports:
       - 3001:3001
     volumes:
-      - ./local-network/network-files/node-sp1/:/root/network-files/node-sp1
+      # This breaks running in Docker Desktop for macOS, is it *really* needed? I see no usage of cardano-cli in the repo
+      #- ./local-network/network-files/node-sp1/:/root/network-files/node-sp1
       - ./local-network/config:/root/config
       - sdk-ipc:/sdk-ipc
 
@@ -37,7 +38,9 @@ services:
       NGINX_PORT: 80
     healthcheck:
       test: ['CMD-SHELL', 'wget -O /dev/null http://localhost || exit 1']
-      timeout: 10s
+      start_period: 5s
+      interval: 5s
+      timeout: 2s
 
   cardano-node:
     depends_on:
@@ -65,6 +68,9 @@ services:
       - ./local-network/config/network:/config
 
   cardano-submit-api:
+    depends_on:
+      local-testnet:
+        condition: service_healthy
     volumes:
       - ./local-network/config/network:/config
 

package/local-network/.dockerignore

@@ -0,0 +1 @@
+bin/

package/local-network/Dockerfile

@@ -6,27 +6,41 @@ ENV DEBIAN_FRONTEND=nonintercative
 
 WORKDIR /build
 ARG CARDANO_NODE_BUILD_URL=https://update-cardano-mainnet.iohk.io/cardano-node-releases/cardano-node-1.35.4-linux.tar.gz
+ARG CARDANO_NODE_BUILD_URL_ARM64=https://github.com/input-output-hk/ogmios-tracker/releases/download/0.1.0/cardano-node-1.35.4-aarch64-linux.tar.gz
+
 RUN apt-get update -y && \
-  apt-get install -y wget tar && \
-  wget $CARDANO_NODE_BUILD_URL -O cardano-node.tar.gz && \
-  mkdir -p bin && \
-  tar -xzf cardano-node.tar.gz -C bin
+    apt-get install -y wget tar curl && \
+    if [ "$(uname -m)" = "aarch64" ] ; then \
+      curl -fsSL "$CARDANO_NODE_BUILD_URL_ARM64" >cardano-node.tar.gz && \
+      mkdir -p cardano-node && \
+      tar -xzf cardano-node.tar.gz -C cardano-node ;\
+    else \
+      curl -fsSL "$CARDANO_NODE_BUILD_URL" >cardano-node.tar.gz && \
+      mkdir -p cardano-node/bin && \
+      tar -xzf cardano-node.tar.gz -C cardano-node/bin ;\
+    fi
 
 FROM ubuntu:${UBUNTU_VERSION}
 
-ENV TINI_VERSION v0.19.0
-
 WORKDIR /root
 RUN apt-get update -y && \
-  apt-get install -y tzdata ca-certificates jq coreutils curl
+  apt-get install -y tzdata ca-certificates jq coreutils curl wget
 
 HEALTHCHECK --interval=5s --timeout=1s --retries=200 --start-period=100ms \
   CMD /root/scripts/get-epoch.sh | awk '{ if ($0 >= "3") exit 0; else exit 1}'
 
 STOPSIGNAL SIGINT
-COPY --from=builder /build/bin ./bin
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static /tini
-RUN chmod +x /tini
-
-COPY . .
+COPY --from=builder /build/cardano-node /opt/cardano-node
+ARG TINI_VERSION=v0.19.0
+RUN mkdir -p ./bin && ln -s /opt/cardano-node/bin/* ./bin/ &&\
+    if [ "$(uname -m)" = "aarch64" ] ; then \
+      TINI_VARIANT=static-arm64 ;\
+    else \
+      TINI_VARIANT=static-amd64 ;\
+    fi &&\
+    curl -fsSL >/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TINI_VARIANT} &&\
+    chmod +x /tini
+
+COPY scripts scripts
+COPY templates templates
 ENTRYPOINT ["/tini", "-g", "--", "/root/scripts/start.sh" ]

package/local-network/scripts/make-babbage.sh

@@ -14,11 +14,29 @@ export PATH=$PWD/bin:$PATH
 
 source ./scripts/nodes-configuration.sh
 
-UNAME=$(uname -s) SED=
-case $UNAME in
-Darwin) SED="gsed" ;;
-Linux) SED="sed" ;;
-esac
+# We need this when running in Docker Desktop on macOS. `sed -i` doesn’t work well with VOLUMEs
+# there, unless it can create its temporary files outside of a VOLUME, which requires $TMPDIR.
+export TMPDIR="${TMPDIR:-/tmp}"
+export TMP="${TMP:-/tmp}"
+
+UNAME=$(uname -s)
+
+# Normal `sed -i` is a bit stubborn, and really wants to create its temporary files in the
+# directory of the target file. It is not a true in-place edit, and often braks permissions.
+# Let’s use this wrapper instead.
+sed_i() {
+    local tmpfile=$(mktemp)
+    local sed_bin=sed
+    if [ "$UNAME" == "Darwin" ] ; then sed_bin=gsed ; fi
+    if $sed_bin "$@" >"$tmpfile"; then
+        cat "$tmpfile" >"${@: -1}" # Replace the last argument file (in-place file) with tmpfile content
+        rm "$tmpfile"
+    else
+        echo "sed failed." >&2
+        rm "$tmpfile"
+        return 1
+    fi
+}
 
 case $(uname) in
 Darwin) date='gdate' ;;
@@ -108,7 +126,7 @@ cardano-cli byron genesis genesis \
 cp templates/babbage/alonzo-babbage-test-genesis.json "${ROOT}/genesis.alonzo.spec.json"
 cp templates/babbage/byron-configuration.yaml "${ROOT}/configuration.yaml"
 
-$SED -i "${ROOT}/configuration.yaml" \
+sed_i \
   -e 's/Protocol: RealPBFT/Protocol: Cardano/' \
   -e 's|GenesisFile: genesis.json|ByronGenesisFile: genesis/byron/genesis.json|' \
   -e '/ByronGenesisFile/ aShelleyGenesisFile: genesis/shelley/genesis.json' \
@@ -117,7 +135,8 @@ $SED -i "${ROOT}/configuration.yaml" \
   -e 's/LastKnownBlockVersion-Major: 0/LastKnownBlockVersion-Major: 6/' \
   -e 's/LastKnownBlockVersion-Minor: 2/LastKnownBlockVersion-Minor: 0/' \
   -e "s/minSeverity: Info/minSeverity: ${CARDANO_NODE_LOG_LEVEL}/" \
-  -e "s/cardano.node.ChainDB: Notice/cardano.node.ChainDB: ${CARDANO_NODE_CHAINDB_LOG_LEVEL}/"
+  -e "s/cardano.node.ChainDB: Notice/cardano.node.ChainDB: ${CARDANO_NODE_CHAINDB_LOG_LEVEL}/" \
+  "${ROOT}/configuration.yaml"
 
 echo "" >>"${ROOT}/configuration.yaml"
 echo "PBftSignatureThreshold: 0.6" >>"${ROOT}/configuration.yaml"
@@ -159,7 +178,7 @@ jq --raw-output ".protocolConsts.protocolMagic = ${NETWORK_MAGIC}" "${ROOT}/gene
 
 rm "${ROOT}/genesis/byron/genesis-wrong.json"
 
-$SED -i "${ROOT}/genesis/shelley/genesis.json" \
+sed_i \
   -e 's/"slotLength": 1/"slotLength": 0.2/' \
   -e 's/"activeSlotsCoeff": 5.0e-2/"activeSlotsCoeff": 0.1/' \
   -e 's/"securityParam": 2160/"securityParam": 10/' \
@@ -172,7 +191,8 @@ $SED -i "${ROOT}/genesis/shelley/genesis.json" \
   -e 's/"major": 0/"major": 7/' \
   -e 's/"rho": 0.0/"rho": 0.1/' \
   -e 's/"tau": 0.0/"tau": 0.1/' \
-  -e 's/"updateQuorum": 5/"updateQuorum": 2/'
+  -e 's/"updateQuorum": 5/"updateQuorum": 2/' \
+  "${ROOT}/genesis/shelley/genesis.json"
 
 for NODE_ID in ${SP_NODES_ID}; do
   TARGET="${ROOT}/node-sp${NODE_ID}"
@@ -248,8 +268,8 @@ for NODE in ${SP_NODES}; do
 done
 
 echo "Update start time in genesis files"
-$SED -i -E "s/\"startTime\": [0-9]+/\"startTime\": ${timeUnix}/" ${ROOT}/genesis/byron/genesis.json
-$SED -i -E "s/\"systemStart\": \".*\"/\"systemStart\": \"${timeISO}\"/" ${ROOT}/genesis/shelley/genesis.json
+sed_i -E "s/\"startTime\": [0-9]+/\"startTime\": ${timeUnix}/" ${ROOT}/genesis/byron/genesis.json
+sed_i -E "s/\"systemStart\": \".*\"/\"systemStart\": \"${timeISO}\"/" ${ROOT}/genesis/shelley/genesis.json
 
 byronGenesisHash=$(cardano-cli byron genesis print-genesis-hash --genesis-json ${ROOT}/genesis/byron/genesis.json)
 shelleyGenesisHash=$(cardano-cli genesis hash --genesis ${ROOT}/genesis/shelley/genesis.json)
@@ -259,9 +279,9 @@ echo "Byron genesis hash: $byronGenesisHash"
 echo "Shelley genesis hash: $shelleyGenesisHash"
 echo "Alonzo genesis hash: $alonzoGenesisHash"
 
-$SED -i -E "s/ByronGenesisHash: '.*'/ByronGenesisHash: '${byronGenesisHash}'/" ${ROOT}/configuration.yaml
-$SED -i -E "s/ShelleyGenesisHash: '.*'/ShelleyGenesisHash: '${shelleyGenesisHash}'/" ${ROOT}/configuration.yaml
-$SED -i -E "s/AlonzoGenesisHash: '.*'/AlonzoGenesisHash: '${alonzoGenesisHash}'/" ${ROOT}/configuration.yaml
+sed_i -E "s/ByronGenesisHash: '.*'/ByronGenesisHash: '${byronGenesisHash}'/" ${ROOT}/configuration.yaml
+sed_i -E "s/ShelleyGenesisHash: '.*'/ShelleyGenesisHash: '${shelleyGenesisHash}'/" ${ROOT}/configuration.yaml
+sed_i -E "s/AlonzoGenesisHash: '.*'/AlonzoGenesisHash: '${alonzoGenesisHash}'/" ${ROOT}/configuration.yaml
 
 # Create config folder
 rm -rf ./config/*
@@ -274,14 +294,16 @@ cp ./templates/babbage/db-sync-config.json ./config/network/cardano-db-sync/conf
 cp ./templates/babbage/node-config.json ./config/network/cardano-node/config.json
 cp ./templates/babbage/submit-api-config.json ./config/network/cardano-submit-api/config.json
 
-$SED -i -E "s/\"ByronGenesisHash\": \".*\"/\"ByronGenesisHash\": \"${byronGenesisHash}\"/" ./config/network/cardano-node/config.json
-$SED -i -E "s/\"ShelleyGenesisHash\": \".*\"/\"ShelleyGenesisHash\": \"${shelleyGenesisHash}\"/" ./config/network/cardano-node/config.json
-$SED -i -E "s/\"AlonzoGenesisHash\": \".*\"/\"AlonzoGenesisHash\": \"${alonzoGenesisHash}\"/" ./config/network/cardano-node/config.json
+sed_i -E "s/\"ByronGenesisHash\": \".*\"/\"ByronGenesisHash\": \"${byronGenesisHash}\"/" ./config/network/cardano-node/config.json
+sed_i -E "s/\"ShelleyGenesisHash\": \".*\"/\"ShelleyGenesisHash\": \"${shelleyGenesisHash}\"/" ./config/network/cardano-node/config.json
+sed_i -E "s/\"AlonzoGenesisHash\": \".*\"/\"AlonzoGenesisHash\": \"${alonzoGenesisHash}\"/" ./config/network/cardano-node/config.json
 
 cp ./templates/babbage/topology.json ./config/network/cardano-node/topology.json
 # docker hostname in topology.json isn't working, so need to specify ip of local network
 CONTAINER_IP=$(hostname -I | xargs)
-$SED -i "s/172.17.0.1/$CONTAINER_IP/g" ./config/network/cardano-node/topology.json
+sed_i "s/172.17.0.1/$CONTAINER_IP/g" ./config/network/cardano-node/topology.json
+# Note: for some reason, the first cardano-node (on port 3001) isn’t immediately responsive to the outside world, so:
+sed_i "s/3001/3002/g" ./config/network/cardano-node/topology.json
 
 cp "${ROOT}"/genesis/byron/genesis.json ./config/network/cardano-node/genesis/byron.json
 cp "${ROOT}"/genesis/byron/genesis.json ./config/network/genesis/byron.json

package/local-network/scripts/ogmios-start.sh

@@ -10,4 +10,4 @@
 while [ -f /sdk-ipc/prevent_ogmios ]; do sleep 10; done
 
 # Start the ogmios as normal
-/bin/ogmios "$@"
+exec /bin/ogmios "$@"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardano-sdk/e2e",
-  "version": "0.33.2",
+  "version": "0.34.0",
   "description": "End to end tests for the cardano-js-sdk packages.",
   "engines": {
     "node": ">=16.20.2"
@@ -44,7 +44,7 @@
     "test:web-extension:watch:run": "yarn test:web-extension:run --watch",
     "test:web-extension:watch": "run-s test:web-extension:build test:web-extension:watch:bg",
     "test:web-extension:watch:bg": "run-p test:web-extension:watch:build test:web-extension:watch:run",
-    "local-network:common": "DISABLE_DB_CACHE=${DISABLE_DB_CACHE:-true} SUBMIT_API_ARGS='--testnet-magic 888' USE_BLOCKFROST=false docker compose -p local-network-e2e -f docker-compose.yml -f ../../compose/common.yml $FILES up",
+    "local-network:common": "DISABLE_DB_CACHE=${DISABLE_DB_CACHE:-true} SUBMIT_API_ARGS='--testnet-magic 888' USE_BLOCKFROST=false __FIX_UMASK__=$(chmod -R a+r ../../compose/placeholder-secrets) docker compose -p local-network-e2e -f docker-compose.yml -f ../../compose/common.yml -f ../../compose/$(uname -m).yml $FILES up",
     "local-network:up": "FILES='' yarn local-network:common",
     "local-network:dev": "FILES='-f ../../compose/dev.yml' yarn local-network:common",
     "local-network:profile:up": "FILES='-f ../../compose/pg-agent.yml' yarn local-network:common",
@@ -80,23 +80,23 @@
   "dependencies": {
     "@cardano-foundation/ledgerjs-hw-app-cardano": "^6.0.0",
     "@cardano-ogmios/client": "5.6.0",
-    "@cardano-sdk/cardano-services": "~0.27.1",
-    "@cardano-sdk/cardano-services-client": "~0.18.0",
+    "@cardano-sdk/cardano-services": "~0.28.0",
+    "@cardano-sdk/cardano-services-client": "~0.19.0",
     "@cardano-sdk/core": "~0.30.0",
     "@cardano-sdk/crypto": "~0.1.22",
-    "@cardano-sdk/hardware-ledger": "~0.8.19",
-    "@cardano-sdk/hardware-trezor": "~0.4.19",
-    "@cardano-sdk/input-selection": "~0.12.26",
+    "@cardano-sdk/hardware-ledger": "~0.9.1",
+    "@cardano-sdk/hardware-trezor": "~0.4.20",
+    "@cardano-sdk/input-selection": "~0.12.27",
     "@cardano-sdk/key-management": "~0.20.1",
-    "@cardano-sdk/ogmios": "~0.15.20",
-    "@cardano-sdk/tx-construction": "~0.18.2",
+    "@cardano-sdk/ogmios": "~0.15.21",
+    "@cardano-sdk/tx-construction": "~0.18.3",
     "@cardano-sdk/util": "~0.15.0",
-    "@cardano-sdk/util-dev": "~0.19.18",
-    "@cardano-sdk/util-rxjs": "~0.7.9",
-    "@cardano-sdk/wallet": "~0.35.2",
+    "@cardano-sdk/util-dev": "~0.20.0",
+    "@cardano-sdk/util-rxjs": "~0.7.10",
+    "@cardano-sdk/wallet": "~0.37.0",
     "@dcspark/cardano-multiplatform-lib-nodejs": "^3.1.1",
     "@vespaiach/axios-fetch-adapter": "^0.3.0",
-    "axios": "^0.27.2",
+    "axios": "^0.28.0",
     "bunyan": "^1.8.15",
     "chalk": "4.1.2",
     "cli-spinners": "^2.9.0",
@@ -124,9 +124,9 @@
     "@babel/preset-env": "^7.18.2",
     "@babel/preset-typescript": "^7.17.12",
     "@cardano-sdk/dapp-connector": "~0.12.14",
-    "@cardano-sdk/projection": "~0.11.10",
-    "@cardano-sdk/projection-typeorm": "~0.8.12",
-    "@cardano-sdk/web-extension": "~0.26.1",
+    "@cardano-sdk/projection": "~0.11.11",
+    "@cardano-sdk/projection-typeorm": "~0.8.13",
+    "@cardano-sdk/web-extension": "~0.27.0",
     "@dcspark/cardano-multiplatform-lib-browser": "^3.1.1",
     "@emurgo/cardano-message-signing-asmjs": "^1.0.1",
     "@types/bunyan": "^1.8.8",
@@ -179,5 +179,5 @@
     "webpack-cli": "^4.9.2",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "5b0ce8d96892557f5e950c4d8633415b61975090"
+  "gitHead": "7f5eadff3a78b3e8c10fd518eb9f13cddc9f2bad"
 }