w8 · tx · A2h···n3F

tx · A2hqESGCj5S4GGaYFNDV5YbpqqxRb79mFxHyGZuqwn3F

3Mz3XPi4hQnfVK9ZaA27YwFfiPApPgFnCts:  -0.01400000 Waves

2019.12.28 04:41 [828250] smart account 3Mz3XPi4hQnfVK9ZaA27YwFfiPApPgFnCts > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "A2hqESGCj5S4GGaYFNDV5YbpqqxRb79mFxHyGZuqwn3F",
    "fee": 1400000,
    "feeAssetId": null,
    "timestamp": 1577497344471,
    "version": 1,
    "sender": "3Mz3XPi4hQnfVK9ZaA27YwFfiPApPgFnCts",
    "senderPublicKey": "PuRPu7vRxThZUjyn7EuGuZyy6f77Sj87fnAzQC9Af4V",
    "proofs": [
        "4ngeZGPg4NNsVQWV2t9QSxsVvZ4nRsCVJWBsLipDYqpRZqMNyJZqBipsw6enbdBdSCFdmVyHZxE2NPmufYp4xzor"
    ],
    "script": "base64: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",
    "chainId": 84,
    "height": 828250,
    "spentComplexity": 0
}

View: original | compacted
Prev: D7Md1EJGmGFp71Ksv1XhjCk4mJdYzMhd5qtFmKeg3qzW
Next: 5eVqTq6qAYWAqyMCNsiYBnZSzNEH13TgGHCxsBcxSHqT

