Celo mainnet deploy changes

clients/js/README.md

@@ -114,5 +114,6 @@ For example, to submit a guardian set upgrade on all chains, simply run:
     worm submit $(cat guardian-upgrade.txt) --network mainnet --chain solana
     worm submit $(cat guardian-upgrade.txt) --network mainnet --chain terra
     worm submit $(cat guardian-upgrade.txt) --network mainnet --chain ethereum
+    worm submit $(cat guardian-upgrade.txt) --network mainnet --chain celo
 
 The VAA payload type (guardian set upgrade) specifies that this VAA should go to the core bridge, and the tool directs it there.

clients/js/networks.ts

@@ -75,7 +75,7 @@ const MAINNET = {
     key: get_env_var("ETH_KEY"),
   },
   celo: {
-    rpc: undefined,
+    rpc: "https://forno.celo.org",
     key: get_env_var("ETH_KEY"),
   },
   near: {

ethereum/.env.celo.mainnet

@@ -11,5 +11,5 @@ INIT_GOV_CONTRACT=0x000000000000000000000000000000000000000000000000000000000000
 BRIDGE_INIT_CHAIN_ID=0xE
 BRIDGE_INIT_GOV_CHAIN_ID=0x1
 BRIDGE_INIT_GOV_CONTRACT=0x0000000000000000000000000000000000000000000000000000000000000004
-# WCELO
+# There is no WCELO.
-BRIDGE_INIT_WETH=0x3Ad443d769A07f287806874F8E5405cE3Ac902b9
+BRIDGE_INIT_WETH=0x0000000000000000000000000000000000000000

ethereum/truffle-config.js

@@ -222,6 +222,8 @@ module.exports = {
         )
       },
       network_id: 42220,
