diff --git a/contracts/config/networks.json b/contracts/config/networks.json index b36c0713ec..20afa3907f 100644 --- a/contracts/config/networks.json +++ b/contracts/config/networks.json @@ -12,7 +12,7 @@ ] }, "localObscuro": { - "chainId": 777, + "chainId": 443, "url": "http://127.0.0.1:3000/v1", "obscuroEncRpcUrl": "ws://127.0.0.1:81", "gasPrice": 2000000000, diff --git a/docs/_docs/testnet/deploying-a-smart-contract-programmatically.md b/docs/_docs/testnet/deploying-a-smart-contract-programmatically.md index 0a0e2e18d4..0dfc1b0ca0 100644 --- a/docs/_docs/testnet/deploying-a-smart-contract-programmatically.md +++ b/docs/_docs/testnet/deploying-a-smart-contract-programmatically.md @@ -62,7 +62,7 @@ release). An arbitrary `gasPrice` should be given e.g. the current price on the 'nonce': w3.eth.getTransactionCount(account.address), 'gasPrice': 1499934385, 'gas': 720000, - 'chainId': 777 + 'chainId': 443 } ) ``` diff --git a/docs/_docs/testnet/deploying-a-smart-contract-programmatically.py b/docs/_docs/testnet/deploying-a-smart-contract-programmatically.py index 8f90ab6cb3..e2e9004250 100644 --- a/docs/_docs/testnet/deploying-a-smart-contract-programmatically.py +++ b/docs/_docs/testnet/deploying-a-smart-contract-programmatically.py @@ -93,7 +93,7 @@ def run(): 'nonce': w3.eth.getTransactionCount(account.address), 'gasPrice': 1499934385, 'gas': 720000, - 'chainId': 777 + 'chainId': 443 } ) diff --git a/docs/_docs/testnet/deploying-a-smart-contract.md b/docs/_docs/testnet/deploying-a-smart-contract.md index f5a4d3364d..b8e60171f7 100644 --- a/docs/_docs/testnet/deploying-a-smart-contract.md +++ b/docs/_docs/testnet/deploying-a-smart-contract.md @@ -34,7 +34,7 @@ You can now go ahead and deploy your smart contract to the Obscuro Testnet. 1. Log in to MetaMask and confirm you are connected to Obscuro Testnet network. The parameters for the Obscuro Testnet can be found [here](https://docs.obscu.ro/testnet/essentials/). -1. In the _Deploy & Run Transactions_ section of Remix change the Environment to _Injected Web3_. This tells Remix to use the network settings currently configured in your MetaMask wallet, which in this case is the Obscuro Testnet. If the connection to Obscuro Testnet is successful you will see the text _Custom (777) network_ displayed under _Injected Web3_. +1. In the _Deploy & Run Transactions_ section of Remix change the Environment to _Injected Web3_. This tells Remix to use the network settings currently configured in your MetaMask wallet, which in this case is the Obscuro Testnet. If the connection to Obscuro Testnet is successful you will see the text _Custom (443) network_ displayed under _Injected Web3_. 1. Click the _Deploy_ button to deploy your smart contract to the Obscuro Testnet. diff --git a/docs/_docs/testnet/example-dapps.md b/docs/_docs/testnet/example-dapps.md index 1f1f6b2bbb..5fcadaaf34 100644 --- a/docs/_docs/testnet/example-dapps.md +++ b/docs/_docs/testnet/example-dapps.md @@ -14,7 +14,7 @@ Building the guessing game in Obscuro addresses both scenarios described above. 1. Start up the wallet extension. Follow instructions [here](https://docs.obscu.ro/wallet-extension/wallet-extension). 1. For the moment, the Guessing Game includes an ERC20 token (called OGG, short for Obscuro Guessing Game). This is partly because OGG is modified to have a built-in faucet: It allocates tokens to addresses as they make a request to allow other addresses to take tokens from their account. 1. If you want to see this balance in your wallet, you have to import a new Token with the address: ``0x5FbDB2315678afecb367f032d93F642f64180aa3`` -1. Browse to [the number guessing game](http://obscuronet.github.io/sample-applications/number-guessing-game). Check you see `Network ID: 777` at the top of the game window to confirm you are connected to Obscuro Testnet. +1. Browse to [the number guessing game](http://obscuronet.github.io/sample-applications/number-guessing-game). Check you see `Network ID: 443` at the top of the game window to confirm you are connected to Obscuro Testnet. 1. MetaMask will open and ask to connect your account. Click `Next` then click `Connect`. 1. Approve the payment of 1 or more token units to play the game (this will be added to the prize pool) by clicking the `Approve game fee` button. 1. MetaMask will ask for your account to sign a transaction specifying the Guess contract address as the approval delegate. This means that you're giving permission for the game to take the participation fee. Click `Confirm`. Once approved you will see a confirmation popup. Click `OK`. diff --git a/docs/_docs/wallet-extension/configure-metamask.md b/docs/_docs/wallet-extension/configure-metamask.md index aefb689264..709612741a 100644 --- a/docs/_docs/wallet-extension/configure-metamask.md +++ b/docs/_docs/wallet-extension/configure-metamask.md @@ -6,8 +6,8 @@ To keep data encrypted between MetaMask and the Obscuro network, MetaMask needs * Network Name: Obscuro Testnet * New RPC URL: `http://127.0.0.1:3000/` -* Chain ID: 777 -* Currency Symbol: OBX +* Chain ID: 443 +* Currency Symbol: ETH It should look like this: diff --git a/go/config/enclave_config.go b/go/config/enclave_config.go index 9b201bfcfa..46ec99d326 100644 --- a/go/config/enclave_config.go +++ b/go/config/enclave_config.go @@ -73,7 +73,7 @@ func DefaultEnclaveConfig() *EnclaveConfig { Address: "127.0.0.1:11000", NodeType: common.Sequencer, L1ChainID: 1337, - ObscuroChainID: 777, + ObscuroChainID: 443, WillAttest: false, // todo (config) - attestation should be on by default before production release ValidateL1Blocks: false, GenesisJSON: nil, diff --git a/go/config/host_config.go b/go/config/host_config.go index c8f0ae47e2..7ea360e369 100644 --- a/go/config/host_config.go +++ b/go/config/host_config.go @@ -237,7 +237,7 @@ func DefaultHostParsedConfig() *HostInputConfig { LogPath: "", PrivateKeyString: "0000000000000000000000000000000000000000000000000000000000000001", L1ChainID: 1337, - ObscuroChainID: 777, + ObscuroChainID: 443, ProfilerEnabled: false, L1StartHash: common.L1BlockHash{}, // this hash will not be found, host will log a warning and then stream from L1 genesis SequencerID: gethcommon.BytesToAddress([]byte("")), diff --git a/go/enclave/container/cli_flags.go b/go/enclave/container/cli_flags.go index 07cf034e80..7bf4eb6bbf 100644 --- a/go/enclave/container/cli_flags.go +++ b/go/enclave/container/cli_flags.go @@ -37,7 +37,7 @@ func getFlagUsageMap() map[string]string { addressName: "The address on which to serve the Obscuro enclave service", nodeTypeName: "The node's type (e.g. sequencer, validator)", l1ChainIDName: "An integer representing the unique chain id of the Ethereum chain used as an L1 (default 1337)", - obscuroChainIDName: "An integer representing the unique chain id of the Obscuro chain (default 777)", + obscuroChainIDName: "An integer representing the unique chain id of the Obscuro chain (default 443)", willAttestName: "Whether the enclave will produce a verified attestation report", validateL1BlocksName: "Whether to validate incoming blocks using the hardcoded L1 genesis.json config", ManagementContractAddressName: "The management contract address on the L1", diff --git a/go/enclave/container/test.toml b/go/enclave/container/test.toml index 5eea42b9c8..196bf80f0d 100644 --- a/go/enclave/container/test.toml +++ b/go/enclave/container/test.toml @@ -3,7 +3,7 @@ hostAddress = "127.0.0.1:10000" address = "127.0.0.1:11000" nodeType = "sequencer" l1ChainID = 1377 -obscuroChainID = 777 +obscuroChainID = 443 willAttest = false validateL1Blocks = false managementContractAddress = "0x0000000000000000000000000000000000000000" diff --git a/go/host/container/cli_flags.go b/go/host/container/cli_flags.go index 445d28124b..00464d1133 100644 --- a/go/host/container/cli_flags.go +++ b/go/host/container/cli_flags.go @@ -60,7 +60,7 @@ func getFlagUsageMap() map[string]string { logPathName: "The path to use for the host's log file", privateKeyName: "The private key for the L1 host account", l1ChainIDName: "An integer representing the unique chain id of the Ethereum chain used as an L1 (default 1337)", - obscuroChainIDName: "An integer representing the unique chain id of the Obscuro chain (default 777)", + obscuroChainIDName: "An integer representing the unique chain id of the Obscuro chain (default 443)", profilerEnabledName: "Runs a profiler instance (Defaults to false)", l1StartHashName: "The L1 block hash where the management contract was deployed", sequencerIDName: "The ID of the sequencer", diff --git a/go/host/container/test.toml b/go/host/container/test.toml index 7a56417666..3d63e17a5c 100644 --- a/go/host/container/test.toml +++ b/go/host/container/test.toml @@ -17,7 +17,7 @@ LogLevel = 3 LogPath = "" PrivateKeyString = "0000000000000000000000000000000000000000000000000000000000000001" L1ChainID = 1337 -ObscuroChainID = 777 +ObscuroChainID = 443 ProfilerEnabled = false DebugNamespaceEnabled = false BatchInterval = "1.0s" diff --git a/integration/constants.go b/integration/constants.go index f1ed44fa67..1e9f85ed83 100644 --- a/integration/constants.go +++ b/integration/constants.go @@ -31,5 +31,5 @@ const ( const ( EthereumChainID = 1337 - ObscuroChainID = 777 + ObscuroChainID = 443 ) diff --git a/integration/manualtests/tx_test.go b/integration/manualtests/tx_test.go index f427ca980a..df9942f5b3 100644 --- a/integration/manualtests/tx_test.go +++ b/integration/manualtests/tx_test.go @@ -47,7 +47,7 @@ var ( l2Wallet = wallet.NewInMemoryWalletFromConfig( "4bfe14725e685901c062ccd4e220c61cf9c189897b6c78bd18d7f51291b2b8f8", - 777, + 443, gethlog.New()) l2Host = "localhost" l2Port = 37900 diff --git a/tools/faucet/cmd/cli.go b/tools/faucet/cmd/cli.go index f6bf8c4c3f..c5755c6fd8 100644 --- a/tools/faucet/cmd/cli.go +++ b/tools/faucet/cmd/cli.go @@ -50,6 +50,6 @@ func parseCLIArgs() *faucet.Config { PK: *faucetPK, JWTSecret: *jwtSecret, ServerPort: *serverPort, - ChainID: big.NewInt(777), // TODO make this configurable + ChainID: big.NewInt(443), // TODO make this configurable } } diff --git a/tools/hardhatdeployer/cli.go b/tools/hardhatdeployer/cli.go index c0d6b78911..3def80f0f2 100644 --- a/tools/hardhatdeployer/cli.go +++ b/tools/hardhatdeployer/cli.go @@ -14,7 +14,7 @@ const ( var ( defaultL1ChainID = big.NewInt(1337) - defaultL2ChainID = big.NewInt(777) + defaultL2ChainID = big.NewInt(443) ) // DefaultConfig stores the contract client default config diff --git a/tools/hardhatdeployer/cli_flags.go b/tools/hardhatdeployer/cli_flags.go index db12ffabb8..ef2395a697 100644 --- a/tools/hardhatdeployer/cli_flags.go +++ b/tools/hardhatdeployer/cli_flags.go @@ -18,7 +18,7 @@ const ( privateKeyUsage = "The private key for the node account" chainIDName = "chainID" - chainIDUsage = "The ID of the chain (defaults to 777 for L2 deployment and 1337 for L1)" + chainIDUsage = "The ID of the chain (defaults to 443 for L2 deployment and 1337 for L1)" constructorParamsName = "constructorParams" constructorParamsUsage = "A comma separated list of strings that will be passed to the deployer. Defaults to empty." diff --git a/tools/walletextension/api/staticOG/javascript.js b/tools/walletextension/api/staticOG/javascript.js index c261d1b3d3..0c208a8240 100644 --- a/tools/walletextension/api/staticOG/javascript.js +++ b/tools/walletextension/api/staticOG/javascript.js @@ -11,7 +11,7 @@ const pathJoin = obscuroGatewayVersion + "/join/"; const pathAuthenticate = obscuroGatewayVersion + "/authenticate/"; const pathQuery = obscuroGatewayVersion + "/query/"; const pathRevoke = obscuroGatewayVersion + "/revoke/"; -const obscuroChainIDDecimal = 777; +const obscuroChainIDDecimal = 443; const methodPost = "post"; const methodGet = "get"; const jsonHeaders = { @@ -40,12 +40,12 @@ async function addNetworkToMetaMask(ethereum, userID, chainIDDecimal) { chainId: chainIdHex, chainName: 'Obscuro Testnet', nativeCurrency: { - name: 'Obscuro', - symbol: 'OBX', + name: 'Sepolia Ether', + symbol: 'ETH', decimals: 18 }, rpcUrls: [obscuroGatewayAddress+"/"+obscuroGatewayVersion+'/?u='+userID], - blockExplorerUrls: null, + blockExplorerUrls: ['https://testnet.obscuroscan.io'], }, ], });