Merge pull request #439 from alephium/fix-circular-reference

Lbqds · web-flow · commit 6942bac82664 · 2024-10-28T18:57:45.000+08:00
Fix the circular dependency in the generated code
diff --git a/artifacts/ts/Add.ts b/artifacts/ts/Add.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as AddContractJson } from "../add/Add.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -256,6 +256,7 @@ export const Add = new Factory(
     AllStructs
   )
 );
+registerContract(Add);
 
 // Use this class to interact with the blockchain
 export class AddInstance extends ContractInstance {
diff --git a/artifacts/ts/Assert.ts b/artifacts/ts/Assert.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as AssertContractJson } from "../test/Assert.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -121,6 +121,7 @@ export const Assert = new Factory(
     AllStructs
   )
 );
+registerContract(Assert);
 
 // Use this class to interact with the blockchain
 export class AssertInstance extends ContractInstance {
diff --git a/artifacts/ts/Debug.ts b/artifacts/ts/Debug.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as DebugContractJson } from "../test/Debug.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -121,6 +121,7 @@ export const Debug = new Factory(
     AllStructs
   )
 );
+registerContract(Debug);
 
 // Use this class to interact with the blockchain
 export class DebugInstance extends ContractInstance {
diff --git a/artifacts/ts/DeprecatedNFTTest1.ts b/artifacts/ts/DeprecatedNFTTest1.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as DeprecatedNFTTest1ContractJson } from "../nft/DeprecatedNFTTest1.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -132,6 +132,7 @@ export const DeprecatedNFTTest1 = new Factory(
     AllStructs
   )
 );
+registerContract(DeprecatedNFTTest1);
 
 // Use this class to interact with the blockchain
 export class DeprecatedNFTTest1Instance extends ContractInstance {
diff --git a/artifacts/ts/DeprecatedNFTTest2.ts b/artifacts/ts/DeprecatedNFTTest2.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as DeprecatedNFTTest2ContractJson } from "../nft/DeprecatedNFTTest2.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -148,6 +148,7 @@ export const DeprecatedNFTTest2 = new Factory(
     AllStructs
   )
 );
+registerContract(DeprecatedNFTTest2);
 
 // Use this class to interact with the blockchain
 export class DeprecatedNFTTest2Instance extends ContractInstance {
diff --git a/artifacts/ts/DeprecatedNFTTest3.ts b/artifacts/ts/DeprecatedNFTTest3.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as DeprecatedNFTTest3ContractJson } from "../nft/DeprecatedNFTTest3.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -148,6 +148,7 @@ export const DeprecatedNFTTest3 = new Factory(
     AllStructs
   )
 );
+registerContract(DeprecatedNFTTest3);
 
 // Use this class to interact with the blockchain
 export class DeprecatedNFTTest3Instance extends ContractInstance {
diff --git a/artifacts/ts/DeprecatedNFTTest4.ts b/artifacts/ts/DeprecatedNFTTest4.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as DeprecatedNFTTest4ContractJson } from "../nft/DeprecatedNFTTest4.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -148,6 +148,7 @@ export const DeprecatedNFTTest4 = new Factory(
     AllStructs
   )
 );
+registerContract(DeprecatedNFTTest4);
 
 // Use this class to interact with the blockchain
 export class DeprecatedNFTTest4Instance extends ContractInstance {
diff --git a/artifacts/ts/DeprecatedNFTTest5.ts b/artifacts/ts/DeprecatedNFTTest5.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as DeprecatedNFTTest5ContractJson } from "../nft/DeprecatedNFTTest5.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -153,6 +153,7 @@ export const DeprecatedNFTTest5 = new Factory(
     AllStructs
   )
 );
+registerContract(DeprecatedNFTTest5);
 
 // Use this class to interact with the blockchain
 export class DeprecatedNFTTest5Instance extends ContractInstance {
diff --git a/artifacts/ts/DeprecatedNFTTest6.ts b/artifacts/ts/DeprecatedNFTTest6.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as DeprecatedNFTTest6ContractJson } from "../nft/DeprecatedNFTTest6.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -148,6 +148,7 @@ export const DeprecatedNFTTest6 = new Factory(
     AllStructs
   )
 );
+registerContract(DeprecatedNFTTest6);
 
 // Use this class to interact with the blockchain
 export class DeprecatedNFTTest6Instance extends ContractInstance {
diff --git a/artifacts/ts/DeprecatedNFTTest7.ts b/artifacts/ts/DeprecatedNFTTest7.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as DeprecatedNFTTest7ContractJson } from "../nft/DeprecatedNFTTest7.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -153,6 +153,7 @@ export const DeprecatedNFTTest7 = new Factory(
     AllStructs
   )
 );
+registerContract(DeprecatedNFTTest7);
 
 // Use this class to interact with the blockchain
 export class DeprecatedNFTTest7Instance extends ContractInstance {
diff --git a/artifacts/ts/FakeTokenTest.ts b/artifacts/ts/FakeTokenTest.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as FakeTokenTestContractJson } from "../token/FakeTokenTest.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -195,6 +195,7 @@ export const FakeTokenTest = new Factory(
     AllStructs
   )
 );
+registerContract(FakeTokenTest);
 
 // Use this class to interact with the blockchain
 export class FakeTokenTestInstance extends ContractInstance {
diff --git a/artifacts/ts/Greeter.ts b/artifacts/ts/Greeter.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as GreeterContractJson } from "../greeter/Greeter.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -136,6 +136,7 @@ export const Greeter = new Factory(
     AllStructs
   )
 );
