Merge branch 'master' of github.com:input-output-hk/partner-chains into beefy_poc

Author: Klapeyron

.github/workflows/e2e-tests.yml

@@ -44,11 +44,6 @@ jobs:
       contents: read
     runs-on: eks
     steps:
-    - name: set ssh-agent to binary host
-      uses: webfactory/[email protected]
-      with:
-        ssh-private-key: ${{ secrets.SSH_KEY_BINARY_HOST }}
-
     - name: Acquire AWS Credentials
       uses: aws-actions/configure-aws-credentials@v2
       with:
@@ -98,18 +93,21 @@ jobs:
         XRAY_CLIENT_SECRET: ${{ secrets.XRAY_CLIENT_SECRET }}
         XRAY_API_BASE_URL: ${{ secrets.XRAY_API_BASE_URL }}
         JIRA_URL: ${{ secrets.JIRA_URL }}
+        K8S_SERVER: ${{ secrets.K8S_SERVER }}
+        K8S_SA_TOKEN: ${{ secrets.K8S_SA_TOKEN }}
       run: |
         cd e2e-tests
         earthly \
           --secret AWS_SESSION_TOKEN="$AWS_SESSION_TOKEN" \
           --secret AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID" \
           --secret AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY" \
+          --secret K8S_SERVER="$K8S_SERVER" \
+          --secret K8S_SA_TOKEN="$K8S_SA_TOKEN" \
           --secret SLACK_WEBHOOK_URL="$SLACK_WEBHOOK_URL" \
           --secret XRAY_CLIENT_ID="$XRAY_CLIENT_ID" \
           --secret XRAY_CLIENT_SECRET="$XRAY_CLIENT_SECRET" \
           --secret XRAY_API_BASE_URL="$XRAY_API_BASE_URL" \
           --secret JIRA_URL="$JIRA_URL" \
-          --ssh-auth-sock="$SSH_AUTH_SOCK" \
           +report \
           --log_level="${LOG_LEVEL:-"info"}" \
           --env=${{ inputs.env }} \

.github/workflows/staging.yml

@@ -46,11 +46,6 @@ jobs:
       TEST_ENVIRONMENT: staging
 
     steps:
-    - name: set ssh-agent to binary host
-      uses: webfactory/[email protected]
-      with:
-        ssh-private-key: ${{ secrets.SSH_KEY_BINARY_HOST }}
-
     - name: Acquire AWS Credentials
       uses: aws-actions/configure-aws-credentials@v2
       with:
@@ -102,18 +97,21 @@ jobs:
         XRAY_CLIENT_SECRET: ${{ secrets.XRAY_CLIENT_SECRET }}
         XRAY_API_BASE_URL: ${{ secrets.XRAY_API_BASE_URL }}
         JIRA_URL: ${{ secrets.JIRA_URL }}
+        K8S_SERVER: ${{ secrets.K8S_SERVER }}
+        K8S_SA_TOKEN: ${{ secrets.K8S_SA_TOKEN }}
       run: |
         cd e2e-tests
         earthly \
           --secret AWS_SESSION_TOKEN="$AWS_SESSION_TOKEN" \
           --secret AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID" \
           --secret AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY" \
+          --secret K8S_SERVER="$K8S_SERVER" \
+          --secret K8S_SA_TOKEN="$K8S_SA_TOKEN" \
           --secret SLACK_WEBHOOK_URL="$SLACK_WEBHOOK_URL" \
           --secret XRAY_CLIENT_ID="$XRAY_CLIENT_ID" \
           --secret XRAY_CLIENT_SECRET="$XRAY_CLIENT_SECRET" \
           --secret XRAY_API_BASE_URL="$XRAY_API_BASE_URL" \
           --secret JIRA_URL="$JIRA_URL" \
-          --ssh-auth-sock="$SSH_AUTH_SOCK" \
           +report \
           --log_level="${LOG_LEVEL:-"info"}" \
           --env=${{ env.TEST_ENVIRONMENT }} \

