From e2a529d8612771be7cacf3652b3e21a9f01d9172 Mon Sep 17 00:00:00 2001 From: yashnevatia Date: Tue, 26 Nov 2024 05:55:35 +0000 Subject: [PATCH] removing wrapper comments --- core/gethwrappers/abigen.go | 14 +++++++------- .../ccip/generated/commit_store/commit_store.go | 14 +++++++------- .../evm_2_evm_offramp/evm_2_evm_offramp.go | 14 +++++++------- .../generated/evm_2_evm_onramp/evm_2_evm_onramp.go | 14 +++++++------- .../ccip/generated/fee_quoter/fee_quoter.go | 14 +++++++------- .../ccip/generated/link_token/link_token.go | 14 +++++++------- .../lock_release_token_pool.go | 14 +++++++------- .../registry_module_owner_custom.go | 14 +++++++------- .../ccip/generated/rmn_contract/rmn_contract.go | 14 +++++++------- .../rmn_proxy_contract/rmn_proxy_contract.go | 14 +++++++------- core/gethwrappers/ccip/generated/router/router.go | 14 +++++++------- .../self_funded_ping_pong/self_funded_ping_pong.go | 14 +++++++------- .../token_admin_registry/token_admin_registry.go | 14 +++++++------- core/gethwrappers/ccip/generated/weth9/weth9.go | 14 +++++++------- 14 files changed, 98 insertions(+), 98 deletions(-) diff --git a/core/gethwrappers/abigen.go b/core/gethwrappers/abigen.go index 19c149e3fd..6f2df3b090 100644 --- a/core/gethwrappers/abigen.go +++ b/core/gethwrappers/abigen.go @@ -64,14 +64,14 @@ func DeployZkSync%s(auth *bind.TransactOpts, backend bind.ContractBackend, param if !ok { return common.Address{}, nil, nil, errors.New("backend is not an ethclient") } - fmt.Println("Deploying zksync contract") + zksyncClient := zkSyncClient.NewClient(client.Client()) - fmt.Println("getting wallet") + wallet := auth.Context.Value("wallet").(*zkSyncAccounts.Wallet) - fmt.Println("got wallet") - fmt.Println("getting bytes") + + decodedBytes := common.FromHex(%sZkBin) - fmt.Println("deploying") + %sAbi, err := %sMetaData.GetAbi() if err != nil { return common.Address{}, nil, nil, err @@ -88,7 +88,7 @@ func DeployZkSync%s(auth *bind.TransactOpts, backend bind.ContractBackend, param if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("hash of tx", hash) + receipt, err := zksyncClient.WaitMined(context.Background(), hash) if err != nil { return common.Address{}, nil, nil, err @@ -97,7 +97,7 @@ func DeployZkSync%s(auth *bind.TransactOpts, backend bind.ContractBackend, param if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("tx hash", tx.Hash) + // this should generated.ConvertToTransaction ethTx := ConvertToTransaction(*tx) address := receipt.ContractAddress diff --git a/core/gethwrappers/ccip/generated/commit_store/commit_store.go b/core/gethwrappers/ccip/generated/commit_store/commit_store.go index 8e92870f17..77034c40f5 100644 --- a/core/gethwrappers/ccip/generated/commit_store/commit_store.go +++ b/core/gethwrappers/ccip/generated/commit_store/commit_store.go @@ -2120,14 +2120,14 @@ func DeployZkSyncCommitStore(auth *bind.TransactOpts, backend bind.ContractBacke if !ok { return common.Address{}, nil, nil, errors.New("backend is not an ethclient") } - fmt.Println("Deploying zksync contract") + zksyncClient := zkSyncClient.NewClient(client.Client()) - fmt.Println("getting wallet") + wallet := auth.Context.Value("wallet").(*zkSyncAccounts.Wallet) - fmt.Println("got wallet") - fmt.Println("getting bytes") + + decodedBytes := common.FromHex(CommitStoreZkBin) - fmt.Println("deploying") + CommitStoreAbi, err := CommitStoreMetaData.GetAbi() if err != nil { return common.Address{}, nil, nil, err @@ -2143,7 +2143,7 @@ func DeployZkSyncCommitStore(auth *bind.TransactOpts, backend bind.ContractBacke if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("hash of tx", hash) + receipt, err := zksyncClient.WaitMined(context.Background(), hash) if err != nil { return common.Address{}, nil, nil, err @@ -2152,7 +2152,7 @@ func DeployZkSyncCommitStore(auth *bind.TransactOpts, backend bind.ContractBacke if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("tx hash", tx.Hash) + ethTx := ConvertToTransaction(*tx) address := receipt.ContractAddress diff --git a/core/gethwrappers/ccip/generated/evm_2_evm_offramp/evm_2_evm_offramp.go b/core/gethwrappers/ccip/generated/evm_2_evm_offramp/evm_2_evm_offramp.go index 465e05ddb6..3d65eba44b 100644 --- a/core/gethwrappers/ccip/generated/evm_2_evm_offramp/evm_2_evm_offramp.go +++ b/core/gethwrappers/ccip/generated/evm_2_evm_offramp/evm_2_evm_offramp.go @@ -2710,14 +2710,14 @@ func DeployZkSyncEVM2EVMOffRamp(auth *bind.TransactOpts, backend bind.ContractBa if !ok { return common.Address{}, nil, nil, errors.New("backend is not an ethclient") } - fmt.Println("Deploying zksync contract") + zksyncClient := zkSyncClient.NewClient(client.Client()) - fmt.Println("getting wallet") + wallet := auth.Context.Value("wallet").(*zkSyncAccounts.Wallet) - fmt.Println("got wallet") - fmt.Println("getting bytes") + + decodedBytes := common.FromHex(EVM2EVMOffRampZkBin) - fmt.Println("deploying") + EVM2EVMOffRampAbi, err := EVM2EVMOffRampMetaData.GetAbi() if err != nil { return common.Address{}, nil, nil, err @@ -2733,7 +2733,7 @@ func DeployZkSyncEVM2EVMOffRamp(auth *bind.TransactOpts, backend bind.ContractBa if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("hash of tx", hash) + receipt, err := zksyncClient.WaitMined(context.Background(), hash) if err != nil { return common.Address{}, nil, nil, err @@ -2742,7 +2742,7 @@ func DeployZkSyncEVM2EVMOffRamp(auth *bind.TransactOpts, backend bind.ContractBa if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("tx hash", tx.Hash) + ethTx := ConvertToTransaction(*tx) address := receipt.ContractAddress diff --git a/core/gethwrappers/ccip/generated/evm_2_evm_onramp/evm_2_evm_onramp.go b/core/gethwrappers/ccip/generated/evm_2_evm_onramp/evm_2_evm_onramp.go index ebce0c1c67..2b31b67472 100644 --- a/core/gethwrappers/ccip/generated/evm_2_evm_onramp/evm_2_evm_onramp.go +++ b/core/gethwrappers/ccip/generated/evm_2_evm_onramp/evm_2_evm_onramp.go @@ -2369,14 +2369,14 @@ func DeployZkSyncEVM2EVMOnRamp(auth *bind.TransactOpts, backend bind.ContractBac if !ok { return common.Address{}, nil, nil, errors.New("backend is not an ethclient") } - fmt.Println("Deploying zksync contract") + zksyncClient := zkSyncClient.NewClient(client.Client()) - fmt.Println("getting wallet") + wallet := auth.Context.Value("wallet").(*zkSyncAccounts.Wallet) - fmt.Println("got wallet") - fmt.Println("getting bytes") + + decodedBytes := common.FromHex(EVM2EVMOnRampZkBin) - fmt.Println("deploying") + EVM2EVMOnRampAbi, err := EVM2EVMOnRampMetaData.GetAbi() if err != nil { return common.Address{}, nil, nil, err @@ -2392,7 +2392,7 @@ func DeployZkSyncEVM2EVMOnRamp(auth *bind.TransactOpts, backend bind.ContractBac if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("hash of tx", hash) + receipt, err := zksyncClient.WaitMined(context.Background(), hash) if err != nil { return common.Address{}, nil, nil, err @@ -2401,7 +2401,7 @@ func DeployZkSyncEVM2EVMOnRamp(auth *bind.TransactOpts, backend bind.ContractBac if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("tx hash", tx.Hash) + ethTx := ConvertToTransaction(*tx) address := receipt.ContractAddress diff --git a/core/gethwrappers/ccip/generated/fee_quoter/fee_quoter.go b/core/gethwrappers/ccip/generated/fee_quoter/fee_quoter.go index e7477c2e58..7545217a16 100644 --- a/core/gethwrappers/ccip/generated/fee_quoter/fee_quoter.go +++ b/core/gethwrappers/ccip/generated/fee_quoter/fee_quoter.go @@ -2959,14 +2959,14 @@ func DeployZkSyncFeeQuoter(auth *bind.TransactOpts, backend bind.ContractBackend if !ok { return common.Address{}, nil, nil, errors.New("backend is not an ethclient") } - fmt.Println("Deploying zksync contract") + zksyncClient := zkSyncClient.NewClient(client.Client()) - fmt.Println("getting wallet") + wallet := auth.Context.Value("wallet").(*zkSyncAccounts.Wallet) - fmt.Println("got wallet") - fmt.Println("getting bytes") + + decodedBytes := common.FromHex(FeeQuoterZkBin) - fmt.Println("deploying") + FeeQuoterAbi, err := FeeQuoterMetaData.GetAbi() if err != nil { return common.Address{}, nil, nil, err @@ -2982,7 +2982,7 @@ func DeployZkSyncFeeQuoter(auth *bind.TransactOpts, backend bind.ContractBackend if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("hash of tx", hash) + receipt, err := zksyncClient.WaitMined(context.Background(), hash) if err != nil { return common.Address{}, nil, nil, err @@ -2991,7 +2991,7 @@ func DeployZkSyncFeeQuoter(auth *bind.TransactOpts, backend bind.ContractBackend if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("tx hash", tx.Hash) + ethTx := ConvertToTransaction(*tx) address := receipt.ContractAddress diff --git a/core/gethwrappers/ccip/generated/link_token/link_token.go b/core/gethwrappers/ccip/generated/link_token/link_token.go index 04d8b15fa8..930ed7e2a2 100644 --- a/core/gethwrappers/ccip/generated/link_token/link_token.go +++ b/core/gethwrappers/ccip/generated/link_token/link_token.go @@ -1995,14 +1995,14 @@ func DeployZkSyncLinkToken(auth *bind.TransactOpts, backend bind.ContractBackend if !ok { return common.Address{}, nil, nil, errors.New("backend is not an ethclient") } - fmt.Println("Deploying zksync contract") + zksyncClient := zkSyncClient.NewClient(client.Client()) - fmt.Println("getting wallet") + wallet := auth.Context.Value("wallet").(*zkSyncAccounts.Wallet) - fmt.Println("got wallet") - fmt.Println("getting bytes") + + decodedBytes := common.FromHex(LinkTokenZkBin) - fmt.Println("deploying") + LinkTokenAbi, err := LinkTokenMetaData.GetAbi() if err != nil { return common.Address{}, nil, nil, err @@ -2018,7 +2018,7 @@ func DeployZkSyncLinkToken(auth *bind.TransactOpts, backend bind.ContractBackend if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("hash of tx", hash) + receipt, err := zksyncClient.WaitMined(context.Background(), hash) if err != nil { return common.Address{}, nil, nil, err @@ -2027,7 +2027,7 @@ func DeployZkSyncLinkToken(auth *bind.TransactOpts, backend bind.ContractBackend if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("tx hash", tx.Hash) + ethTx := ConvertToTransaction(*tx) address := receipt.ContractAddress diff --git a/core/gethwrappers/ccip/generated/lock_release_token_pool/lock_release_token_pool.go b/core/gethwrappers/ccip/generated/lock_release_token_pool/lock_release_token_pool.go index fa26ed7b34..cc36d4d9a9 100644 --- a/core/gethwrappers/ccip/generated/lock_release_token_pool/lock_release_token_pool.go +++ b/core/gethwrappers/ccip/generated/lock_release_token_pool/lock_release_token_pool.go @@ -3231,14 +3231,14 @@ func DeployZkSyncLockReleaseTokenPool(auth *bind.TransactOpts, backend bind.Cont if !ok { return common.Address{}, nil, nil, errors.New("backend is not an ethclient") } - fmt.Println("Deploying zksync contract") + zksyncClient := zkSyncClient.NewClient(client.Client()) - fmt.Println("getting wallet") + wallet := auth.Context.Value("wallet").(*zkSyncAccounts.Wallet) - fmt.Println("got wallet") - fmt.Println("getting bytes") + + decodedBytes := common.FromHex(LockReleaseTokenPoolZkBin) - fmt.Println("deploying") + LockReleaseTokenPoolAbi, err := LockReleaseTokenPoolMetaData.GetAbi() if err != nil { return common.Address{}, nil, nil, err @@ -3254,7 +3254,7 @@ func DeployZkSyncLockReleaseTokenPool(auth *bind.TransactOpts, backend bind.Cont if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("hash of tx", hash) + receipt, err := zksyncClient.WaitMined(context.Background(), hash) if err != nil { return common.Address{}, nil, nil, err @@ -3263,7 +3263,7 @@ func DeployZkSyncLockReleaseTokenPool(auth *bind.TransactOpts, backend bind.Cont if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("tx hash", tx.Hash) + ethTx := ConvertToTransaction(*tx) address := receipt.ContractAddress diff --git a/core/gethwrappers/ccip/generated/registry_module_owner_custom/registry_module_owner_custom.go b/core/gethwrappers/ccip/generated/registry_module_owner_custom/registry_module_owner_custom.go index 929f9965a4..ea7f7acbef 100644 --- a/core/gethwrappers/ccip/generated/registry_module_owner_custom/registry_module_owner_custom.go +++ b/core/gethwrappers/ccip/generated/registry_module_owner_custom/registry_module_owner_custom.go @@ -423,14 +423,14 @@ func DeployZkSyncRegistryModuleOwnerCustom(auth *bind.TransactOpts, backend bind if !ok { return common.Address{}, nil, nil, errors.New("backend is not an ethclient") } - fmt.Println("Deploying zksync contract") + zksyncClient := zkSyncClient.NewClient(client.Client()) - fmt.Println("getting wallet") + wallet := auth.Context.Value("wallet").(*zkSyncAccounts.Wallet) - fmt.Println("got wallet") - fmt.Println("getting bytes") + + decodedBytes := common.FromHex(RegistryModuleOwnerCustomZkBin) - fmt.Println("deploying") + RegistryModuleOwnerCustomAbi, err := RegistryModuleOwnerCustomMetaData.GetAbi() if err != nil { return common.Address{}, nil, nil, err @@ -446,7 +446,7 @@ func DeployZkSyncRegistryModuleOwnerCustom(auth *bind.TransactOpts, backend bind if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("hash of tx", hash) + receipt, err := zksyncClient.WaitMined(context.Background(), hash) if err != nil { return common.Address{}, nil, nil, err @@ -455,7 +455,7 @@ func DeployZkSyncRegistryModuleOwnerCustom(auth *bind.TransactOpts, backend bind if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("tx hash", tx.Hash) + ethTx := ConvertToTransaction(*tx) address := receipt.ContractAddress diff --git a/core/gethwrappers/ccip/generated/rmn_contract/rmn_contract.go b/core/gethwrappers/ccip/generated/rmn_contract/rmn_contract.go index 023d1745a6..a8d4ef158b 100644 --- a/core/gethwrappers/ccip/generated/rmn_contract/rmn_contract.go +++ b/core/gethwrappers/ccip/generated/rmn_contract/rmn_contract.go @@ -2754,14 +2754,14 @@ func DeployZkSyncRMNContract(auth *bind.TransactOpts, backend bind.ContractBacke if !ok { return common.Address{}, nil, nil, errors.New("backend is not an ethclient") } - fmt.Println("Deploying zksync contract") + zksyncClient := zkSyncClient.NewClient(client.Client()) - fmt.Println("getting wallet") + wallet := auth.Context.Value("wallet").(*zkSyncAccounts.Wallet) - fmt.Println("got wallet") - fmt.Println("getting bytes") + + decodedBytes := common.FromHex(RMNContractZkBin) - fmt.Println("deploying") + RMNContractAbi, err := RMNContractMetaData.GetAbi() if err != nil { return common.Address{}, nil, nil, err @@ -2777,7 +2777,7 @@ func DeployZkSyncRMNContract(auth *bind.TransactOpts, backend bind.ContractBacke if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("hash of tx", hash) + receipt, err := zksyncClient.WaitMined(context.Background(), hash) if err != nil { return common.Address{}, nil, nil, err @@ -2786,7 +2786,7 @@ func DeployZkSyncRMNContract(auth *bind.TransactOpts, backend bind.ContractBacke if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("tx hash", tx.Hash) + ethTx := ConvertToTransaction(*tx) address := receipt.ContractAddress diff --git a/core/gethwrappers/ccip/generated/rmn_proxy_contract/rmn_proxy_contract.go b/core/gethwrappers/ccip/generated/rmn_proxy_contract/rmn_proxy_contract.go index 398e43b4aa..215126a984 100644 --- a/core/gethwrappers/ccip/generated/rmn_proxy_contract/rmn_proxy_contract.go +++ b/core/gethwrappers/ccip/generated/rmn_proxy_contract/rmn_proxy_contract.go @@ -756,14 +756,14 @@ func DeployZkSyncRMNProxyContract(auth *bind.TransactOpts, backend bind.Contract if !ok { return common.Address{}, nil, nil, errors.New("backend is not an ethclient") } - fmt.Println("Deploying zksync contract") + zksyncClient := zkSyncClient.NewClient(client.Client()) - fmt.Println("getting wallet") + wallet := auth.Context.Value("wallet").(*zkSyncAccounts.Wallet) - fmt.Println("got wallet") - fmt.Println("getting bytes") + + decodedBytes := common.FromHex(RMNProxyContractZkBin) - fmt.Println("deploying") + RMNProxyContractAbi, err := RMNProxyContractMetaData.GetAbi() if err != nil { return common.Address{}, nil, nil, err @@ -779,7 +779,7 @@ func DeployZkSyncRMNProxyContract(auth *bind.TransactOpts, backend bind.Contract if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("hash of tx", hash) + receipt, err := zksyncClient.WaitMined(context.Background(), hash) if err != nil { return common.Address{}, nil, nil, err @@ -788,7 +788,7 @@ func DeployZkSyncRMNProxyContract(auth *bind.TransactOpts, backend bind.Contract if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("tx hash", tx.Hash) + ethTx := ConvertToTransaction(*tx) address := receipt.ContractAddress diff --git a/core/gethwrappers/ccip/generated/router/router.go b/core/gethwrappers/ccip/generated/router/router.go index bdf279bb0c..ed0b93687d 100644 --- a/core/gethwrappers/ccip/generated/router/router.go +++ b/core/gethwrappers/ccip/generated/router/router.go @@ -1404,14 +1404,14 @@ func DeployZkSyncRouter(auth *bind.TransactOpts, backend bind.ContractBackend, p if !ok { return common.Address{}, nil, nil, errors.New("backend is not an ethclient") } - fmt.Println("Deploying zksync contract") + zksyncClient := zkSyncClient.NewClient(client.Client()) - fmt.Println("getting wallet") + wallet := auth.Context.Value("wallet").(*zkSyncAccounts.Wallet) - fmt.Println("got wallet") - fmt.Println("getting bytes") + + decodedBytes := common.FromHex(RouterZkBin) - fmt.Println("deploying") + RouterAbi, err := RouterMetaData.GetAbi() if err != nil { return common.Address{}, nil, nil, err @@ -1427,7 +1427,7 @@ func DeployZkSyncRouter(auth *bind.TransactOpts, backend bind.ContractBackend, p if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("hash of tx", hash) + receipt, err := zksyncClient.WaitMined(context.Background(), hash) if err != nil { return common.Address{}, nil, nil, err @@ -1436,7 +1436,7 @@ func DeployZkSyncRouter(auth *bind.TransactOpts, backend bind.ContractBackend, p if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("tx hash", tx.Hash) + ethTx := ConvertToTransaction(*tx) address := receipt.ContractAddress diff --git a/core/gethwrappers/ccip/generated/self_funded_ping_pong/self_funded_ping_pong.go b/core/gethwrappers/ccip/generated/self_funded_ping_pong/self_funded_ping_pong.go index 2f4e4c2475..77511e5a91 100644 --- a/core/gethwrappers/ccip/generated/self_funded_ping_pong/self_funded_ping_pong.go +++ b/core/gethwrappers/ccip/generated/self_funded_ping_pong/self_funded_ping_pong.go @@ -1498,14 +1498,14 @@ func DeployZkSyncSelfFundedPingPong(auth *bind.TransactOpts, backend bind.Contra if !ok { return common.Address{}, nil, nil, errors.New("backend is not an ethclient") } - fmt.Println("Deploying zksync contract") + zksyncClient := zkSyncClient.NewClient(client.Client()) - fmt.Println("getting wallet") + wallet := auth.Context.Value("wallet").(*zkSyncAccounts.Wallet) - fmt.Println("got wallet") - fmt.Println("getting bytes") + + decodedBytes := common.FromHex(SelfFundedPingPongZkBin) - fmt.Println("deploying") + SelfFundedPingPongAbi, err := SelfFundedPingPongMetaData.GetAbi() if err != nil { return common.Address{}, nil, nil, err @@ -1521,7 +1521,7 @@ func DeployZkSyncSelfFundedPingPong(auth *bind.TransactOpts, backend bind.Contra if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("hash of tx", hash) + receipt, err := zksyncClient.WaitMined(context.Background(), hash) if err != nil { return common.Address{}, nil, nil, err @@ -1530,7 +1530,7 @@ func DeployZkSyncSelfFundedPingPong(auth *bind.TransactOpts, backend bind.Contra if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("tx hash", tx.Hash) + ethTx := ConvertToTransaction(*tx) address := receipt.ContractAddress diff --git a/core/gethwrappers/ccip/generated/token_admin_registry/token_admin_registry.go b/core/gethwrappers/ccip/generated/token_admin_registry/token_admin_registry.go index a3348a3906..7976c722af 100644 --- a/core/gethwrappers/ccip/generated/token_admin_registry/token_admin_registry.go +++ b/core/gethwrappers/ccip/generated/token_admin_registry/token_admin_registry.go @@ -1497,14 +1497,14 @@ func DeployZkSyncTokenAdminRegistry(auth *bind.TransactOpts, backend bind.Contra if !ok { return common.Address{}, nil, nil, errors.New("backend is not an ethclient") } - fmt.Println("Deploying zksync contract") + zksyncClient := zkSyncClient.NewClient(client.Client()) - fmt.Println("getting wallet") + wallet := auth.Context.Value("wallet").(*zkSyncAccounts.Wallet) - fmt.Println("got wallet") - fmt.Println("getting bytes") + + decodedBytes := common.FromHex(TokenAdminRegistryZkBin) - fmt.Println("deploying") + TokenAdminRegistryAbi, err := TokenAdminRegistryMetaData.GetAbi() if err != nil { return common.Address{}, nil, nil, err @@ -1520,7 +1520,7 @@ func DeployZkSyncTokenAdminRegistry(auth *bind.TransactOpts, backend bind.Contra if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("hash of tx", hash) + receipt, err := zksyncClient.WaitMined(context.Background(), hash) if err != nil { return common.Address{}, nil, nil, err @@ -1529,7 +1529,7 @@ func DeployZkSyncTokenAdminRegistry(auth *bind.TransactOpts, backend bind.Contra if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("tx hash", tx.Hash) + ethTx := ConvertToTransaction(*tx) address := receipt.ContractAddress diff --git a/core/gethwrappers/ccip/generated/weth9/weth9.go b/core/gethwrappers/ccip/generated/weth9/weth9.go index 9820f08f96..4d2286d9b7 100644 --- a/core/gethwrappers/ccip/generated/weth9/weth9.go +++ b/core/gethwrappers/ccip/generated/weth9/weth9.go @@ -993,14 +993,14 @@ func DeployZkSyncWETH9(auth *bind.TransactOpts, backend bind.ContractBackend, pa if !ok { return common.Address{}, nil, nil, errors.New("backend is not an ethclient") } - fmt.Println("Deploying zksync contract") + zksyncClient := zkSyncClient.NewClient(client.Client()) - fmt.Println("getting wallet") + wallet := auth.Context.Value("wallet").(*zkSyncAccounts.Wallet) - fmt.Println("got wallet") - fmt.Println("getting bytes") + + decodedBytes := common.FromHex(WETH9ZkBin) - fmt.Println("deploying") + WETH9Abi, err := WETH9MetaData.GetAbi() if err != nil { return common.Address{}, nil, nil, err @@ -1016,7 +1016,7 @@ func DeployZkSyncWETH9(auth *bind.TransactOpts, backend bind.ContractBackend, pa if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("hash of tx", hash) + receipt, err := zksyncClient.WaitMined(context.Background(), hash) if err != nil { return common.Address{}, nil, nil, err @@ -1025,7 +1025,7 @@ func DeployZkSyncWETH9(auth *bind.TransactOpts, backend bind.ContractBackend, pa if err != nil { return common.Address{}, nil, nil, err } - fmt.Println("tx hash", tx.Hash) + ethTx := ConvertToTransaction(*tx) address := receipt.ContractAddress