Skip to content

Commit 2582573

Browse files
xenolissxenoliss
authored
Merge branch 'main' into bo/chain-1993
2 parents ae77ba3 + 9bb1484 commit 2582573

132 files changed

Lines changed: 5822 additions & 485 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.

‎base/Makefile‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ BASE_RPC=https://base-sepolia.cbhq.net
66
# Update values in this section to specify token recipients / token amount
77
####################################################################################################
88
# alpha or prod
9-
ENV_NAME=prod
9+
ENV_NAME=alpha
1010

1111
SOLANA_SOL_RECEIVER = 0x9827993b7b317eb6c74279d49074a13b33a3495a30637c86a7513922014ba424
1212
USER_SPL_ATA = 0x6621d2d930ef7ada6260d3e0a5679a8fe81fde41262314f2efbf9c4c828550b1
1313
USER_REMOTE_ERC20_ATA = 0x4394d16902c022f8f87c7667429bc8b2860d033e316b9f9515534505fae314e9
14-
USER_REMOTE_ETH_ATA = 0x5c201187570d0d5cfdf2b447414c63d27fdebc2de3da8a7c9ea2dfeb8e3bfaba
14+
USER_REMOTE_ETH_ATA = 0x15e9307085f98b2e64eb3dd36b7fbafea201cc2a9fcb36c8c207e99bc7b97f30
1515

1616
AMOUNT = 1000000000
1717
####################################################################################################
@@ -42,6 +42,15 @@ forge-deps:
4242
forge install --no-git github.com/foundry-rs/forge-std \
4343
github.com/Vectorized/solady@92e647bb2b387e952480a5a37800e9b4d54f7a06
4444

45+
.PHONY: bindings
46+
bindings:
47+
go install github.com/ethereum/go-ethereum/cmd/abigen@v1.14.11
48+
forge build
49+
abigen --abi ./out/BridgeValidator.sol/BridgeValidator.abi.json --pkg bindings --type BridgeValidator --out bindings/bridge_validator.go
50+
abigen --abi ./out/Bridge.sol/Bridge.abi.json --pkg bindings --type Bridge --out bindings/bridge.go
51+
abigen --abi ./out/MessageLib.sol/MessageLib.abi.json --pkg bindings --type MessageLib --out bindings/message_lib.go
52+
abigen --abi ./out/RelayerOrchestrator.sol/RelayerOrchestrator.abi.json --pkg bindings --type RelayerOrchestrator --out bindings/relayer_orchestrator.go
53+
4554
.PHONY: coverage
4655
coverage:
4756
@ forge coverage --no-match-coverage "(script|test)"
@@ -53,6 +62,10 @@ dev-deploy: deploy create-wrapped-sol create-wrapped-spl
5362
deploy:
5463
BRIDGE_ENVIRONMENT=$(ENV_NAME) forge script DeployScript --account testnet-admin --rpc-url $(BASE_RPC) --sender $(shell cast wallet address --account testnet-admin) --broadcast -vvvv
5564

65+
.PHONY: upgrade
66+
upgrade:
67+
BRIDGE_ENVIRONMENT=$(ENV_NAME) forge script UpgradeScript --account testnet-upgrade --rpc-url $(BASE_RPC) --broadcast -vvvv
68+
5669
.PHONY: create-wrapped-sol
5770
create-wrapped-sol:
5871
BRIDGE_ENVIRONMENT=$(ENV_NAME) TOKEN_NAME=WrappedSOL TOKEN_SYMBOL=wSOL REMOTE_TOKEN=$(REMOTE_SOL) forge script CreateTokenScript --account testnet-admin --rpc-url $(BASE_RPC) --broadcast -vvvv

