Skip to content

Commit 054376f

Browse files
krebernisakkrebernisak
authored
Update type domain to 'link.chain' (#610)
* Update type domain to 'link.chain' * Update TS bindings consts, add ec test * Update facilityId/exitCode * Update Deployable contract pin * Fix static test * Polish * Fix test * Extract contract type const * PR feedback * Fix Upgradeable exit code Go binding * Remove unused (common?) exit codes
1 parent f8d460b commit 054376f

133 files changed

Lines changed: 728 additions & 582 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎contracts/contracts/ccip/ccipsend_executor/contract.tolk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,5 +161,5 @@ get fun facilityId(): uint16 {
161161
}
162162

163163
get fun errorCode(local: uint16): uint16 {
164-
return getErrorCode(stringCrc32("com.chainlink.ton.ccip.CCIPSendExecutor"), local);
164+
return getErrorCode(stringCrc32("link.chain.ton.ccip.CCIPSendExecutor"), local);
165165
}

‎contracts/contracts/ccip/ccipsend_executor/types.tolk‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// SPDX-License-Identifier: BUSL-1.1
22
import "../onramp/messages.tolk";
33

4-
const CCIPSendExecutor_FACILITY_NAME = "com.chainlink.ton.ccip.CCIPSendExecutor";
5-
// getFacilityId(stringCrc32(CCIPSendExecutor_FACILITY_NAME));
6-
const CCIPSendExecutor_FACILITY_ID = 436;
4+
const CCIPSendExecutor_FACILITY_NAME = "link.chain.ton.ccip.CCIPSendExecutor";
5+
const CCIPSendExecutor_FACILITY_ID = 178; // (crc32(<facility>) % 640) + 10
76

87
type CCIPSendExecutor_ID = uint224
98

‎contracts/contracts/ccip/common/types.tolk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: BUSL-1.1
22
import "errors";
33
import "../../lib/utils";
4-
import "../../deployable/types"
4+
import "../../lib/deployable/types"
55

66
// 1-byte length prefixed byte slice (up to 64 bytes)
77
// Almost all uses need to Cell<> box this type because it can be sized up to 8+512 bits

‎contracts/contracts/ccip/fee_quoter/contract.tolk‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import "storage"
88
import "../common/types";
99
import "../common/cross_chain_address_validation"
1010
import "../../lib/access/ownable_2step";
11-
import "../../deployable/types";
11+
import "../../lib/deployable/types";
12+
import "../../lib/funding/withdrawable"
13+
import "../../lib/versioning/upgradeable"
1214
import "../../lib/utils";
1315
import "../../lib/math";
1416
import "../router/messages"
1517
import "../ccipsend_executor/messages"
16-
import "../../lib/funding/withdrawable"
17-
import "../../lib/versioning/upgradeable"
1818

1919
const CONTRACT_VERSION = "1.6.0";
2020
const RESERVE = ton("1"); // TODO: set correct value
@@ -648,7 +648,7 @@ get fun facilityId(): uint16 {
648648
}
649649

650650
get fun errorCode(local: uint16): uint16 {
651-
return getErrorCode(stringCrc32("com.chainlink.ton.ccip.FeeQuoter"), local);
651+
return getErrorCode(stringCrc32("link.chain.ton.ccip.FeeQuoter"), local);
652652
}
653653

654654
get fun destChainSelectors(): tuple? {

‎contracts/contracts/ccip/fee_quoter/types.tolk‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import "../../lib/utils"
22

3-
const FeeQuoter_FACILITY_NAME = "com.chainlink.ton.ccip.FeeQuoter";
4-
// getFacilityId(stringCrc32(FeeQuoter_FACILITY_NAME));
5-
const FeeQuoter_FACILITY_ID = 248;
3+
const FeeQuoter_FACILITY_NAME = "link.chain.ton.ccip.FeeQuoter";
4+
const FeeQuoter_FACILITY_ID = 344; // (crc32(<facility>) % 640) + 10
65

76
struct TimestampedPrice {
87
value: uint224;

‎contracts/contracts/ccip/merkle_root/contract.tolk‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// SPDX-License-Identifier: BUSL-1.1
2-
import "messages"
3-
import "errors"
4-
import "storage"
2+
import "../../lib/utils"
3+
import "../../lib/deployable/types"
4+
import "../../lib/funding/withdrawable"
55
import "../offramp/messages"
66
import "../offramp/types"
7-
import "../../lib/utils"
8-
import "../../deployable/types.tolk"
97
import "../receive_executor/storage"
108
import "../router/storage"
11-
import "../../lib/funding/withdrawable"
9+
import "messages"
10+
import "errors"
11+
import "storage"
1212
import "types"
1313

1414
// MerkleRoot contract
@@ -121,5 +121,5 @@ get fun facilityId(): uint16 {
121121
}
122122

123123
get fun errorCode(local: uint16): uint16 {
124-
return getErrorCode(stringCrc32("com.chainlink.ton.ccip.MerkleRoot"), local);
124+
return getErrorCode(stringCrc32("link.chain.ton.ccip.MerkleRoot"), local);
125125
}

‎contracts/contracts/ccip/merkle_root/types.tolk‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
// SPDX-License-Identifier: BUSL-1.1
2-
const MerkleRoot_FACILITY_NAME = "com.chainlink.ton.ccip.MerkleRoot";
3-
// getFacilityId(stringCrc32(MerkleRoot_FACILITY_NAME));
4-
const MerkleRoot_FACILITY_ID = 479;
2+
const MerkleRoot_FACILITY_NAME = "link.chain.ton.ccip.MerkleRoot";
3+
const MerkleRoot_FACILITY_ID = 186; // (crc32(<facility>) % 640) + 10

‎contracts/contracts/ccip/offramp/contract.tolk‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
// SPDX-License-Identifier: BUSL-1.1
2-
import "messages"
3-
import "errors"
4-
import "types"
5-
import "storage"
6-
import "events"
7-
82
import "../../lib/versioning/upgradeable"
9-
import "../common/types.tolk"
10-
import "../../deployable/types.tolk"
3+
import "../../lib/deployable/types"
114
import "../../lib/access/ownable_2step.tolk"
125
import "../../lib/funding/withdrawable.tolk"
136
import "../../lib/crypto/merkle_multi_proof.tolk"
147
import "../../lib/ocr/multi_ocr3_base"
158
import "../../lib/ocr/types"
169
import "../../lib/utils.tolk"
10+
import "../../lib/receiver/types"
11+
import "../../lib/deployable/namespace"
12+
13+
import "../common/types.tolk"
14+
1715
import "../fee_quoter/messages"
1816
import "../merkle_root/messages"
1917
import "../merkle_root/storage"
2018
import "../receive_executor/messages"
2119
import "../receive_executor/storage"
2220
import "../router/messages"
23-
import "../../lib/receiver/types"
24-
import "../../lib/deployable/namespace"
21+
22+
import "messages"
23+
import "errors"
24+
import "types"
25+
import "storage"
26+
import "events"
2527

2628
const CONTRACT_VERSION = "1.6.0";
2729
const RESERVE = ton("5");
@@ -981,7 +983,7 @@ get fun facilityId(): uint16 {
981983
}
982984

983985
get fun errorCode(local: uint16): uint16 {
984-
return getErrorCode(stringCrc32("com.chainlink.ton.ccip.OffRamp"), local);
986+
return getErrorCode(stringCrc32("link.chain.ton.ccip.OffRamp"), local);
985987
}
986988

987989
get fun reserve(): coins {

‎contracts/contracts/ccip/offramp/messages.tolk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import "../../lib/ocr/multi_ocr3_base.tolk"
55
import "../../lib/utils"
66
import "../../lib/funding/withdrawable"
77
import "../../lib/versioning/upgradeable"
8+
import "../../lib/deployable/types"
89
import "../common/types.tolk"
910
import "../rmn_remote/lib"
1011
import "../merkle_root/messages"
1112
import "../receive_executor/messages"
1213
import "../fee_quoter/messages"
1314
import "../router/messages"
14-
import "../../deployable/types.tolk"
1515

1616
type OffRamp_InMessage =
1717
| OffRamp_Commit

‎contracts/contracts/ccip/offramp/types.tolk‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
import "../common/types"
33
import "../fee_quoter/types"
44
import "../../lib/utils"
5-
import "../../deployable/types"
5+
import "../../lib/deployable/types"
66

7-
const OffRamp_FACILITY_NAME = "com.chainlink.ton.ccip.OffRamp";
8-
// getFacilityId(stringCrc32(OffRamp_FACILITY_NAME));
9-
const OffRamp_FACILITY_ID = 84;
7+
const OffRamp_FACILITY_NAME = "link.chain.ton.ccip.OffRamp";
8+
const OffRamp_FACILITY_ID = 221; // (crc32(<facility>) % 640) + 10
109

1110
struct ExecutionReport {
1211
sourceChainSelector: uint64;

0 commit comments

Comments
 (0)