Diff: 
Old New Differences
94 94  func withdraw (txBytes,blockHeight,merkleProof) = {
95 95      let txId = extractTxId(txBytes)
96 96      let txRecipient = extractTxRecipient(txBytes)
97 +     let txAttachment = extractTxAttachment(txBytes)
97 98      let txAmount = extractTxAmount(txBytes)
98 99      let txAsset = extractTxAsset(txBytes)
99 100      let txType = extractTxType(txBytes)
110 111          else if ((txRecipient != tokenPortInOtherChain))
111 112              then throw("incorrect tx recipient")
112 113              else {
113 -                 let recipient = i.caller
114 +                 let recipient = Address(txAttachment)
114 115                  ScriptResult(WriteSet([DataEntry(txIdKey, true)]), TransferSet([ScriptTransfer(recipient, txAmount, assetInThisChain)]))
115 116                  }
116 117      }
Full: 
Old New Differences
1 1  {-# STDLIB_VERSION 3 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 4  let tokenPortInOtherChain = match getBinary(this, "tokenPortInOtherChain") {
5 5      case b: ByteVector => 
6 6          b
7 7      case _ => 
8 8          throw("tokenPortInOtherChain is not defined")
9 9  }
10 10  
11 11  let chainCollector = match getBinary(this, "chainCollector") {
12 12      case b: ByteVector => 
13 13          Address(b)
14 14      case _ => 
15 15          throw("chainCollector is not defined")
16 16  }
17 17  
18 18  func blockInfoAt (height) = match getBinary(chainCollector, toString(height)) {
19 19      case b: ByteVector => 
20 20          b
21 21      case _ => 
22 22          throw("Block info not found")
23 23  }
24 24  
25 25  
26 26  func assetIdToString (assetId) = match assetId {
27 27      case assetId: ByteVector => 
28 28          toBase58String(assetId)
29 29      case _ => 
30 30          "WAVES"
31 31  }
32 32  
33 33  
34 34  func assetIdFromString (asset) = if ((asset == "WAVES"))
35 35      then unit
36 36      else fromBase58String(asset)
37 37  
38 38  
39 39  func extractTxAsset (txBodyBytes) = {
40 40      let assetByte = takeRightBytes(take(txBodyBytes, (((1 + 1) + 32) + 1)), 1)
41 41      if ((assetByte == base58'1'))
42 42          then unit
43 43          else takeRightBytes(take(txBodyBytes, ((((1 + 1) + 32) + 1) + 32)), 32)
44 44      }
45 45  
46 46  
47 47  func extractTxId (txBodyBytes) = blake2b256(txBodyBytes)
48 48  
49 49  
50 50  func extractTxRecipient (txBodyBytes) = {
51 51      let assetByte = takeRightBytes(take(txBodyBytes, (((1 + 1) + 32) + 1)), 1)
52 52      let assetIdLenght = if ((assetByte == base58'1'))
53 53          then 0
54 54          else 32
55 55      let feeAssetByte = takeRightBytes(take(txBodyBytes, (((((1 + 1) + 32) + 1) + assetIdLenght) + 1)), 1)
56 56      let feeAssetIdLenght = if ((feeAssetByte == base58'1'))
57 57          then 0
58 58          else 32
59 59      takeRightBytes(take(txBodyBytes, ((((((((((1 + 1) + 32) + 1) + assetIdLenght) + 1) + feeAssetIdLenght) + 8) + 8) + 8) + 26)), 26)
60 60      }
61 61  
62 62  
63 63  func extractTxAmount (txBodyBytes) = {
64 64      let assetByte = takeRightBytes(take(txBodyBytes, (((1 + 1) + 32) + 1)), 1)
65 65      let assetIdLenght = if ((assetByte == base58'1'))
66 66          then 0
67 67          else 32
68 68      let feeAssetByte = takeRightBytes(take(txBodyBytes, (((((1 + 1) + 32) + 1) + assetIdLenght) + 1)), 1)
69 69      let feeAssetIdLenght = if ((feeAssetByte == base58'1'))
70 70          then 0
71 71          else 32
72 72      toInt(takeRightBytes(take(txBodyBytes, ((((((((1 + 1) + 32) + 1) + assetIdLenght) + 1) + feeAssetIdLenght) + 8) + 8)), 8))
73 73      }
74 74  
75 75  
76 76  func extractTxAttachment (txBodyBytes) = {
77 77      let assetByte = takeRightBytes(take(txBodyBytes, (((1 + 1) + 32) + 1)), 1)
78 78      let assetIdLenght = if ((assetByte == base58'1'))
79 79          then 0
80 80          else 32
81 81      let feeAssetByte = takeRightBytes(take(txBodyBytes, (((((1 + 1) + 32) + 1) + assetIdLenght) + 1)), 1)
82 82      let feeAssetIdLenght = if ((feeAssetByte == base58'1'))
83 83          then 0
84 84          else 32
85 85      let attachmentLength = toInt(takeRightBytes(take(txBodyBytes, (((((((((((1 + 1) + 32) + 1) + assetIdLenght) + 1) + feeAssetIdLenght) + 8) + 8) + 8) + 32) + 2)), 2))
86 86      takeRightBytes(take(txBodyBytes, ((((((((((((1 + 1) + 32) + 1) + assetIdLenght) + 1) + feeAssetIdLenght) + 8) + 8) + 8) + 26) + 2) + attachmentLength)), attachmentLength)
87 87      }
88 88  
89 89  
90 90  func extractTxType (txBodyBytes) = take(txBodyBytes, 1)
91 91  
92 92  
93 93  @Callable(i)
94 94  func withdraw (txBytes,blockHeight,merkleProof) = {
95 95      let txId = extractTxId(txBytes)
96 96      let txRecipient = extractTxRecipient(txBytes)
97 +     let txAttachment = extractTxAttachment(txBytes)
97 98      let txAmount = extractTxAmount(txBytes)
98 99      let txAsset = extractTxAsset(txBytes)
99 100      let txType = extractTxType(txBytes)
100 101      let txIdKey = (toBase58String(txId) + "_tx")
101 102      let assetKey = (assetIdToString(txAsset) + "_asset")
102 103      let assetInThisChain =     match getString(this, assetKey) {
103 104          case s: String => 
104 105              assetIdFromString(s)
105 106          case _ => 
106 107              throw("incorrect asset")
107 108      }
108 109      if ((txType != base58'5'))
109 110          then throw("incorrect transaction type")
110 111          else if ((txRecipient != tokenPortInOtherChain))
111 112              then throw("incorrect tx recipient")
112 113              else {
113 -                 let recipient = i.caller
114 +                 let recipient = Address(txAttachment)
114 115                  ScriptResult(WriteSet([DataEntry(txIdKey, true)]), TransferSet([ScriptTransfer(recipient, txAmount, assetInThisChain)]))
115 116                  }
116 117      }
117 118  
118 119  
119 120  @Verifier(tx)
120 121  func verify () = sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)
121 122

