Or 1535 thanos cannon update for predeploy contracts #132

nguyenzung · 2024-04-17T02:27:07Z

Update for predeploy contracts

Test: you can replace "http://localhost:9545" to your L2_RPC

USDC:

decimal(): curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"eth_call","params":[{"to":"0x4200000000000000000000000000000000000778","data":"0x313ce567"}, "latest"],"id":1}' http://localhost:9545

admin(): curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"eth_call","params":[{"to":"0x4200000000000000000000000000000000000778","data":"0xf851a440"}, "latest"],"id":1}' http://localhost:9545

implementation(): curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"eth_call","params":[{"to":"0x4200000000000000000000000000000000000778","data":"0x5c60da1b"}, "latest"],"id":1}' http://localhost:9545

Bridge:

admin(): curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"eth_call","params":[{"to":"0x4200000000000000000000000000000000000775","data":"0xf851a440"}, "latest"],"id":1}' http://localhost:9545

implementation(): curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"eth_call","params":[{"to":"0x4200000000000000000000000000000000000775","data":"0x5c60da1b"}, "latest"],"id":1}' http://localhost:9545

messenger(): curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"eth_call","params":[{"to":"0x4200000000000000000000000000000000000775","data":"0x3cb747bf"}, "latest"],"id":1}' http://localhost:9545

l1Usdc(): curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"eth_call","params":[{"to":"0x4200000000000000000000000000000000000775","data":"0x56c3b587"}, "latest"],"id":1}' http://localhost:9545

l2Usdc(): curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"eth_call","params":[{"to":"0x4200000000000000000000000000000000000775","data":"0xa1b4bc04"}, "latest"],"id":1}' http://localhost:9545

MasterMinter:

getWorker(address): curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"eth_call","params":[{"to":"0x4200000000000000000000000000000000000777","data":"0xc011b1c30000000000000000000000004200000000000000000000000000000000000775"}, "latest"],"id":1}' http://localhost:9545

Thank you very much!

xxeonge · 2024-04-17T02:42:15Z

Hello! @nguyenzung

In my opinion, since the deployment address of SignatureChecker is included during the deployment of FiatTokenV2_2.sol(it can be checked in foundry.toml), it seems we should deploy SignatureChecker as well.
Additionally, when I was modifying the predeploy deployment code, Justin from the smart contract team mentioned that even though it's a library, if it contains public or external functions, it should be deployed!

Thank you😊

steven94kr · 2024-04-17T02:54:02Z

@nguyenzung
Oh, I missed something else,,,,(Is it failed to make devnet-up as well to you?,,,)
I will check it after lunch,,, 🥹🙇🏼‍♂️

nguyenzung · 2024-04-17T02:58:10Z

Hello! @nguyenzung

In my opinion, since the deployment address of SignatureChecker is included during the deployment of FiatTokenV2_2.sol(it can be checked in foundry.toml), it seems we should deploy SignatureChecker as well. Additionally, when I was modifying the predeploy deployment code, Justin from the smart contract team mentioned that even though it's a library, if it contains public or external functions, it should be deployed!

Thank you😊

Thank you!

Let me roll it back. Anw, I am curious about why we should deploy a lib if it contains public or external functions

nguyenzung · 2024-04-17T02:59:48Z

@nguyenzung Oh, I missed something else,,,,(Is it failed to make devnet-up as well to you?,,,) I will check it after lunch,,, 🥹🙇🏼‍♂️

Thank you very much, Steven

I can start devnet, but when I looked at the PR about USDC, I found that there are things need to be checked more. I am doing it in this PR

xxeonge · 2024-04-17T04:01:44Z

https://eip2535diamonds.substack.com/p/the-difference-between-solidity-libraries

I will send you a link for reference !! I don’t know if there will be an answer..!🥹 @nguyenzung

steven94kr · 2024-04-17T04:29:53Z

op-chain-ops/genesis/layer_two.go

