Merge branch 'main' into test_677-account-nonce-discrepancies-additio…

…nal-tests
hashgraph · Feb 5, 2025 · 6671124 · 6671124
2 parents f49d8be + 7f00646
commit 6671124
Show file tree

Hide file tree

Showing 25 changed files with 1,902 additions and 500 deletions.
diff --git a/artifacts/contracts/openzeppelin/ERC-20/ERC20Mock.sol/OZERC20Mock.json b/artifacts/contracts/openzeppelin/ERC-20/ERC20Mock.sol/OZERC20Mock.json
diff --git a/artifacts/contracts/openzeppelin/ERC-721/ERC721Mock.sol/OZERC721Mock.json b/artifacts/contracts/openzeppelin/ERC-721/ERC721Mock.sol/OZERC721Mock.json
diff --git a/...ystem-contracts/hedera-token-service/examples/erc-20/ERC20Contract.sol/ERC20Contract.json b/...ystem-contracts/hedera-token-service/examples/erc-20/ERC20Contract.sol/ERC20Contract.json
diff --git a/...em-contracts/hedera-token-service/examples/erc-721/ERC721Contract.sol/ERC721Contract.json b/...em-contracts/hedera-token-service/examples/erc-721/ERC721Contract.sol/ERC721Contract.json
diff --git a/...contracts/system-contracts/hedera-token-service/examples/hrc-904/Airdrop.sol/Airdrop.json b/...contracts/system-contracts/hedera-token-service/examples/hrc-904/Airdrop.sol/Airdrop.json
diff --git a/...stem-contracts/hedera-token-service/examples/hrc-904/CancelAirdrop.sol/CancelAirdrop.json b/...stem-contracts/hedera-token-service/examples/hrc-904/CancelAirdrop.sol/CancelAirdrop.json
diff --git a/...system-contracts/hedera-token-service/examples/hrc-904/ClaimAirdrop.sol/ClaimAirdrop.json b/...system-contracts/hedera-token-service/examples/hrc-904/ClaimAirdrop.sol/ClaimAirdrop.json
diff --git a/...em-contracts/hedera-token-service/examples/hrc-904/HRC904Contract.sol/HRC904Contract.json b/...em-contracts/hedera-token-service/examples/hrc-904/HRC904Contract.sol/HRC904Contract.json
diff --git a/...en-service/examples/token-manage/TokenManagementContract.sol/TokenManagementContract.json b/...en-service/examples/token-manage/TokenManagementContract.sol/TokenManagementContract.json
diff --git a/...contracts/system-contracts/hedera-token-service/examples/hrc-904/Airdrop.sol/Airdrop.json b/...contracts/system-contracts/hedera-token-service/examples/hrc-904/Airdrop.sol/Airdrop.json
@@ -190,6 +190,11 @@
         "internalType": "address[]",
         "name": "receivers",
         "type": "address[]"
+      },
+      {
+        "internalType": "int64[]",
+        "name": "serials",
+        "type": "int64[]"
       }
     ],
     "name": "nftAirdropDistribute",

diff --git a/...stem-contracts/hedera-token-service/examples/hrc-904/CancelAirdrop.sol/CancelAirdrop.json b/...stem-contracts/hedera-token-service/examples/hrc-904/CancelAirdrop.sol/CancelAirdrop.json
@@ -70,7 +70,7 @@
         "type": "int64[]"
       }
     ],
-    "name": "cancelAirdrops",
+    "name": "cancelMultipleAirdrops",
     "outputs": [
       {
         "internalType": "int64",

diff --git a/...system-contracts/hedera-token-service/examples/hrc-904/ClaimAirdrop.sol/ClaimAirdrop.json b/...system-contracts/hedera-token-service/examples/hrc-904/ClaimAirdrop.sol/ClaimAirdrop.json
@@ -70,7 +70,7 @@
         "type": "int64[]"
       }
     ],
-    "name": "claimAirdrops",
+    "name": "claimMultipleAirdrops",
     "outputs": [
       {
         "internalType": "int64",

diff --git a/...em-contracts/hedera-token-service/examples/hrc-904/HRC904Contract.sol/HRC904Contract.json b/...em-contracts/hedera-token-service/examples/hrc-904/HRC904Contract.sol/HRC904Contract.json