Skip to content

Commit 5e2409f

Browse files
spidemenspidemen
committed
merge from main
2 parents cfb1e6a + 6c9a93b commit 5e2409f

21 files changed

+1055
-340
lines changed

‎Makefile‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
.PHONY: abi deploy upgrade whitelist fee-wallet update-worker update-payment check slither mythril
1+
.PHONY: abi deploy upgrade whitelist fee-wallet update-worker update-payment verify-impl verify-proxy check slither mythril
22

33
ifdef ENV_FILE
44
include $(ENV_FILE)
55
endif
66

7-
LATEST ?= V5
7+
LATEST ?= V6
88
RPC_URL ?= http://127.0.0.1:8545
99
UPGRADE_TO ?= $(LATEST)
1010

@@ -29,6 +29,12 @@ update-worker:
2929
update-payment:
3030
PROXY_ADDRESS=$(PROXY_ADDRESS) forge script ./script/UpdatePayment.s.sol --rpc-url $(RPC_URL) --broadcast --private-key $(PRIVATE_KEY)
3131

32+
verify-impl:
33+
FOUNDRY_PROFILE=verify ETHERSCAN_API_KEY=$(ETHERSCAN_API_KEY) forge verify-contract --verifier-url $(VERIFIER_URL) --watch $(IMPL_ADDRESS) src/Blueprint$(LATEST).sol:Blueprint$(LATEST)
34+
35+
verify-proxy:
36+
FOUNDRY_PROFILE=verify ETHERSCAN_API_KEY=$(ETHERSCAN_API_KEY) forge verify-contract --verifier-url $(VERIFIER_URL) --watch $(PROXY_ADDRESS) lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol:ERC1967Proxy --constructor-args `cast abi-encode "constructor(address,bytes)" $(PROXY_DEPLOY_ARG1) $(PROXY_DEPLOY_ARG2)`
37+
3238
check:
3339
cast call --rpc-url $(RPC_URL) $(PROXY_ADDRESS) "VERSION()(string)"
3440

‎artifacts/BlueprintV6.json‎

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