Old	New		Differences
94	94		func withdraw (txBytes,blockHeight,merkleProof) = {
95	95		let txId = extractTxId(txBytes)
96	96		let txRecipient = extractTxRecipient(txBytes)
	97	+	let txAttachment = extractTxAttachment(txBytes)
97	98		let txAmount = extractTxAmount(txBytes)
98	99		let txAsset = extractTxAsset(txBytes)
99	100		let txType = extractTxType(txBytes)

110	111		else if ((txRecipient != tokenPortInOtherChain))
111	112		then throw("incorrect tx recipient")
112	113		else {
113		-	let recipient = ~~i.caller~~
	114	+	let recipient = Address(txAttachment)
114	115		ScriptResult(WriteSet([DataEntry(txIdKey, true)]), TransferSet([ScriptTransfer(recipient, txAmount, assetInThisChain)]))
115	116		}
116	117		}

Old	New		Differences
1	1		{-# STDLIB_VERSION 3 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4	4		let tokenPortInOtherChain = match getBinary(this, "tokenPortInOtherChain") {
5	5		case b: ByteVector =>
6	6		b
7	7		case _ =>
8	8		throw("tokenPortInOtherChain is not defined")
9	9		}
10	10
11	11		let chainCollector = match getBinary(this, "chainCollector") {
12	12		case b: ByteVector =>
13	13		Address(b)
14	14		case _ =>
15	15		throw("chainCollector is not defined")
16	16		}
17	17
18	18		func blockInfoAt (height) = match getBinary(chainCollector, toString(height)) {
19	19		case b: ByteVector =>
20	20		b
21	21		case _ =>
22	22		throw("Block info not found")
23	23		}
24	24
25	25
26	26		func assetIdToString (assetId) = match assetId {
27	27		case assetId: ByteVector =>
28	28		toBase58String(assetId)
29	29		case _ =>
30	30		"WAVES"
31	31		}
32	32
33	33
34	34		func assetIdFromString (asset) = if ((asset == "WAVES"))
35	35		then unit
36	36		else fromBase58String(asset)
37	37
38	38
39	39		func extractTxAsset (txBodyBytes) = {
40	40		let assetByte = takeRightBytes(take(txBodyBytes, (((1 + 1) + 32) + 1)), 1)
41	41		if ((assetByte == base58'1'))
42	42		then unit
43	43		else takeRightBytes(take(txBodyBytes, ((((1 + 1) + 32) + 1) + 32)), 32)
44	44		}
45	45
46	46
47	47		func extractTxId (txBodyBytes) = blake2b256(txBodyBytes)
48	48
49	49
50	50		func extractTxRecipient (txBodyBytes) = {
51	51		let assetByte = takeRightBytes(take(txBodyBytes, (((1 + 1) + 32) + 1)), 1)
52	52		let assetIdLenght = if ((assetByte == base58'1'))
53	53		then 0
54	54		else 32
55	55		let feeAssetByte = takeRightBytes(take(txBodyBytes, (((((1 + 1) + 32) + 1) + assetIdLenght) + 1)), 1)
56	56		let feeAssetIdLenght = if ((feeAssetByte == base58'1'))
57	57		then 0
58	58		else 32
59	59		takeRightBytes(take(txBodyBytes, ((((((((((1 + 1) + 32) + 1) + assetIdLenght) + 1) + feeAssetIdLenght) + 8) + 8) + 8) + 26)), 26)
60	60		}
61	61
62	62
63	63		func extractTxAmount (txBodyBytes) = {
64	64		let assetByte = takeRightBytes(take(txBodyBytes, (((1 + 1) + 32) + 1)), 1)
65	65		let assetIdLenght = if ((assetByte == base58'1'))
66	66		then 0
67	67		else 32
68	68		let feeAssetByte = takeRightBytes(take(txBodyBytes, (((((1 + 1) + 32) + 1) + assetIdLenght) + 1)), 1)
69	69		let feeAssetIdLenght = if ((feeAssetByte == base58'1'))
70	70		then 0
71	71		else 32
72	72		toInt(takeRightBytes(take(txBodyBytes, ((((((((1 + 1) + 32) + 1) + assetIdLenght) + 1) + feeAssetIdLenght) + 8) + 8)), 8))
73	73		}
74	74
75	75
76	76		func extractTxAttachment (txBodyBytes) = {
77	77		let assetByte = takeRightBytes(take(txBodyBytes, (((1 + 1) + 32) + 1)), 1)
78	78		let assetIdLenght = if ((assetByte == base58'1'))
79	79		then 0
80	80		else 32
81	81		let feeAssetByte = takeRightBytes(take(txBodyBytes, (((((1 + 1) + 32) + 1) + assetIdLenght) + 1)), 1)
82	82		let feeAssetIdLenght = if ((feeAssetByte == base58'1'))
83	83		then 0
84	84		else 32
85	85		let attachmentLength = toInt(takeRightBytes(take(txBodyBytes, (((((((((((1 + 1) + 32) + 1) + assetIdLenght) + 1) + feeAssetIdLenght) + 8) + 8) + 8) + 32) + 2)), 2))
86	86		takeRightBytes(take(txBodyBytes, ((((((((((((1 + 1) + 32) + 1) + assetIdLenght) + 1) + feeAssetIdLenght) + 8) + 8) + 8) + 26) + 2) + attachmentLength)), attachmentLength)
87	87		}
88	88
89	89
90	90		func extractTxType (txBodyBytes) = take(txBodyBytes, 1)
91	91
92	92
93	93		@Callable(i)
94	94		func withdraw (txBytes,blockHeight,merkleProof) = {
95	95		let txId = extractTxId(txBytes)
96	96		let txRecipient = extractTxRecipient(txBytes)
	97	+	let txAttachment = extractTxAttachment(txBytes)
97	98		let txAmount = extractTxAmount(txBytes)
98	99		let txAsset = extractTxAsset(txBytes)
99	100		let txType = extractTxType(txBytes)
100	101		let txIdKey = (toBase58String(txId) + "_tx")
101	102		let assetKey = (assetIdToString(txAsset) + "_asset")
102	103		let assetInThisChain = match getString(this, assetKey) {
103	104		case s: String =>
104	105		assetIdFromString(s)
105	106		case _ =>
106	107		throw("incorrect asset")
107	108		}
108	109		if ((txType != base58'5'))
109	110		then throw("incorrect transaction type")
110	111		else if ((txRecipient != tokenPortInOtherChain))
111	112		then throw("incorrect tx recipient")
112	113		else {
113		-	let recipient = ~~i.caller~~
	114	+	let recipient = Address(txAttachment)
114	115		ScriptResult(WriteSet([DataEntry(txIdKey, true)]), TransferSet([ScriptTransfer(recipient, txAmount, assetInThisChain)]))
115	116		}
116	117		}
117	118
118	119
119	120		@Verifier(tx)
120	121		func verify () = sigVerify(tx.bodyBytes, tx.proofs[0], tx.senderPublicKey)
121	122

github/deemru/w8io/026f985 
65.37 ms ◑