‎base/broadcast/CreateToken.s.sol/84532/run-1757544865455.json‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
{
2+
"transactions": [
3+
{
4+
"hash": "0xe4cb08b1ba74ed0a7f70a90d2b851fd31d2100eadf4d083940f014c3f1e87d7b",
5+
"transactionType": "CALL",
6+
"contractName": null,
7+
"contractAddress": "0xbb20d7ff5cf9b0915fc4453dbed2b0dba18ebd3d",
8+
"function": "deploy(bytes32,string,string,uint8)",
9+
"arguments": [
10+
"0x069be72ab836d4eacc02525b7350a78a395da2f1253a40ebafd6630000000000",
11+
"WrappedSOL",
12+
"wSOL",
13+
"9"
14+
],
15+
"transaction": {
16+
"from": "0x8c1a617bdb47342f9c17ac8750e0b070c372c721",
17+
"to": "0xbb20d7ff5cf9b0915fc4453dbed2b0dba18ebd3d",
18+
"gas": "0x57de2",
19+
"value": "0x0",
20+
"input": "0x23c3601f069be72ab836d4eacc02525b7350a78a395da2f1253a40ebafd6630000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000000a57726170706564534f4c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000477534f4c00000000000000000000000000000000000000000000000000000000",
21+
"nonce": "0x537",
22+
"chainId": "0x14a34"
23+
},
24+
"additionalContracts": [
25+
{
26+
"transactionType": "CREATE2",
27+
"address": "0xf7d7f103de1c36fb401f78e6f773f477eb702e37",
28+
"initCode": "0x60523d8160223d397300959e02e91b13c79b734055b0274e33b30df4dc60195155f3363d3d373d3d363d602036600436635c60da1b60e01b36527fa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50545afa5036515af43d6000803e604d573d6000fd5b3d6000f3"
29+
}
30+
],
31+
"isFixedGasLimit": false
32+
}
33+
],
34+
"receipts": [
35+
{
36+
"status": "0x1",
37+
"cumulativeGasUsed": "0x185ca7",
38+
"logs": [
39+
{
40+
"address": "0xf7d7f103de1c36fb401f78e6f773f477eb702e37",
41+
"topics": [
42+
"0xc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2"
43+
],
44+
"data": "0x0000000000000000000000000000000000000000000000000000000000000001",
45+
"blockHash": "0x2121b01a03b7fbe3176fc5e03a239341d63a1e5b65d48043e3239915cdb481c4",
46+
"blockNumber": "0x1d75160",
47+
"transactionHash": "0xe4cb08b1ba74ed0a7f70a90d2b851fd31d2100eadf4d083940f014c3f1e87d7b",
48+
"transactionIndex": "0x6",
49+
"logIndex": "0x2d",
50+
"removed": false
51+
},
52+
{
53+
"address": "0xbb20d7ff5cf9b0915fc4453dbed2b0dba18ebd3d",
54+
"topics": [
55+
"0x0b84965add45c4d10c5aacc22714edc5f88def8df83d2c1f9d18b45ef2d28783",
56+
"0x000000000000000000000000f7d7f103de1c36fb401f78e6f773f477eb702e37",
57+
"0x069be72ab836d4eacc02525b7350a78a395da2f1253a40ebafd6630000000000"
58+
],
59+
"data": "0x0000000000000000000000008c1a617bdb47342f9c17ac8750e0b070c372c721",
60+
"blockHash": "0x2121b01a03b7fbe3176fc5e03a239341d63a1e5b65d48043e3239915cdb481c4",
61+
"blockNumber": "0x1d75160",
62+
"transactionHash": "0xe4cb08b1ba74ed0a7f70a90d2b851fd31d2100eadf4d083940f014c3f1e87d7b",
63+
"transactionIndex": "0x6",
64+
"logIndex": "0x2e",
65+
"removed": false
66+
}
67+
],
68+
"logsBloom": "0x00000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000800000100000000001000004000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100800000000000000080000000080000000000000000000000000000000000000000010000000000000000000000000001000000000000000000000000400000010000000000000000000000004000000000000000002000000000000000000000000000000000000000800000000000000000000000000",
69+
"type": "0x2",
70+
"transactionHash": "0xe4cb08b1ba74ed0a7f70a90d2b851fd31d2100eadf4d083940f014c3f1e87d7b",
71+
"transactionIndex": "0x6",
72+
"blockHash": "0x2121b01a03b7fbe3176fc5e03a239341d63a1e5b65d48043e3239915cdb481c4",
73+
"blockNumber": "0x1d75160",
74+
"gasUsed": "0x3c14a",
75+
"effectiveGasPrice": "0xf0805",
76+
"from": "0x8c1a617bdb47342f9c17ac8750e0b070c372c721",
77+
"to": "0xbb20d7ff5cf9b0915fc4453dbed2b0dba18ebd3d",
78+
"contractAddress": null,
79+
"l1BaseFeeScalar": "0x44d",
80+
"l1BlobBaseFee": "0x1519163cf",
81+
"l1BlobBaseFeeScalar": "0xa118b",
82+
"l1Fee": "0x699a25dd00",
83+
"l1GasPrice": "0x11",
84+
"l1GasUsed": "0x795"
85+
}
86+
],
87+
"libraries": [],
88+
"pending": [],
89+
"returns": {},
90+
"timestamp": 1757544865455,
91+
"chain": 84532,
92+
"commit": "1ae5413"
93+
}