‎broadcast/UpdatePayment.s.sol/8453/run-1746599411.json‎

Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
{
2+
"transactions": [
3+
{
4+
"hash": "0x2884f219010cc2747b7c673623a68570605eb863dfa0aadf7e89949722935a6b",
5+
"transactionType": "CALL",
6+
"contractName": null,
7+
"contractAddress": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
8+
"function": "addPaymentAddress(address)",
9+
"arguments": [
10+
"0x0000000000000000000000000000000000000000"
11+
],
12+
"transaction": {
13+
"from": "0x4eeb748bd7ca4d4e582d5b9c60c73acdf67d4b8c",
14+
"to": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
15+
"gas": "0x1418d",
16+
"value": "0x0",
17+
"input": "0xe63dee480000000000000000000000000000000000000000000000000000000000000000",
18+
"nonce": "0x2b",
19+
"chainId": "0x2105"
20+
},
21+
"additionalContracts": [],
22+
"isFixedGasLimit": false
23+
},
24+
{
25+
"hash": "0x8cb67143e154c0536d816b84d8b7a7339c9ad0feff49036f21675972207695d7",
26+
"transactionType": "CALL",
27+
"contractName": null,
28+
"contractAddress": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
29+
"function": "setCreateAgentTokenCost(address,uint256)",
30+
"arguments": [
31+
"0x0000000000000000000000000000000000000000",
32+
"42000000000000000"
33+
],
34+
"transaction": {
35+
"from": "0x4eeb748bd7ca4d4e582d5b9c60c73acdf67d4b8c",
36+
"to": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
37+
"gas": "0x139e7",
38+
"value": "0x0",
39+
"input": "0x19ea61c40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009536c708910000",
40+
"nonce": "0x2c",
41+
"chainId": "0x2105"
42+
},
43+
"additionalContracts": [],
44+
"isFixedGasLimit": false
45+
},
46+
{
47+
"hash": "0x2657d4eeacb5e376a4af9d35798a0055c472bf4185812608d2463f7177be8b8c",
48+
"transactionType": "CALL",
49+
"contractName": null,
50+
"contractAddress": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
51+
"function": "setUpdateCreateAgentTokenCost(address,uint256)",
52+
"arguments": [
53+
"0x0000000000000000000000000000000000000000",
54+
"0"
55+
],
56+
"transaction": {
57+
"from": "0x4eeb748bd7ca4d4e582d5b9c60c73acdf67d4b8c",
58+
"to": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
59+
"gas": "0xbcb6",
60+
"value": "0x0",
61+
"input": "0x821c8ba100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
62+
"nonce": "0x2d",
63+
"chainId": "0x2105"
64+
},
65+
"additionalContracts": [],
66+
"isFixedGasLimit": false
67+
}
68+
],
69+
"receipts": [
70+
{
71+
"status": "0x1",
72+
"cumulativeGasUsed": "0x32e4503",
73+
"logs": [
74+
{
75+
"address": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
76+
"topics": [
77+
"0xa18d3ff16bc484e128eabcf244718e89aadc30bd9708fb720f3109b1415503f3"
78+
],
79+
"data": "0x0000000000000000000000000000000000000000000000000000000000000000",
80+
"blockHash": "0x122535800ac31c80172af55f07dc9de1782f846edb36fc6b6e57f0b50e64e909",
81+
"blockNumber": "0x1c85087",
82+
"transactionHash": "0x2884f219010cc2747b7c673623a68570605eb863dfa0aadf7e89949722935a6b",
83+
"transactionIndex": "0xa4",
84+
"logIndex": "0x201",
85+
"removed": false
86+
}
87+
],
88+
"logsBloom": "0x00008000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000",
89+
"type": "0x2",
90+
"transactionHash": "0x2884f219010cc2747b7c673623a68570605eb863dfa0aadf7e89949722935a6b",
91+
"transactionIndex": "0xa4",
92+
"blockHash": "0x122535800ac31c80172af55f07dc9de1782f846edb36fc6b6e57f0b50e64e909",
93+
"blockNumber": "0x1c85087",
94+
"gasUsed": "0xe8cd",
95+
"effectiveGasPrice": "0x11d6eb",
96+
"from": "0x4eeb748bd7ca4d4e582d5b9c60c73acdf67d4b8c",
97+
"to": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
98+
"contractAddress": null,
99+
"l1BaseFeeScalar": "0x8dd",
100+
"l1BlobBaseFee": "0x86cdd5c",
101+
"l1BlobBaseFeeScalar": "0x101c12",
102+
"l1Fee": "0x3bad66a75",
103+
"l1GasPrice": "0x11fee2c9",
104+
"l1GasUsed": "0x640"
105+
},
106+
{
107+
"status": "0x1",
108+
"cumulativeGasUsed": "0x32f1ba6",
109+
"logs": [
110+
{
111+
"address": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
112+
"topics": [
113+
"0x694aa63d946094ce1aeccef5c17db0a23a409eddfb68793b3c29fea103d12086"
114+
],
115+
"data": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009536c708910000",
116+
"blockHash": "0x122535800ac31c80172af55f07dc9de1782f846edb36fc6b6e57f0b50e64e909",
117+
"blockNumber": "0x1c85087",
118+
"transactionHash": "0x8cb67143e154c0536d816b84d8b7a7339c9ad0feff49036f21675972207695d7",
119+
"transactionIndex": "0xa5",
120+
"logIndex": "0x202",
121+
"removed": false
122+
}
123+
],
124+
"logsBloom": "0x00000000000000000000000000000010000000000000000000000004000000000000000000000000000000000000020000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000002000000000000",
125+
"type": "0x2",
126+
"transactionHash": "0x8cb67143e154c0536d816b84d8b7a7339c9ad0feff49036f21675972207695d7",
127+
"transactionIndex": "0xa5",
128+
"blockHash": "0x122535800ac31c80172af55f07dc9de1782f846edb36fc6b6e57f0b50e64e909",
129+
"blockNumber": "0x1c85087",
130+
"gasUsed": "0xd6a3",
131+
"effectiveGasPrice": "0x11d6eb",
132+
"from": "0x4eeb748bd7ca4d4e582d5b9c60c73acdf67d4b8c",
133+
"to": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
134+
"contractAddress": null,
135+
"l1BaseFeeScalar": "0x8dd",
136+
"l1BlobBaseFee": "0x86cdd5c",
137+
"l1BlobBaseFeeScalar": "0x101c12",
138+
"l1Fee": "0x3bad66a75",
139+
"l1GasPrice": "0x11fee2c9",
140+
"l1GasUsed": "0x640"
141+
},
142+
{
143+
"status": "0x1",
144+
"cumulativeGasUsed": "0x32fa446",
145+
"logs": [
146+
{
147+
"address": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
148+
"topics": [
149+
"0xb74c378f83cb6eb186d519c74f0def054cc246ca81bccd2c53b5d0d699501324"
150+
],
151+
"data": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
152+
"blockHash": "0x122535800ac31c80172af55f07dc9de1782f846edb36fc6b6e57f0b50e64e909",
153+
"blockNumber": "0x1c85087",
154+
"transactionHash": "0x2657d4eeacb5e376a4af9d35798a0055c472bf4185812608d2463f7177be8b8c",
155+
"transactionIndex": "0xa6",
156+
"logIndex": "0x203",
157+
"removed": false
158+
}
159+
],
160+
"logsBloom": "0x00000000000000000000000000000010000004000000000000000000000000000000000000000000000000000000020000000000000000000100000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000",
161+
"type": "0x2",
162+
"transactionHash": "0x2657d4eeacb5e376a4af9d35798a0055c472bf4185812608d2463f7177be8b8c",
163+
"transactionIndex": "0xa6",
164+
"blockHash": "0x122535800ac31c80172af55f07dc9de1782f846edb36fc6b6e57f0b50e64e909",
165+
"blockNumber": "0x1c85087",
166+
"gasUsed": "0x88a0",
167+
"effectiveGasPrice": "0x11d6eb",
168+
"from": "0x4eeb748bd7ca4d4e582d5b9c60c73acdf67d4b8c",
169+
"to": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
170+
"contractAddress": null,
171+
"l1BaseFeeScalar": "0x8dd",
172+
"l1BlobBaseFee": "0x86cdd5c",
173+
"l1BlobBaseFeeScalar": "0x101c12",
174+
"l1Fee": "0x3bad66a75",
175+
"l1GasPrice": "0x11fee2c9",
176+
"l1GasUsed": "0x640"
177+
}
178+
],
179+
"libraries": [],
180+
"pending": [],
181+
"returns": {},
182+
"timestamp": 1746599411,
183+
"chain": 8453,
184+
"commit": "939f4c2"
185+
}

