diff --git a/server/cmd/server/.env b/server/cmd/server/.env index e12fc49..14af5da 100644 --- a/server/cmd/server/.env +++ b/server/cmd/server/.env @@ -8,12 +8,12 @@ WALLET_PATH="wallet.pem" WALLET_PASSWORD="" # MultiversX proxy (e.g.: https://testnet-gateway.multiversx.com) MULTIVERSX_PROXY="https://testnet-gateway.multiversx.com" -# Multi Sig address on MultiversX to register the transactions -MULTI_SIG_SC_ADDRESS="erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx" +# Header verifier address on MultiversX to register the transactions +HEADER_VERIFIER_SC_ADDRESS="erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx" # ESDT Safe address on MultiversX to execute the transactions ESDT_SAFE_SC_ADDRESS="erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx" -# Max retries to wait in seconds for account nonce update after sending bridge txs -MAX_RETRIES_SECONDS_WAIT_NONCE=60 +# Interval in milliseconds between sending bridge txs +INTERVAL_TO_SEND=60 # Server certificate for tls secured connection with clients. # One should use the same certificate for clients as well. # You can generate your own certificate files with the binary found in diff --git a/server/cmd/server/main.go b/server/cmd/server/main.go index 04b382c..616ab8b 100644 --- a/server/cmd/server/main.go +++ b/server/cmd/server/main.go @@ -37,16 +37,16 @@ const ( ) const ( - envGRPCPort = "GRPC_PORT" - envWallet = "WALLET_PATH" - envPassword = "WALLET_PASSWORD" - envMultiSigSCAddr = "MULTI_SIG_SC_ADDRESS" - envEsdtSafeSCAddr = "ESDT_SAFE_SC_ADDRESS" - envMultiversXProxy = "MULTIVERSX_PROXY" - envMaxRetriesWaitNonce = "MAX_RETRIES_SECONDS_WAIT_NONCE" - envCertFile = "CERT_FILE" - envCertPkFile = "CERT_PK_FILE" - envHasher = "HASHER" + envGRPCPort = "GRPC_PORT" + envWallet = "WALLET_PATH" + envPassword = "WALLET_PASSWORD" + envHeaderVerifierSCAddr = "HEADER_VERIFIER_SC_ADDRESS" + envEsdtSafeSCAddr = "ESDT_SAFE_SC_ADDRESS" + envMultiversXProxy = "MULTIVERSX_PROXY" + envIntervalToSend = "INTERVAL_TO_SEND" + envCertFile = "CERT_FILE" + envCertPkFile = "CERT_PK_FILE" + envHasher = "HASHER" ) func main() { @@ -142,24 +142,24 @@ func loadConfig() (*config.ServerConfig, error) { grpcPort := os.Getenv(envGRPCPort) walletPath := os.Getenv(envWallet) walletPassword := os.Getenv(envPassword) - multiSigSCAddress := os.Getenv(envMultiSigSCAddr) + headerVerifierSCAddress := os.Getenv(envHeaderVerifierSCAddr) esdtSafeSCAddress := os.Getenv(envEsdtSafeSCAddr) proxy := os.Getenv(envMultiversXProxy) - maxRetriesWaitNonceStr := os.Getenv(envMaxRetriesWaitNonce) + intervalToSendStr := os.Getenv(envIntervalToSend) certFile := os.Getenv(envCertFile) certPkFile := os.Getenv(envCertPkFile) hasher := os.Getenv(envHasher) - maxRetriesWaitNonce, err := strconv.Atoi(maxRetriesWaitNonceStr) + intervalToSend, err := strconv.Atoi(intervalToSendStr) if err != nil { return nil, err } log.Info("loaded config", "grpc port", grpcPort) - log.Info("loaded config", "multiSigSCAddress", multiSigSCAddress) + log.Info("loaded config", "headerVerifierSCAddress", headerVerifierSCAddress) log.Info("loaded config", "esdtSafeSCAddress", esdtSafeSCAddress) log.Info("loaded config", "proxy", proxy) - log.Info("loaded config", "maxRetriesWaitNonce", maxRetriesWaitNonce) + log.Info("loaded config", "intervalToSend", intervalToSend) log.Info("loaded config", "hasher", hasher) log.Info("loaded config", "certificate file", certFile) @@ -172,11 +172,11 @@ func loadConfig() (*config.ServerConfig, error) { Password: walletPassword, }, TxSenderConfig: txSender.TxSenderConfig{ - MultisigSCAddress: multiSigSCAddress, - EsdtSafeSCAddress: esdtSafeSCAddress, - Proxy: proxy, - MaxRetriesSecondsWaitNonce: maxRetriesWaitNonce, - Hasher: hasher, + HeaderVerifierSCAddress: headerVerifierSCAddress, + EsdtSafeSCAddress: esdtSafeSCAddress, + Proxy: proxy, + IntervalToSend: intervalToSend, + Hasher: hasher, }, CertificateConfig: cert.FileCfg{ CertFile: certFile, diff --git a/server/txSender/config.go b/server/txSender/config.go index ed5cac0..2ba31ee 100644 --- a/server/txSender/config.go +++ b/server/txSender/config.go @@ -8,9 +8,9 @@ type WalletConfig struct { // TxSenderConfig holds tx sender config type TxSenderConfig struct { - MultisigSCAddress string - EsdtSafeSCAddress string - Proxy string - MaxRetriesSecondsWaitNonce int - Hasher string + HeaderVerifierSCAddress string + EsdtSafeSCAddress string + Proxy string + IntervalToSend int + Hasher string } diff --git a/server/txSender/factory.go b/server/txSender/factory.go index 9b9c6b3..5882829 100644 --- a/server/txSender/factory.go +++ b/server/txSender/factory.go @@ -30,7 +30,7 @@ func CreateTxSender(wallet core.CryptoComponentsHolder, cfg TxSenderConfig) (*tx nonceHandler, err := nonceHandlerV3.NewNonceTransactionHandlerV3(nonceHandlerV3.ArgsNonceTransactionsHandlerV3{ Proxy: proxy, - IntervalToSend: time.Second * time.Duration(cfg.MaxRetriesSecondsWaitNonce), + IntervalToSend: time.Millisecond * time.Duration(cfg.IntervalToSend), }) if err != nil { return nil, err @@ -62,7 +62,7 @@ func CreateTxSender(wallet core.CryptoComponentsHolder, cfg TxSenderConfig) (*tx TxInteractor: ti, TxNonceHandler: nonceHandler, DataFormatter: dtaFormatter, - SCMultiSigAddress: cfg.MultisigSCAddress, + SCMultiSigAddress: cfg.HeaderVerifierSCAddress, SCEsdtSafeAddress: cfg.EsdtSafeSCAddress, }) }