Or 1397 titan canyon unify usdc.e usdc bridge into tokamak contracts bedrock src l2 tokamak #108

xxeonge · 2024-03-25T09:46:49Z

Unifying USDC.e and L2UsdcBridge contracts.
Add submodules used by the contracts and remapped their paths in foundry.toml
Linked library for FiatTokenV2_2.sol to the predeploy address of SignatureCheck.sol

theo-learner · 2024-03-26T02:30:38Z

@xxeonge Thanks a lot. But the Slither CI test is not passing properly because of some error. Did you check it?

Failed to generate IR for L2UsdcBridge.onlyEOA.

AaronLee22 · 2024-03-26T02:32:49Z

L2UsdcBridge.onlyEOA.

@xxeonge Thanks a lot. But the Slither CI test is not passing properly because of some error. Did you check it?
Failed to generate IR for L2UsdcBridge.onlyEOA.

Let me check this out too!

nguyenzung · 2024-03-26T03:18:31Z

Correct me if I am wrong. I think we can extend OptimismMintableERC20 and use StandardBridge for this task.

Actually, I don't know about the background. What is the benefit of this solution?

rlgns98kr · 2024-03-26T03:22:26Z

Correct me if I am wrong. I think we can extend OptimismMintableERC20 and use StandardBridge for this task.

Actually, I don't know about the background. What is the benefit of this solution?

Thank you, Brave. I'm sorry about it.
There is a standard about USDC and USDC Bridge recommended by Circle (https://www.circle.com/blog/bridged-usdc-standard)

So, Zena made this code. And we will include this code as predeploy!

xxeonge · 2024-03-26T04:03:03Z

@xxeonge Thanks a lot. But the Slither CI test is not passing properly because of some error. Did you check it?
Failed to generate IR for L2UsdcBridge.onlyEOA.

Sorry for late reply. I will check. Thank you!!

xxeonge · 2024-04-01T08:14:53Z

++) The L1UsdcBridge contract was added to deploy the L1Usdcbridge.

remove libraries tag in foundry.toml, I'll remove it first, as it's better suited for predeploy not unifying.
Unifying L1UsdcBridge and proxy contracts.
libraries and universal related to UsdcBridge have been integrated into the canyon repo.
Modified slither-check.yml to resolve slither errors.

rlgns98kr · 2024-04-01T10:37:12Z

packages/tokamak/contracts-bedrock/foundry.toml

@@ -24,6 +26,7 @@ bytecode_hash = 'none'
 build_info = true
 build_info_path = 'artifacts/build-info'

+


Thank you!
I think we can remove this empty line!

@rlgns98kr
Thank you! i removed empty lines : )

rlgns98kr · 2024-04-01T10:37:58Z

@AaronLee22
Thank you very much!
Do you know why the check action is not worked about latest commit?

AaronLee22 · 2024-04-02T01:30:51Z

@AaronLee22 Thank you very much! Do you know why the check action is not worked about latest commit?

Sure, I attempted to resolve this error by following both recommendations from the Slither team, specifically by removing the 'ignore-compile: true' option, yet the issue persisted. The Slither team is currently addressing a known problem where certain libraries or aliases within smart contracts cannot be retrieved. Consequently, I was compelled to manually exclude the specific smart contract experiencing the 'Failed to generate IR' issue.

rlgns98kr · 2024-04-02T05:26:05Z

packages/tokamak/contracts-bedrock/src/libraries/Address.sol

@@ -0,0 +1,222 @@
+// SPDX-License-Identifier: MIT


I'm sorry. I missed these files.
How about changing the directory structure? I'm sorry again my fault,,, 😢😢

src
--tokamak-contracts
----USDC
------L1
------L2
------libraries
------universal

@rlgns98kr
In L2, is there no need to separate the usdc contract and usdcBridge contract files??
If we have to separate them, what name should we give them? 🤔

Oh, I'm sorry for my late.
About sub directory, I think yours is greeat! So I think you can keep your seperate structure in the L2!

rlgns98kr

Thank you very much, @xxeonge and @AaronLee22!
Congratulations for your first contribution! 👍👍

… L1&L2

…th L1&L2

nguyenzung · 2024-04-24T02:43:35Z

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

+     * validated in the constructor.
+     */
+    bytes32
+        private constant IMPLEMENTATION_SLOT = 0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3;


@xxeonge It is the impl slot for usdc

nguyenzung · 2024-04-24T02:44:11Z

...drock/src/tokamak-contracts/USDC/L2/tokamak-USDC/upgradeability/AdminUpgradeabilityProxy.sol

+     * validated in the constructor.
+     */
+    bytes32
+        private constant ADMIN_SLOT = 0x10d6a54a4754c8869d6886b5f5d7fbfa5b4522237ea5c60d11bc4e7a1ff9390b;


It is admin slot for usdc

xxeonge requested review from theo-learner, ohbyeongmin, rlgns98kr, nguyenzung and AaronLee22 March 25, 2024 09:46

xxeonge marked this pull request as draft March 28, 2024 05:04

xxeonge assigned xxeonge and unassigned xxeonge Mar 28, 2024

AaronLee22 marked this pull request as ready for review April 1, 2024 02:40

rlgns98kr reviewed Apr 1, 2024

View reviewed changes

xxeonge force-pushed the OR-1397-titan-canyon-unify-USDC.e-USDC-bridge-into-tokamak-contracts-bedrock-src-L2-tokamak branch from 31c4111 to f61ff9c Compare April 2, 2024 01:00

