Merge remote-tracking branch 'origin/feature/solidity-contract' into …

…feature/solidity-contract
AElfProject · Jul 17, 2024 · a4a2a01 · a4a2a01
2 parents 2b6040d + 1eb0097
commit a4a2a01
Show file tree

Hide file tree

Showing 2 changed files with 1,829 additions and 1 deletion.
diff --git a/contract/AElf.Contracts.Genesis/BasicContractZero_Solidity.cs b/contract/AElf.Contracts.Genesis/BasicContractZero_Solidity.cs
@@ -129,7 +129,7 @@ public override Hash UploadSoliditySmartContract(UploadSoliditySmartContractInpu
         var wasmCode = new WasmContractCode();
         wasmCode.MergeFrom(input.Code);
         var codeHash = wasmCode.CodeHash;
-        AssertContractExists(codeHash);
+        AssertContractNotExists(codeHash);
         var reg = new SmartContractRegistration
         {
             Category = input.Category,

diff --git a/test/AElf.Contracts.SolidityContract.Tests/contracts/UniswapV2Pair.contract b/test/AElf.Contracts.SolidityContract.Tests/contracts/UniswapV2Pair.contract