+registerContract(Greeter);
 
 // Use this class to interact with the blockchain
 export class GreeterInstance extends ContractInstance {
diff --git a/artifacts/ts/MapTest.ts b/artifacts/ts/MapTest.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as MapTestContractJson } from "../test/MapTest.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -183,6 +183,7 @@ export const MapTest = new Factory(
     AllStructs
   )
 );
+registerContract(MapTest);
 
 // Use this class to interact with the blockchain
 export class MapTestInstance extends ContractInstance {
diff --git a/artifacts/ts/MapTestWrapper.ts b/artifacts/ts/MapTestWrapper.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as MapTestWrapperContractJson } from "../test/MapTestWrapper.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -166,6 +166,7 @@ export const MapTestWrapper = new Factory(
     AllStructs
   )
 );
+registerContract(MapTestWrapper);
 
 // Use this class to interact with the blockchain
 export class MapTestWrapperInstance extends ContractInstance {
diff --git a/artifacts/ts/MetaData.ts b/artifacts/ts/MetaData.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as MetaDataContractJson } from "../test/MetaData.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -163,6 +163,7 @@ export const MetaData = new Factory(
     AllStructs
   )
 );
+registerContract(MetaData);
 
 // Use this class to interact with the blockchain
 export class MetaDataInstance extends ContractInstance {
diff --git a/artifacts/ts/NFTCollectionTest.ts b/artifacts/ts/NFTCollectionTest.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as NFTCollectionTestContractJson } from "../nft/NFTCollectionTest.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -205,6 +205,7 @@ export const NFTCollectionTest = new Factory(
     AllStructs
   )
 );
+registerContract(NFTCollectionTest);
 
 // Use this class to interact with the blockchain
 export class NFTCollectionTestInstance extends ContractInstance {
diff --git a/artifacts/ts/NFTCollectionWithRoyaltyTest.ts b/artifacts/ts/NFTCollectionWithRoyaltyTest.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as NFTCollectionWithRoyaltyTestContractJson } from "../nft/NFTCollectionWithRoyaltyTest.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -270,6 +270,7 @@ export const NFTCollectionWithRoyaltyTest = new Factory(
     AllStructs
   )
 );
+registerContract(NFTCollectionWithRoyaltyTest);
 
 // Use this class to interact with the blockchain
 export class NFTCollectionWithRoyaltyTestInstance extends ContractInstance {
diff --git a/artifacts/ts/NFTTest.ts b/artifacts/ts/NFTTest.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as NFTTestContractJson } from "../nft/NFTTest.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -151,6 +151,7 @@ export const NFTTest = new Factory(
     AllStructs
   )
 );
+registerContract(NFTTest);
 
 // Use this class to interact with the blockchain
 export class NFTTestInstance extends ContractInstance {
diff --git a/artifacts/ts/NFTTestStd.ts b/artifacts/ts/NFTTestStd.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as NFTTestStdContractJson } from "../nft/NFTTestStd.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -170,6 +170,7 @@ export const NFTTestStd = new Factory(
     AllStructs
   )
 );
+registerContract(NFTTestStd);
 
 // Use this class to interact with the blockchain
 export class NFTTestStdInstance extends ContractInstance {
diff --git a/artifacts/ts/OwnerOnly.ts b/artifacts/ts/OwnerOnly.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as OwnerOnlyContractJson } from "../test/OwnerOnly.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -131,6 +131,7 @@ export const OwnerOnly = new Factory(
     AllStructs
   )
 );
+registerContract(OwnerOnly);
 
 // Use this class to interact with the blockchain
 export class OwnerOnlyInstance extends ContractInstance {
diff --git a/artifacts/ts/Sub.ts b/artifacts/ts/Sub.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as SubContractJson } from "../sub/Sub.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -128,6 +128,7 @@ export const Sub = new Factory(
     AllStructs
   )
 );
+registerContract(Sub);
 
 // Use this class to interact with the blockchain
 export class SubInstance extends ContractInstance {
diff --git a/artifacts/ts/TokenTest.ts b/artifacts/ts/TokenTest.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as TokenTestContractJson } from "../token/TokenTest.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -182,6 +182,7 @@ export const TokenTest = new Factory(
     AllStructs
   )
 );
+registerContract(TokenTest);
 
 // Use this class to interact with the blockchain
 export class TokenTestInstance extends ContractInstance {
diff --git a/artifacts/ts/TokenTestStd.ts b/artifacts/ts/TokenTestStd.ts
@@ -34,7 +34,7 @@ import {
   Narrow,
 } from "@alephium/web3";
 import { default as TokenTestStdContractJson } from "../token/TokenTestStd.ral.json";
-import { getContractByCodeHash } from "./contracts";
+import { getContractByCodeHash, registerContract } from "./contracts";
 import {
   AddStruct1,
   AddStruct2,
@@ -198,6 +198,7 @@ export const TokenTestStd = new Factory(
     AllStructs
   )
 );
+registerContract(TokenTestStd);
 
 // Use this class to interact with the blockchain
 export class TokenTestStdInstance extends ContractInstance {
diff --git a/artifacts/ts/Transact.ts b/artifacts/ts/Transact.ts
diff --git a/artifacts/ts/UserAccount.ts b/artifacts/ts/UserAccount.ts
diff --git a/artifacts/ts/Warnings.ts b/artifacts/ts/Warnings.ts
diff --git a/artifacts/ts/WrongNFTTest.ts b/artifacts/ts/WrongNFTTest.ts
diff --git a/artifacts/ts/contracts.ts b/artifacts/ts/contracts.ts
diff --git a/packages/cli/src/codegen.ts b/packages/cli/src/codegen.ts
