Skip to content

Commit 30393e0

Browse files
author
YukiTsuchida
committed
Refactor deployment scripts and update dependencies
1 parent a7e7e1d commit 30393e0

File tree

14 files changed

+10135
-9438
lines changed

14 files changed

+10135
-9438
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ interface IContractModule {
3232

3333
## How to deploy a contract module
3434

35-
[Here](./scripts/deploy/002_DeployApp.s.sol) is an example of deploying with the module `CrossSimpleModule` that implements the simple commit.
35+
[Here](./scripts/DeployAll.s.sol) is an example of deploying with the module `CrossSimpleModule` that implements the simple commit.
3636

3737
## For Developers
3838

‎contracts/core/TxAtomicSimple.sol‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ abstract contract TxAtomicSimple is IBCKeeper, PacketHandler, ContractRegistry {
2929
PacketDataCall.Data memory pdc = PacketDataCall.decode(anyPayload.value);
3030

3131
PacketAcknowledgementCall.Data memory ack;
32-
try getModule(packet).onContractCall(
33-
CrossContext(pdc.tx_id, txIndexParticipant, pdc.tx.signers), pdc.tx.call_info
34-
) returns (bytes memory ret) {
32+
try getModule(packet)
33+
.onContractCall(
34+
CrossContext(pdc.tx_id, txIndexParticipant, pdc.tx.signers), pdc.tx.call_info
35+
) returns (bytes memory ret) {
3536
ack.status = PacketAcknowledgementCall.CommitStatus.COMMIT_STATUS_OK;
3637
emit OnContractCall(pdc.tx_id, txIndexParticipant, true, ret);
3738
} catch (bytes memory) {

‎contracts/proto/cross/core/atomic/simple/AtomicSimple.sol‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ library PacketData {
3333
(Data memory x,) = _decode(32, bs, bs.length);
3434
store(x, self);
3535
}
36+
3637
// inner decoder
3738

3839
/**
@@ -123,6 +124,7 @@ library PacketData {
123124
}
124125
return bs;
125126
}
127+
126128
// inner encoder
127129

128130
/**
@@ -145,6 +147,7 @@ library PacketData {
145147
}
146148
return pointer - offset;
147149
}
150+
148151
// nested encoder
149152

150153
/**
@@ -171,6 +174,7 @@ library PacketData {
171174
delete tmp;
172175
return pointer - offset;
173176
}
177+
174178
// estimator
175179

176180
/**
@@ -257,6 +261,7 @@ library Acknowledgement {
257261
(Data memory x,) = _decode(32, bs, bs.length);
258262
store(x, self);
259263
}
264+
260265
// inner decoder
261266

262267
/**
@@ -331,6 +336,7 @@ library Acknowledgement {
331336
}
332337
return bs;
333338
}
339+
334340
// inner encoder
335341

336342
/**
@@ -354,6 +360,7 @@ library Acknowledgement {
354360
}
355361
return pointer - offset;
356362
}
363+
357364
// nested encoder
358365

359366
/**
@@ -380,6 +387,7 @@ library Acknowledgement {
380387
delete tmp;
381388
return pointer - offset;
382389
}
390+
383391
// estimator
384392

385393
/**
@@ -469,6 +477,7 @@ library Header {
469477
(Data memory x,) = _decode(32, bs, bs.length);
470478
store(x, self);
471479
}
480+
472481
// inner decoder
473482

474483
/**
@@ -573,6 +582,7 @@ library Header {
573582
}
574583
return bs;
575584
}
585+
576586
// inner encoder
577587

578588
/**
@@ -595,6 +605,7 @@ library Header {
595605
}
596606
return pointer - offset;
597607
}
608+
598609
// nested encoder
599610

600611
/**
@@ -621,6 +632,7 @@ library Header {
621632
delete tmp;
622633
return pointer - offset;
623634
}
635+
624636
// estimator
625637

626638
/**
@@ -728,6 +740,7 @@ library HeaderField {
728740
(Data memory x,) = _decode(32, bs, bs.length);
729741
store(x, self);
730742
}
743+
731744
// inner decoder
732745

733746
/**
@@ -802,6 +815,7 @@ library HeaderField {
802815
}
803816
return bs;
804817
}
818+
805819
// inner encoder
806820

807821
/**
@@ -825,6 +839,7 @@ library HeaderField {
825839
}
826840
return pointer - offset;
827841
}
842+
828843
// nested encoder
829844

830845
/**
@@ -851,6 +866,7 @@ library HeaderField {
851866
delete tmp;
852867
return pointer - offset;
853868
}
869+
854870
// estimator
855871

856872
/**
@@ -941,6 +957,7 @@ library PacketDataCall {
941957
(Data memory x,) = _decode(32, bs, bs.length);
942958
store(x, self);
943959
}
960+
944961
// inner decoder
945962

946963
/**
@@ -1037,6 +1054,7 @@ library PacketDataCall {
10371054
}
10381055
return bs;
10391056
}
1057+
10401058
// inner encoder
10411059

10421060
/**
@@ -1060,6 +1078,7 @@ library PacketDataCall {
10601078

10611079
return pointer - offset;
10621080
}
1081+
10631082
// nested encoder
10641083

10651084
/**
@@ -1086,6 +1105,7 @@ library PacketDataCall {
10861105
delete tmp;
10871106
return pointer - offset;
10881107
}
1108+
10891109
// estimator
10901110

10911111
/**
@@ -1175,6 +1195,7 @@ library PacketDataCallResolvedContractTransaction {
11751195
(Data memory x,) = _decode(32, bs, bs.length);
11761196
store(x, self);
11771197
}
1198+
11781199
// inner decoder
11791200

11801201
/**
@@ -1392,6 +1413,7 @@ library PacketDataCallResolvedContractTransaction {
13921413
}
13931414
return bs;
13941415
}
1416+
13951417
// inner encoder
13961418

13971419
/**
@@ -1433,6 +1455,7 @@ library PacketDataCallResolvedContractTransaction {
14331455
}
14341456
return pointer - offset;
14351457
}
1458+
14361459
// nested encoder
14371460

14381461
/**
@@ -1459,6 +1482,7 @@ library PacketDataCallResolvedContractTransaction {
14591482
delete tmp;
14601483
return pointer - offset;
14611484
}
1485+
14621486
// estimator
14631487

14641488
/**
@@ -1658,6 +1682,7 @@ library PacketAcknowledgementCall {
16581682
(Data memory x,) = _decode(32, bs, bs.length);
16591683
store(x, self);
16601684
}
1685+
16611686
// inner decoder
16621687

16631688
/**
@@ -1718,6 +1743,7 @@ library PacketAcknowledgementCall {
17181743
}
17191744
return bs;
17201745
}
1746+
17211747
// inner encoder
17221748

17231749
/**
@@ -1738,6 +1764,7 @@ library PacketAcknowledgementCall {
17381764
}
17391765
return pointer - offset;
17401766
}
1767+
17411768
// nested encoder
17421769

17431770
/**
@@ -1764,6 +1791,7 @@ library PacketAcknowledgementCall {
17641791
delete tmp;
17651792
return pointer - offset;
17661793
}
1794+
17671795
// estimator
17681796

17691797
/**
@@ -1847,6 +1875,7 @@ library ReturnValue {
18471875
(Data memory x,) = _decode(32, bs, bs.length);
18481876
store(x, self);
18491877
}
1878+
18501879
// inner decoder
18511880

18521881
/**
@@ -1906,6 +1935,7 @@ library ReturnValue {
19061935
}
19071936
return bs;
19081937
}
1938+
19091939
// inner encoder
19101940

19111941
/**
@@ -1925,6 +1955,7 @@ library ReturnValue {
19251955
}
19261956
return pointer - offset;
19271957
}
1958+
19281959
// nested encoder
19291960

19301961
/**
@@ -1951,6 +1982,7 @@ library ReturnValue {
19511982
delete tmp;
19521983
return pointer - offset;
19531984
}
1985+
19541986
// estimator
19551987

19561988
/**

‎contracts/proto/cross/core/auth/Auth.sol‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ library Account {
3232
(Data memory x,) = _decode(32, bs, bs.length);
3333
store(x, self);
3434
}
35+
3536
// inner decoder
3637

3738
/**
@@ -122,6 +123,7 @@ library Account {
122123
}
123124
return bs;
124125
}
126+
125127
// inner encoder
126128

127129
/**
@@ -145,6 +147,7 @@ library Account {
145147

146148
return pointer - offset;
147149
}
150+
148151
// nested encoder
149152

150153
/**
@@ -171,6 +174,7 @@ library Account {
171174
delete tmp;
172175
return pointer - offset;
173176
}
177+
174178
// estimator
175179

176180
/**
@@ -318,6 +322,7 @@ library AuthType {
318322
(Data memory x,) = _decode(32, bs, bs.length);
319323
store(x, self);
320324
}
325+
321326
// inner decoder
322327

323328
/**
@@ -413,6 +418,7 @@ library AuthType {
413418
}
414419
return bs;
415420
}
421+
416422
// inner encoder
417423

418424
/**
@@ -437,6 +443,7 @@ library AuthType {
437443

438444
return pointer - offset;
439445
}
446+
440447
// nested encoder
441448

442449
/**
@@ -463,6 +470,7 @@ library AuthType {
463470
delete tmp;
464471
return pointer - offset;
465472
}
473+
466474
// estimator
467475

468476
/**

‎deployments.toml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
[5777]
2+
endpoint_url = "http://127.0.0.1:8545"
3+
4+
[5777.string]
5+
mnemonic = "math razor capable expose worth grape metal sunset metal sudden usage scheme"
6+
port_cross = "cross"
7+
mock_client_type = "mock-client"
8+
9+
[5777.uint]
10+
mnemonic_index = 0
11+
deployed_at = 1760588200
12+
13+
[5777.bool]
14+
debug_mode = true
15+
16+
[5777.address]
17+
ibc_client = "0xB9c99Dc02185993bdB9C48Fc29544f6cC6604F87"
18+
ibc_connection = "0xdD5109D05Ac357E446992a60E64764041A0E8529"
19+
ibc_channel = "0x361552A65C96621003C62C5971b910a1fdC9ba78"
20+
ibc_handler = "0x9eBF3956EE45B2b9F1fC85FB8990ce6be52F47a6"
21+
mock_cross_contract = "0x727A5648832D2b317925CE043eA9b7fE04B4CD55"
22+
cross_simple_module = "0x702E40245797c5a2108A566b3CE2Bf14Bc6aF841"
23+
mock_client = "0xaa43d337145E8930d01cb4E60Abf6595C692921E"
24+
deployer = "0xa89F47C6b463f74d87572b058427dA0A13ec5425"

‎foundry.toml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
[profile.default]
2-
solc_version = "0.8.9"
2+
solc_version = "0.8.13"
33
src = "contracts"
44
test = "test"
55
script = "scripts"
66
libs = ["lib", "node_modules"]
77
optimizer = true
88
optimizer_runs = 1000
99
evm_version = "london"
10+
fs_permissions = [
11+
{ access = "read-write", path = "./deployments.toml" }
12+
]
13+
14+
[rpc_endpoints]
15+
anvil = "http://127.0.0.1:8545"

0 commit comments

Comments
 (0)