‎base/broadcast/CreateToken.s.sol/84532/run-1757544880417.json‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
{
2+
"transactions": [
3+
{
4+
"hash": "0x21c53b9e39b3a128fe4c85d9495e6527d8573d31a3eb895912cc98ff65b83a42",
5+
"transactionType": "CALL",
6+
"contractName": null,
7+
"contractAddress": "0xbb20d7ff5cf9b0915fc4453dbed2b0dba18ebd3d",
8+
"function": "deploy(bytes32,string,string,uint8)",
9+
"arguments": [
10+
"0x6ccf56ff18093bc61462cd67c8aa86216fbad049e41d9bffa0856e5f34af5498",
11+
"WrappedSPL",
12+
"wSPL",
13+
"9"
14+
],
15+
"transaction": {
16+
"from": "0x8c1a617bdb47342f9c17ac8750e0b070c372c721",
17+
"to": "0xbb20d7ff5cf9b0915fc4453dbed2b0dba18ebd3d",
18+
"gas": "0x5301a",
19+
"value": "0x0",
20+
"input": "0x23c3601f6ccf56ff18093bc61462cd67c8aa86216fbad049e41d9bffa0856e5f34af5498000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000000a5772617070656453504c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000047753504c00000000000000000000000000000000000000000000000000000000",
21+
"nonce": "0x538",
22+
"chainId": "0x14a34"
23+
},
24+
"additionalContracts": [
25+
{
26+
"transactionType": "CREATE2",
27+
"address": "0x76a41f52506a519fd09e889effca0c7c0b4f9604",
28+
"initCode": "0x60523d8160223d397300959e02e91b13c79b734055b0274e33b30df4dc60195155f3363d3d373d3d363d602036600436635c60da1b60e01b36527fa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50545afa5036515af43d6000803e604d573d6000fd5b3d6000f3"
29+
}
30+
],
31+
"isFixedGasLimit": false
32+
}
33+
],
34+
"receipts": [
35+
{
36+
"status": "0x1",
37+
"cumulativeGasUsed": "0x4eeaa0",
38+
"logs": [
39+
{
40+
"address": "0x76a41f52506a519fd09e889effca0c7c0b4f9604",
41+
"topics": [
42+
"0xc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2"
43+
],
44+
"data": "0x0000000000000000000000000000000000000000000000000000000000000001",
45+
"blockHash": "0x6df8c3cb72f230727d8dd58de7277fccb6cd5eb04181a5196ebda75c4a9d218f",
46+
"blockNumber": "0x1d75168",
47+
"blockTimestamp": "0x68c201b0",
48+
"transactionHash": "0x21c53b9e39b3a128fe4c85d9495e6527d8573d31a3eb895912cc98ff65b83a42",
49+
"transactionIndex": "0xd",
50+
"logIndex": "0xdb",
51+
"removed": false
52+
},
53+
{
54+
"address": "0xbb20d7ff5cf9b0915fc4453dbed2b0dba18ebd3d",
55+
"topics": [
56+
"0x0b84965add45c4d10c5aacc22714edc5f88def8df83d2c1f9d18b45ef2d28783",
57+
"0x00000000000000000000000076a41f52506a519fd09e889effca0c7c0b4f9604",
58+
"0x6ccf56ff18093bc61462cd67c8aa86216fbad049e41d9bffa0856e5f34af5498"
59+
],
60+
"data": "0x0000000000000000000000008c1a617bdb47342f9c17ac8750e0b070c372c721",
61+
"blockHash": "0x6df8c3cb72f230727d8dd58de7277fccb6cd5eb04181a5196ebda75c4a9d218f",
62+
"blockNumber": "0x1d75168",
63+
"blockTimestamp": "0x68c201b0",
64+
"transactionHash": "0x21c53b9e39b3a128fe4c85d9495e6527d8573d31a3eb895912cc98ff65b83a42",
65+
"transactionIndex": "0xd",
66+
"logIndex": "0xdc",
67+
"removed": false
68+
}
69+
],
70+
"logsBloom": "0x00000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000100000000000010000000000001000000000000000000000000000000000000000000000000200000000000000000000001000000000000000000000000000000000000000400000000000000000000000000000100800000000000000080000000080000000000000000000000000000000000000000090000000000004000000000000000008000000000000000000000000000000000000000000000000000004000000000000000002000000000000000000000000000000000000000000000000000000000000000040",
71+
"type": "0x2",
72+
"transactionHash": "0x21c53b9e39b3a128fe4c85d9495e6527d8573d31a3eb895912cc98ff65b83a42",
73+
"transactionIndex": "0xd",
74+
"blockHash": "0x6df8c3cb72f230727d8dd58de7277fccb6cd5eb04181a5196ebda75c4a9d218f",
75+
"blockNumber": "0x1d75168",
76+
"gasUsed": "0x3c186",
77+
"effectiveGasPrice": "0xf429f",
78+
"from": "0x8c1a617bdb47342f9c17ac8750e0b070c372c721",
79+
"to": "0xbb20d7ff5cf9b0915fc4453dbed2b0dba18ebd3d",
80+
"contractAddress": null,
81+
"l1BaseFeeScalar": "0x44d",
82+
"l1BlobBaseFee": "0x148d8d860",
83+
"l1BlobBaseFeeScalar": "0xa118b",
84+
"l1Fee": "0x6d415874e1",
85+
"l1GasPrice": "0x12",
86+
"l1GasUsed": "0x80e"
87+
}
88+
],
89+
"libraries": [],
90+
"pending": [],
91+
"returns": {},
92+
"timestamp": 1757544880417,
93+
"chain": 84532,
94+
"commit": "1ae5413"
95+
}

