@opcat-labs/cat-sdk 2.1.2 → 2.1.3

package/artifacts/.templates/cat20/cat20.scrypt.tpl

@@ -21,8 +21,8 @@ contract CAT20 {
     this.hasAdmin = hasAdmin;
     this.adminScriptHash = adminScriptHash;
   }
-  public function unlock(CAT20ContractUnlockArgs unlockArgs, CAT20GuardConstState guardState, int guardInputIndex, BacktraceInfo backtraceInfo, SHPreimage __scrypt_ts_shPreimage, CAT20State __scrypt_ts_curState, bytes __scrypt_ts_prevouts, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes, TxHashPreimage __scrypt_ts_prevTxHashPreimage) {
-    require(Tx.checkPreimageSigHashType(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage), SigHash.ALL));
+  public function unlock(CAT20ContractUnlockArgs unlockArgs, CAT20GuardConstState guardState, int guardInputIndex, BacktraceInfo backtraceInfo, SHPreimage __scrypt_ts_shPreimage, Sig __scrypt_ts_preimageSig, CAT20State __scrypt_ts_curState, bytes __scrypt_ts_prevouts, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes, TxHashPreimage __scrypt_ts_prevTxHashPreimage) {
+    require(checkDataSig(Sig(__scrypt_ts_preimageSig[0 : len(__scrypt_ts_preimageSig) - 1]), sha256(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage)), ContextUtils.pubKey) && checkSig(__scrypt_ts_preimageSig, ContextUtils.pubKey));
     
     int __scrypt_ts_inputCount = ContextUtils.checkSpentAmounts(__scrypt_ts_spentAmounts, __scrypt_ts_shPreimage.hashSpentAmounts);
     

package/artifacts/.templates/cat20/cat20Admin.scrypt.tpl