+      gas: 8000000,
+      gasPrice: null
     },    
     celo_alfajores_testnet: {
       provider: () => {

node/cmd/guardiand/adminnodes.go

@@ -106,13 +106,13 @@ func runListNodes(cmd *cobra.Command, args []string) {
 		{"Aurora", vaa.ChainIDAurora},
 		{"Fantom", vaa.ChainIDFantom},
 		{"Karura", vaa.ChainIDKarura},
+		{"Celo", vaa.ChainIDCelo},
 	}
 
 	if isTestnet {
 		networks = append(networks, network{"Ropsten", vaa.ChainIDEthereumRopsten})
 		networks = append(networks, network{"Acala", vaa.ChainIDAcala})
 		networks = append(networks, network{"Klaytn", vaa.ChainIDKlaytn})
-		networks = append(networks, network{"Celo", vaa.ChainIDCelo})
 		networks = append(networks, network{"Moonbeam", vaa.ChainIDMoonbeam})
 	}
 

node/cmd/guardiand/node.go

@@ -328,12 +328,12 @@ func runNode(cmd *cobra.Command, args []string) {
 	readiness.RegisterComponent(common.ReadinessAuroraSyncing)
 	readiness.RegisterComponent(common.ReadinessFantomSyncing)
 	readiness.RegisterComponent(common.ReadinessKaruraSyncing)
+	readiness.RegisterComponent(common.ReadinessCeloSyncing)
 
 	if *testnetMode {
 		readiness.RegisterComponent(common.ReadinessEthRopstenSyncing)
 		readiness.RegisterComponent(common.ReadinessAcalaSyncing)
 		readiness.RegisterComponent(common.ReadinessKlaytnSyncing)
-		readiness.RegisterComponent(common.ReadinessCeloSyncing)
 		readiness.RegisterComponent(common.ReadinessMoonbeamSyncing)
 	}
 
@@ -443,6 +443,12 @@ func runNode(cmd *cobra.Command, args []string) {
 	if *karuraContract == "" && !*unsafeDevMode {
 		logger.Fatal("Please specify --karuraContract")
 	}
+	if *celoRPC == "" {
+		logger.Fatal("Please specify --celoRPC")
+	}
+	if *celoContract == "" && !*unsafeDevMode {
+		logger.Fatal("Please specify --celoContract")
+	}
 	if *testnetMode {
 		if *ethRopstenRPC == "" {
 			logger.Fatal("Please specify --ethRopstenRPC")
@@ -462,12 +468,6 @@ func runNode(cmd *cobra.Command, args []string) {
 		if *klaytnContract == "" {
 			logger.Fatal("Please specify --klaytnContract")
 		}
-		if *celoRPC == "" {
-			logger.Fatal("Please specify --celoRPC")
-		}
-		if *celoContract == "" {
-			logger.Fatal("Please specify --celoContract")
-		}
 		if *moonbeamRPC == "" {
 			logger.Fatal("Please specify --moonbeamRPC")
 		}
@@ -493,12 +493,6 @@ func runNode(cmd *cobra.Command, args []string) {
 		if *klaytnContract != "" && !*unsafeDevMode {
 			logger.Fatal("Please do not specify --klaytnContract")
 		}
-		if *celoRPC != "" && !*unsafeDevMode {
-			logger.Fatal("Please do not specify --celoRPC")
-		}
-		if *celoContract != "" && !*unsafeDevMode {
-			logger.Fatal("Please do not specify --celoContract")
-		}
 		if *moonbeamRPC != "" && !*unsafeDevMode {
 			logger.Fatal("Please do not specify --moonbeamRPC")
 		}
@@ -689,10 +683,10 @@ func runNode(cmd *cobra.Command, args []string) {
 	chainObsvReqC[vaa.ChainIDAurora] = make(chan *gossipv1.ObservationRequest)
 	chainObsvReqC[vaa.ChainIDFantom] = make(chan *gossipv1.ObservationRequest)
 	chainObsvReqC[vaa.ChainIDKarura] = make(chan *gossipv1.ObservationRequest)
+	chainObsvReqC[vaa.ChainIDCelo] = make(chan *gossipv1.ObservationRequest)
 	if *testnetMode {
 		chainObsvReqC[vaa.ChainIDAcala] = make(chan *gossipv1.ObservationRequest)
 		chainObsvReqC[vaa.ChainIDKlaytn] = make(chan *gossipv1.ObservationRequest)
-		chainObsvReqC[vaa.ChainIDCelo] = make(chan *gossipv1.ObservationRequest)
 		chainObsvReqC[vaa.ChainIDMoonbeam] = make(chan *gossipv1.ObservationRequest)
 		chainObsvReqC[vaa.ChainIDEthereumRopsten] = make(chan *gossipv1.ObservationRequest)
 	}
@@ -844,6 +838,10 @@ func runNode(cmd *cobra.Command, args []string) {
 			ethereum.NewEthWatcher(*karuraRPC, karuraContractAddr, "karura", common.ReadinessKaruraSyncing, vaa.ChainIDKarura, lockC, nil, 1, chainObsvReqC[vaa.ChainIDKarura], *unsafeDevMode).Run); err != nil {
 			return err
 		}
+		if err := supervisor.Run(ctx, "celowatch",
+			ethereum.NewEthWatcher(*celoRPC, celoContractAddr, "celo", common.ReadinessCeloSyncing, vaa.ChainIDCelo, lockC, nil, 1, chainObsvReqC[vaa.ChainIDCelo], *unsafeDevMode).Run); err != nil {
+			return err
+		}
 
 		if *testnetMode {
 			if err := supervisor.Run(ctx, "ethropstenwatch",
@@ -858,10 +856,6 @@ func runNode(cmd *cobra.Command, args []string) {
 				ethereum.NewEthWatcher(*klaytnRPC, klaytnContractAddr, "klaytn", common.ReadinessKlaytnSyncing, vaa.ChainIDKlaytn, lockC, nil, 1, chainObsvReqC[vaa.ChainIDKlaytn], *unsafeDevMode).Run); err != nil {
 				return err
 			}
-			if err := supervisor.Run(ctx, "celowatch",
-				ethereum.NewEthWatcher(*celoRPC, celoContractAddr, "celo", common.ReadinessCeloSyncing, vaa.ChainIDCelo, lockC, nil, 1, chainObsvReqC[vaa.ChainIDCelo], *unsafeDevMode).Run); err != nil {
-				return err
-			}
 			if err := supervisor.Run(ctx, "moonbeamwatch",
 				ethereum.NewEthWatcher(*moonbeamRPC, moonbeamContractAddr, "moonbeam", common.ReadinessMoonbeamSyncing, vaa.ChainIDMoonbeam, lockC, nil, 1, chainObsvReqC[vaa.ChainIDMoonbeam], *unsafeDevMode).Run); err != nil {
 				return err

node/hack/repair_eth/repair_eth.go

@@ -36,7 +36,7 @@ var etherscanAPIMap = map[vaa.ChainID]string{
 	vaa.ChainIDAurora:    "https://explorer.mainnet.aurora.dev/api",
 	vaa.ChainIDFantom:    "https://api.ftmscan.com/api",
 	vaa.ChainIDKarura:    "https://blockscout.karura.network/api",
-	vaa.ChainIDCelo:      "https://explorer.celo.org/api",
+	vaa.ChainIDCelo:      "https://celoscan.xyz/api",
 }
 
 var coreContractMap = map[vaa.ChainID]string{
@@ -47,8 +47,8 @@ var coreContractMap = map[vaa.ChainID]string{
 	vaa.ChainIDOasis:     "0xfe8cd454b4a1ca468b57d79c0cc77ef5b6f64585", // <- converted to all lower case for easy compares
 	vaa.ChainIDAurora:    "0xa321448d90d4e5b0a732867c18ea198e75cac48e",
 	vaa.ChainIDFantom:    strings.ToLower("0x126783A6Cb203a3E35344528B26ca3a0489a1485"),
-	vaa.ChainIDCelo:      strings.ToLower("0x88505117ca88e7dd2eC6ea1e13f0948db2d50d56"), // This needs to be the mainnet wormhole address
 	vaa.ChainIDKarura:    strings.ToLower("0xa321448d90d4e5b0A732867c18eA198e75CAC48E"),
+	vaa.ChainIDCelo:      strings.ToLower("0xa321448d90d4e5b0A732867c18eA198e75CAC48E"),
 }
 
 var (
@@ -77,7 +77,7 @@ func addUserAgent(req *http.Request) *http.Request {
 }
 
 func usesBlockscout(chainId vaa.ChainID) bool {
-	return chainId == vaa.ChainIDOasis || chainId == vaa.ChainIDAurora || chainId == vaa.ChainIDKarura || chainId == vaa.ChainIDCelo
+	return chainId == vaa.ChainIDOasis || chainId == vaa.ChainIDAurora || chainId == vaa.ChainIDKarura
 }
 
 func getAdminClient(ctx context.Context, addr string) (*grpc.ClientConn, error, nodev1.NodePrivilegedServiceClient) {

node/pkg/common/mainnet_consts.go

@@ -44,5 +44,7 @@ var KnownEmitters = []struct {
 	{vaa.ChainIDFantom, "0000000000000000000000007C9Fc5741288cDFdD83CeB07f3ea7e22618D79D2"},    // 10 Fantom Token Bridge
 	{vaa.ChainIDFantom, "000000000000000000000000A9c7119aBDa80d4a4E0C06C8F4d8cF5893234535"},    // 10 Fantom NFT Bridge
 	{vaa.ChainIDKarura, "000000000000000000000000ae9d7fe007b3327AA64A32824Aaac52C42a6E624"},    // 11 Karura Token Bridge
-	{vaa.ChainIDKarura, "000000000000000000000000b91e3638F82A1fACb28690b37e3aAE45d2c33808"},    // 11 Karura NFT Bridge	
+	{vaa.ChainIDKarura, "000000000000000000000000b91e3638F82A1fACb28690b37e3aAE45d2c33808"},    // 11 Karura NFT Bridge
+	{vaa.ChainIDCelo, "000000000000000000000000796Dff6D74F3E27060B71255Fe517BFb23C93eed"},      // 14 Celo Token Bridge
+	{vaa.ChainIDCelo, "000000000000000000000000A6A377d75ca5c9052c9a77ED1e865Cc25Bd97bf3"},      // 14 Celo NFT Bridge
 }

sdk/js/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.3.2
+
+### Added
+
+Celo Mainnet support
+
 ## 0.3.1
 
 ### Added

sdk/js/src/utils/consts.ts

@@ -123,9 +123,9 @@ const MAINNET = {
     nft_bridge: undefined,
   },
   celo: {
-    core: undefined,
+    core: "0xa321448d90d4e5b0A732867c18eA198e75CAC48E",
-    token_bridge: undefined,
+    token_bridge: "0x796Dff6D74F3E27060B71255Fe517BFb23C93eed",
-    nft_bridge: undefined,
+    nft_bridge: "0xA6A377d75ca5c9052c9a77ED1e865Cc25Bd97bf3",
   },
   near: {
     core: undefined,