‎broadcast/UpdatePayment.s.sol/8453/run-1748230548.json‎

Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
{
2+
"transactions": [
3+
{
4+
"hash": "0xbe8d1f15df04f55c5b620fb19f4809a9f68acbef0d487c8f042b9866d007728a",
5+
"transactionType": "CALL",
6+
"contractName": null,
7+
"contractAddress": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
8+
"function": "addPaymentAddress(address)",
9+
"arguments": [
10+
"0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"
11+
],
12+
"transaction": {
13+
"from": "0x4eeb748bd7ca4d4e582d5b9c60c73acdf67d4b8c",
14+
"to": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
15+
"gas": "0x142d8",
16+
"value": "0x0",
17+
"input": "0xe63dee48000000000000000000000000833589fcd6edb6e08f4c7c32d4f71b54bda02913",
18+
"nonce": "0x2e",
19+
"chainId": "0x2105"
20+
},
21+
"additionalContracts": [],
22+
"isFixedGasLimit": false
23+
},
24+
{
25+
"hash": "0xa9961645bc1446370be4c854fdc22ce6a7ae6716f5ed1170da800a2fbbd90ece",
26+
"transactionType": "CALL",
27+
"contractName": null,
28+
"contractAddress": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
29+
"function": "setCreateAgentTokenCost(address,uint256)",
30+
"arguments": [
31+
"0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
32+
"0"
33+
],
34+
"transaction": {
35+
"from": "0x4eeb748bd7ca4d4e582d5b9c60c73acdf67d4b8c",
36+
"to": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
37+
"gas": "0xbdd2",
38+
"value": "0x0",
39+
"input": "0x19ea61c4000000000000000000000000833589fcd6edb6e08f4c7c32d4f71b54bda029130000000000000000000000000000000000000000000000000000000000000000",
40+
"nonce": "0x2f",
41+
"chainId": "0x2105"
42+
},
43+
"additionalContracts": [],
44+
"isFixedGasLimit": false
45+
},
46+
{
47+
"hash": "0xe5355dfb8cdac5c87b939380bc994da4c4095581dfa01e6d46968593dae864b3",
48+
"transactionType": "CALL",
49+
"contractName": null,
50+
"contractAddress": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
51+
"function": "setUpdateCreateAgentTokenCost(address,uint256)",
52+
"arguments": [
53+
"0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
54+
"0"
55+
],
56+
"transaction": {
57+
"from": "0x4eeb748bd7ca4d4e582d5b9c60c73acdf67d4b8c",
58+
"to": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
59+
"gas": "0xbe02",
60+
"value": "0x0",
61+
"input": "0x821c8ba1000000000000000000000000833589fcd6edb6e08f4c7c32d4f71b54bda029130000000000000000000000000000000000000000000000000000000000000000",
62+
"nonce": "0x30",
63+
"chainId": "0x2105"
64+
},
65+
"additionalContracts": [],
66+
"isFixedGasLimit": false
67+
}
68+
],
69+
"receipts": [
70+
{
71+
"status": "0x1",
72+
"cumulativeGasUsed": "0x2e0525b",
73+
"logs": [
74+
{
75+
"address": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
76+
"topics": [
77+
"0xa18d3ff16bc484e128eabcf244718e89aadc30bd9708fb720f3109b1415503f3"
78+
],
79+
"data": "0x000000000000000000000000833589fcd6edb6e08f4c7c32d4f71b54bda02913",
80+
"blockHash": "0xff2e40ff155ba2f3b34ea814ed10f29a05d7e2677798f20bd55bb594ef325862",
81+
"blockNumber": "0x1d4c258",
82+
"transactionHash": "0xbe8d1f15df04f55c5b620fb19f4809a9f68acbef0d487c8f042b9866d007728a",
83+
"transactionIndex": "0xc5",
84+
"logIndex": "0x2a9",
85+
"removed": false
86+
}
87+
],
88+
"logsBloom": "0x00008000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000",
89+
"type": "0x2",
90+
"transactionHash": "0xbe8d1f15df04f55c5b620fb19f4809a9f68acbef0d487c8f042b9866d007728a",
91+
"transactionIndex": "0xc5",
92+
"blockHash": "0xff2e40ff155ba2f3b34ea814ed10f29a05d7e2677798f20bd55bb594ef325862",
93+
"blockNumber": "0x1d4c258",
94+
"gasUsed": "0xe9bd",
95+
"effectiveGasPrice": "0xa5cd5",
96+
"from": "0x4eeb748bd7ca4d4e582d5b9c60c73acdf67d4b8c",
97+
"to": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
98+
"contractAddress": null,
99+
"l1BaseFeeScalar": "0x8dd",
100+
"l1BlobBaseFee": "0x1",
101+
"l1BlobBaseFeeScalar": "0x101c12",
102+
"l1Fee": "0x70da63a0",
103+
"l1GasPrice": "0x1f15e855",
104+
"l1GasUsed": "0x640"
105+
},
106+
{
107+
"status": "0x1",
108+
"cumulativeGasUsed": "0x2e0d426",
109+
"logs": [
110+
{
111+
"address": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
112+
"topics": [
113+
"0x694aa63d946094ce1aeccef5c17db0a23a409eddfb68793b3c29fea103d12086"
114+
],
115+
"data": "0x000000000000000000000000833589fcd6edb6e08f4c7c32d4f71b54bda029130000000000000000000000000000000000000000000000000000000000000000",
116+
"blockHash": "0xff2e40ff155ba2f3b34ea814ed10f29a05d7e2677798f20bd55bb594ef325862",
117+
"blockNumber": "0x1d4c258",
118+
"transactionHash": "0xa9961645bc1446370be4c854fdc22ce6a7ae6716f5ed1170da800a2fbbd90ece",
119+
"transactionIndex": "0xc6",
120+
"logIndex": "0x2aa",
121+
"removed": false
122+
}
123+
],
124+
"logsBloom": "0x00000000000000000000000000000010000000000000000000000004000000000000000000000000000000000000020000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000002000000000000",
125+
"type": "0x2",
126+
"transactionHash": "0xa9961645bc1446370be4c854fdc22ce6a7ae6716f5ed1170da800a2fbbd90ece",
127+
"transactionIndex": "0xc6",
128+
"blockHash": "0xff2e40ff155ba2f3b34ea814ed10f29a05d7e2677798f20bd55bb594ef325862",
129+
"blockNumber": "0x1d4c258",
130+
"gasUsed": "0x81cb",
131+
"effectiveGasPrice": "0xa5cd5",
132+
"from": "0x4eeb748bd7ca4d4e582d5b9c60c73acdf67d4b8c",
133+
"to": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
134+
"contractAddress": null,
135+
"l1BaseFeeScalar": "0x8dd",
136+
"l1BlobBaseFee": "0x1",
137+
"l1BlobBaseFeeScalar": "0x101c12",
138+
"l1Fee": "0x70da63a0",
139+
"l1GasPrice": "0x1f15e855",
140+
"l1GasUsed": "0x640"
141+
},
142+
{
143+
"status": "0x1",
144+
"cumulativeGasUsed": "0x2e15db6",
145+
"logs": [
146+
{
147+
"address": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
148+
"topics": [
149+
"0xb74c378f83cb6eb186d519c74f0def054cc246ca81bccd2c53b5d0d699501324"
150+
],
151+
"data": "0x000000000000000000000000833589fcd6edb6e08f4c7c32d4f71b54bda029130000000000000000000000000000000000000000000000000000000000000000",
152+
"blockHash": "0xff2e40ff155ba2f3b34ea814ed10f29a05d7e2677798f20bd55bb594ef325862",
153+
"blockNumber": "0x1d4c258",
154+
"transactionHash": "0xe5355dfb8cdac5c87b939380bc994da4c4095581dfa01e6d46968593dae864b3",
155+
"transactionIndex": "0xc7",
156+
"logIndex": "0x2ab",
157+
"removed": false
158+
}
159+
],
160+
"logsBloom": "0x00000000000000000000000000000010000004000000000000000000000000000000000000000000000000000000020000000000000000000100000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000",
161+
"type": "0x2",
162+
"transactionHash": "0xe5355dfb8cdac5c87b939380bc994da4c4095581dfa01e6d46968593dae864b3",
163+
"transactionIndex": "0xc7",
164+
"blockHash": "0xff2e40ff155ba2f3b34ea814ed10f29a05d7e2677798f20bd55bb594ef325862",
165+
"blockNumber": "0x1d4c258",
166+
"gasUsed": "0x8990",
167+
"effectiveGasPrice": "0xa5cd5",
168+
"from": "0x4eeb748bd7ca4d4e582d5b9c60c73acdf67d4b8c",
169+
"to": "0xd344e886856a31b6594337e51a6eefc07dd5d1db",
170+
"contractAddress": null,
171+
"l1BaseFeeScalar": "0x8dd",
172+
"l1BlobBaseFee": "0x1",
173+
"l1BlobBaseFeeScalar": "0x101c12",
174+
"l1Fee": "0x70da63a0",
175+
"l1GasPrice": "0x1f15e855",
176+
"l1GasUsed": "0x640"
177+
}
178+
],
179+
"libraries": [],
180+
"pending": [],
181+
"returns": {},
182+
"timestamp": 1748230548,
183+
"chain": 8453,
184+
"commit": "15b5520"
185+
}

0 commit comments

Comments
 (0)