@@ -13,8 +13,8 @@ contract CAT20Admin {
   constructor(bytes genesisOutpoint) {
     this.genesisOutpoint = genesisOutpoint;
   }
-  public function authorizeToSpendToken(PubKey adminPubKey, Sig adminSig, BacktraceInfo backtraceInfo, SHPreimage __scrypt_ts_shPreimage, TxOut __scrypt_ts_changeInfo, CAT20AdminState __scrypt_ts_curState, bytes __scrypt_ts_prevouts, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes, TxHashPreimage __scrypt_ts_prevTxHashPreimage) {
-    require(Tx.checkPreimageSigHashType(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage), SigHash.ALL));
+  public function authorizeToSpendToken(PubKey adminPubKey, Sig adminSig, BacktraceInfo backtraceInfo, SHPreimage __scrypt_ts_shPreimage, Sig __scrypt_ts_preimageSig, TxOut __scrypt_ts_changeInfo, CAT20AdminState __scrypt_ts_curState, bytes __scrypt_ts_prevouts, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes, TxHashPreimage __scrypt_ts_prevTxHashPreimage) {
+    require(checkDataSig(Sig(__scrypt_ts_preimageSig[0 : len(__scrypt_ts_preimageSig) - 1]), sha256(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage)), ContextUtils.pubKey) && checkSig(__scrypt_ts_preimageSig, ContextUtils.pubKey));
     
     int __scrypt_ts_inputCount = ContextUtils.checkSpentAmounts(__scrypt_ts_spentAmounts, __scrypt_ts_shPreimage.hashSpentAmounts);
     
@@ -38,8 +38,8 @@ contract CAT20Admin {
     require(hash256(adminOutput + 
       (__scrypt_ts_changeInfo.satoshis > 0 ? TxUtils.buildOutput(__scrypt_ts_changeInfo.scriptHash, __scrypt_ts_changeInfo.satoshis) : b'')) == __scrypt_ts_shPreimage.hashOutputs);
   }
-  public function transferOwnership(PubKey adminPubKey, Sig adminSig, Ripemd160 newPubKeyHash, BacktraceInfo backtraceInfo, SHPreimage __scrypt_ts_shPreimage, TxOut __scrypt_ts_changeInfo, CAT20AdminState __scrypt_ts_curState, bytes __scrypt_ts_prevouts, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes, TxHashPreimage __scrypt_ts_prevTxHashPreimage) {
-    require(Tx.checkPreimageSigHashType(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage), SigHash.ALL));
+  public function transferOwnership(PubKey adminPubKey, Sig adminSig, Ripemd160 newPubKeyHash, BacktraceInfo backtraceInfo, SHPreimage __scrypt_ts_shPreimage, Sig __scrypt_ts_preimageSig, TxOut __scrypt_ts_changeInfo, CAT20AdminState __scrypt_ts_curState, bytes __scrypt_ts_prevouts, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes, TxHashPreimage __scrypt_ts_prevTxHashPreimage) {
+    require(checkDataSig(Sig(__scrypt_ts_preimageSig[0 : len(__scrypt_ts_preimageSig) - 1]), sha256(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage)), ContextUtils.pubKey) && checkSig(__scrypt_ts_preimageSig, ContextUtils.pubKey));
     
     int __scrypt_ts_inputCount = ContextUtils.checkSpentAmounts(__scrypt_ts_spentAmounts, __scrypt_ts_shPreimage.hashSpentAmounts);
     

package/artifacts/.templates/cat20/cat20Guard_12_12_2.scrypt.tpl

@@ -12,8 +12,8 @@ import "@opcat-labs/scrypt-ts-opcat/assets/.templates/smart-contract/builtin-lib
 
 contract CAT20Guard_12_12_2 {
   constructor(){}
-  public function unlock(bytes[12] nextStateHashes, bytes[12] ownerAddrOrScriptHashes, int[12] outputTokens, int[12] tokenScriptHashIndexes, int[12] outputSatoshis, CAT20State[12] cat20States, int outputCount, SHPreimage __scrypt_ts_shPreimage, CAT20GuardConstState __scrypt_ts_curState, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes) {
-    require(Tx.checkPreimageSigHashType(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage), SigHash.ALL));
+  public function unlock(bytes[12] nextStateHashes, bytes[12] ownerAddrOrScriptHashes, int[12] outputTokens, int[12] tokenScriptHashIndexes, int[12] outputSatoshis, CAT20State[12] cat20States, int outputCount, SHPreimage __scrypt_ts_shPreimage, Sig __scrypt_ts_preimageSig, CAT20GuardConstState __scrypt_ts_curState, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes) {
+    require(checkDataSig(Sig(__scrypt_ts_preimageSig[0 : len(__scrypt_ts_preimageSig) - 1]), sha256(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage)), ContextUtils.pubKey) && checkSig(__scrypt_ts_preimageSig, ContextUtils.pubKey));
     
     int __scrypt_ts_inputCount = ContextUtils.checkSpentAmounts(__scrypt_ts_spentAmounts, __scrypt_ts_shPreimage.hashSpentAmounts);
     

package/artifacts/.templates/cat20/cat20Guard_12_12_4.scrypt.tpl

@@ -12,8 +12,8 @@ import "@opcat-labs/scrypt-ts-opcat/assets/.templates/smart-contract/builtin-lib
 
 contract CAT20Guard_12_12_4 {
   constructor(){}
-  public function unlock(bytes[12] nextStateHashes, bytes[12] ownerAddrOrScriptHashes, int[12] outputTokens, int[12] tokenScriptHashIndexes, int[12] outputSatoshis, CAT20State[12] cat20States, int outputCount, SHPreimage __scrypt_ts_shPreimage, CAT20GuardConstState __scrypt_ts_curState, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes) {
-    require(Tx.checkPreimageSigHashType(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage), SigHash.ALL));
+  public function unlock(bytes[12] nextStateHashes, bytes[12] ownerAddrOrScriptHashes, int[12] outputTokens, int[12] tokenScriptHashIndexes, int[12] outputSatoshis, CAT20State[12] cat20States, int outputCount, SHPreimage __scrypt_ts_shPreimage, Sig __scrypt_ts_preimageSig, CAT20GuardConstState __scrypt_ts_curState, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes) {
+    require(checkDataSig(Sig(__scrypt_ts_preimageSig[0 : len(__scrypt_ts_preimageSig) - 1]), sha256(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage)), ContextUtils.pubKey) && checkSig(__scrypt_ts_preimageSig, ContextUtils.pubKey));
     
     int __scrypt_ts_inputCount = ContextUtils.checkSpentAmounts(__scrypt_ts_spentAmounts, __scrypt_ts_shPreimage.hashSpentAmounts);
     

package/artifacts/.templates/cat20/cat20Guard_6_6_2.scrypt.tpl

@@ -12,8 +12,8 @@ import "@opcat-labs/scrypt-ts-opcat/assets/.templates/smart-contract/builtin-lib
 
 contract CAT20Guard_6_6_2 {
   constructor(){}
-  public function unlock(bytes[6] nextStateHashes, bytes[6] ownerAddrOrScriptHashes, int[6] outputTokens, int[6] tokenScriptHashIndexes, int[6] outputSatoshis, CAT20State[6] cat20States, int outputCount, SHPreimage __scrypt_ts_shPreimage, CAT20GuardConstState __scrypt_ts_curState, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes) {
-    require(Tx.checkPreimageSigHashType(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage), SigHash.ALL));
+  public function unlock(bytes[6] nextStateHashes, bytes[6] ownerAddrOrScriptHashes, int[6] outputTokens, int[6] tokenScriptHashIndexes, int[6] outputSatoshis, CAT20State[6] cat20States, int outputCount, SHPreimage __scrypt_ts_shPreimage, Sig __scrypt_ts_preimageSig, CAT20GuardConstState __scrypt_ts_curState, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes) {
+    require(checkDataSig(Sig(__scrypt_ts_preimageSig[0 : len(__scrypt_ts_preimageSig) - 1]), sha256(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage)), ContextUtils.pubKey) && checkSig(__scrypt_ts_preimageSig, ContextUtils.pubKey));
     
     int __scrypt_ts_inputCount = ContextUtils.checkSpentAmounts(__scrypt_ts_spentAmounts, __scrypt_ts_shPreimage.hashSpentAmounts);
     

package/artifacts/.templates/cat20/cat20Guard_6_6_4.scrypt.tpl

@@ -12,8 +12,8 @@ import "@opcat-labs/scrypt-ts-opcat/assets/.templates/smart-contract/builtin-lib
 
 contract CAT20Guard_6_6_4 {
   constructor(){}
-  public function unlock(bytes[6] nextStateHashes, bytes[6] ownerAddrOrScriptHashes, int[6] outputTokens, int[6] tokenScriptHashIndexes, int[6] outputSatoshis, CAT20State[6] cat20States, int outputCount, SHPreimage __scrypt_ts_shPreimage, CAT20GuardConstState __scrypt_ts_curState, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes) {
-    require(Tx.checkPreimageSigHashType(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage), SigHash.ALL));
+  public function unlock(bytes[6] nextStateHashes, bytes[6] ownerAddrOrScriptHashes, int[6] outputTokens, int[6] tokenScriptHashIndexes, int[6] outputSatoshis, CAT20State[6] cat20States, int outputCount, SHPreimage __scrypt_ts_shPreimage, Sig __scrypt_ts_preimageSig, CAT20GuardConstState __scrypt_ts_curState, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes) {
+    require(checkDataSig(Sig(__scrypt_ts_preimageSig[0 : len(__scrypt_ts_preimageSig) - 1]), sha256(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage)), ContextUtils.pubKey) && checkSig(__scrypt_ts_preimageSig, ContextUtils.pubKey));
     
     int __scrypt_ts_inputCount = ContextUtils.checkSpentAmounts(__scrypt_ts_spentAmounts, __scrypt_ts_shPreimage.hashSpentAmounts);
     

package/artifacts/.templates/cat20/minters/cat20ClosedMinter.scrypt.tpl

@@ -16,8 +16,8 @@ contract CAT20ClosedMinter {
     this.issuerAddress = ownerAddress;
     this.genesisOutpoint = genesisOutpoint;
   }
-  public function mint(CAT20State tokenMint, PubKey issuerPubKey, Sig issuerSig, int minterSatoshis, int tokenSatoshis, BacktraceInfo backtraceInfo, SHPreimage __scrypt_ts_shPreimage, TxOut __scrypt_ts_changeInfo, CAT20ClosedMinterState __scrypt_ts_curState, bytes __scrypt_ts_prevouts, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes, TxHashPreimage __scrypt_ts_prevTxHashPreimage) {
-    require(Tx.checkPreimageSigHashType(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage), SigHash.ALL));
+  public function mint(CAT20State tokenMint, PubKey issuerPubKey, Sig issuerSig, int minterSatoshis, int tokenSatoshis, BacktraceInfo backtraceInfo, SHPreimage __scrypt_ts_shPreimage, Sig __scrypt_ts_preimageSig, TxOut __scrypt_ts_changeInfo, CAT20ClosedMinterState __scrypt_ts_curState, bytes __scrypt_ts_prevouts, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes, TxHashPreimage __scrypt_ts_prevTxHashPreimage) {
+    require(checkDataSig(Sig(__scrypt_ts_preimageSig[0 : len(__scrypt_ts_preimageSig) - 1]), sha256(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage)), ContextUtils.pubKey) && checkSig(__scrypt_ts_preimageSig, ContextUtils.pubKey));
     
     int __scrypt_ts_inputCount = ContextUtils.checkSpentAmounts(__scrypt_ts_spentAmounts, __scrypt_ts_shPreimage.hashSpentAmounts);
     

package/artifacts/.templates/cat20/minters/cat20OpenMinter.scrypt.tpl

@@ -24,8 +24,8 @@ contract CAT20OpenMinter {
     this.limit = limit;
     this.preminerAddr = premineAddr;
   }
-  public function mint(CAT20State tokenMint, int[2] nextRemainingCounts, PubKey preminerPubKey, Sig preminerSig, int minterSatoshis, int tokenSatoshis, BacktraceInfo backtraceInfo, SHPreimage __scrypt_ts_shPreimage, TxOut __scrypt_ts_changeInfo, CAT20OpenMinterState __scrypt_ts_curState, bytes __scrypt_ts_prevouts, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes, TxHashPreimage __scrypt_ts_prevTxHashPreimage) {
-    require(Tx.checkPreimageSigHashType(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage), SigHash.ALL));
+  public function mint(CAT20State tokenMint, int[2] nextRemainingCounts, PubKey preminerPubKey, Sig preminerSig, int minterSatoshis, int tokenSatoshis, BacktraceInfo backtraceInfo, SHPreimage __scrypt_ts_shPreimage, Sig __scrypt_ts_preimageSig, TxOut __scrypt_ts_changeInfo, CAT20OpenMinterState __scrypt_ts_curState, bytes __scrypt_ts_prevouts, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes, TxHashPreimage __scrypt_ts_prevTxHashPreimage) {
+    require(checkDataSig(Sig(__scrypt_ts_preimageSig[0 : len(__scrypt_ts_preimageSig) - 1]), sha256(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage)), ContextUtils.pubKey) && checkSig(__scrypt_ts_preimageSig, ContextUtils.pubKey));
     
     int __scrypt_ts_inputCount = ContextUtils.checkSpentAmounts(__scrypt_ts_spentAmounts, __scrypt_ts_shPreimage.hashSpentAmounts);
     

package/artifacts/.templates/cat721/cat721.scrypt.tpl

@@ -17,8 +17,8 @@ contract CAT721 {
     this.minterScriptHash = minterScriptHash;
     this.guardVariantScriptHashes = guardVariantScriptHashes;
   }
-  public function unlock(CAT721ContractUnlockArgs unlockArgs, CAT721GuardConstState guardState, int guardInputIndex, BacktraceInfo backtraceInfo, SHPreimage __scrypt_ts_shPreimage, CAT721State __scrypt_ts_curState, bytes __scrypt_ts_prevouts, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes, TxHashPreimage __scrypt_ts_prevTxHashPreimage) {
-    require(Tx.checkPreimageSigHashType(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage), SigHash.ALL));
+  public function unlock(CAT721ContractUnlockArgs unlockArgs, CAT721GuardConstState guardState, int guardInputIndex, BacktraceInfo backtraceInfo, SHPreimage __scrypt_ts_shPreimage, Sig __scrypt_ts_preimageSig, CAT721State __scrypt_ts_curState, bytes __scrypt_ts_prevouts, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes, TxHashPreimage __scrypt_ts_prevTxHashPreimage) {
+    require(checkDataSig(Sig(__scrypt_ts_preimageSig[0 : len(__scrypt_ts_preimageSig) - 1]), sha256(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage)), ContextUtils.pubKey) && checkSig(__scrypt_ts_preimageSig, ContextUtils.pubKey));
     
     int __scrypt_ts_inputCount = ContextUtils.checkSpentAmounts(__scrypt_ts_spentAmounts, __scrypt_ts_shPreimage.hashSpentAmounts);
     

package/artifacts/.templates/cat721/cat721Guard_12_12_2.scrypt.tpl

@@ -11,8 +11,8 @@ import "@opcat-labs/scrypt-ts-opcat/assets/.templates/smart-contract/builtin-lib
 
 contract CAT721Guard_12_12_2 {
   constructor(){}
-  public function unlock(bytes[12] nextStateHashes, bytes[12] ownerAddrOrScriptHashes, int[12] outputLocalIds, int[12] nftScriptHashIndexes, int[12] outputSatoshis, CAT721State[12] cat721States, int outputCount, SHPreimage __scrypt_ts_shPreimage, CAT721GuardConstState __scrypt_ts_curState, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes) {
-    require(Tx.checkPreimageSigHashType(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage), SigHash.ALL));
+  public function unlock(bytes[12] nextStateHashes, bytes[12] ownerAddrOrScriptHashes, int[12] outputLocalIds, int[12] nftScriptHashIndexes, int[12] outputSatoshis, CAT721State[12] cat721States, int outputCount, SHPreimage __scrypt_ts_shPreimage, Sig __scrypt_ts_preimageSig, CAT721GuardConstState __scrypt_ts_curState, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes) {
+    require(checkDataSig(Sig(__scrypt_ts_preimageSig[0 : len(__scrypt_ts_preimageSig) - 1]), sha256(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage)), ContextUtils.pubKey) && checkSig(__scrypt_ts_preimageSig, ContextUtils.pubKey));
     
     int __scrypt_ts_inputCount = ContextUtils.checkSpentAmounts(__scrypt_ts_spentAmounts, __scrypt_ts_shPreimage.hashSpentAmounts);
     

package/artifacts/.templates/cat721/cat721Guard_12_12_4.scrypt.tpl

@@ -11,8 +11,8 @@ import "@opcat-labs/scrypt-ts-opcat/assets/.templates/smart-contract/builtin-lib
 
 contract CAT721Guard_12_12_4 {
   constructor(){}
-  public function unlock(bytes[12] nextStateHashes, bytes[12] ownerAddrOrScriptHashes, int[12] outputLocalIds, int[12] nftScriptHashIndexes, int[12] outputSatoshis, CAT721State[12] cat721States, int outputCount, SHPreimage __scrypt_ts_shPreimage, CAT721GuardConstState __scrypt_ts_curState, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes) {
-    require(Tx.checkPreimageSigHashType(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage), SigHash.ALL));
+  public function unlock(bytes[12] nextStateHashes, bytes[12] ownerAddrOrScriptHashes, int[12] outputLocalIds, int[12] nftScriptHashIndexes, int[12] outputSatoshis, CAT721State[12] cat721States, int outputCount, SHPreimage __scrypt_ts_shPreimage, Sig __scrypt_ts_preimageSig, CAT721GuardConstState __scrypt_ts_curState, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes) {
+    require(checkDataSig(Sig(__scrypt_ts_preimageSig[0 : len(__scrypt_ts_preimageSig) - 1]), sha256(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage)), ContextUtils.pubKey) && checkSig(__scrypt_ts_preimageSig, ContextUtils.pubKey));
     
     int __scrypt_ts_inputCount = ContextUtils.checkSpentAmounts(__scrypt_ts_spentAmounts, __scrypt_ts_shPreimage.hashSpentAmounts);
     

package/artifacts/.templates/cat721/cat721Guard_6_6_2.scrypt.tpl

@@ -11,8 +11,8 @@ import "@opcat-labs/scrypt-ts-opcat/assets/.templates/smart-contract/builtin-lib
 
 contract CAT721Guard_6_6_2 {
   constructor(){}
-  public function unlock(bytes[6] nextStateHashes, bytes[6] ownerAddrOrScriptHashes, int[6] outputLocalIds, int[6] nftScriptHashIndexes, int[6] outputSatoshis, CAT721State[6] cat721States, int outputCount, SHPreimage __scrypt_ts_shPreimage, CAT721GuardConstState __scrypt_ts_curState, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes) {
-    require(Tx.checkPreimageSigHashType(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage), SigHash.ALL));
+  public function unlock(bytes[6] nextStateHashes, bytes[6] ownerAddrOrScriptHashes, int[6] outputLocalIds, int[6] nftScriptHashIndexes, int[6] outputSatoshis, CAT721State[6] cat721States, int outputCount, SHPreimage __scrypt_ts_shPreimage, Sig __scrypt_ts_preimageSig, CAT721GuardConstState __scrypt_ts_curState, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes) {
+    require(checkDataSig(Sig(__scrypt_ts_preimageSig[0 : len(__scrypt_ts_preimageSig) - 1]), sha256(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage)), ContextUtils.pubKey) && checkSig(__scrypt_ts_preimageSig, ContextUtils.pubKey));
     
     int __scrypt_ts_inputCount = ContextUtils.checkSpentAmounts(__scrypt_ts_spentAmounts, __scrypt_ts_shPreimage.hashSpentAmounts);
     

package/artifacts/.templates/cat721/cat721Guard_6_6_4.scrypt.tpl

@@ -11,8 +11,8 @@ import "@opcat-labs/scrypt-ts-opcat/assets/.templates/smart-contract/builtin-lib
 
 contract CAT721Guard_6_6_4 {
   constructor(){}
-  public function unlock(bytes[6] nextStateHashes, bytes[6] ownerAddrOrScriptHashes, int[6] outputLocalIds, int[6] nftScriptHashIndexes, int[6] outputSatoshis, CAT721State[6] cat721States, int outputCount, SHPreimage __scrypt_ts_shPreimage, CAT721GuardConstState __scrypt_ts_curState, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes) {
-    require(Tx.checkPreimageSigHashType(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage), SigHash.ALL));
+  public function unlock(bytes[6] nextStateHashes, bytes[6] ownerAddrOrScriptHashes, int[6] outputLocalIds, int[6] nftScriptHashIndexes, int[6] outputSatoshis, CAT721State[6] cat721States, int outputCount, SHPreimage __scrypt_ts_shPreimage, Sig __scrypt_ts_preimageSig, CAT721GuardConstState __scrypt_ts_curState, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes) {
+    require(checkDataSig(Sig(__scrypt_ts_preimageSig[0 : len(__scrypt_ts_preimageSig) - 1]), sha256(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage)), ContextUtils.pubKey) && checkSig(__scrypt_ts_preimageSig, ContextUtils.pubKey));
     
     int __scrypt_ts_inputCount = ContextUtils.checkSpentAmounts(__scrypt_ts_spentAmounts, __scrypt_ts_shPreimage.hashSpentAmounts);
     

package/artifacts/.templates/cat721/minters/cat721ClosedMinter.scrypt.tpl

@@ -18,8 +18,8 @@ contract CAT721ClosedMinter {
     this.genesisOutpoint = genesisOutpoint;
     this.max = max;
   }
-  public function mint(CAT721State nftMint, PubKey issuerPubKey, Sig issuerSig, int minterSatoshis, int nftSatoshis, BacktraceInfo backtraceInfo, SHPreimage __scrypt_ts_shPreimage, TxOut __scrypt_ts_changeInfo, CAT721ClosedMinterState __scrypt_ts_curState, bytes __scrypt_ts_prevouts, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes, TxHashPreimage __scrypt_ts_prevTxHashPreimage) {
-    require(Tx.checkPreimageSigHashType(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage), SigHash.ALL));
+  public function mint(CAT721State nftMint, PubKey issuerPubKey, Sig issuerSig, int minterSatoshis, int nftSatoshis, BacktraceInfo backtraceInfo, SHPreimage __scrypt_ts_shPreimage, Sig __scrypt_ts_preimageSig, TxOut __scrypt_ts_changeInfo, CAT721ClosedMinterState __scrypt_ts_curState, bytes __scrypt_ts_prevouts, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes, TxHashPreimage __scrypt_ts_prevTxHashPreimage) {
+    require(checkDataSig(Sig(__scrypt_ts_preimageSig[0 : len(__scrypt_ts_preimageSig) - 1]), sha256(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage)), ContextUtils.pubKey) && checkSig(__scrypt_ts_preimageSig, ContextUtils.pubKey));
     
     int __scrypt_ts_inputCount = ContextUtils.checkSpentAmounts(__scrypt_ts_spentAmounts, __scrypt_ts_shPreimage.hashSpentAmounts);
     

package/artifacts/.templates/cat721/minters/cat721OpenMinter.scrypt.tpl

@@ -22,8 +22,8 @@ contract CAT721OpenMinter {
     this.premine = premine;
     this.preminerAddr = preminerAddr;
   }
-  public function mint(CAT721State nftMint, CAT721OpenMintInfoState openMintInfo, bytes[15] proof, bool[15] proofNodePos, PubKey preminerPubKey, Sig preminerSig, int minterSatoshis, int nftSatoshis, BacktraceInfo backtraceInfo, SHPreimage __scrypt_ts_shPreimage, TxOut __scrypt_ts_changeInfo, CAT721OpenMinterState __scrypt_ts_curState, bytes __scrypt_ts_prevouts, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes, TxHashPreimage __scrypt_ts_prevTxHashPreimage) {
-    require(Tx.checkPreimageSigHashType(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage), SigHash.ALL));
+  public function mint(CAT721State nftMint, CAT721OpenMintInfoState openMintInfo, bytes[15] proof, bool[15] proofNodePos, PubKey preminerPubKey, Sig preminerSig, int minterSatoshis, int nftSatoshis, BacktraceInfo backtraceInfo, SHPreimage __scrypt_ts_shPreimage, Sig __scrypt_ts_preimageSig, TxOut __scrypt_ts_changeInfo, CAT721OpenMinterState __scrypt_ts_curState, bytes __scrypt_ts_prevouts, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes, TxHashPreimage __scrypt_ts_prevTxHashPreimage) {
+    require(checkDataSig(Sig(__scrypt_ts_preimageSig[0 : len(__scrypt_ts_preimageSig) - 1]), sha256(ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage)), ContextUtils.pubKey) && checkSig(__scrypt_ts_preimageSig, ContextUtils.pubKey));
     
     int __scrypt_ts_inputCount = ContextUtils.checkSpentAmounts(__scrypt_ts_spentAmounts, __scrypt_ts_shPreimage.hashSpentAmounts);
     

package/artifacts/cat20/cat20.json

@@ -1,11 +1,11 @@
 {
   "version": 10,
-  "compilerVersion": "1.21.0+commit.2ada378",
-  "contract": "_opcat_labs_cat_sdk_2_1_2__rs__CAT20",
-  "md5": "d1a217cc3546a930185fdaad1b126182",
+  "compilerVersion": "1.22.0+commit.47800da",
+  "contract": "_opcat_labs_cat_sdk_2_1_3__rs__CAT20",
+  "md5": "d803bcd538736bcbc4072dc471a75052",
   "structs": [
     {
-      "name": "_opcat_labs_cat_sdk_2_1_2__rs__CAT20GuardConstState",
+      "name": "_opcat_labs_cat_sdk_2_1_3__rs__CAT20GuardConstState",
       "params": [
         {
           "name": "tokenScriptHashes",
@@ -27,7 +27,7 @@
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_cat_sdk_2_1_2__rs__CAT20State",
+      "name": "_opcat_labs_cat_sdk_2_1_3__rs__CAT20State",
       "params": [
         {
           "name": "ownerAddr",
@@ -41,7 +41,7 @@
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_cat_sdk_2_1_2__rs__CAT20ClosedMinterState",
+      "name": "_opcat_labs_cat_sdk_2_1_3__rs__CAT20ClosedMinterState",
       "params": [
         {
           "name": "tokenScriptHash",
@@ -51,7 +51,7 @@
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_cat_sdk_2_1_2__rs__CAT20OpenMinterState",
+      "name": "_opcat_labs_cat_sdk_2_1_3__rs__CAT20OpenMinterState",
       "params": [
         {
           "name": "tokenScriptHash",
@@ -69,7 +69,7 @@
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_cat_sdk_2_1_2__rs__CAT20AdminState",
+      "name": "_opcat_labs_cat_sdk_2_1_3__rs__CAT20AdminState",
       "params": [
         {
           "name": "tag",
@@ -83,7 +83,7 @@
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_scrypt_ts_opcat_2_1_2__rs__TxOut",
+      "name": "_opcat_labs_scrypt_ts_opcat_2_1_3__rs__TxOut",
       "params": [
         {
           "name": "scriptHash",
@@ -101,7 +101,7 @@
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_scrypt_ts_opcat_2_1_2__rs__TxIn",
+      "name": "_opcat_labs_scrypt_ts_opcat_2_1_3__rs__TxIn",
       "params": [
         {
           "name": "prevTxHash",
@@ -123,7 +123,7 @@
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_scrypt_ts_opcat_2_1_2__rs__TxHashPreimage",
+      "name": "_opcat_labs_scrypt_ts_opcat_2_1_3__rs__TxHashPreimage",
       "params": [
         {
           "name": "version",
@@ -145,11 +145,11 @@
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_scrypt_ts_opcat_2_1_2__rs__BacktraceInfo",
+      "name": "_opcat_labs_scrypt_ts_opcat_2_1_3__rs__BacktraceInfo",
       "params": [
         {
           "name": "prevTxInput",
-          "type": "_opcat_labs_scrypt_ts_opcat_2_1_2__rs__TxIn"
+          "type": "_opcat_labs_scrypt_ts_opcat_2_1_3__rs__TxIn"
         },
         {
           "name": "prevTxInputIndex",
@@ -157,13 +157,13 @@
         },
         {
           "name": "prevPrevTxPreimage",
-          "type": "_opcat_labs_scrypt_ts_opcat_2_1_2__rs__TxHashPreimage"
+          "type": "_opcat_labs_scrypt_ts_opcat_2_1_3__rs__TxHashPreimage"
         }
       ],
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_scrypt_ts_opcat_2_1_2__rs__SHPreimage",
+      "name": "_opcat_labs_scrypt_ts_opcat_2_1_3__rs__SHPreimage",
       "params": [
         {
           "name": "nVersion",
@@ -225,7 +225,7 @@
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_scrypt_ts_opcat_2_1_2__rs__Outpoint",
+      "name": "_opcat_labs_scrypt_ts_opcat_2_1_3__rs__Outpoint",
       "params": [
         {
           "name": "txHash",
@@ -239,7 +239,7 @@
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_scrypt_ts_opcat_2_1_2__rs__ChainTxVerifyResponse",
+      "name": "_opcat_labs_scrypt_ts_opcat_2_1_3__rs__ChainTxVerifyResponse",
       "params": [
         {
           "name": "prevPrevScript",
@@ -253,7 +253,7 @@
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_cat_sdk_2_1_2__rs__CAT20ContractUnlockArgs",
+      "name": "_opcat_labs_cat_sdk_2_1_3__rs__CAT20ContractUnlockArgs",
       "params": [
         {
           "name": "spendType",
@@ -275,7 +275,7 @@
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_cat_sdk_2_1_2__rs__CAT721ContractUnlockArgs",
+      "name": "_opcat_labs_cat_sdk_2_1_3__rs__CAT721ContractUnlockArgs",
       "params": [
         {
           "name": "userPubKey",
@@ -293,7 +293,7 @@
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_scrypt_ts_opcat_2_1_2__rs__ReadVarintResult",
+      "name": "_opcat_labs_scrypt_ts_opcat_2_1_3__rs__ReadVarintResult",
       "params": [
         {
           "name": "data",
@@ -309,50 +309,50 @@
   ],
   "library": [
     {
-      "name": "_opcat_labs_cat_sdk_2_1_2__rs__OwnerUtils",
+      "name": "_opcat_labs_cat_sdk_2_1_3__rs__OwnerUtils",
       "params": [],
       "properties": [],
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_scrypt_ts_opcat_2_1_2__rs__TxUtils",
+      "name": "_opcat_labs_scrypt_ts_opcat_2_1_3__rs__TxUtils",
       "params": [],
       "properties": [],
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_scrypt_ts_opcat_2_1_2__rs__StateUtils",
+      "name": "_opcat_labs_scrypt_ts_opcat_2_1_3__rs__StateUtils",
       "params": [],
       "properties": [],
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_scrypt_ts_opcat_2_1_2__rs__TxHashPreimageUtils",
+      "name": "_opcat_labs_scrypt_ts_opcat_2_1_3__rs__TxHashPreimageUtils",
       "params": [],
       "properties": [],
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_cat_sdk_2_1_2__rs__CAT20GuardStateLib",
+      "name": "_opcat_labs_cat_sdk_2_1_3__rs__CAT20GuardStateLib",
       "params": [],
       "properties": [],
       "genericTypes": [],
-      "stateType": "_opcat_labs_cat_sdk_2_1_2__rs__CAT20GuardConstState"
+      "stateType": "_opcat_labs_cat_sdk_2_1_3__rs__CAT20GuardConstState"
     },
     {
-      "name": "_opcat_labs_scrypt_ts_opcat_2_1_2__rs__Backtrace",
+      "name": "_opcat_labs_scrypt_ts_opcat_2_1_3__rs__Backtrace",
       "params": [],
       "properties": [],
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_scrypt_ts_opcat_2_1_2__rs__ContextUtils",
+      "name": "_opcat_labs_scrypt_ts_opcat_2_1_3__rs__ContextUtils",
       "params": [],
       "properties": [],
       "genericTypes": []
     },
     {
-      "name": "_opcat_labs_scrypt_ts_opcat_2_1_2__rs__StdUtils",
+      "name": "_opcat_labs_scrypt_ts_opcat_2_1_3__rs__StdUtils",
       "params": [],
       "properties": [],
       "genericTypes": []
@@ -367,11 +367,11 @@
       "params": [
         {
           "name": "unlockArgs",
-          "type": "_opcat_labs_cat_sdk_2_1_2__rs__CAT20ContractUnlockArgs"
+          "type": "_opcat_labs_cat_sdk_2_1_3__rs__CAT20ContractUnlockArgs"
         },
         {
           "name": "guardState",
-          "type": "_opcat_labs_cat_sdk_2_1_2__rs__CAT20GuardConstState"
+          "type": "_opcat_labs_cat_sdk_2_1_3__rs__CAT20GuardConstState"
         },
         {
           "name": "guardInputIndex",
@@ -379,15 +379,19 @@
         },
         {
           "name": "backtraceInfo",
-          "type": "_opcat_labs_scrypt_ts_opcat_2_1_2__rs__BacktraceInfo"
+          "type": "_opcat_labs_scrypt_ts_opcat_2_1_3__rs__BacktraceInfo"
         },
         {
           "name": "__scrypt_ts_shPreimage",
-          "type": "_opcat_labs_scrypt_ts_opcat_2_1_2__rs__SHPreimage"
+          "type": "_opcat_labs_scrypt_ts_opcat_2_1_3__rs__SHPreimage"
+        },
+        {
+          "name": "__scrypt_ts_preimageSig",
+          "type": "Sig"
         },
         {
           "name": "__scrypt_ts_curState",
-          "type": "_opcat_labs_cat_sdk_2_1_2__rs__CAT20State"
+          "type": "_opcat_labs_cat_sdk_2_1_3__rs__CAT20State"
         },
         {
           "name": "__scrypt_ts_prevouts",
@@ -407,7 +411,7 @@
         },
         {
           "name": "__scrypt_ts_prevTxHashPreimage",
-          "type": "_opcat_labs_scrypt_ts_opcat_2_1_2__rs__TxHashPreimage"
+          "type": "_opcat_labs_scrypt_ts_opcat_2_1_3__rs__TxHashPreimage"
         }
       ]
     },
@@ -434,8 +438,8 @@
     }
   ],
   "stateProps": [],
-  "stateType": "_opcat_labs_cat_sdk_2_1_2__rs__CAT20State",
+  "stateType": "_opcat_labs_cat_sdk_2_1_3__rs__CAT20State",
   "buildType": "release",
   "file": "../cat20.scrypt",
-  "hex": "512097dfd76851bf465e8f715593b217714858bbe9570ff3bd5e33840a34e20ff0262102ba79df5f8ae7604a9830f03c7933028186aede0675a16f025dc4f8be8eec0382201008ce7480da41702918d1ec8e6849ba32b4d65b1e40dc669c31a1e6306b266c00000000000000<minterScriptHash><guardVariantScriptHashes[0]><guardVariantScriptHashes[1]><guardVariantScriptHashes[2]><guardVariantScriptHashes[3]><hasAdmin><adminScriptHash>56795e7a755d7a5d7a5d7a5d7a5d7a5d7a5d7a5d7a5d7a5d7a5d7a5d7a5d7a5579557955795579607a607a607a607a6d6d5c7a5c7a5c7a5c7a5c7a5c7a5c7a5c7a5c7a78597a75587a587a587a587a587a587a587a587a76587a75577a577a577a577a577a577a577a6d6d6d750122790122790122790122790122790122790122790122790122790122790122790122790122790122795d798277549d5c79827701209d5b79827701209d5a79827701209d597900a26958798277549d5779827701209d5679827701209d5579827701209d5479827701209d5379827701209d527900a2697800a26976519c6476529c6751686476539c67516864760281009c67516864760282009c67516864760283009c675168695d795d797e5c797e5b797e5a79767600a2637609ffffffffffffffff00a16700686976586e8b806e7c7f75007f6b6d6d6d6c7e59797e58797e57797e56797e55797e54797e5379546e8b806e7c7f75007f6b6d6d6c7e5279546e8b806e7c7f75007f6b6d6d6c7e7854807e6b6d6d6d6d6d6d6d6c5b79785c795c79210ac407f0e4bd44bfc207355a778b046225a7068fc59ee7eda43ad905aadbffc800206c266b30e6a1319c66dc401e5bd6b432ba49688eecd118297041da8074ce08105e7956795679aa7676517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e01007e817757795679567956795679537956795479577995939521414136d08c5ed2bf3ba048afe6dcaebafeffffffffffffffffffffffffffffff006e6e9776009f636e936776687777777b757c6e5296a0636e7c947b757c6853798277527982775379012080517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e01205279947f77545379935279930130787e527e54797e58797e527e53797e52797e57797e6b6d6d6d6d6d6d6c765779ac6b6d6d6d6d6d6c7769011179011d7978aa7888785878827d77527997009d6e7c966b6d6d6c77011379012379011a7970aa5379886e9f69765479012478827d77527997009d6e7c967777779d537952798b0124957f7552790124957f7d7701207f75007f777801247f7501207f77768277549d767601007e817777726d726d7b75011279011f7954795279aa527988765379012078827d77527997009d6e7c967777779d6d75011379011e7954795279aa527988765379012078827d77527997009d6e7c967777779d6d75011779011779011c79011a79011a79788277528052797e78827752807e787e5279a95279a97ea97ea877770117797653798b0120957f7553790120957f775279886d75011379011379011379011379011b79012179557955795579557953798277549d5279014878827d77527997009d6e7c967777775279014878827d77527997009d6e7c96777777557952790000527902fd009f637551675279030000019f6301fd7b757c52776752790500000000019f6301fe7b757c54776701ff7b757c587768686878537952796e8b806e7c7f75007f6b6d6d6c7e7777777e55797e780000527902fd009f637551675279030000019f6301fd7b757c52776752790500000000019f6301fe7b757c54776701ff7b757c587768686878537952796e8b806e7c7f75007f6b6d6d6c7e7777777e54797e53797eaa6b6d6d6d6c76700124950120937f7553790124957f77886d6d6d75013079013079013079013079013079013079013079013079013079011479011e790127798b0120957f750127790120957f77011d795b795b795b795b795b795b795b795b795b7959797656798b0148957f7556790148957f775a795a795a795a795379827701209d76827701209d707600a2637605ffffffff00a16700686976546e8b806e7c7f75007f6b6d6d6c777e787e52797600a2637605ffffffff00a16700686976546e8b806e7c7f75007f6b6d6d6c777e6b6d6d6c88597976567956795679567953798277549d5279014878827d77527997009d6e7c967777775279014878827d77527997009d6e7c96777777557952790000527902fd009f637551675279030000019f6301fd7b757c52776752790500000000019f6301fe7b757c54776701ff7b757c587768686878537952796e8b806e7c7f75007f6b6d6d6c7e7777777e55797e780000527902fd009f637551675279030000019f6301fd7b757c52776752790500000000019f6301fe7b757c54776701ff7b757c587768686878537952796e8b806e7c7f75007f6b6d6d6c7e7777777e54797e53797eaa6b6d6d6d6c8853795a7901489558930120937f755a7901489558937f77785b797600a2637605ffffffff00a16700686976546e8b806e7c7f75007f6b6d6d6c777e787c726d726d726d726d726d726d785579876478547987675168696d6d6d6d6d6d6d013e79013e79013e79013e79013e79013e79013e79013e79013e79013e79013e79013e79013e79013279012a790140790124790126797853796e8b0120957f75780120957f77777776011e79011e79011e79011e7953766b796c756b6d6d6c876476011e79011e79011e79011e7952766b796c756b6d6d6c876751686476011e79011e79011e79011e7951766b796c756b6d6d6c876751686476011e79011e79011e79011e7900766b796c756b6d6d6c87675168697854796e8b0120957f75780120957f7777770113790113790113790113790113790113790113790113790113790113790113790113790113795c795c795c795c7953766b796c756b6d6d6c827752805d795d795d795d7953766b796c756b6d6d6c7e5d795d795d795d7952766b796c756b6d6d6c827752807e5d795d795d795d7952766b796c756b6d6d6c7e5d795d795d795d7951766b796c756b6d6d6c827752807e5d795d795d795d7951766b796c756b6d6d6c7e5d795d795d795d7900766b796c756b6d6d6c827752807e5d795d795d795d7900766b796c756b6d6d6c7e597959795979597953766b796c756b6d6d6c827752807e597959795979597953766b796c756b6d6d6c7e597959795979597952766b796c756b6d6d6c827752807e597959795979597952766b796c756b6d6d6c7e597959795979597951766b796c756b6d6d6c827752807e597959795979597951766b796c756b6d6d6c7e597959795979597900766b796c756b6d6d6c827752807e597959795979597900766b796c756b6d6d6c7e557955795579557953766b796c756b6d6d6c827752807e557955795579557953766b796c756b6d6d6c7e557955795579557952766b796c756b6d6d6c827752807e557955795579557952766b796c756b6d6d6c7e557955795579557951766b796c756b6d6d6c827752807e557955795579557951766b796c756b6d6d6c7e557955795579557900766b796c756b6d6d6c827752807e557955795579557900766b796c756b6d6d6c7e78827752807e787e5d795d795d795d7953766b796c756b6d6d6ca95e795e795e795e7952766b796c756b6d6d6ca97e5e795e795e795e7951766b796c756b6d6d6ca97e5e795e795e795e7900766b796c756b6d6d6ca97e5a795a795a795a7953766b796c756b6d6d6ca97e5a795a795a795a7952766b796c756b6d6d6ca97e5a795a795a795a7951766b796c756b6d6d6ca97e5a795a795a795a7900766b796c756b6d6d6ca97e567956795679567953766b796c756b6d6d6ca97e567956795679567952766b796c756b6d6d6ca97e567956795679567951766b796c756b6d6d6ca97e567956795679567900766b796c756b6d6d6ca97e5279a97ea97ea86b6d6d6d6d6d6d6c7788567955798b7f7555797f77810113790113790113790113795455797600a26976549f69948c766b796c756b6d6d6c5779886d6d6d6d6d6d6d6d6d6d01427900a26301427952a1670068690001407900a26301407956799f690115790141796e8b0120957f75780120957f6b6d6d6c68014379009c630142795379787676827701219d750376a91478a97e0288ac7e7778886d014179014379ad67014379519c6352797888675779697657798868686d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d51"
+  "hex": "2102ba79df5f8ae7604a9830f03c7933028186aede0675a16f025dc4f8be8eec038200000000000000<minterScriptHash><guardVariantScriptHashes[0]><guardVariantScriptHashes[1]><guardVariantScriptHashes[2]><guardVariantScriptHashes[3]><hasAdmin><adminScriptHash>56795e7a755d7a5d7a5d7a5d7a5d7a5d7a5d7a5d7a5d7a5d7a5d7a5d7a5d7a5579557955795579607a607a607a607a6d6d5c7a5c7a5c7a5c7a5c7a5c7a5c7a5c7a5c7a78597a75587a587a587a587a587a587a587a587a76587a75577a577a577a577a577a577a577a6d6d6d7501127901137982778c7f75007f770121790121790121790121790121790121790121790121790121790121790121790121790121790121795d798277549d5c79827701209d5b79827701209d5a79827701209d597900a26958798277549d5779827701209d5679827701209d5579827701209d5479827701209d5379827701209d527900a2697800a26976519c6476529c6751686476539c67516864760281009c67516864760282009c67516864760283009c675168695d795d797e5c797e5b797e5a79767600a2637609ffffffffffffffff00a16700686976586e8b806e7c7f75007f6b6d6d6d6c7e59797e58797e57797e56797e55797e54797e5379546e8b806e7c7f75007f6b6d6d6c7e5279546e8b806e7c7f75007f6b6d6d6c7e7854807e6b6d6d6d6d6d6d6d6ca85979ba630112795879ac670068695e79011b7978aa7888785878827d77527997009d6e7c966b6d6d6c77607901217901187970aa5379886e9f69765479012478827d77527997009d6e7c967777779d537952798b0124957f7552790124957f7d7701207f75007f777801247f7501207f77768277549d767601007e817777726d726d7b755f79011d7954795279aa527988765379012078827d77527997009d6e7c967777779d6d756079011c7954795279aa527988765379012078827d77527997009d6e7c967777779d6d75011479011479011a79011779011779788277528052797e78827752807e787e5279a95279a97ea97ea877770114797653798b0120957f7553790120957f775279886d756079607960796079011879011f79557955795579557953798277549d5279014878827d77527997009d6e7c967777775279014878827d77527997009d6e7c96777777557952790000527902fd009f637551675279030000019f6301fd7b757c52776752790500000000019f6301fe7b757c54776701ff7b757c587768686878537952796e8b806e7c7f75007f6b6d6d6c7e7777777e55797e780000527902fd009f637551675279030000019f6301fd7b757c52776752790500000000019f6301fe7b757c54776701ff7b757c587768686878537952796e8b806e7c7f75007f6b6d6d6c7e7777777e54797e53797eaa6b6d6d6d6c76700124950120937f7553790124957f77886d6d6d75012e79012e79012e79012e79012e79012e79012e79012e79012e79011479011b790125798b0120957f750125790120957f77011a795b795b795b795b795b795b795b795b795b7959797656798b0148957f7556790148957f775a795a795a795a795379827701209d76827701209d707600a2637605ffffffff00a16700686976546e8b806e7c7f75007f6b6d6d6c777e787e52797600a2637605ffffffff00a16700686976546e8b806e7c7f75007f6b6d6d6c777e6b6d6d6c88597976567956795679567953798277549d5279014878827d77527997009d6e7c967777775279014878827d77527997009d6e7c96777777557952790000527902fd009f637551675279030000019f6301fd7b757c52776752790500000000019f6301fe7b757c54776701ff7b757c587768686878537952796e8b806e7c7f75007f6b6d6d6c7e7777777e55797e780000527902fd009f637551675279030000019f6301fd7b757c52776752790500000000019f6301fe7b757c54776701ff7b757c587768686878537952796e8b806e7c7f75007f6b6d6d6c7e7777777e54797e53797eaa6b6d6d6d6c8853795a7901489558930120937f755a7901489558937f77785b797600a2637605ffffffff00a16700686976546e8b806e7c7f75007f6b6d6d6c777e787c726d726d726d726d726d726d785579876478547987675168696d6d6d6d6d6d6d013c79013c79013c79013c79013c79013c79013c79013c79013c79013c79013c79013c79013c79013079012879013e790121790123797853796e8b0120957f75780120957f77777776011e79011e79011e79011e7953766b796c756b6d6d6c876476011e79011e79011e79011e7952766b796c756b6d6d6c876751686476011e79011e79011e79011e7951766b796c756b6d6d6c876751686476011e79011e79011e79011e7900766b796c756b6d6d6c87675168697854796e8b0120957f75780120957f7777770113790113790113790113790113790113790113790113790113790113790113790113790113795c795c795c795c7953766b796c756b6d6d6c827752805d795d795d795d7953766b796c756b6d6d6c7e5d795d795d795d7952766b796c756b6d6d6c827752807e5d795d795d795d7952766b796c756b6d6d6c7e5d795d795d795d7951766b796c756b6d6d6c827752807e5d795d795d795d7951766b796c756b6d6d6c7e5d795d795d795d7900766b796c756b6d6d6c827752807e5d795d795d795d7900766b796c756b6d6d6c7e597959795979597953766b796c756b6d6d6c827752807e597959795979597953766b796c756b6d6d6c7e597959795979597952766b796c756b6d6d6c827752807e597959795979597952766b796c756b6d6d6c7e597959795979597951766b796c756b6d6d6c827752807e597959795979597951766b796c756b6d6d6c7e597959795979597900766b796c756b6d6d6c827752807e597959795979597900766b796c756b6d6d6c7e557955795579557953766b796c756b6d6d6c827752807e557955795579557953766b796c756b6d6d6c7e557955795579557952766b796c756b6d6d6c827752807e557955795579557952766b796c756b6d6d6c7e557955795579557951766b796c756b6d6d6c827752807e557955795579557951766b796c756b6d6d6c7e557955795579557900766b796c756b6d6d6c827752807e557955795579557900766b796c756b6d6d6c7e78827752807e787e5d795d795d795d7953766b796c756b6d6d6ca95e795e795e795e7952766b796c756b6d6d6ca97e5e795e795e795e7951766b796c756b6d6d6ca97e5e795e795e795e7900766b796c756b6d6d6ca97e5a795a795a795a7953766b796c756b6d6d6ca97e5a795a795a795a7952766b796c756b6d6d6ca97e5a795a795a795a7951766b796c756b6d6d6ca97e5a795a795a795a7900766b796c756b6d6d6ca97e567956795679567953766b796c756b6d6d6ca97e567956795679567952766b796c756b6d6d6ca97e567956795679567951766b796c756b6d6d6ca97e567956795679567900766b796c756b6d6d6ca97e5279a97ea97ea86b6d6d6d6d6d6d6c7788567955798b7f7555797f77810113790113790113790113795455797600a26976549f69948c766b796c756b6d6d6c5779886d6d6d6d6d6d6d6d6d6d01407900a26301407952a16700686900013e7900a263013e7956799f69011279013f796e8b0120957f75780120957f6b6d6d6c68014179009c630140795379787676827701219d750376a91478a97e0288ac7e7778886d013f79014179ad67014179519c6352797888675779697657798868686d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d6d51"
 }

package/artifacts/cat20/cat20.scrypt

@@ -12,7 +12,7 @@ import "../scrypt-ts-opcat/assets/smart-contract/builtin-libs/stateUtils.scrypt"
 
 
 
-contract _opcat_labs_cat_sdk_2_1_2__rs__CAT20 {
+contract _opcat_labs_cat_sdk_2_1_3__rs__CAT20 {
   bytes minterScriptHash;
   Sha256[4] guardVariantScriptHashes;
   bool hasAdmin;
@@ -23,33 +23,33 @@ contract _opcat_labs_cat_sdk_2_1_2__rs__CAT20 {
     this.hasAdmin = hasAdmin;
     this.adminScriptHash = adminScriptHash;
   }
-  public function unlock(_opcat_labs_cat_sdk_2_1_2__rs__CAT20ContractUnlockArgs unlockArgs, _opcat_labs_cat_sdk_2_1_2__rs__CAT20GuardConstState guardState, int guardInputIndex, _opcat_labs_scrypt_ts_opcat_2_1_2__rs__BacktraceInfo backtraceInfo, _opcat_labs_scrypt_ts_opcat_2_1_2__rs__SHPreimage __scrypt_ts_shPreimage, _opcat_labs_cat_sdk_2_1_2__rs__CAT20State __scrypt_ts_curState, bytes __scrypt_ts_prevouts, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes, _opcat_labs_scrypt_ts_opcat_2_1_2__rs__TxHashPreimage __scrypt_ts_prevTxHashPreimage) {
-    require(Tx.checkPreimageSigHashType(_opcat_labs_scrypt_ts_opcat_2_1_2__rs__ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage), SigHash.ALL));
+  public function unlock(_opcat_labs_cat_sdk_2_1_3__rs__CAT20ContractUnlockArgs unlockArgs, _opcat_labs_cat_sdk_2_1_3__rs__CAT20GuardConstState guardState, int guardInputIndex, _opcat_labs_scrypt_ts_opcat_2_1_3__rs__BacktraceInfo backtraceInfo, _opcat_labs_scrypt_ts_opcat_2_1_3__rs__SHPreimage __scrypt_ts_shPreimage, Sig __scrypt_ts_preimageSig, _opcat_labs_cat_sdk_2_1_3__rs__CAT20State __scrypt_ts_curState, bytes __scrypt_ts_prevouts, bytes __scrypt_ts_spentAmounts, bytes __scrypt_ts_spentDataHashes, bytes __scrypt_ts_spentScriptHashes, _opcat_labs_scrypt_ts_opcat_2_1_3__rs__TxHashPreimage __scrypt_ts_prevTxHashPreimage) {
+    require(checkDataSig(Sig(__scrypt_ts_preimageSig[0 : len(__scrypt_ts_preimageSig) - 1]), sha256(_opcat_labs_scrypt_ts_opcat_2_1_3__rs__ContextUtils.serializeSHPreimage(__scrypt_ts_shPreimage)), _opcat_labs_scrypt_ts_opcat_2_1_3__rs__ContextUtils.pubKey) && checkSig(__scrypt_ts_preimageSig, _opcat_labs_scrypt_ts_opcat_2_1_3__rs__ContextUtils.pubKey));
     
-    int __scrypt_ts_inputCount = _opcat_labs_scrypt_ts_opcat_2_1_2__rs__ContextUtils.checkSpentAmounts(__scrypt_ts_spentAmounts, __scrypt_ts_shPreimage.hashSpentAmounts);
+    int __scrypt_ts_inputCount = _opcat_labs_scrypt_ts_opcat_2_1_3__rs__ContextUtils.checkSpentAmounts(__scrypt_ts_spentAmounts, __scrypt_ts_shPreimage.hashSpentAmounts);
     
-    _opcat_labs_scrypt_ts_opcat_2_1_2__rs__Outpoint __scrypt_ts_prevout = _opcat_labs_scrypt_ts_opcat_2_1_2__rs__ContextUtils.checkPrevouts(__scrypt_ts_prevouts, __scrypt_ts_shPreimage.hashPrevouts, __scrypt_ts_shPreimage.inputIndex, __scrypt_ts_inputCount);
+    _opcat_labs_scrypt_ts_opcat_2_1_3__rs__Outpoint __scrypt_ts_prevout = _opcat_labs_scrypt_ts_opcat_2_1_3__rs__ContextUtils.checkPrevouts(__scrypt_ts_prevouts, __scrypt_ts_shPreimage.hashPrevouts, __scrypt_ts_shPreimage.inputIndex, __scrypt_ts_inputCount);
     
-    _opcat_labs_scrypt_ts_opcat_2_1_2__rs__ContextUtils.checkSpentScripts(__scrypt_ts_spentScriptHashes, __scrypt_ts_shPreimage.hashSpentScriptHashes, __scrypt_ts_inputCount);
+    _opcat_labs_scrypt_ts_opcat_2_1_3__rs__ContextUtils.checkSpentScripts(__scrypt_ts_spentScriptHashes, __scrypt_ts_shPreimage.hashSpentScriptHashes, __scrypt_ts_inputCount);
     
-    _opcat_labs_scrypt_ts_opcat_2_1_2__rs__ContextUtils.checkSpentDataHashes(__scrypt_ts_spentDataHashes, __scrypt_ts_shPreimage.hashSpentDataHashes, __scrypt_ts_inputCount);
+    _opcat_labs_scrypt_ts_opcat_2_1_3__rs__ContextUtils.checkSpentDataHashes(__scrypt_ts_spentDataHashes, __scrypt_ts_shPreimage.hashSpentDataHashes, __scrypt_ts_inputCount);
     
-    _opcat_labs_cat_sdk_2_1_2__rs__CAT20State __scrypt_ts_nextState = __scrypt_ts_curState;
+    _opcat_labs_cat_sdk_2_1_3__rs__CAT20State __scrypt_ts_nextState = __scrypt_ts_curState;
     
-    _opcat_labs_scrypt_ts_opcat_2_1_2__rs__StateUtils.checkInputState(__scrypt_ts_shPreimage.inputIndex, _opcat_labs_cat_sdk_2_1_2__rs__CAT20.stateHash(__scrypt_ts_curState), __scrypt_ts_spentDataHashes);
+    _opcat_labs_scrypt_ts_opcat_2_1_3__rs__StateUtils.checkInputState(__scrypt_ts_shPreimage.inputIndex, _opcat_labs_cat_sdk_2_1_3__rs__CAT20.stateHash(__scrypt_ts_curState), __scrypt_ts_spentDataHashes);
     
-    _opcat_labs_scrypt_ts_opcat_2_1_2__rs__Backtrace.checkPrevTxHashPreimage(__scrypt_ts_prevTxHashPreimage, __scrypt_ts_prevouts, __scrypt_ts_shPreimage.inputIndex);
+    _opcat_labs_scrypt_ts_opcat_2_1_3__rs__Backtrace.checkPrevTxHashPreimage(__scrypt_ts_prevTxHashPreimage, __scrypt_ts_prevouts, __scrypt_ts_shPreimage.inputIndex);
     
-    _opcat_labs_scrypt_ts_opcat_2_1_2__rs__Backtrace.verifyFromScript(backtraceInfo, this.minterScriptHash, __scrypt_ts_spentScriptHashes[__scrypt_ts_shPreimage.inputIndex * 32 : (__scrypt_ts_shPreimage.inputIndex + 1) * 32], __scrypt_ts_prevTxHashPreimage.inputList);
+    _opcat_labs_scrypt_ts_opcat_2_1_3__rs__Backtrace.verifyFromScript(backtraceInfo, this.minterScriptHash, __scrypt_ts_spentScriptHashes[__scrypt_ts_shPreimage.inputIndex * 32 : (__scrypt_ts_shPreimage.inputIndex + 1) * 32], __scrypt_ts_prevTxHashPreimage.inputList);
     this.checkGuard(guardState, __scrypt_ts_shPreimage.spentScriptHash, __scrypt_ts_shPreimage.inputIndex, guardInputIndex, __scrypt_ts_spentScriptHashes, __scrypt_ts_spentDataHashes);
     require(unlockArgs.spendType >= 0 && unlockArgs.spendType <= 2);
     bytes spentScriptHash = b'';
     if(unlockArgs.spendScriptInputIndex >= 0) {
         require(unlockArgs.spendScriptInputIndex < __scrypt_ts_inputCount);
-        spentScriptHash = _opcat_labs_scrypt_ts_opcat_2_1_2__rs__ContextUtils.getSpentScriptHash(__scrypt_ts_spentScriptHashes, unlockArgs.spendScriptInputIndex);
+        spentScriptHash = _opcat_labs_scrypt_ts_opcat_2_1_3__rs__ContextUtils.getSpentScriptHash(__scrypt_ts_spentScriptHashes, unlockArgs.spendScriptInputIndex);
       }
     if(unlockArgs.spendType == 0) {
-        _opcat_labs_cat_sdk_2_1_2__rs__OwnerUtils.checkUserOwner(unlockArgs.userPubKey, __scrypt_ts_nextState.ownerAddr);
+        _opcat_labs_cat_sdk_2_1_3__rs__OwnerUtils.checkUserOwner(unlockArgs.userPubKey, __scrypt_ts_nextState.ownerAddr);
         require(checkSig(unlockArgs.userSig, unlockArgs.userPubKey));
       } else if(unlockArgs.spendType == 1) {
         require(__scrypt_ts_nextState.ownerAddr == spentScriptHash);
@@ -59,18 +59,18 @@ contract _opcat_labs_cat_sdk_2_1_2__rs__CAT20 {
       }
     require(true);
   }
-  function checkGuard(_opcat_labs_cat_sdk_2_1_2__rs__CAT20GuardConstState guardState, bytes t_cat20ScriptHash, int t_cat20InputIndexVal, int guardInputIndexVal, bytes t_spentScriptsCtx, bytes t_spentDataHashesCtx) : bool {
-    bytes guardScriptHash = _opcat_labs_scrypt_ts_opcat_2_1_2__rs__ContextUtils.getSpentScriptHash(t_spentScriptsCtx, guardInputIndexVal);
+  function checkGuard(_opcat_labs_cat_sdk_2_1_3__rs__CAT20GuardConstState guardState, bytes t_cat20ScriptHash, int t_cat20InputIndexVal, int guardInputIndexVal, bytes t_spentScriptsCtx, bytes t_spentDataHashesCtx) : bool {
+    bytes guardScriptHash = _opcat_labs_scrypt_ts_opcat_2_1_3__rs__ContextUtils.getSpentScriptHash(t_spentScriptsCtx, guardInputIndexVal);
     require(guardScriptHash == this.guardVariantScriptHashes[0] || guardScriptHash == this.guardVariantScriptHashes[1] || guardScriptHash == this.guardVariantScriptHashes[2] || guardScriptHash == this.guardVariantScriptHashes[3]);
-    require(_opcat_labs_scrypt_ts_opcat_2_1_2__rs__ContextUtils.getSpentDataHash(t_spentDataHashesCtx, guardInputIndexVal) == _opcat_labs_cat_sdk_2_1_2__rs__CAT20GuardStateLib.stateHash(guardState));
+    require(_opcat_labs_scrypt_ts_opcat_2_1_3__rs__ContextUtils.getSpentDataHash(t_spentDataHashesCtx, guardInputIndexVal) == _opcat_labs_cat_sdk_2_1_3__rs__CAT20GuardStateLib.stateHash(guardState));
     int tokenScriptIndex = unpack(guardState.tokenScriptIndexes[t_cat20InputIndexVal : t_cat20InputIndexVal + 1]);
     require(guardState.tokenScriptHashes[(tokenScriptIndex)] == t_cat20ScriptHash);
     return true;
   }
-  static function serializeState(_opcat_labs_cat_sdk_2_1_2__rs__CAT20State __scrypt_ts_curState): bytes {
+  static function serializeState(_opcat_labs_cat_sdk_2_1_3__rs__CAT20State __scrypt_ts_curState): bytes {
     return num2bin(len(__scrypt_ts_curState.ownerAddr), 2) + __scrypt_ts_curState.ownerAddr + num2bin(len(pack(__scrypt_ts_curState.amount)), 2) + pack(__scrypt_ts_curState.amount) + hash160(hash160(__scrypt_ts_curState.ownerAddr) + hash160(pack(__scrypt_ts_curState.amount)));
   }
-  static function stateHash(_opcat_labs_cat_sdk_2_1_2__rs__CAT20State __scrypt_ts_curState): bytes {
+  static function stateHash(_opcat_labs_cat_sdk_2_1_3__rs__CAT20State __scrypt_ts_curState): bytes {
     return sha256(num2bin(len(__scrypt_ts_curState.ownerAddr), 2) + __scrypt_ts_curState.ownerAddr + num2bin(len(pack(__scrypt_ts_curState.amount)), 2) + pack(__scrypt_ts_curState.amount) + hash160(hash160(__scrypt_ts_curState.ownerAddr) + hash160(pack(__scrypt_ts_curState.amount))));
   }
 }