@atomiqlabs/chain-starknet 4.0.0-dev.12 → 4.0.0-dev.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +201 -201
- package/dist/index.d.ts +38 -38
- package/dist/index.js +54 -54
- package/dist/starknet/StarknetChainType.d.ts +13 -13
- package/dist/starknet/StarknetChainType.js +2 -2
- package/dist/starknet/StarknetInitializer.d.ts +27 -27
- package/dist/starknet/StarknetInitializer.js +69 -69
- package/dist/starknet/btcrelay/BtcRelayAbi.d.ts +250 -250
- package/dist/starknet/btcrelay/BtcRelayAbi.js +341 -341
- package/dist/starknet/btcrelay/StarknetBtcRelay.d.ts +186 -186
- package/dist/starknet/btcrelay/StarknetBtcRelay.js +379 -379
- package/dist/starknet/btcrelay/headers/StarknetBtcHeader.d.ts +31 -31
- package/dist/starknet/btcrelay/headers/StarknetBtcHeader.js +74 -74
- package/dist/starknet/btcrelay/headers/StarknetBtcStoredHeader.d.ts +51 -51
- package/dist/starknet/btcrelay/headers/StarknetBtcStoredHeader.js +113 -113
- package/dist/starknet/chain/StarknetAction.d.ts +19 -19
- package/dist/starknet/chain/StarknetAction.js +73 -73
- package/dist/starknet/chain/StarknetChainInterface.d.ts +52 -52
- package/dist/starknet/chain/StarknetChainInterface.js +91 -91
- package/dist/starknet/chain/StarknetModule.d.ts +14 -14
- package/dist/starknet/chain/StarknetModule.js +13 -13
- package/dist/starknet/chain/modules/ERC20Abi.d.ts +755 -755
- package/dist/starknet/chain/modules/ERC20Abi.js +1032 -1032
- package/dist/starknet/chain/modules/StarknetAccounts.d.ts +6 -6
- package/dist/starknet/chain/modules/StarknetAccounts.js +24 -24
- package/dist/starknet/chain/modules/StarknetAddresses.d.ts +9 -9
- package/dist/starknet/chain/modules/StarknetAddresses.js +26 -26
- package/dist/starknet/chain/modules/StarknetBlocks.d.ts +20 -20
- package/dist/starknet/chain/modules/StarknetBlocks.js +64 -64
- package/dist/starknet/chain/modules/StarknetEvents.d.ts +44 -44
- package/dist/starknet/chain/modules/StarknetEvents.js +88 -88
- package/dist/starknet/chain/modules/StarknetFees.d.ts +77 -77
- package/dist/starknet/chain/modules/StarknetFees.js +114 -114
- package/dist/starknet/chain/modules/StarknetSignatures.d.ts +29 -29
- package/dist/starknet/chain/modules/StarknetSignatures.js +72 -72
- package/dist/starknet/chain/modules/StarknetTokens.d.ts +69 -69
- package/dist/starknet/chain/modules/StarknetTokens.js +102 -98
- package/dist/starknet/chain/modules/StarknetTransactions.d.ts +93 -93
- package/dist/starknet/chain/modules/StarknetTransactions.js +261 -260
- package/dist/starknet/contract/StarknetContractBase.d.ts +13 -13
- package/dist/starknet/contract/StarknetContractBase.js +20 -16
- package/dist/starknet/contract/StarknetContractModule.d.ts +8 -8
- package/dist/starknet/contract/StarknetContractModule.js +11 -11
- package/dist/starknet/contract/modules/StarknetContractEvents.d.ts +51 -51
- package/dist/starknet/contract/modules/StarknetContractEvents.js +97 -97
- package/dist/starknet/events/StarknetChainEvents.d.ts +21 -21
- package/dist/starknet/events/StarknetChainEvents.js +52 -52
- package/dist/starknet/events/StarknetChainEventsBrowser.d.ts +89 -90
- package/dist/starknet/events/StarknetChainEventsBrowser.js +296 -294
- package/dist/starknet/provider/RpcProviderWithRetries.d.ts +21 -21
- package/dist/starknet/provider/RpcProviderWithRetries.js +32 -32
- package/dist/starknet/spv_swap/SpvVaultContractAbi.d.ts +488 -488
- package/dist/starknet/spv_swap/SpvVaultContractAbi.js +656 -656
- package/dist/starknet/spv_swap/StarknetSpvVaultContract.d.ts +66 -66
- package/dist/starknet/spv_swap/StarknetSpvVaultContract.js +382 -382
- package/dist/starknet/spv_swap/StarknetSpvVaultData.d.ts +49 -49
- package/dist/starknet/spv_swap/StarknetSpvVaultData.js +145 -145
- package/dist/starknet/spv_swap/StarknetSpvWithdrawalData.d.ts +25 -25
- package/dist/starknet/spv_swap/StarknetSpvWithdrawalData.js +72 -72
- package/dist/starknet/swaps/EscrowManagerAbi.d.ts +431 -431
- package/dist/starknet/swaps/EscrowManagerAbi.js +583 -583
- package/dist/starknet/swaps/StarknetSwapContract.d.ts +191 -191
- package/dist/starknet/swaps/StarknetSwapContract.js +424 -424
- package/dist/starknet/swaps/StarknetSwapData.d.ts +74 -74
- package/dist/starknet/swaps/StarknetSwapData.js +325 -325
- package/dist/starknet/swaps/StarknetSwapModule.d.ts +10 -10
- package/dist/starknet/swaps/StarknetSwapModule.js +11 -11
- package/dist/starknet/swaps/handlers/IHandler.d.ts +13 -13
- package/dist/starknet/swaps/handlers/IHandler.js +2 -2
- package/dist/starknet/swaps/handlers/claim/ClaimHandlers.d.ts +13 -13
- package/dist/starknet/swaps/handlers/claim/ClaimHandlers.js +13 -13
- package/dist/starknet/swaps/handlers/claim/HashlockClaimHandler.d.ts +21 -21
- package/dist/starknet/swaps/handlers/claim/HashlockClaimHandler.js +44 -44
- package/dist/starknet/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler.d.ts +24 -24
- package/dist/starknet/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler.js +48 -48
- package/dist/starknet/swaps/handlers/claim/btc/BitcoinOutputClaimHandler.d.ts +25 -25
- package/dist/starknet/swaps/handlers/claim/btc/BitcoinOutputClaimHandler.js +40 -40
- package/dist/starknet/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler.d.ts +20 -20
- package/dist/starknet/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler.js +30 -30
- package/dist/starknet/swaps/handlers/claim/btc/IBitcoinClaimHandler.d.ts +45 -45
- package/dist/starknet/swaps/handlers/claim/btc/IBitcoinClaimHandler.js +52 -52
- package/dist/starknet/swaps/handlers/refund/TimelockRefundHandler.d.ts +17 -17
- package/dist/starknet/swaps/handlers/refund/TimelockRefundHandler.js +27 -27
- package/dist/starknet/swaps/modules/StarknetLpVault.d.ts +69 -69
- package/dist/starknet/swaps/modules/StarknetLpVault.js +122 -122
- package/dist/starknet/swaps/modules/StarknetSwapClaim.d.ts +53 -53
- package/dist/starknet/swaps/modules/StarknetSwapClaim.js +100 -100
- package/dist/starknet/swaps/modules/StarknetSwapInit.d.ts +94 -87
- package/dist/starknet/swaps/modules/StarknetSwapInit.js +235 -225
- package/dist/starknet/swaps/modules/StarknetSwapRefund.d.ts +62 -62
- package/dist/starknet/swaps/modules/StarknetSwapRefund.js +128 -128
- package/dist/starknet/wallet/StarknetKeypairWallet.d.ts +7 -7
- package/dist/starknet/wallet/StarknetKeypairWallet.js +35 -30
- package/dist/starknet/wallet/StarknetSigner.d.ts +12 -12
- package/dist/starknet/wallet/StarknetSigner.js +47 -46
- package/dist/utils/Utils.d.ts +37 -37
- package/dist/utils/Utils.js +260 -261
- package/package.json +43 -37
- package/src/index.ts +47 -47
- package/src/starknet/StarknetChainType.ts +28 -28
- package/src/starknet/StarknetInitializer.ts +108 -108
- package/src/starknet/btcrelay/BtcRelayAbi.ts +338 -338
- package/src/starknet/btcrelay/StarknetBtcRelay.ts +494 -494
- package/src/starknet/btcrelay/headers/StarknetBtcHeader.ts +100 -100
- package/src/starknet/btcrelay/headers/StarknetBtcStoredHeader.ts +141 -141
- package/src/starknet/chain/StarknetAction.ts +85 -85
- package/src/starknet/chain/StarknetChainInterface.ts +149 -149
- package/src/starknet/chain/StarknetModule.ts +19 -19
- package/src/starknet/chain/modules/ERC20Abi.ts +1029 -1029
- package/src/starknet/chain/modules/StarknetAccounts.ts +25 -25
- package/src/starknet/chain/modules/StarknetAddresses.ts +22 -22
- package/src/starknet/chain/modules/StarknetBlocks.ts +75 -74
- package/src/starknet/chain/modules/StarknetEvents.ts +104 -104
- package/src/starknet/chain/modules/StarknetFees.ts +154 -154
- package/src/starknet/chain/modules/StarknetSignatures.ts +91 -91
- package/src/starknet/chain/modules/StarknetTokens.ts +120 -116
- package/src/starknet/chain/modules/StarknetTransactions.ts +285 -283
- package/src/starknet/contract/StarknetContractBase.ts +30 -26
- package/src/starknet/contract/StarknetContractModule.ts +16 -16
- package/src/starknet/contract/modules/StarknetContractEvents.ts +134 -134
- package/src/starknet/events/StarknetChainEvents.ts +67 -67
- package/src/starknet/events/StarknetChainEventsBrowser.ts +411 -411
- package/src/starknet/provider/RpcProviderWithRetries.ts +43 -43
- package/src/starknet/spv_swap/SpvVaultContractAbi.ts +656 -656
- package/src/starknet/spv_swap/StarknetSpvVaultContract.ts +483 -483
- package/src/starknet/spv_swap/StarknetSpvVaultData.ts +195 -195
- package/src/starknet/spv_swap/StarknetSpvWithdrawalData.ts +79 -79
- package/src/starknet/swaps/EscrowManagerAbi.ts +582 -582
- package/src/starknet/swaps/StarknetSwapContract.ts +647 -647
- package/src/starknet/swaps/StarknetSwapData.ts +455 -455
- package/src/starknet/swaps/StarknetSwapModule.ts +17 -17
- package/src/starknet/swaps/handlers/IHandler.ts +20 -20
- package/src/starknet/swaps/handlers/claim/ClaimHandlers.ts +23 -23
- package/src/starknet/swaps/handlers/claim/HashlockClaimHandler.ts +53 -53
- package/src/starknet/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler.ts +73 -73
- package/src/starknet/swaps/handlers/claim/btc/BitcoinOutputClaimHandler.ts +67 -67
- package/src/starknet/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler.ts +50 -50
- package/src/starknet/swaps/handlers/claim/btc/IBitcoinClaimHandler.ts +102 -102
- package/src/starknet/swaps/handlers/refund/TimelockRefundHandler.ts +38 -38
- package/src/starknet/swaps/modules/StarknetLpVault.ts +147 -147
- package/src/starknet/swaps/modules/StarknetSwapClaim.ts +141 -141
- package/src/starknet/swaps/modules/StarknetSwapInit.ts +300 -287
- package/src/starknet/swaps/modules/StarknetSwapRefund.ts +196 -196
- package/src/starknet/wallet/StarknetKeypairWallet.ts +44 -39
- package/src/starknet/wallet/StarknetSigner.ts +55 -55
- package/src/utils/Utils.ts +251 -252
|
@@ -1,101 +1,101 @@
|
|
|
1
|
-
import {BtcHeader} from "@atomiqlabs/base";
|
|
2
|
-
import {Buffer} from "buffer";
|
|
3
|
-
import {BigNumberish} from "starknet";
|
|
4
|
-
import {toHex, u32ArrayToBuffer, u32ReverseEndianness} from "../../../utils/Utils";
|
|
5
|
-
import {sha256} from "@noble/hashes/sha2";
|
|
6
|
-
|
|
7
|
-
export type StarknetBtcHeaderType = {
|
|
8
|
-
reversed_version: BigNumberish;
|
|
9
|
-
previous_blockhash: BigNumberish[];
|
|
10
|
-
merkle_root: BigNumberish[];
|
|
11
|
-
reversed_timestamp: BigNumberish;
|
|
12
|
-
nbits: BigNumberish;
|
|
13
|
-
nonce: BigNumberish;
|
|
14
|
-
hash?: Buffer
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
export class StarknetBtcHeader implements BtcHeader {
|
|
18
|
-
|
|
19
|
-
reversed_version: number;
|
|
20
|
-
previous_blockhash: number[];
|
|
21
|
-
merkle_root: number[];
|
|
22
|
-
reversed_timestamp: number;
|
|
23
|
-
nbits: number;
|
|
24
|
-
nonce: number;
|
|
25
|
-
hash?: Buffer;
|
|
26
|
-
|
|
27
|
-
constructor(obj: StarknetBtcHeaderType) {
|
|
28
|
-
this.reversed_version = Number(obj.reversed_version);
|
|
29
|
-
this.previous_blockhash = obj.previous_blockhash.map(val => Number(val));
|
|
30
|
-
this.merkle_root = obj.merkle_root.map(val => Number(val));
|
|
31
|
-
this.reversed_timestamp = Number(obj.reversed_timestamp);
|
|
32
|
-
this.nbits = Number(obj.nbits);
|
|
33
|
-
this.nonce = Number(obj.nonce);
|
|
34
|
-
this.hash = obj.hash;
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
getMerkleRoot(): Buffer {
|
|
38
|
-
return u32ArrayToBuffer(this.merkle_root);
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
getNbits(): number {
|
|
42
|
-
return u32ReverseEndianness(this.nbits);
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
getNonce(): number {
|
|
46
|
-
return u32ReverseEndianness(this.nonce);
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
getReversedPrevBlockhash(): Buffer {
|
|
50
|
-
return u32ArrayToBuffer(this.previous_blockhash);
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
getTimestamp(): number {
|
|
54
|
-
return u32ReverseEndianness(this.reversed_timestamp);
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
getVersion(): number {
|
|
58
|
-
return u32ReverseEndianness(this.reversed_version);
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
getHash(): Buffer {
|
|
62
|
-
if(this.hash!=null) return this.hash;
|
|
63
|
-
const buffer = Buffer.alloc(80);
|
|
64
|
-
buffer.writeUInt32BE(this.reversed_version, 0);
|
|
65
|
-
u32ArrayToBuffer(this.previous_blockhash).copy(buffer, 4);
|
|
66
|
-
u32ArrayToBuffer(this.merkle_root).copy(buffer, 36);
|
|
67
|
-
buffer.writeUInt32BE(this.reversed_timestamp, 68);
|
|
68
|
-
buffer.writeUInt32BE(this.nbits, 72);
|
|
69
|
-
buffer.writeUInt32BE(this.nonce, 76);
|
|
70
|
-
return Buffer.from(sha256(sha256(buffer)));
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
serialize(): BigNumberish[] {
|
|
74
|
-
return [
|
|
75
|
-
this.reversed_version,
|
|
76
|
-
...this.previous_blockhash,
|
|
77
|
-
...this.merkle_root,
|
|
78
|
-
this.reversed_timestamp,
|
|
79
|
-
this.nbits,
|
|
80
|
-
this.nonce
|
|
81
|
-
];
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
static fromSerializedFeltArray(span: BigNumberish[]): StarknetBtcHeader {
|
|
85
|
-
const reversed_version = toHex(span.shift());
|
|
86
|
-
const previous_blockhash = span.splice(0, 8).map(toHex);
|
|
87
|
-
const merkle_root = span.splice(0, 8).map(toHex);
|
|
88
|
-
const reversed_timestamp = toHex(span.shift());
|
|
89
|
-
const nbits = toHex(span.shift());
|
|
90
|
-
const nonce = toHex(span.shift());
|
|
91
|
-
return new StarknetBtcHeader({
|
|
92
|
-
reversed_version,
|
|
93
|
-
previous_blockhash,
|
|
94
|
-
merkle_root,
|
|
95
|
-
reversed_timestamp,
|
|
96
|
-
nbits,
|
|
97
|
-
nonce
|
|
98
|
-
});
|
|
99
|
-
}
|
|
100
|
-
|
|
1
|
+
import {BtcHeader} from "@atomiqlabs/base";
|
|
2
|
+
import {Buffer} from "buffer";
|
|
3
|
+
import {BigNumberish} from "starknet";
|
|
4
|
+
import {toHex, u32ArrayToBuffer, u32ReverseEndianness} from "../../../utils/Utils";
|
|
5
|
+
import {sha256} from "@noble/hashes/sha2";
|
|
6
|
+
|
|
7
|
+
export type StarknetBtcHeaderType = {
|
|
8
|
+
reversed_version: BigNumberish;
|
|
9
|
+
previous_blockhash: BigNumberish[];
|
|
10
|
+
merkle_root: BigNumberish[];
|
|
11
|
+
reversed_timestamp: BigNumberish;
|
|
12
|
+
nbits: BigNumberish;
|
|
13
|
+
nonce: BigNumberish;
|
|
14
|
+
hash?: Buffer
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
export class StarknetBtcHeader implements BtcHeader {
|
|
18
|
+
|
|
19
|
+
reversed_version: number;
|
|
20
|
+
previous_blockhash: number[];
|
|
21
|
+
merkle_root: number[];
|
|
22
|
+
reversed_timestamp: number;
|
|
23
|
+
nbits: number;
|
|
24
|
+
nonce: number;
|
|
25
|
+
hash?: Buffer;
|
|
26
|
+
|
|
27
|
+
constructor(obj: StarknetBtcHeaderType) {
|
|
28
|
+
this.reversed_version = Number(obj.reversed_version);
|
|
29
|
+
this.previous_blockhash = obj.previous_blockhash.map(val => Number(val));
|
|
30
|
+
this.merkle_root = obj.merkle_root.map(val => Number(val));
|
|
31
|
+
this.reversed_timestamp = Number(obj.reversed_timestamp);
|
|
32
|
+
this.nbits = Number(obj.nbits);
|
|
33
|
+
this.nonce = Number(obj.nonce);
|
|
34
|
+
this.hash = obj.hash;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
getMerkleRoot(): Buffer {
|
|
38
|
+
return u32ArrayToBuffer(this.merkle_root);
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
getNbits(): number {
|
|
42
|
+
return u32ReverseEndianness(this.nbits);
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
getNonce(): number {
|
|
46
|
+
return u32ReverseEndianness(this.nonce);
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
getReversedPrevBlockhash(): Buffer {
|
|
50
|
+
return u32ArrayToBuffer(this.previous_blockhash);
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
getTimestamp(): number {
|
|
54
|
+
return u32ReverseEndianness(this.reversed_timestamp);
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
getVersion(): number {
|
|
58
|
+
return u32ReverseEndianness(this.reversed_version);
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
getHash(): Buffer {
|
|
62
|
+
if(this.hash!=null) return this.hash;
|
|
63
|
+
const buffer = Buffer.alloc(80);
|
|
64
|
+
buffer.writeUInt32BE(this.reversed_version, 0);
|
|
65
|
+
u32ArrayToBuffer(this.previous_blockhash).copy(buffer, 4);
|
|
66
|
+
u32ArrayToBuffer(this.merkle_root).copy(buffer, 36);
|
|
67
|
+
buffer.writeUInt32BE(this.reversed_timestamp, 68);
|
|
68
|
+
buffer.writeUInt32BE(this.nbits, 72);
|
|
69
|
+
buffer.writeUInt32BE(this.nonce, 76);
|
|
70
|
+
return Buffer.from(sha256(sha256(buffer)));
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
serialize(): BigNumberish[] {
|
|
74
|
+
return [
|
|
75
|
+
this.reversed_version,
|
|
76
|
+
...this.previous_blockhash,
|
|
77
|
+
...this.merkle_root,
|
|
78
|
+
this.reversed_timestamp,
|
|
79
|
+
this.nbits,
|
|
80
|
+
this.nonce
|
|
81
|
+
];
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
static fromSerializedFeltArray(span: BigNumberish[]): StarknetBtcHeader {
|
|
85
|
+
const reversed_version = toHex(span.shift());
|
|
86
|
+
const previous_blockhash = span.splice(0, 8).map(toHex);
|
|
87
|
+
const merkle_root = span.splice(0, 8).map(toHex);
|
|
88
|
+
const reversed_timestamp = toHex(span.shift());
|
|
89
|
+
const nbits = toHex(span.shift());
|
|
90
|
+
const nonce = toHex(span.shift());
|
|
91
|
+
return new StarknetBtcHeader({
|
|
92
|
+
reversed_version,
|
|
93
|
+
previous_blockhash,
|
|
94
|
+
merkle_root,
|
|
95
|
+
reversed_timestamp,
|
|
96
|
+
nbits,
|
|
97
|
+
nonce
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
|
|
101
101
|
}
|
|
@@ -1,142 +1,142 @@
|
|
|
1
|
-
import {BtcStoredHeader, StatePredictorUtils} from "@atomiqlabs/base";
|
|
2
|
-
import {StarknetBtcHeader, StarknetBtcHeaderType} from "./StarknetBtcHeader";
|
|
3
|
-
import {Buffer} from "buffer";
|
|
4
|
-
import {BigNumberish, cairo, Uint256} from "starknet";
|
|
5
|
-
import {bigNumberishToBuffer, bufferToU32Array, u32ArrayToBuffer, isUint256, toHex} from "../../../utils/Utils";
|
|
6
|
-
|
|
7
|
-
export type StarknetBtcStoredHeaderType = {
|
|
8
|
-
blockheader: StarknetBtcHeader | StarknetBtcHeaderType,
|
|
9
|
-
block_hash: BigNumberish[],
|
|
10
|
-
chain_work: BigNumberish | Uint256,
|
|
11
|
-
block_height: BigNumberish,
|
|
12
|
-
last_diff_adjustment: BigNumberish,
|
|
13
|
-
prev_block_timestamps: BigNumberish[]
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
export class StarknetBtcStoredHeader implements BtcStoredHeader<StarknetBtcHeader> {
|
|
17
|
-
|
|
18
|
-
blockheader: StarknetBtcHeader;
|
|
19
|
-
block_hash: number[];
|
|
20
|
-
chain_work: Uint256;
|
|
21
|
-
block_height: number;
|
|
22
|
-
last_diff_adjustment: number;
|
|
23
|
-
prev_block_timestamps: number[];
|
|
24
|
-
|
|
25
|
-
constructor(obj: StarknetBtcStoredHeaderType) {
|
|
26
|
-
this.blockheader = obj.blockheader instanceof StarknetBtcHeader ? obj.blockheader : new StarknetBtcHeader(obj.blockheader);
|
|
27
|
-
this.block_hash = obj.block_hash.map(val => Number(val));
|
|
28
|
-
this.chain_work = isUint256(obj.chain_work) ? obj.chain_work : cairo.uint256(obj.chain_work);
|
|
29
|
-
this.block_height = Number(obj.block_height);
|
|
30
|
-
this.last_diff_adjustment = Number(obj.last_diff_adjustment);
|
|
31
|
-
this.prev_block_timestamps = obj.prev_block_timestamps.map(val => Number(val));
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
getBlockheight(): number {
|
|
35
|
-
return this.block_height;
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
getChainWork(): Buffer {
|
|
39
|
-
return bigNumberishToBuffer(this.chain_work, 32);
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
getHeader(): StarknetBtcHeader {
|
|
43
|
-
return this.blockheader;
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
getLastDiffAdjustment(): number {
|
|
47
|
-
return this.last_diff_adjustment;
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
getPrevBlockTimestamps(): number[] {
|
|
51
|
-
return this.prev_block_timestamps;
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
getBlockHash(): Buffer {
|
|
55
|
-
return u32ArrayToBuffer(this.block_hash).reverse();
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
/**
|
|
59
|
-
* Computes prevBlockTimestamps for a next block, shifting the old block timestamps to the left & appending
|
|
60
|
-
* this block's timestamp to the end
|
|
61
|
-
*
|
|
62
|
-
* @private
|
|
63
|
-
*/
|
|
64
|
-
private computeNextBlockTimestamps(): number[] {
|
|
65
|
-
const prevBlockTimestamps = [...this.prev_block_timestamps];
|
|
66
|
-
for(let i=1;i<10;i++) {
|
|
67
|
-
prevBlockTimestamps[i-1] = prevBlockTimestamps[i];
|
|
68
|
-
}
|
|
69
|
-
prevBlockTimestamps[9] = this.blockheader.getTimestamp();
|
|
70
|
-
return prevBlockTimestamps;
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
/**
|
|
74
|
-
* Computes total chain work after a new header with "nbits" is added to the chain
|
|
75
|
-
*
|
|
76
|
-
* @param nbits
|
|
77
|
-
* @private
|
|
78
|
-
*/
|
|
79
|
-
private computeNextChainWork(nbits: number): Buffer {
|
|
80
|
-
const chainWork = [...this.getChainWork()];
|
|
81
|
-
StatePredictorUtils.addInPlace(chainWork, [...StatePredictorUtils.getChainwork(nbits)]);
|
|
82
|
-
return Buffer.from(chainWork);
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
/**
|
|
86
|
-
* Computes lastDiffAdjustment, this changes only once every DIFF_ADJUSTMENT_PERIOD blocks
|
|
87
|
-
*
|
|
88
|
-
* @param headerTimestamp
|
|
89
|
-
* @private
|
|
90
|
-
*/
|
|
91
|
-
private computeNextLastDiffAdjustment(headerTimestamp: number) {
|
|
92
|
-
const blockheight = this.block_height+1;
|
|
93
|
-
|
|
94
|
-
let lastDiffAdjustment = this.last_diff_adjustment;
|
|
95
|
-
if(blockheight % StatePredictorUtils.DIFF_ADJUSTMENT_PERIOD === 0) {
|
|
96
|
-
lastDiffAdjustment = headerTimestamp;
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
return lastDiffAdjustment;
|
|
100
|
-
}
|
|
101
|
-
|
|
102
|
-
computeNext(header: StarknetBtcHeader): StarknetBtcStoredHeader {
|
|
103
|
-
return new StarknetBtcStoredHeader({
|
|
104
|
-
chain_work: "0x"+this.computeNextChainWork(header.getNbits()).toString("hex"),
|
|
105
|
-
prev_block_timestamps: this.computeNextBlockTimestamps(),
|
|
106
|
-
block_height: this.block_height+1,
|
|
107
|
-
last_diff_adjustment: this.computeNextLastDiffAdjustment(header.getTimestamp()),
|
|
108
|
-
block_hash: bufferToU32Array(header.getHash()),
|
|
109
|
-
blockheader: header
|
|
110
|
-
});
|
|
111
|
-
}
|
|
112
|
-
|
|
113
|
-
serialize(): BigNumberish[] {
|
|
114
|
-
return [
|
|
115
|
-
...this.blockheader.serialize(),
|
|
116
|
-
...this.block_hash,
|
|
117
|
-
this.chain_work.low,
|
|
118
|
-
this.chain_work.high,
|
|
119
|
-
this.block_height,
|
|
120
|
-
this.last_diff_adjustment,
|
|
121
|
-
...this.prev_block_timestamps
|
|
122
|
-
]
|
|
123
|
-
}
|
|
124
|
-
|
|
125
|
-
static fromSerializedFeltArray(span: BigNumberish[]): StarknetBtcStoredHeader {
|
|
126
|
-
const blockheader = StarknetBtcHeader.fromSerializedFeltArray(span);
|
|
127
|
-
const block_hash = span.splice(0, 8).map(toHex);
|
|
128
|
-
const chain_work = {low: span.shift(), high: span.shift()};
|
|
129
|
-
const block_height = toHex(span.shift());
|
|
130
|
-
const last_diff_adjustment = toHex(span.shift());
|
|
131
|
-
const prev_block_timestamps = span.splice(0, 10).map(toHex);
|
|
132
|
-
return new StarknetBtcStoredHeader({
|
|
133
|
-
blockheader,
|
|
134
|
-
block_hash,
|
|
135
|
-
chain_work,
|
|
136
|
-
block_height,
|
|
137
|
-
last_diff_adjustment,
|
|
138
|
-
prev_block_timestamps
|
|
139
|
-
});
|
|
140
|
-
}
|
|
141
|
-
|
|
1
|
+
import {BtcStoredHeader, StatePredictorUtils} from "@atomiqlabs/base";
|
|
2
|
+
import {StarknetBtcHeader, StarknetBtcHeaderType} from "./StarknetBtcHeader";
|
|
3
|
+
import {Buffer} from "buffer";
|
|
4
|
+
import {BigNumberish, cairo, Uint256} from "starknet";
|
|
5
|
+
import {bigNumberishToBuffer, bufferToU32Array, u32ArrayToBuffer, isUint256, toHex} from "../../../utils/Utils";
|
|
6
|
+
|
|
7
|
+
export type StarknetBtcStoredHeaderType = {
|
|
8
|
+
blockheader: StarknetBtcHeader | StarknetBtcHeaderType,
|
|
9
|
+
block_hash: BigNumberish[],
|
|
10
|
+
chain_work: BigNumberish | Uint256,
|
|
11
|
+
block_height: BigNumberish,
|
|
12
|
+
last_diff_adjustment: BigNumberish,
|
|
13
|
+
prev_block_timestamps: BigNumberish[]
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export class StarknetBtcStoredHeader implements BtcStoredHeader<StarknetBtcHeader> {
|
|
17
|
+
|
|
18
|
+
blockheader: StarknetBtcHeader;
|
|
19
|
+
block_hash: number[];
|
|
20
|
+
chain_work: Uint256;
|
|
21
|
+
block_height: number;
|
|
22
|
+
last_diff_adjustment: number;
|
|
23
|
+
prev_block_timestamps: number[];
|
|
24
|
+
|
|
25
|
+
constructor(obj: StarknetBtcStoredHeaderType) {
|
|
26
|
+
this.blockheader = obj.blockheader instanceof StarknetBtcHeader ? obj.blockheader : new StarknetBtcHeader(obj.blockheader);
|
|
27
|
+
this.block_hash = obj.block_hash.map(val => Number(val));
|
|
28
|
+
this.chain_work = isUint256(obj.chain_work) ? obj.chain_work : cairo.uint256(obj.chain_work);
|
|
29
|
+
this.block_height = Number(obj.block_height);
|
|
30
|
+
this.last_diff_adjustment = Number(obj.last_diff_adjustment);
|
|
31
|
+
this.prev_block_timestamps = obj.prev_block_timestamps.map(val => Number(val));
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
getBlockheight(): number {
|
|
35
|
+
return this.block_height;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
getChainWork(): Buffer {
|
|
39
|
+
return bigNumberishToBuffer(this.chain_work, 32);
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
getHeader(): StarknetBtcHeader {
|
|
43
|
+
return this.blockheader;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
getLastDiffAdjustment(): number {
|
|
47
|
+
return this.last_diff_adjustment;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
getPrevBlockTimestamps(): number[] {
|
|
51
|
+
return this.prev_block_timestamps;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
getBlockHash(): Buffer {
|
|
55
|
+
return u32ArrayToBuffer(this.block_hash).reverse();
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
/**
|
|
59
|
+
* Computes prevBlockTimestamps for a next block, shifting the old block timestamps to the left & appending
|
|
60
|
+
* this block's timestamp to the end
|
|
61
|
+
*
|
|
62
|
+
* @private
|
|
63
|
+
*/
|
|
64
|
+
private computeNextBlockTimestamps(): number[] {
|
|
65
|
+
const prevBlockTimestamps = [...this.prev_block_timestamps];
|
|
66
|
+
for(let i=1;i<10;i++) {
|
|
67
|
+
prevBlockTimestamps[i-1] = prevBlockTimestamps[i];
|
|
68
|
+
}
|
|
69
|
+
prevBlockTimestamps[9] = this.blockheader.getTimestamp();
|
|
70
|
+
return prevBlockTimestamps;
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
/**
|
|
74
|
+
* Computes total chain work after a new header with "nbits" is added to the chain
|
|
75
|
+
*
|
|
76
|
+
* @param nbits
|
|
77
|
+
* @private
|
|
78
|
+
*/
|
|
79
|
+
private computeNextChainWork(nbits: number): Buffer {
|
|
80
|
+
const chainWork = [...this.getChainWork()];
|
|
81
|
+
StatePredictorUtils.addInPlace(chainWork, [...StatePredictorUtils.getChainwork(nbits)]);
|
|
82
|
+
return Buffer.from(chainWork);
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
/**
|
|
86
|
+
* Computes lastDiffAdjustment, this changes only once every DIFF_ADJUSTMENT_PERIOD blocks
|
|
87
|
+
*
|
|
88
|
+
* @param headerTimestamp
|
|
89
|
+
* @private
|
|
90
|
+
*/
|
|
91
|
+
private computeNextLastDiffAdjustment(headerTimestamp: number) {
|
|
92
|
+
const blockheight = this.block_height+1;
|
|
93
|
+
|
|
94
|
+
let lastDiffAdjustment = this.last_diff_adjustment;
|
|
95
|
+
if(blockheight % StatePredictorUtils.DIFF_ADJUSTMENT_PERIOD === 0) {
|
|
96
|
+
lastDiffAdjustment = headerTimestamp;
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
return lastDiffAdjustment;
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
computeNext(header: StarknetBtcHeader): StarknetBtcStoredHeader {
|
|
103
|
+
return new StarknetBtcStoredHeader({
|
|
104
|
+
chain_work: "0x"+this.computeNextChainWork(header.getNbits()).toString("hex"),
|
|
105
|
+
prev_block_timestamps: this.computeNextBlockTimestamps(),
|
|
106
|
+
block_height: this.block_height+1,
|
|
107
|
+
last_diff_adjustment: this.computeNextLastDiffAdjustment(header.getTimestamp()),
|
|
108
|
+
block_hash: bufferToU32Array(header.getHash()),
|
|
109
|
+
blockheader: header
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
serialize(): BigNumberish[] {
|
|
114
|
+
return [
|
|
115
|
+
...this.blockheader.serialize(),
|
|
116
|
+
...this.block_hash,
|
|
117
|
+
this.chain_work.low,
|
|
118
|
+
this.chain_work.high,
|
|
119
|
+
this.block_height,
|
|
120
|
+
this.last_diff_adjustment,
|
|
121
|
+
...this.prev_block_timestamps
|
|
122
|
+
]
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
static fromSerializedFeltArray(span: BigNumberish[]): StarknetBtcStoredHeader {
|
|
126
|
+
const blockheader = StarknetBtcHeader.fromSerializedFeltArray(span);
|
|
127
|
+
const block_hash = span.splice(0, 8).map(toHex);
|
|
128
|
+
const chain_work = {low: span.shift(), high: span.shift()};
|
|
129
|
+
const block_height = toHex(span.shift());
|
|
130
|
+
const last_diff_adjustment = toHex(span.shift());
|
|
131
|
+
const prev_block_timestamps = span.splice(0, 10).map(toHex);
|
|
132
|
+
return new StarknetBtcStoredHeader({
|
|
133
|
+
blockheader,
|
|
134
|
+
block_hash,
|
|
135
|
+
chain_work,
|
|
136
|
+
block_height,
|
|
137
|
+
last_diff_adjustment,
|
|
138
|
+
prev_block_timestamps
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
|
|
142
142
|
}
|
|
@@ -1,85 +1,85 @@
|
|
|
1
|
-
import {Call} from "starknet";
|
|
2
|
-
import {StarknetChainInterface} from "./StarknetChainInterface";
|
|
3
|
-
import {StarknetTx} from "./modules/StarknetTransactions";
|
|
4
|
-
import {StarknetGas, starknetGasAdd} from "./modules/StarknetFees";
|
|
5
|
-
|
|
6
|
-
export class StarknetAction {
|
|
7
|
-
|
|
8
|
-
gas: StarknetGas;
|
|
9
|
-
readonly mainSigner: string;
|
|
10
|
-
private readonly root: StarknetChainInterface;
|
|
11
|
-
private readonly instructions: Call[];
|
|
12
|
-
private feeRate: string;
|
|
13
|
-
|
|
14
|
-
constructor(
|
|
15
|
-
mainSigner: string,
|
|
16
|
-
root: StarknetChainInterface,
|
|
17
|
-
instructions: Call[] | Call = [],
|
|
18
|
-
gasLimit?: StarknetGas,
|
|
19
|
-
feeRate?: string
|
|
20
|
-
) {
|
|
21
|
-
this.mainSigner = mainSigner;
|
|
22
|
-
this.root = root;
|
|
23
|
-
this.instructions = Array.isArray(instructions) ? instructions : [instructions];
|
|
24
|
-
this.gas = {
|
|
25
|
-
l1Gas: gasLimit?.l1Gas ?? 0,
|
|
26
|
-
l2Gas: gasLimit?.l2Gas ?? 0,
|
|
27
|
-
l1DataGas: gasLimit?.l1DataGas ?? 0,
|
|
28
|
-
};
|
|
29
|
-
this.feeRate = feeRate;
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
private estimateFeeRate(): Promise<string> {
|
|
33
|
-
return this.root.Fees.getFeeRate();
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
public addIx(instruction: Call, gasLimit?: StarknetGas) {
|
|
37
|
-
this.instructions.push(instruction);
|
|
38
|
-
this.gas = starknetGasAdd(this.gas, gasLimit);
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
public add(action: StarknetAction): this {
|
|
42
|
-
return this.addAction(action);
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
public addAction(action: StarknetAction, index: number = this.instructions.length): this {
|
|
46
|
-
if(action.mainSigner!==this.mainSigner) throw new Error("Actions need to have the same signer!");
|
|
47
|
-
if(this.gas.l1Gas==null && action.gas.l1Gas!=null) this.gas.l1Gas = action.gas.l1Gas;
|
|
48
|
-
if(this.gas.l2Gas==null && action.gas.l2Gas!=null) this.gas.l2Gas = action.gas.l2Gas;
|
|
49
|
-
if(this.gas.l1DataGas==null && action.gas.l1DataGas!=null) this.gas.l1DataGas = action.gas.l1DataGas;
|
|
50
|
-
if(this.gas.l1Gas!=null && action.gas.l1Gas!=null) this.gas.l1Gas += action.gas.l1Gas;
|
|
51
|
-
if(this.gas.l2Gas!=null && action.gas.l2Gas!=null) this.gas.l2Gas += action.gas.l2Gas;
|
|
52
|
-
if(this.gas.l1DataGas!=null && action.gas.l1DataGas!=null) this.gas.l1DataGas += action.gas.l1DataGas;
|
|
53
|
-
this.instructions.splice(index, 0, ...action.instructions);
|
|
54
|
-
if(this.feeRate==null) this.feeRate = action.feeRate;
|
|
55
|
-
return this;
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
public async tx(feeRate?: string): Promise<StarknetTx> {
|
|
59
|
-
if(feeRate==null) feeRate = this.feeRate;
|
|
60
|
-
if(feeRate==null) feeRate = await this.estimateFeeRate();
|
|
61
|
-
|
|
62
|
-
return {
|
|
63
|
-
type: "INVOKE",
|
|
64
|
-
tx: this.instructions,
|
|
65
|
-
details: {
|
|
66
|
-
...this.root.Fees.getFeeDetails(this.gas, feeRate),
|
|
67
|
-
walletAddress: this.mainSigner,
|
|
68
|
-
cairoVersion: "1",
|
|
69
|
-
chainId: this.root.starknetChainId,
|
|
70
|
-
nonce: null,
|
|
71
|
-
accountDeploymentData: [],
|
|
72
|
-
skipValidate: false
|
|
73
|
-
}
|
|
74
|
-
};
|
|
75
|
-
}
|
|
76
|
-
|
|
77
|
-
public async addToTxs(txs: StarknetTx[], feeRate?: string): Promise<void> {
|
|
78
|
-
txs.push(await this.tx(feeRate));
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
public ixsLength(): number {
|
|
82
|
-
return this.instructions.length;
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
}
|
|
1
|
+
import {Call} from "starknet";
|
|
2
|
+
import {StarknetChainInterface} from "./StarknetChainInterface";
|
|
3
|
+
import {StarknetTx} from "./modules/StarknetTransactions";
|
|
4
|
+
import {StarknetGas, starknetGasAdd} from "./modules/StarknetFees";
|
|
5
|
+
|
|
6
|
+
export class StarknetAction {
|
|
7
|
+
|
|
8
|
+
gas: StarknetGas;
|
|
9
|
+
readonly mainSigner: string;
|
|
10
|
+
private readonly root: StarknetChainInterface;
|
|
11
|
+
private readonly instructions: Call[];
|
|
12
|
+
private feeRate: string;
|
|
13
|
+
|
|
14
|
+
constructor(
|
|
15
|
+
mainSigner: string,
|
|
16
|
+
root: StarknetChainInterface,
|
|
17
|
+
instructions: Call[] | Call = [],
|
|
18
|
+
gasLimit?: StarknetGas,
|
|
19
|
+
feeRate?: string
|
|
20
|
+
) {
|
|
21
|
+
this.mainSigner = mainSigner;
|
|
22
|
+
this.root = root;
|
|
23
|
+
this.instructions = Array.isArray(instructions) ? instructions : [instructions];
|
|
24
|
+
this.gas = {
|
|
25
|
+
l1Gas: gasLimit?.l1Gas ?? 0,
|
|
26
|
+
l2Gas: gasLimit?.l2Gas ?? 0,
|
|
27
|
+
l1DataGas: gasLimit?.l1DataGas ?? 0,
|
|
28
|
+
};
|
|
29
|
+
this.feeRate = feeRate;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
private estimateFeeRate(): Promise<string> {
|
|
33
|
+
return this.root.Fees.getFeeRate();
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
public addIx(instruction: Call, gasLimit?: StarknetGas) {
|
|
37
|
+
this.instructions.push(instruction);
|
|
38
|
+
this.gas = starknetGasAdd(this.gas, gasLimit);
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
public add(action: StarknetAction): this {
|
|
42
|
+
return this.addAction(action);
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
public addAction(action: StarknetAction, index: number = this.instructions.length): this {
|
|
46
|
+
if(action.mainSigner!==this.mainSigner) throw new Error("Actions need to have the same signer!");
|
|
47
|
+
if(this.gas.l1Gas==null && action.gas.l1Gas!=null) this.gas.l1Gas = action.gas.l1Gas;
|
|
48
|
+
if(this.gas.l2Gas==null && action.gas.l2Gas!=null) this.gas.l2Gas = action.gas.l2Gas;
|
|
49
|
+
if(this.gas.l1DataGas==null && action.gas.l1DataGas!=null) this.gas.l1DataGas = action.gas.l1DataGas;
|
|
50
|
+
if(this.gas.l1Gas!=null && action.gas.l1Gas!=null) this.gas.l1Gas += action.gas.l1Gas;
|
|
51
|
+
if(this.gas.l2Gas!=null && action.gas.l2Gas!=null) this.gas.l2Gas += action.gas.l2Gas;
|
|
52
|
+
if(this.gas.l1DataGas!=null && action.gas.l1DataGas!=null) this.gas.l1DataGas += action.gas.l1DataGas;
|
|
53
|
+
this.instructions.splice(index, 0, ...action.instructions);
|
|
54
|
+
if(this.feeRate==null) this.feeRate = action.feeRate;
|
|
55
|
+
return this;
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
public async tx(feeRate?: string): Promise<StarknetTx> {
|
|
59
|
+
if(feeRate==null) feeRate = this.feeRate;
|
|
60
|
+
if(feeRate==null) feeRate = await this.estimateFeeRate();
|
|
61
|
+
|
|
62
|
+
return {
|
|
63
|
+
type: "INVOKE",
|
|
64
|
+
tx: this.instructions,
|
|
65
|
+
details: {
|
|
66
|
+
...this.root.Fees.getFeeDetails(this.gas, feeRate),
|
|
67
|
+
walletAddress: this.mainSigner,
|
|
68
|
+
cairoVersion: "1",
|
|
69
|
+
chainId: this.root.starknetChainId,
|
|
70
|
+
nonce: null,
|
|
71
|
+
accountDeploymentData: [],
|
|
72
|
+
skipValidate: false
|
|
73
|
+
}
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
public async addToTxs(txs: StarknetTx[], feeRate?: string): Promise<void> {
|
|
78
|
+
txs.push(await this.tx(feeRate));
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
public ixsLength(): number {
|
|
82
|
+
return this.instructions.length;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
}
|