Add New Node Flow fixes #1712
There are no files selected for viewing
This file contains 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 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 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 |
|---|---|---|
|
|
@@ -43,12 +43,12 @@ if [[ -z "${ipconfig_id}" ]]; then | |
| exit 0 | ||
|
There was a problem hiding this comment. Consider using a non-zero exit status when the script exits due to not finding the |
||
| fi | ||
|
|
||
| #az network nic ip-config address-pool remove \ | ||
| # --address-pool ${pool} \ | ||
| # --ip-config-name "${ipconfig_id}" \ | ||
| # --nic-name "${nic_id}" \ | ||
| # --resource-group Testnet \ | ||
| # --lb-name ${lb} \ | ||
|
Comment on lines
+46
to
+51
There was a problem hiding this comment. The block of code that removes an address pool from the network interface configuration has been commented out. If this is intentional to prevent the removal for now, ensure that there is a tracking mechanism (like a TODO or a ticket) to revisit this if the functionality needs to be restored in the future. |
||
|
|
||
|
|
||
| echo 'Load balancer removed successfully' | ||
|
There was a problem hiding this comment. The message 'Load balancer removed successfully' is misleading because the code that performs the removal is commented out. This message should be updated to reflect the current behavior of the script. |
||
This file contains 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 |
|---|---|---|
|
|
@@ -122,7 +122,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { | |
| return l2Network.deployments.execute("CrossChainMessenger", { | ||
| from: l2Accounts.deployer, | ||
| log: true, | ||
| gasLimit: 5_000_000 | ||
| }, "relayMessage", msg); | ||
| }; | ||
|
|
||
|
|
||
This file contains 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 |
|---|---|---|
|
|
@@ -55,14 +55,14 @@ var EnclaveFlags = map[string]*flag.TenFlag{ | |
| MaxRollupSizeFlag: flag.NewUint64Flag(MaxRollupSizeFlag, 1024*64, "The maximum size a rollup is allowed to reach"), | ||
| L2BaseFeeFlag: flag.NewUint64Flag(L2BaseFeeFlag, 1, ""), | ||
| L2CoinbaseFlag: flag.NewStringFlag(L2CoinbaseFlag, "0xd6C9230053f45F873Cb66D8A02439380a37A4fbF", ""), | ||
| GasBatchExecutionLimit: flag.NewUint64Flag(GasBatchExecutionLimit, 30_000_000, "Max gas that can be executed in a single batch"), | ||
| ObscuroGenesisFlag: flag.NewStringFlag(ObscuroGenesisFlag, "", "The json string with the obscuro genesis"), | ||
| L1ChainIDFlag: flag.NewInt64Flag(L1ChainIDFlag, 1337, "An integer representing the unique chain id of the Ethereum chain used as an L1 (default 1337)"), | ||
| ObscuroChainIDFlag: flag.NewInt64Flag(ObscuroChainIDFlag, 443, "An integer representing the unique chain id of the Obscuro chain (default 443)"), | ||
| UseInMemoryDBFlag: flag.NewBoolFlag(UseInMemoryDBFlag, true, "Whether the enclave will use an in-memory DB rather than persist data"), | ||
| ProfilerEnabledFlag: flag.NewBoolFlag(ProfilerEnabledFlag, false, "Runs a profiler instance (Defaults to false)"), | ||
| DebugNamespaceEnabledFlag: flag.NewBoolFlag(DebugNamespaceEnabledFlag, false, "Whether the debug namespace is enabled"), | ||
| GasLocalExecutionCapFlag: flag.NewUint64Flag(GasLocalExecutionCapFlag, 40_000_000, "Max gas usage when executing local transactions"), | ||
| } | ||
|
|
||
| // enclaveRestrictedFlags are the flags that the enclave can receive ONLY over the Ego signed enclave.json | ||
|
|
||
This file contains 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 |
|---|---|---|
|
|
@@ -86,7 +86,7 @@ func (m *MessageBusManager) GenerateMessageBusDeployTx() (*common.L2Tx, error) { | |
| tx := &types.LegacyTx{ | ||
| Nonce: 0, // The first transaction of the owner identity should always be deploying the contract | ||
| Value: gethcommon.Big0, | ||
| Gas: 5_000_000, // It's quite the expensive contract. | ||
| GasPrice: gethcommon.Big0, // Synthetic transactions are on the house. Or the house. | ||
| Data: gethcommon.FromHex(MessageBus.MessageBusMetaData.Bin), | ||
| To: nil, // Geth requires nil instead of gethcommon.Address{} which equates to zero address in order to return receipt. | ||
|
|
@@ -219,7 +219,7 @@ func (m *MessageBusManager) CreateSyntheticTransactions(messages common.CrossCha | |
| tx := &types.LegacyTx{ | ||
| Nonce: startingNonce + uint64(idx), | ||
| Value: gethcommon.Big0, | ||
| Gas: 5_000_000, | ||
| GasPrice: gethcommon.Big0, // Synthetic transactions are on the house. Or the house. | ||
| Data: data, | ||
| To: m.messageBusAddress, | ||
|
|
||
This file contains 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 | ||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -685,15 +685,18 @@ func (e *enclaveImpl) GetTransactionCount(encryptedParams common.EncryptedParams | |||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||
| var nonce uint64 | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| headBatch := e.registry.HeadBatchSeq() | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| if headBatch != nil { | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| l2Head, err := e.storage.FetchBatchBySeqNo(headBatch.Uint64()) | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| if err == nil { | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| // todo - we should return an error when head state is not available, but for current test situations with race | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| // conditions we allow it to return zero while head state is uninitialized | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| s, err := e.storage.CreateStateDB(l2Head.Hash()) | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| if err != nil { | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| return nil, responses.ToInternalError(err) | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| nonce = s.GetNonce(address) | ||||||||||||||||||||||||||||||||||||||||||||||||||||
|
There was a problem hiding this comment. The refactoring of the logic for fetching the head batch sequence and creating a state DB includes a new conditional check for However, the error handling inside the conditional block could be improved. The comment on line 692 suggests that there are known race conditions that are being temporarily tolerated by allowing a zero nonce to be returned when the head state is uninitialized. This could lead to unexpected behavior and should be addressed as soon as possible. Additionally, the error from l2Head, err := e.storage.FetchBatchBySeqNo(headBatch.Uint64())
if err == nil {
// TODO: We should return an error when head state is not available, but for current test situations with race
// conditions we allow it to return zero while head state is uninitialized
s, err := e.storage.CreateStateDB(l2Head.Hash())
if err != nil {
return nil, responses.ToInternalError(err)
}
nonce = s.GetNonce(address)Committable suggestion
Suggested change
|
||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||
| encoded := hexutil.EncodeUint64(nonce) | ||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||
This file contains 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 |
|---|---|---|
|
|
@@ -163,6 +163,9 @@ func (s *sequencer) createGenesisBatch(block *common.L1Block) error { | |
| return err | ||
| } | ||
|
|
||
| // errors in unit test seem to suggest that batch 2 was received before batch 1 | ||
| // this ensures that there is enough gap so that batch 1 is issued before batch 2 | ||
| time.Sleep(time.Second) | ||
| // produce batch #2 which has the message bus and any other system contracts | ||
| cb, err := s.produceBatch( | ||
| big.NewInt(0).Add(batch.Header.SequencerOrderNo, big.NewInt(1)), | ||
|
|
||
This file contains 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 |
|---|---|---|
|
|
@@ -83,7 +83,7 @@ func DefaultEnclaveConfig() *config.EnclaveConfig { | |
| MaxRollupSize: 1024 * 64, | ||
| GasPaymentAddress: gethcommon.HexToAddress("0xd6C9230053f45F873Cb66D8A02439380a37A4fbF"), | ||
| BaseFee: new(big.Int).SetUint64(1), | ||
| GasBatchExecutionLimit: 30_000_000, | ||
| GasLocalExecutionCapFlag: 40_000_000, | ||
| } | ||
| } | ||
This file contains 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 |
|---|---|---|
|
|
@@ -99,7 +99,7 @@ func PrefundWallets(ctx context.Context, faucetWallet wallet.Wallet, faucetClien | |
| tx := &types.LegacyTx{ | ||
| Nonce: startingNonce + uint64(idx), | ||
| Value: alloc, | ||
| Gas: uint64(100_000), | ||
| GasPrice: gethcommon.Big1, | ||
| To: &destAddr, | ||
| } | ||
|
|
||
This file contains 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 |
|---|---|---|
|
|
@@ -2,18 +2,18 @@ package integration | |
|
|
||
| // Tracks the start ports handed out to different tests, in a bid to minimise conflicts. | ||
| const ( | ||
| StartPortEth2NetworkTests = 10000 | ||
| StartPortNodeRunnerTest = 14000 | ||
| StartPortSimulationGethInMem = 18000 | ||
| StartPortSimulationInMem = 22000 | ||
| StartPortSimulationFullNetwork = 26000 | ||
| StartPortSmartContractTests = 30000 | ||
| StartPortContractDeployerTest = 34000 | ||
| StartPortWalletExtensionUnitTest = 38000 | ||
| StartPortFaucetUnitTest = 42000 | ||
| StartPortFaucetHTTPUnitTest = 48000 | ||
| StartPortTenscanUnitTest = 52000 | ||
| StartPortTenGatewayUnitTest = 56000 | ||
|
There was a problem hiding this comment. Consider adding a comment explaining the rationale for choosing these specific port numbers, as they are now in a range that might be more commonly used by other applications. |
||
|
|
||
| DefaultGethWSPortOffset = 100 | ||
| DefaultGethAUTHPortOffset = 200 | ||
|
|
@@ -24,9 +24,9 @@ const ( | |
| DefaultEnclaveOffset = 700 // The default offset between a Geth nodes port and the enclave ports. Used in Socket Simulations. | ||
| DefaultHostRPCHTTPOffset = 800 // The default offset for the host's RPC HTTP port | ||
| DefaultHostRPCWSOffset = 900 // The default offset for the host's RPC websocket port | ||
| DefaultTenscanHTTPPortOffset = 1000 | ||
| DefaultTenGatewayHTTPPortOffset = 1001 | ||
| DefaultTenGatewayWSPortOffset = 1002 | ||
| ) | ||
|
|
||
| const ( | ||
|
|
||
This file contains 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 |
|---|---|---|
|
|
@@ -18,6 +18,8 @@ import ( | |
| "github.com/ethereum/go-ethereum/ethclient" | ||
| "github.com/ten-protocol/go-ten/integration/datagenerator" | ||
| "golang.org/x/sync/errgroup" | ||
|
|
||
| gethcommon "github.com/ethereum/go-ethereum/common" | ||
| ) | ||
|
|
||
| const ( | ||
|
|
@@ -206,6 +208,10 @@ func (n *Impl) Start() error { | |
| startTime := time.Now() | ||
| var eg errgroup.Group | ||
|
|
||
| if err := n.ensureNoDuplicatedNetwork(); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // initialize the genesis data on the nodes | ||
| for _, nodeDataDir := range n.dataDirs { | ||
| dataDir := nodeDataDir | ||
|
|
@@ -506,6 +512,11 @@ func (n *Impl) waitForMergeEvent(startTime time.Time) error { | |
| } | ||
|
|
||
| fmt.Printf("Reached the merge block after %s\n", time.Since(startTime)) | ||
|
|
||
| if err = n.prefundedBalancesActive(dial); err != nil { | ||
| fmt.Printf("Error prefunding accounts %s\n", err.Error()) | ||
| return err | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
|
|
@@ -589,6 +600,31 @@ func (n *Impl) gethImportEnodes(enodes []string) error { | |
| return nil | ||
| } | ||
|
|
||
| func (n *Impl) prefundedBalancesActive(client *ethclient.Client) error { | ||
| for _, addr := range n.preFundedMinerAddrs { | ||
| balance, err := client.BalanceAt(context.Background(), gethcommon.HexToAddress(addr), nil) | ||
| if err != nil { | ||
| return fmt.Errorf("unable to check balance for account %s - %w", addr, err) | ||
| } | ||
| if balance.Cmp(gethcommon.Big0) == 0 { | ||
| return fmt.Errorf("unexpected %s balance for account %s", balance.String(), addr) | ||
| } | ||
| fmt.Printf("Account %s prefunded with %s\n", addr, balance.String()) | ||
| } | ||
|
|
||
| return nil | ||
|
There was a problem hiding this comment. The if balance.Cmp(expectedMinimumBalance) < 0 {
return fmt.Errorf("insufficient balance for account %s: %s", addr, balance.String())
} |
||
| } | ||
|
|
||
| func (n *Impl) ensureNoDuplicatedNetwork() error { | ||
| for nodeIdx, port := range n.gethWSPorts { | ||
| _, err := ethclient.Dial(fmt.Sprintf("ws://127.0.0.1:%d", port)) | ||
| if err == nil { | ||
| return fmt.Errorf("unexpected geth node %d is active before the network is started", nodeIdx) | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func min(a, b int) int { | ||
| if a < b { | ||
| return a | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The removal of
HOC_ERC20_ADDRandPOC_ERC20_ADDRfrommanual-deploy-testnet-validator.ymlis confirmed. However, these variables are still referenced in.github/workflows/manual-deploy-testnet-l2.yml. This could be an oversight or intentional, depending on whether these workflows are interconnected or independent.HOC_ERC20_ADDRandPOC_ERC20_ADDRare still used in.github/workflows/manual-deploy-testnet-l2.yml.Analysis chain
The declarations for
node_l1_ws_url,HOC_ERC20_ADDR, andPOC_ERC20_ADDRhave been removed. Confirm that there are no lingering references to these variables in the workflow.Scripts Executed
The following scripts were executed for the analysis:
Script:
Length of output: 394