‎base/broadcast/CreateToken.s.sol/84532/run-1757623826753.json‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
{
2+
"transactions": [
3+
{
4+
"hash": "0xd3c824f46378c2d97c05426446076705341d1c19174d6b71757c73fe4015aa82",
5+
"transactionType": "CALL",
6+
"contractName": null,
7+
"contractAddress": "0x93d8a8960112d74c0db4f18e8ee2576728f4d668",
8+
"function": "deploy(bytes32,string,string,uint8)",
9+
"arguments": [
10+
"0x069be72ab836d4eacc02525b7350a78a395da2f1253a40ebafd6630000000000",
11+
"WrappedSOL",
12+
"wSOL",
13+
"9"
14+
],
15+
"transaction": {
16+
"from": "0x8c1a617bdb47342f9c17ac8750e0b070c372c721",
17+
"to": "0x93d8a8960112d74c0db4f18e8ee2576728f4d668",
18+
"gas": "0x57de2",
19+
"value": "0x0",
20+
"input": "0x23c3601f069be72ab836d4eacc02525b7350a78a395da2f1253a40ebafd6630000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000000a57726170706564534f4c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000477534f4c00000000000000000000000000000000000000000000000000000000",
21+
"nonce": "0x549",
22+
"chainId": "0x14a34"
23+
},
24+
"additionalContracts": [
25+
{
26+
"transactionType": "CREATE2",
27+
"address": "0xe061cb6ca67e152aff009dbb20749a096a579974",
28+
"initCode": "0x60523d8160223d3973e79fe3b056e1cf928efd42b6bd89e85f93f1a48860195155f3363d3d373d3d363d602036600436635c60da1b60e01b36527fa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50545afa5036515af43d6000803e604d573d6000fd5b3d6000f3"
29+
}
30+
],
31+
"isFixedGasLimit": false
32+
}
33+
],
34+
"receipts": [
35+
{
36+
"status": "0x1",
37+
"cumulativeGasUsed": "0x217b0f",
38+
"logs": [
39+
{
40+
"address": "0xe061cb6ca67e152aff009dbb20749a096a579974",
41+
"topics": [
42+
"0xc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2"
43+
],
44+
"data": "0x0000000000000000000000000000000000000000000000000000000000000001",
45+
"blockHash": "0x3d85adc026eec3349aed931cb696dd66b678830985666b2b43f5b8dfaa26bd9e",
46+
"blockNumber": "0x1d7eb99",
47+
"transactionHash": "0xd3c824f46378c2d97c05426446076705341d1c19174d6b71757c73fe4015aa82",
48+
"transactionIndex": "0x7",
49+
"logIndex": "0x2c",
50+
"removed": false
51+
},
52+
{
53+
"address": "0x93d8a8960112d74c0db4f18e8ee2576728f4d668",
54+
"topics": [
55+
"0x0b84965add45c4d10c5aacc22714edc5f88def8df83d2c1f9d18b45ef2d28783",
56+
"0x000000000000000000000000e061cb6ca67e152aff009dbb20749a096a579974",
57+
"0x069be72ab836d4eacc02525b7350a78a395da2f1253a40ebafd6630000000000"
58+
],
59+
"data": "0x0000000000000000000000008c1a617bdb47342f9c17ac8750e0b070c372c721",
60+
"blockHash": "0x3d85adc026eec3349aed931cb696dd66b678830985666b2b43f5b8dfaa26bd9e",
61+
"blockNumber": "0x1d7eb99",
62+
"transactionHash": "0xd3c824f46378c2d97c05426446076705341d1c19174d6b71757c73fe4015aa82",
63+
"transactionIndex": "0x7",
64+
"logIndex": "0x2d",
65+
"removed": false
66+
}
67+
],
68+
"logsBloom": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000010000000000000000080000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000001008020000000000000c0000000080000000008000000000000000000000000400000000000000000010000000000000001000000000000000000000000000000002000000000000000000000004000000000000000000000000000000000200000000000000000000000800000000000000000000000000",
69+
"type": "0x2",
70+
"transactionHash": "0xd3c824f46378c2d97c05426446076705341d1c19174d6b71757c73fe4015aa82",
71+
"transactionIndex": "0x7",
72+
"blockHash": "0x3d85adc026eec3349aed931cb696dd66b678830985666b2b43f5b8dfaa26bd9e",
73+
"blockNumber": "0x1d7eb99",
74+
"gasUsed": "0x3c14a",
75+
"effectiveGasPrice": "0xf4282",
76+
"from": "0x8c1a617bdb47342f9c17ac8750e0b070c372c721",
77+
"to": "0x93d8a8960112d74c0db4f18e8ee2576728f4d668",
78+
"contractAddress": null,
79+
"l1BaseFeeScalar": "0x44d",
80+
"l1BlobBaseFee": "0x1",
81+
"l1BlobBaseFeeScalar": "0xa118b",
82+
"l1Fee": "0x18dda",
83+
"l1GasPrice": "0xbb3b",
84+
"l1GasUsed": "0x788"
85+
}
86+
],
87+
"libraries": [],
88+
"pending": [],
89+
"returns": {},
90+
"timestamp": 1757623826753,
91+
"chain": 84532,
92+
"commit": "1008d20"
93+
}

0 commit comments

Comments
 (0)