Extend cldf timelock converter logic for TON #628
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -34,6 +34,9 @@ const ( | |||||
|
|
||||||
| // supportedTONImageRepository is the only supported Docker image repository for TON localnet. | ||||||
| supportedTONImageRepository = "ghcr.io/neodix42/mylocalton-docker" | ||||||
|
|
||||||
| // defaultTxTONAmount is the default amount of TON to use for transactions. | ||||||
| defaultTxTONAmount = "0.1" | ||||||
| ) | ||||||
|
|
||||||
| // CTFChainProviderConfig holds the configuration to initialize the CTFChainProvider. | ||||||
|
|
@@ -123,17 +126,20 @@ func (p *CTFChainProvider) Initialize(ctx context.Context) (chain.BlockChain, er | |||||
| } | ||||||
|
|
||||||
| // airdrop the deployer wallet | ||||||
| err = fundTonWallets(ctx, nodeClient, []*address.Address{tonWallet.WalletAddress()}, []tlb.Coins{tlb.MustFromTON("1000")}) // TODO does 1000 here make sense? | ||||||
|
huangzhen1997 marked this conversation as resolved.
Outdated
|
||||||
| if err != nil { | ||||||
| return nil, fmt.Errorf("failed to fund wallet: %w", err) | ||||||
| } | ||||||
|
|
||||||
| p.chain = &cldf_ton.Chain{ | ||||||
| ChainMetadata: cldf_ton.ChainMetadata{Selector: p.selector}, | ||||||
| Client: nodeClient, | ||||||
|
huangzhen1997 marked this conversation as resolved.
|
||||||
| WalletAddress: tonWallet.WalletAddress(), | ||||||
|
There was a problem hiding this comment. The change from
Contributor
Author
There was a problem hiding this comment. @copilot This is not true, it's tested in rpc_provider_test.go line 276
Contributor
There was a problem hiding this comment. Not related to this PR but I wonder if we need to apply this change to the rest of the codebase. Any context on bounceable address? // Address - returns old (bounce) version of wallet address
// DEPRECATED: because of address reform, use WalletAddress,
// it will return UQ format
func (w *Wallet) Address() *address.Address {
return w.addr
}
// WalletAddress - returns new standard non bounce address
func (w *Wallet) WalletAddress() *address.Address {
return w.addr.Bounce(false)
}
Contributor
Author
There was a problem hiding this comment. I think we want to switch to the new WalletAddress() to have non-bounceable, but the underlying address data is identical, just the string rep could be different. Do you see any risk with this change ?
huangzhen1997 marked this conversation as resolved.
There was a problem hiding this comment. The code previously called
Suggested change
|
||||||
| URL: url, | ||||||
| TxOps: cldf_ton.TxOps{ | ||||||
| Wallet: tonWallet, | ||||||
| Amount: tlb.MustFromTON(defaultTxTONAmount), // default amount for transactions | ||||||
|
krebernisak marked this conversation as resolved.
Outdated
|
||||||
| }, | ||||||
|
jadepark-dev marked this conversation as resolved.
Outdated
|
||||||
| } | ||||||
|
|
||||||
| return *p.chain, nil | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -5,16 +5,25 @@ import ( | |||
| "github.com/xssnick/tonutils-go/ton" | ||||
| "github.com/xssnick/tonutils-go/ton/wallet" | ||||
|
|
||||
| "github.com/xssnick/tonutils-go/tlb" | ||||
|
|
||||
| "github.com/smartcontractkit/chainlink-deployments-framework/chain/internal/common" | ||||
| ) | ||||
|
|
||||
| type ChainMetadata = common.ChainMetadata | ||||
|
|
||||
| // TxOps holds configuration for transaction operations. | ||||
| type TxOps struct { | ||||
| Wallet *wallet.Wallet // Wallet abstraction (signing, sending) | ||||
| Amount tlb.Coins // Default amount for msg transfers | ||||
| } | ||||
|
|
||||
| // Chain represents a TON chain. | ||||
| type Chain struct { | ||||
| ChainMetadata // Contains canonical chain identifier | ||||
| Client *ton.APIClient // APIClient for Lite Server connection | ||||
| Wallet *wallet.Wallet // Wallet abstraction (signing, sending) | ||||
|
There was a problem hiding this comment. The
Suggested change
|
||||
| WalletAddress *address.Address // Address of deployer wallet | ||||
| URL string // Liteserver URL | ||||
| TxOps TxOps // Transaction operations configuration | ||||
| } | ||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -28,6 +28,7 @@ import ( | |||||||||
| "github.com/smartcontractkit/mcms/sdk/evm/bindings" | ||||||||||
| "github.com/smartcontractkit/mcms/sdk/solana" | ||||||||||
| "github.com/smartcontractkit/mcms/sdk/sui" | ||||||||||
| "github.com/smartcontractkit/mcms/sdk/ton" | ||||||||||
| "github.com/smartcontractkit/mcms/types" | ||||||||||
| "github.com/spf13/cobra" | ||||||||||
| "github.com/spf13/pflag" | ||||||||||
|
|
@@ -1183,6 +1184,8 @@ func newCfgv2(lggr logger.Logger, cmd *cobra.Command, domain cldf_domain.Domain, | |||||||||
| if err != nil { | ||||||||||
| return nil, fmt.Errorf("error creating Sui timelock converter: %w", err) | ||||||||||
| } | ||||||||||
| case chainsel.FamilyTon: | ||||||||||
| converter = ton.NewTimelockConverter() | ||||||||||
| default: | ||||||||||
| return nil, fmt.Errorf("unsupported chain family %s", fam) | ||||||||||
| } | ||||||||||
|
|
@@ -1489,18 +1492,18 @@ func getExecutorWithChainOverride(cfg *cfgv2, chainSelector types.ChainSelector) | |||||||||
| if !ok { | ||||||||||
| return nil, fmt.Errorf("invalid encoder type: %T", encoder) | ||||||||||
| } | ||||||||||
| c := cfg.blockchains.EVMChains()[uint64(chainSelector)] | ||||||||||
|
gustavogama-cll marked this conversation as resolved.
|
||||||||||
|
|
||||||||||
| return evm.NewExecutor(evmEncoder, c.Client, c.DeployerKey), nil | ||||||||||
|
|
||||||||||
| case chainsel.FamilySolana: | ||||||||||
| solanaEncoder, ok := encoder.(*solana.Encoder) | ||||||||||
| if !ok { | ||||||||||
| return nil, fmt.Errorf("invalid encoder type: %T", encoder) | ||||||||||
| } | ||||||||||
| c := cfg.blockchains.SolanaChains()[uint64(chainSelector)] | ||||||||||
|
|
||||||||||
| return solana.NewExecutor(solanaEncoder, c.Client, *c.DeployerKey), nil | ||||||||||
|
|
||||||||||
| case chainsel.FamilyAptos: | ||||||||||
| encoder, ok := encoder.(*aptos.Encoder) | ||||||||||
|
|
@@ -1511,9 +1514,9 @@ func getExecutorWithChainOverride(cfg *cfgv2, chainSelector types.ChainSelector) | |||||||||
| if err != nil { | ||||||||||
| return nil, fmt.Errorf("error getting aptos role from proposal: %w", err) | ||||||||||
| } | ||||||||||
| c := cfg.blockchains.AptosChains()[uint64(chainSelector)] | ||||||||||
|
|
||||||||||
| return aptos.NewExecutor(c.Client, c.DeployerSigner, encoder, *role), nil | ||||||||||
|
|
||||||||||
| case chainsel.FamilySui: | ||||||||||
| encoder, ok := encoder.(*sui.Encoder) | ||||||||||
|
|
@@ -1524,10 +1527,18 @@ func getExecutorWithChainOverride(cfg *cfgv2, chainSelector types.ChainSelector) | |||||||||
| if err != nil { | ||||||||||
| return nil, fmt.Errorf("error getting sui metadata from proposal: %w", err) | ||||||||||
| } | ||||||||||
| c := cfg.blockchains.SuiChains()[uint64(chainSelector)] | ||||||||||
| entrypointEncoder := suibindings.NewCCIPEntrypointArgEncoder(metadata.RegistryObj, metadata.DeployerStateObj) | ||||||||||
|
|
||||||||||
| return sui.NewExecutor(c.Client, c.Signer, encoder, entrypointEncoder, metadata.McmsPackageID, metadata.Role, cfg.timelockProposal.ChainMetadata[chainSelector].MCMAddress, metadata.AccountObj, metadata.RegistryObj, metadata.TimelockObj) | ||||||||||
| case chainsel.FamilyTon: | ||||||||||
| encoder, ok := encoder.(*ton.Encoder) | ||||||||||
| if !ok { | ||||||||||
| return nil, fmt.Errorf("error getting encoder for chain %d", cfg.chainSelector) | ||||||||||
|
huangzhen1997 marked this conversation as resolved.
Outdated
huangzhen1997 marked this conversation as resolved.
Outdated
gustavogama-cll marked this conversation as resolved.
Outdated
|
||||||||||
| } | ||||||||||
| c := cfg.blockchains.TonChains()[uint64(chainSelector)] | ||||||||||
|
|
||||||||||
| return ton.NewExecutor(encoder, c.Client, c.TxOps.Wallet, c.TxOps.Amount) | ||||||||||
|
huangzhen1997 marked this conversation as resolved.
Outdated
|
||||||||||
| default: | ||||||||||
| return nil, fmt.Errorf("unsupported chain family %s", family) | ||||||||||
| } | ||||||||||
|
|
@@ -1557,26 +1568,29 @@ func getTimelockExecutorWithChainOverride(cfg *cfgv2, chainSelector types.ChainS | |||||||||
| var executor sdk.TimelockExecutor | ||||||||||
| switch family { | ||||||||||
| case chainsel.FamilyEVM: | ||||||||||
| c := cfg.blockchains.EVMChains()[uint64(chainSelector)] | ||||||||||
|
|
||||||||||
| executor = evm.NewTimelockExecutor(c.Client, c.DeployerKey) | ||||||||||
| case chainsel.FamilySolana: | ||||||||||
| c := cfg.blockchains.SolanaChains()[uint64(chainSelector)] | ||||||||||
| executor = solana.NewTimelockExecutor(c.Client, *c.DeployerKey) | ||||||||||
| case chainsel.FamilyAptos: | ||||||||||
| c := cfg.blockchains.AptosChains()[uint64(chainSelector)] | ||||||||||
| executor = aptos.NewTimelockExecutor(c.Client, c.DeployerSigner) | ||||||||||
| case chainsel.FamilySui: | ||||||||||
| c := cfg.blockchains.SuiChains()[uint64(chainSelector)] | ||||||||||
|
github-code-quality[bot] marked this conversation as resolved.
Fixed
|
||||||||||
| metadata, err := suiMetadataFromProposal(chainSelector, cfg.timelockProposal) | ||||||||||
| if err != nil { | ||||||||||
| return nil, fmt.Errorf("error getting sui metadata from proposal: %w", err) | ||||||||||
| } | ||||||||||
| entrypointEncoder := suibindings.NewCCIPEntrypointArgEncoder(metadata.AccountObj, metadata.DeployerStateObj) | ||||||||||
| executor, err = sui.NewTimelockExecutor(c.Client, c.Signer, entrypointEncoder, metadata.McmsPackageID, metadata.RegistryObj, metadata.AccountObj) | ||||||||||
| if err != nil { | ||||||||||
| return nil, fmt.Errorf("error creating sui timelock executor: %w", err) | ||||||||||
| } | ||||||||||
| case chainsel.FamilyTon: | ||||||||||
| c := cfg.blockchains.TonChains()[uint64(chainSelector)] | ||||||||||
| return ton.NewTimelockExecutor(c.Client, c.TxOps.Wallet, c.TxOps.Amount) | ||||||||||
|
huangzhen1997 marked this conversation as resolved.
Outdated
huangzhen1997 marked this conversation as resolved.
Outdated
|
||||||||||
| default: | ||||||||||
| return nil, fmt.Errorf("unsupported chain family %s", family) | ||||||||||
| } | ||||||||||
|
|
@@ -1631,6 +1645,9 @@ var getInspectorFromChainSelector = func(cfg cfgv2) (sdk.Inspector, error) { | |||||||||
| if err != nil { | ||||||||||
| return nil, fmt.Errorf("error creating sui inspector: %w", err) | ||||||||||
| } | ||||||||||
| case chainsel.FamilyTon: | ||||||||||
| chain := cfg.blockchains.TonChains()[cfg.chainSelector] | ||||||||||
| inspector = ton.NewInspector(chain.Client) | ||||||||||
|
huangzhen1997 marked this conversation as resolved.
huangzhen1997 marked this conversation as resolved.
huangzhen1997 marked this conversation as resolved.
Comment on lines
+1619
to
+1620
There was a problem hiding this comment. Variable 'chain' should be renamed to 'c' for consistency with the naming pattern used in the same function for other chain families (lines 1535, 1539, 1542, 1545).
Suggested change
There was a problem hiding this comment. The TON inspector creation in getInspectorFromChainSelector lacks test coverage. Add test cases to verify the inspector is created correctly for TON chains.
huangzhen1997 marked this conversation as resolved.
|
||||||||||
| default: | ||||||||||
| return nil, fmt.Errorf("unsupported chain family %s", fam) | ||||||||||
| } | ||||||||||
|
|
||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.