changelog.md

@@ -6,6 +6,16 @@ This changelog is based on [Keep A Changelog](https://keepachangelog.com/en/1.1.
 
 ## Changed
 
+## Added
+
+## Fixed
+
+## Removed
+
+# v1.7.0
+
+## Changed
+
 * `partner-chains-db-sync-data-sources` and `partner-chains-mock-data-sources` crates now exports all its public members from the root
 * `partner-chains-db-sync-data-sources` crate now exports all its public members from the root
 * `smart-contracts` commands can accept parameter to configure Ogmios requests timeout

dev/docker/chain-spec/README.md

@@ -8,7 +8,7 @@ The runtime WebAssembly (WASM) binary compiled by default may not be determinist
 
 Utilizing a Docker image for the build process ensures a consistent build environment and deterministic WASM builds.
 
-## Do I need to run it everytime?
+## Do I need to run it every time?
 
 It is not necessary to use this Docker image for every build. For local development and testing, using the hardcoded chain spec is sufficient. However, a deterministic chain spec becomes crucial when initiating a new partner chain:
 

docs/intro.md

@@ -33,7 +33,19 @@ ARG --global pytest_cmd=pytest --blockchain $blockchain --env $env --log-cli-lev
 
 build:
   ARG USERARCH
-  RUN mkdir -m 0700 ~/.ssh && cat config/substrate/known_hosts >> ~/.ssh/known_hosts
+  IF [ "$USERARCH" = "arm64" ]
+    RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip" -o "awscliv2.zip"
+  ELSE
+    RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+  END
+  RUN unzip -q awscliv2.zip
+  RUN ./aws/install
+  RUN curl -LO --silent https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/${USERARCH}/kubectl
+  RUN install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
+  RUN --secret K8S_SERVER kubectl config set-cluster my-cluster --server=${K8S_SERVER} --insecure-skip-tls-verify=true
+  RUN --secret K8S_SA_TOKEN kubectl config set-credentials github-actions --token=${K8S_SA_TOKEN}
+  RUN kubectl config set-context my-context --cluster=my-cluster --user=github-actions --namespace=default
+  RUN kubectl config use-context my-context
   RUN curl -L --silent https://github.com/getsops/sops/releases/download/v3.7.3/sops_3.7.3_${USERARCH}.deb > sops.deb && dpkg -i sops.deb && rm sops.deb
   RUN pip install -r requirements.txt
 
@@ -44,9 +56,9 @@ test:
   FROM +build
   ARG CI_RUN
   IF [ "$CI_RUN" = "true" ]
-    RUN --secret AWS_SECRET_ACCESS_KEY --secret AWS_ACCESS_KEY_ID --secret AWS_SESSION_TOKEN --no-cache --ssh eval $pytest_cmd --ci-run || true
+    RUN --secret AWS_SECRET_ACCESS_KEY --secret AWS_ACCESS_KEY_ID --secret AWS_SESSION_TOKEN --no-cache eval $pytest_cmd --ci-run || true
   ELSE
-    RUN --mount=type=secret,target=/root/.aws/credentials,id=aws --no-cache --ssh eval $pytest_cmd || true
+    RUN --mount=type=secret,target=/root/.aws/credentials,id=aws --mount=type=secret,target=/root/.kube/config,id=kube --no-cache eval $pytest_cmd || true
   END
 
 test-artifacts:

e2e-tests/Earthfile

@@ -142,7 +142,7 @@ All test layers upload full logs, metrics, and test reports to GitHub Artifacts
 | Block Production Advances | `test_block_producing` | Validate that node produces new blocks over time | Block height increases after 1.5x block duration sleep | Ensures block authoring is active and chain is progressing | Python SDK call to `get_latest_pc_block_number()` with timing validation |
 | Basic Transaction Execution | `test_transaction` | Send transaction and verify state change | Receiver balance increases; sender balance decreases by amount + fee | Verifies signing, submission, and state application of transactions | SDK with internal signing + submit logic, validates balance changes |
 | Chain Status Matches Cardano Tip | `test_get_status` | Validate that `getStatus()` aligns with Cardano CLI tip | Epoch/slot data close to Cardano tip; timestamps and sidechain data present | Confirms sync between mainchain and sidechain | `curl -d '{"jsonrpc":"2.0","method":"sidechain_getStatus","params":[],"id":1}' http://localhost:9933` with Cardano CLI comparison |
-| Genesis Params Returned | `test_get_params` | Confirm genesis config is available via RPC | `genesis_utxo` returned and correct | Ensures sidechain is initialized with correct bootstrap parameters | `curl -d '{"jsonrpc":"2.0","method":"partner_chain_getParams","params":[],"id":1}' http://localhost:9933` with genesis validation |
+| Genesis Params Returned | `test_get_params` | Confirm genesis config is available via RPC | `genesis_utxo` returned and correct | Ensures chain genesis_utxo can be retreived | `curl -d '{"jsonrpc":"2.0","method":"partner_chain_getParams","params":[],"id":1}' http://localhost:9933` with genesis validation |
 
 #### **RPC Interface Tests**
 
@@ -197,4 +197,3 @@ test_categories:
 ```
 
 Each category is run with appropriate test markers and configurations to ensure comprehensive coverage of the Partner Chain functionality.
-

e2e-tests/README.md

@@ -64,19 +64,36 @@ class MainchainAccount:
 
 
 @dataclass
-class SSH:
-    username: str = MISSING
-    host: str = MISSING
-    port: int = MISSING
-    host_keys_path: Optional[str] = None
-    private_key_path: Optional[str] = None
+class KubernetesConfig:
+    pod: str = MISSING
+    namespace: str = MISSING
+    container: str = MISSING
+
+
+@dataclass
+class DockerConfig:
+    container: str = MISSING
+
+
+@dataclass
+class RunnerConfig:
+    copy_secrets: bool = False
+    workdir: Optional[str] = None
+    docker: Optional[DockerConfig] = None
+    kubernetes: Optional[KubernetesConfig] = None
 
 
 @dataclass
 class Tool:
-    cli: str = MISSING
-    ssh: Optional[SSH] = None
-    shell: Optional[str] = SI("${...tools_shell}")
+    path: str = MISSING
+    runner: RunnerConfig = SI("${..runner}")
+
+
+@dataclass
+class Tools:
+    runner: RunnerConfig = MISSING
+    cardano_cli: Tool = MISSING
+    node: Tool = MISSING
 
 
 @dataclass
@@ -115,16 +132,11 @@ class StackApiConfig:
     ogmios_host: str = MISSING
     ogmios_port: int = MISSING
     ogmios_url: str = SI("${.ogmios_scheme}://${.ogmios_host}:${.ogmios_port}")
-    tools: dict[str, Tool] = MISSING
-    tools_host: str = MISSING
-    tools_shell: Optional[str] = None
-    ssh: Optional[SSH] = None
+    tools: Tools = MISSING
 
 
 @dataclass
 class ApiConfig:
-    genesis_utxo: str = MISSING
-    atms_kind: str = MISSING
     committee_epoch_slippage: int = MISSING
     committee_participation_tolerance: float = MISSING
     max_validators: int = MISSING

e2e-tests/config/api_config.py

@@ -1,5 +1,4 @@
 {
-    "atms_kind": "plain-ecdsa-secp256k1",
     "committee_epoch_slippage": 0,
     "committee_participation_tolerance": 0.05,
     "max_validators": 32,

e2e-tests/config/config.json

@@ -22,8 +22,5 @@
                 "port": "${nodes_config[default_port]}"
             }
         }
-    },
-    "stack_config": {
-        "tools_host": "binary-host-service.sc.svc.cluster.local"
     }
 }