@@ -68,6 +69,13 @@ func BuildL2Genesis(config *DeployConfig, l1StartBlock *types.Block) (*core.Gene
 			db.CreateAccount(codeAddr)
 			db.SetState(addr, ImplementationSlot, eth.AddressAsLeftPaddedHash(codeAddr))
 			log.Info("Set proxy", "name", name, "address", addr, "implementation", codeAddr)
+


You've catched this points! You are so great. Thank you very much. 🙇🏼‍♂️

FiatTokenV2 use the

tokamak-thanos/packages/tokamak/contracts-bedrock/src/tokamak-contracts/USDC/L2/tokamak-USDC/upgradeability/UpgradeabilityProxy.sol

Line 48 in 79ee692

/**

How about adding the variable for slot in here ?

tokamak-thanos/op-chain-ops/genesis/helpers.go

Line 26 in 483d83b

ImplementationSlot = common.HexToHash("0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc")

ImplementationSlotForZepplin

Thank you very much, Steven

Let me create a variable

steven94kr · 2024-04-17T04:33:25Z

op-chain-ops/genesis/setters.go

 		case predeploys.FiatTokenV2_2Addr:
 			db.SetCode(addr, fiatTokenProxyBytecode)
+			db.SetState(addr, common.HexToHash("0x10d6a54a4754c8869d6886b5f5d7fbfa5b4522237ea5c60d11bc4e7a1ff9390b"), eth.AddressAsLeftPaddedHash(proxyAdminAddr))


I think we can add variable as well!

AdminSlotForZepplin

steven94kr · 2024-04-17T04:48:25Z

op-chain-ops/genesis/config.go

 	storage["MasterMinter"] = state.StorageValues{
 		"_owner": config.MasterMinterOwner,
 		"controllers": map[any]any{
-			"_controller": predeploys.L2UsdcBridgeAddr,
-			"_worker":     predeploys.L2UsdcBridgeAddr,
+			predeploys.L2UsdcBridgeAddr: predeploys.L2UsdcBridgeAddr,


tokamak-thanos/packages/tokamak/contracts-bedrock/src/tokamak-contracts/USDC/L2/tokamak-USDC/minting/Controller.sol

Line 70 in 79ee692

function configureController(address _controller, address _worker)

Great. Thank you very much, Brave,,,🙇🏼‍♂️😍🥰

steven94kr · 2024-04-17T05:02:17Z

Oh, I'm sorry. I have a question! 🙇🏼‍♂️
@xxeonge @nguyenzung
If I run the make bindings-build, There is some update of usdcBridge's binding files.

Do you know why? And should we update the files? 🙇🏼‍♂️

nguyenzung · 2024-04-17T05:04:35Z

Oh, I'm sorry. I have a question! 🙇🏼‍♂️ @xxeonge @nguyenzung If I run the make bindings-build, There is some update of usdcBridge's binding files. Do you know why? And should we update the files? 🙇🏼‍♂️

I think we need to view in assembly to verify it. Let me check

steven94kr · 2024-04-17T05:06:32Z

Thank you very much,,,🙇🏻‍♂️🥰🫡

xxeonge · 2024-04-17T05:08:45Z

Thank you so much😊
When I tried it, the file didn't change, so I think I need to check with @nguyenzung

steven94kr · 2024-04-17T05:30:11Z

Thank you so much😊 When I tried it, the file didn't change, so I think I need to check with @nguyenzung

If you delete forge-artifacts and build again, I think you can see the changes.
After that, if you still can't see the changes, please contact to me.

xxeonge · 2024-04-17T05:51:08Z

Thank you so much😊 When I tried it, the file didn't change, so I think I need to check with @nguyenzung

If you delete forge-artifacts and build again, I think you can see the changes. After that, if you still can't see the changes, please contact to me.

I cloned a new main and ran make bindings-build, but the file does not change..! OR-1535-thanos-cannon-update-for-predeploy-contracts as well @rlgns98kr

steven94kr · 2024-04-17T05:53:23Z

@xxeonge
Oh, Thank you for your checking. I will check again about the changes,,,🙇🏼‍♂️

nguyenzung · 2024-04-17T06:47:34Z

Oh, I'm sorry. I have a question! 🙇🏼‍♂️ @xxeonge @nguyenzung If I run the make bindings-build, There is some update of usdcBridge's binding files. Do you know why? And should we update the files? 🙇🏼‍♂️

I think we need to view in assembly to verify it. Let me check

It seems like the change does not have any meaning.

Line 0x11EC and 0x11ED are located between 2 STOP instructions, and those line does not change storage slot or does not return anything. Maybe the change related to compile config

nguyenzung · 2024-04-17T07:27:32Z

https://eip2535diamonds.substack.com/p/the-difference-between-solidity-libraries

I will send you a link for reference !! I don’t know if there will be an answer..!🥹 @nguyenzung

I tested by debugging, but it seems not run as what described in the article.

When we deploy a contract that using lib with external function, there is one transaction. Can we have one transaction for deploying 2 addresses?

Anw, the code was rolled back. I think it is good for now

steven94kr

Thank you very much, Brave! 🥰

nguyenzung added 3 commits April 17, 2024 09:23

OR-1535 update log

64c3fff

OR-1535 remove predeploy for a lib

fc2972d

OR-1535 config storage slots

97357a2

nguyenzung self-assigned this Apr 17, 2024

OR-1535 fix go lint

5fe3080

OR-1535 add SignatureChecker

a90d8f1

nguyenzung requested review from theo-learner, ohbyeongmin, praveen263112, steven94kr, AaronLee22, xxeonge and 0x6e616d April 17, 2024 03:44

steven94kr reviewed Apr 17, 2024

View reviewed changes

OR-1535 create common vars for proxies storage slots

2372fd6

steven94kr approved these changes Apr 17, 2024

View reviewed changes

nguyenzung merged commit 8ee6d4f into main Apr 17, 2024
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Or 1535 thanos cannon update for predeploy contracts #132

Or 1535 thanos cannon update for predeploy contracts #132

nguyenzung commented Apr 17, 2024 •

edited

Loading

xxeonge commented Apr 17, 2024

steven94kr commented Apr 17, 2024

nguyenzung commented Apr 17, 2024

nguyenzung commented Apr 17, 2024

xxeonge commented Apr 17, 2024

steven94kr Apr 17, 2024 •

edited

Loading

nguyenzung Apr 17, 2024

nguyenzung Apr 17, 2024

nguyenzung Apr 17, 2024

steven94kr Apr 17, 2024

nguyenzung Apr 17, 2024

steven94kr Apr 17, 2024

steven94kr commented Apr 17, 2024

nguyenzung commented Apr 17, 2024

steven94kr commented Apr 17, 2024

xxeonge commented Apr 17, 2024

steven94kr commented Apr 17, 2024

xxeonge commented Apr 17, 2024

steven94kr commented Apr 17, 2024

nguyenzung commented Apr 17, 2024 •

edited

Loading

nguyenzung commented Apr 17, 2024

steven94kr left a comment

Or 1535 thanos cannon update for predeploy contracts #132

Or 1535 thanos cannon update for predeploy contracts #132

Conversation

nguyenzung commented Apr 17, 2024 • edited Loading

xxeonge commented Apr 17, 2024

steven94kr commented Apr 17, 2024

nguyenzung commented Apr 17, 2024

nguyenzung commented Apr 17, 2024

xxeonge commented Apr 17, 2024

steven94kr Apr 17, 2024 • edited Loading

Choose a reason for hiding this comment

nguyenzung Apr 17, 2024

Choose a reason for hiding this comment

nguyenzung Apr 17, 2024

Choose a reason for hiding this comment

nguyenzung Apr 17, 2024

Choose a reason for hiding this comment

steven94kr Apr 17, 2024

Choose a reason for hiding this comment

nguyenzung Apr 17, 2024

Choose a reason for hiding this comment

steven94kr Apr 17, 2024

Choose a reason for hiding this comment

steven94kr commented Apr 17, 2024

nguyenzung commented Apr 17, 2024

steven94kr commented Apr 17, 2024

xxeonge commented Apr 17, 2024

steven94kr commented Apr 17, 2024

xxeonge commented Apr 17, 2024

steven94kr commented Apr 17, 2024

nguyenzung commented Apr 17, 2024 • edited Loading

nguyenzung commented Apr 17, 2024

steven94kr left a comment

Choose a reason for hiding this comment

nguyenzung commented Apr 17, 2024 •

edited

Loading

steven94kr Apr 17, 2024 •

edited

Loading

nguyenzung commented Apr 17, 2024 •

edited

Loading