xxeonge self-assigned this Apr 2, 2024

rlgns98kr reviewed Apr 2, 2024

View reviewed changes

rlgns98kr approved these changes Apr 3, 2024

View reviewed changes

xxeonge added 8 commits April 3, 2024 15:57

[OR-1397] add git submodule in tokamak/contracts-bedrock

6bb61a3

[OR-1397] add libraries

5f52233

[OR-1397] add remappings openzeppelin

6d8c14f

[OR-1397] unify USDC.e & USDC-Bridge contracts

ad1dbfd

remove libraries

610c96b

[OR-1397] unify L1UsdcBridge contracts

1b944a7

[OR-1397] add Address.sol for UsdcBridge contracts

1785156

[OR-1397] add StandardBridgeStorage.sol for UsdcBridge contracts

8cb20c9

xxeonge and others added 15 commits April 3, 2024 15:57

[OR-1397] unify L2UsdcBrige contracts

c37cec8

Run slither action without ignore-compile: true

f85f96d

OR-1397 Update slither-check.yml to fix Failed to generate IR

6be9c02

OR-1397 Update slither-check.yml to fix Failed to generate IR

64b126f

OR-1397 Update slither-check.yml to fix Failed to generate IR

ce6a0c2

OR-1397 Update slither-check.yml to fix Failed to generate IR on both…

fc55eaf

… L1&L2

OR-1397 Update slither-check.yml to fix Failed to generate IR on both…

e0f8f3e

… L1&L2

copy add remappings for openzeppelin

43e9c7c

[OR-1397] remove Address.sol

19403a2

[OR-1397] remove StandardBridgeStorage.sol

fb2d78e

[OR-1397] unifying USDC.e and UsdcBridge contracts

79ee692

[OR-1397] remove L1-tokamak

9104c78

[OR-1397] remove L2-tokamak

9ca4006

[OR-1397] Update slither-check.yml to fix Failed to generate IR on bo…

8b1f0f8

…th L1&L2

Update StandardBridgeStorage.sol

c0f9851

xxeonge force-pushed the OR-1397-titan-canyon-unify-USDC.e-USDC-bridge-into-tokamak-contracts-bedrock-src-L2-tokamak branch from 3cbb4c3 to c0f9851 Compare April 3, 2024 06:58

xxeonge merged commit cefd452 into main Apr 3, 2024
5 checks passed

nguyenzung reviewed Apr 24, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Or 1397 titan canyon unify usdc.e usdc bridge into tokamak contracts bedrock src l2 tokamak #108

Or 1397 titan canyon unify usdc.e usdc bridge into tokamak contracts bedrock src l2 tokamak #108

xxeonge commented Mar 25, 2024 •

edited

Loading

theo-learner commented Mar 26, 2024

AaronLee22 commented Mar 26, 2024

nguyenzung commented Mar 26, 2024 •

edited

Loading

rlgns98kr commented Mar 26, 2024 •

edited

Loading

xxeonge commented Mar 26, 2024

xxeonge commented Apr 1, 2024 •

edited

Loading

rlgns98kr Apr 1, 2024

xxeonge Apr 2, 2024

rlgns98kr commented Apr 1, 2024

AaronLee22 commented Apr 2, 2024

rlgns98kr Apr 2, 2024 •

edited

Loading

xxeonge Apr 2, 2024 •

edited

Loading

rlgns98kr Apr 3, 2024

rlgns98kr left a comment

nguyenzung Apr 24, 2024

nguyenzung Apr 24, 2024

		@@ -24,6 +26,7 @@ bytecode_hash = 'none'
		build_info = true
		build_info_path = 'artifacts/build-info'

Or 1397 titan canyon unify usdc.e usdc bridge into tokamak contracts bedrock src l2 tokamak #108

Or 1397 titan canyon unify usdc.e usdc bridge into tokamak contracts bedrock src l2 tokamak #108

Conversation

xxeonge commented Mar 25, 2024 • edited Loading

theo-learner commented Mar 26, 2024

AaronLee22 commented Mar 26, 2024

nguyenzung commented Mar 26, 2024 • edited Loading

rlgns98kr commented Mar 26, 2024 • edited Loading

xxeonge commented Mar 26, 2024

xxeonge commented Apr 1, 2024 • edited Loading

rlgns98kr Apr 1, 2024

Choose a reason for hiding this comment

xxeonge Apr 2, 2024

Choose a reason for hiding this comment

rlgns98kr commented Apr 1, 2024

AaronLee22 commented Apr 2, 2024

rlgns98kr Apr 2, 2024 • edited Loading

Choose a reason for hiding this comment

xxeonge Apr 2, 2024 • edited Loading

Choose a reason for hiding this comment

rlgns98kr Apr 3, 2024

Choose a reason for hiding this comment

rlgns98kr left a comment

Choose a reason for hiding this comment

nguyenzung Apr 24, 2024

Choose a reason for hiding this comment

nguyenzung Apr 24, 2024

Choose a reason for hiding this comment

xxeonge commented Mar 25, 2024 •

edited

Loading

nguyenzung commented Mar 26, 2024 •

edited

Loading

rlgns98kr commented Mar 26, 2024 •

edited

Loading

xxeonge commented Apr 1, 2024 •

edited

Loading

rlgns98kr Apr 2, 2024 •

edited

Loading

xxeonge Apr 2, 2024 •

edited

Loading