fix(erc721): rework to relay pattern (no re-key), keep diagnostics

Signed-off-by: ValentinVPK <valentin.krumov@limechain.tech>

Author: ValentinVPK

.github/workflows/test-workflow.yml

@@ -29,7 +29,7 @@ permissions:
 jobs:
   acceptance-workflow:
     runs-on: hl-contr-lin-lg
-    timeout-minutes: 45
+    timeout-minutes: 15 # TEMPORARY (v0.77 iteration) — restore to 45 before merge
     strategy:
       fail-fast: false
 

.github/workflows/tests.yml

@@ -1,5 +1,13 @@
 name: Tests CI
 
+# =============================================================================
+# TEMPORARY — v0.77 fix iteration only. REVERT BEFORE MERGE.
+# Reduced to a single suite so each push runs one ~5-min job instead of 14
+# suites (most hanging to the job cap) on a serialized runner pool. The full
+# 14-suite job list + PublishResults lives in git history; restore it before
+# this PR is merged. To iterate a different suite, change `testfilter` below.
+# =============================================================================
+
 on:
   pull_request:
     branches: [main, release/**]
@@ -21,125 +29,8 @@ defaults:
     shell: bash
 
 jobs:
-  ERC20Contract:
-    name: ERC20 Contract Test Suite
-    uses: ./.github/workflows/test-workflow.yml
-    with:
-      testfilter: ERC20
-
   ERC721Contract:
     name: ERC721 Contract Test Suite
     uses: ./.github/workflows/test-workflow.yml
     with:
       testfilter: ERC721
-
-  TokenCreateContract:
-    name: Token Create Test Suite
-    uses: ./.github/workflows/test-workflow.yml
-    with:
-      testfilter: TokenCreateContract
-
-  TokenQueryContract:
-    name: Token Query Test Suite
-    uses: ./.github/workflows/test-workflow.yml
-    with:
-      testfilter: TokenQueryContract
-
-  TokenManagmentContract:
-    name: Token Managment Test Suite
-    uses: ./.github/workflows/test-workflow.yml
-    with:
-      testfilter: TokenManagmentContract
-
-  TokenTransferContract:
-    name: Token Transfer Test Suite
-    uses: ./.github/workflows/test-workflow.yml
-    with:
-      testfilter: TokenTransferContract
-
-  HIP755:
-    name: HIP755 Test Suite
-    uses: ./.github/workflows/test-workflow.yml
-    with:
-      testfilter: HIP755
-
-  HIP1215:
-    name: HIP1215 Test Suite
-    uses: ./.github/workflows/test-workflow.yml
-    with:
-      testfilter: HIP1215
-
-  HRC:
-    name: HRC Test Suite
-    uses: ./.github/workflows/test-workflow.yml
-    with:
-      testfilter: HRC
-
-  PrngSystemContract:
-    name: PrngSystemContract Test Suite
-    uses: ./.github/workflows/test-workflow.yml
-    with:
-      testfilter: PrngSystemContract
-
-  HederaAccountService:
-    name: HederaAccountService Test Suite
-    uses: ./.github/workflows/test-workflow.yml
-    with:
-      testfilter: HAS
-
-  HIP904Batch1:
-    name: HIP904 Contract Test Suite Batch 1
-    uses: ./.github/workflows/test-workflow.yml
-    with:
-      testfilter: HIP904Batch1
-
-  HIP904Batch2:
-    name: HIP904 Contract Test Suite Batch 2
-    uses: ./.github/workflows/test-workflow.yml
-    with:
-      testfilter: HIP904Batch2
-
-  HIP904Batch3:
-    name: HIP904 Contract Test Suite Batch 3
-    uses: ./.github/workflows/test-workflow.yml
-    with:
-      testfilter: HIP904Batch3
-
-  PublishResults:
-    name: Publish Results
-    if: ${{ !cancelled() }}
-    needs:
-      - ERC20Contract
-      - ERC721Contract
-      - TokenCreateContract
-      - TokenQueryContract
-      - TokenManagmentContract
-      - TokenTransferContract
-      - HIP755
-      - HIP1215
-      - HRC
-      - PrngSystemContract
-      - HederaAccountService
-      - HIP904Batch1
-      - HIP904Batch2
-      - HIP904Batch3
-
-    runs-on: hl-contr-lin-md
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
-        with:
-          egress-policy: audit
-
-      - name: Download Test Reports
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
-        with:
-          pattern: Test Results (*)
-          merge-multiple: true
-
-      - name: Publish Test Report
-        uses: step-security/publish-unit-test-result-action@681100d67b09305624c089873f12c545ee7cbc24 # v2.23.0
-        with:
-          check_name: Test Results
-          json_thousands_separator: ','
-          junit_files: 'test-*.xml'

test/token-service/erc-721/ERC721Contract.js

@@ -9,63 +9,75 @@ import utils from '../utils';
 
 describe('ERC721Contract Test Suite', function () {
   let tokenCreateContract;
-  let tokenTransferContract;
   let tokenAddress;
   let erc721Contract;
   let mintedTokenSerialNumber;
   let nftInitialOwnerAddress;
   let signers, firstWallet, secondWallet;
 
   before(async function () {
+    this.timeout(180000); // [diag] bound the hook so a hang flushes instead of eating the 45m job cap
+    const step = async (label, fn) => {
+      console.log('[diag] erc721c: ' + label);
+      try {
+        return await fn();
+      } catch (err) {
+        utils.logRelayError('erc721c:' + label, err);
+        throw err;
+      }
+    };
     signers = await ethers.getSigners();
-    tokenCreateContract = await utils.deployTokenCreateContract();
-    tokenTransferContract = await utils.deployTokenTransferContract();
-    await hapi.updateAccountKeys([
-      await tokenCreateContract.getAddress(),
-      await tokenTransferContract.getAddress(),
-    ]);
-    erc721Contract = await utils.deployERC721Contract();
-    tokenAddress = await utils.createNonFungibleToken(
-      tokenCreateContract,
-      signers[0].address,
+    firstWallet = signers[0];
+    secondWallet = signers[1];
+    tokenCreateContract = await step('deployTokenCreateContract', () =>
+      utils.deployTokenCreateContract(),
     );
-    await hapi.updateTokenKeys(tokenAddress, [
-      await tokenCreateContract.getAddress(),
-      await tokenTransferContract.getAddress(),
-    ]);
-    mintedTokenSerialNumber = await utils.mintNFT(
-      tokenCreateContract,
-      tokenAddress,
+    erc721Contract = await step('deployERC721Contract', () =>
+      utils.deployERC721Contract(),
     );
-    await utils.associateToken(
-      tokenCreateContract,
-      tokenAddress,
-      Constants.Contract.TokenCreateContract,
+    const erc721Addr = await erc721Contract.getAddress();
+    // Relay model: no account re-keying. The token is precompile-created (so the
+    // contract can read its ERC721 facade) with firstWallet — the tx sender — as
+    // treasury, which its own signature authorizes, and the NFT is minted
+    // straight to it. So no re-key and no separate transfer to seed ownership.
+    tokenAddress = await step('createNonFungibleToken', () =>
+      utils.createNonFungibleToken(tokenCreateContract, firstWallet.address),
     );
-    await utils.grantTokenKyc(tokenCreateContract, tokenAddress);
-    firstWallet = signers[0];
-    secondWallet = signers[1];
-
-    await tokenCreateContract.associateTokenPublic(
-      await erc721Contract.getAddress(),
-      tokenAddress,
-      Constants.GAS_LIMIT_1_000_000,
+    mintedTokenSerialNumber = await step('mintNFT', () =>
+      utils.mintNFT(tokenCreateContract, tokenAddress),
     );
-
-    await tokenCreateContract.grantTokenKycPublic(
-      tokenAddress,
-      await erc721Contract.getAddress(),
-      Constants.GAS_LIMIT_1_000_000,
+    // Receivers must be associated + KYC-granted (treasury firstWallet is
+    // exempt). secondWallet self-associates with its own key; the contract holds
+    // the inherited KYC key so it grants KYC without the target signing.
+    await step('associate secondWallet', () =>
+      hapi.associateWithSigner(
+        utils.getHardhatSignerPrivateKeyByIndex(1),
+        tokenAddress,
+      ),
     );
-
-    await tokenTransferContract.transferNFTPublic(
-      tokenAddress,
-      await tokenCreateContract.getAddress(),
-      signers[0].address,
-      mintedTokenSerialNumber,
-      Constants.GAS_LIMIT_1_000_000,
+    await step('grantKyc secondWallet', () =>
+      tokenCreateContract.grantTokenKycPublic(
+        tokenAddress,
+        secondWallet.address,
+        Constants.GAS_LIMIT_1_000_000,
+      ),
+    );
+    await step('associate erc721Contract', () =>
+      tokenCreateContract.associateTokenPublic(
+        erc721Addr,
+        tokenAddress,
+        Constants.GAS_LIMIT_1_000_000,
+      ),
     );
-    nftInitialOwnerAddress = signers[0].address;
+    await step('grantKyc erc721Contract', () =>
+      tokenCreateContract.grantTokenKycPublic(
+        tokenAddress,
+        erc721Addr,
+        Constants.GAS_LIMIT_1_000_000,
+      ),
+    );
+    nftInitialOwnerAddress = firstWallet.address;
+    console.log('[diag] erc721c: before DONE');
   });
 
   after(function () {
@@ -225,16 +237,10 @@ describe('ERC721Contract Test Suite', function () {
     let serialNumber;
 
     before(async function () {
+      // Minted straight to the treasury (firstWallet), so no transfer needed.
       serialNumber = await utils.mintNFT(tokenCreateContract, tokenAddress, [
         '0x02',
       ]);
-      await tokenTransferContract.transferNFTPublic(
-        tokenAddress,
-        await tokenCreateContract.getAddress(),
-        signers[0].address,
-        serialNumber,
-        Constants.GAS_LIMIT_1_000_000,
-      );
     });
 
     it('should NOT be able to execute approve', async function () {