From 04f4a862c8cf2c2552dcdb89dc24607f837f455c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matev=C5=BE=20Jekovec?= Date: Thu, 22 Feb 2024 19:54:35 +0100 Subject: [PATCH 1/3] docs: Add 3rd party RPC endpoints --- docs/guide.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guide.mdx b/docs/guide.mdx index 90c76ce7..bc0e621b 100644 --- a/docs/guide.mdx +++ b/docs/guide.mdx @@ -122,8 +122,8 @@ it'll work just fine. Sapphire is programmable using any language that targets the EVM, such as Solidity or Vyper. If you prefer to use an Ethereum framework like Hardhat or Foundry, you can also use those with Sapphire; all you need to do is set your Web3 gateway URL. -You can find the details of the Oasis Sapphire Web3 gateway -[here](https://github.com/oasisprotocol/docs/blob/main/docs/dapp/sapphire/README.mdx#web3-gateway). +You can find the details of the Oasis Sapphire Web3 endpoints +[here](https://github.com/oasisprotocol/docs/blob/main/docs/dapp/sapphire/README.mdx#rpc-endpoints). ### Transactions & Calls From 3cb5e243f6d84028fc2662ff294af8139605a184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matev=C5=BE=20Jekovec?= Date: Mon, 11 Mar 2024 14:13:51 +0100 Subject: [PATCH 2/3] docs: Migrate oasis.dev -> oasis.io --- clients/go/compat.go | 2 +- clients/js/README.md | 2 +- clients/js/src/networks.ts | 2 +- clients/js/test/compat.spec.ts | 2 +- contracts/hardhat.config.ts | 4 ++-- docs/browser.md | 2 +- docs/gasless.md | 2 +- docs/guide.mdx | 2 +- docs/quickstart.mdx | 4 ++-- examples/hardhat-boilerplate/README.md | 6 +++--- examples/hardhat-boilerplate/hardhat.config.js | 2 +- examples/hardhat/hardhat.config.ts | 2 +- examples/onchain-signer/hardhat.config.ts | 2 +- integrations/graph/docker-compose.yml | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/clients/go/compat.go b/clients/go/compat.go index 39138128..419aa167 100644 --- a/clients/go/compat.go +++ b/clients/go/compat.go @@ -36,7 +36,7 @@ var Networks = map[uint64]NetworkParams{ 0x5aff: { Name: "testnet", ChainID: *big.NewInt(0x5aff), - DefaultGateway: "https://testnet.sapphire.oasis.dev", + DefaultGateway: "https://testnet.sapphire.oasis.io", RuntimeID: "0x000000000000000000000000000000000000000000000000a6d1e3ebf60dff6c", }, 0x5afe: { diff --git a/clients/js/README.md b/clients/js/README.md index 4e5bce17..3623b906 100644 --- a/clients/js/README.md +++ b/clients/js/README.md @@ -93,6 +93,6 @@ Use that for unsigned queries instead. ## See Also -- [Oasis Testnet Faucet](https://faucet.testnet.oasis.dev/) +- [Oasis Testnet Faucet](https://faucet.testnet.oasis.io/) - [Creating dapps for Sapphire](https://docs.oasis.io/dapp/sapphire/quickstart) - [How to Transfer ROSE into an EVM ParaTime](https://docs.oasis.io/general/manage-tokens/how-to-transfer-rose-into-paratime/) diff --git a/clients/js/src/networks.ts b/clients/js/src/networks.ts index 48548539..ddba78df 100644 --- a/clients/js/src/networks.ts +++ b/clients/js/src/networks.ts @@ -7,7 +7,7 @@ const mainnetParams = { const testnetParams = { chainId: 0x5aff, - defaultGateway: 'https://testnet.sapphire.oasis.dev/', + defaultGateway: 'https://testnet.sapphire.oasis.io/', runtimeId: '0x000000000000000000000000000000000000000000000000a6d1e3ebf60dff6c', }; diff --git a/clients/js/test/compat.spec.ts b/clients/js/test/compat.spec.ts index 9895fd96..13633308 100644 --- a/clients/js/test/compat.spec.ts +++ b/clients/js/test/compat.spec.ts @@ -427,7 +427,7 @@ describe('fetchPublicKeyByChainId', () => { await expectFetch(0x5afe, 'https://sapphire.oasis.io', { fetch: fetchImpl as unknown as typeof fetch, }); - await expectFetch(0x5aff, 'https://testnet.sapphire.oasis.dev', { + await expectFetch(0x5aff, 'https://testnet.sapphire.oasis.io', { fetch: fetchImpl as unknown as typeof fetch, }); }); diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts index ca1b89b8..5fbb3a17 100644 --- a/contracts/hardhat.config.ts +++ b/contracts/hardhat.config.ts @@ -59,14 +59,14 @@ const config: HardhatUserConfig = { }, networks: { 'emerald-testnet': { - url: 'https://testnet.emerald.oasis.dev', + url: 'https://testnet.emerald.oasis.io', chainId: 0xa515, accounts: process.env.EMERALD_TESTNET_PRIVATE_KEY ? [process.env.EMERALD_TESTNET_PRIVATE_KEY] : [], }, 'sapphire-testnet': { - url: 'https://testnet.sapphire.oasis.dev', + url: 'https://testnet.sapphire.oasis.io', chainId: 0x5aff, accounts: process.env.SAPPHIRE_TESTNET_PRIVATE_KEY ? [process.env.SAPPHIRE_TESTNET_PRIVATE_KEY] diff --git a/docs/browser.md b/docs/browser.md index ca1c5627..ff7236d3 100644 --- a/docs/browser.md +++ b/docs/browser.md @@ -194,7 +194,7 @@ repository. ::: -[block explorer]: https://testnet.explorer.sapphire.oasis.dev/tx/0x3303dea5d48291d1564cad573f21fc71fcbdc2b862e17e056287fd9207e3bc53 +[block explorer]: https://explorer.oasis.io/testnet/sapphire/tx/0x3303dea5d48291d1564cad573f21fc71fcbdc2b862e17e056287fd9207e3bc53 [guide-transaction-calls]: guide.mdx#transactions--calls [Hardhat boilerplate repo]: https://github.com/NomicFoundation/hardhat-boilerplate [Hardhat boilerplate]: https://hardhat.org/tutorial/boilerplate-project diff --git a/docs/gasless.md b/docs/gasless.md index f67a6fa6..54eacedb 100644 --- a/docs/gasless.md +++ b/docs/gasless.md @@ -327,7 +327,7 @@ Use the newly deployed: - address of your account for `--owner-address` ```shell -npx gsn relayer-run --relayHubAddress 0xc4423AB6133B06e4e60D594Ac49abE53374124b3 --managerStakeTokenAddress 0x6Ed21672c0c26Daa32943F7b1cA1f1d0ABdbac66 --ownerAddress '0xfA3AC9f65C9D75EE3978ab76c6a1105f03156204' --ethereumNodeUrl 'https://testnet.sapphire.oasis.dev' --workdir . +npx gsn relayer-run --relayHubAddress 0xc4423AB6133B06e4e60D594Ac49abE53374124b3 --managerStakeTokenAddress 0x6Ed21672c0c26Daa32943F7b1cA1f1d0ABdbac66 --ownerAddress '0xfA3AC9f65C9D75EE3978ab76c6a1105f03156204' --ethereumNodeUrl 'https://testnet.sapphire.oasis.io' --workdir . ``` ### Fund and Register GSN Relay Server diff --git a/docs/guide.mdx b/docs/guide.mdx index bc0e621b..5ceebb9b 100644 --- a/docs/guide.mdx +++ b/docs/guide.mdx @@ -39,7 +39,7 @@ ParaTime][how-to-deposit-rose] chapter to learn more. [overview chapter]: https://github.com/oasisprotocol/docs/blob/main/docs/general/oasis-network/README.mdx [how-to-deposit-rose]: https://github.com/oasisprotocol/docs/blob/main/docs/general/manage-tokens/how-to-transfer-rose-into-paratime.mdx -[Testnet faucet]: https://faucet.testnet.oasis.dev/ +[Testnet faucet]: https://faucet.testnet.oasis.io/ ## Testnet and Mainnet diff --git a/docs/quickstart.mdx b/docs/quickstart.mdx index faf85312..f909fa6f 100644 --- a/docs/quickstart.mdx +++ b/docs/quickstart.mdx @@ -78,7 +78,7 @@ index 414e974..49c95f9 100644 + networks: { + 'sapphire-testnet': { + // This is Testnet! If you want Mainnet, add a new network config item. -+ url: "https://testnet.sapphire.oasis.dev", ++ url: "https://testnet.sapphire.oasis.io", + accounts: process.env.PRIVATE_KEY + ? [process.env.PRIVATE_KEY] + : [], @@ -101,7 +101,7 @@ Now for the fun part. We need to configure the Sapphire network and get some tok Hit up the one and only [Oasis Testnet faucet] and select "Sapphire". Submit the form and be on your way. -[Oasis Testnet faucet]: https://faucet.testnet.oasis.dev +[Oasis Testnet faucet]: https://faucet.testnet.oasis.io ### Get the Contract diff --git a/examples/hardhat-boilerplate/README.md b/examples/hardhat-boilerplate/README.md index c0fd3e61..4407b0f9 100644 --- a/examples/hardhat-boilerplate/README.md +++ b/examples/hardhat-boilerplate/README.md @@ -15,7 +15,7 @@ pnpm install ``` You will need some TEST tokens in order to deploy the smart contract. Head to -https://faucet.testnet.oasis.dev/ and request some. +https://faucet.testnet.oasis.io/ and request some. Next, run this to deploy your contract on Sapphire Testnet: @@ -31,8 +31,8 @@ pnpm start ``` Open [http://localhost:3000/](http://localhost:3000/) in a browser to see your -Dapp. You will need to have [Metamask](https://metamask.io) installed and -connected to `https://testnet.sapphire.oasis.dev/` endpoint with chain ID +dApp. You will need to have [Metamask](https://metamask.io) installed and +connected to `https://testnet.sapphire.oasis.io/` endpoint with chain ID `23295`. [Hardhat boilerplate code]: https://hardhat.org/tutorial diff --git a/examples/hardhat-boilerplate/hardhat.config.js b/examples/hardhat-boilerplate/hardhat.config.js index 718dcc1e..1b6fe1f0 100644 --- a/examples/hardhat-boilerplate/hardhat.config.js +++ b/examples/hardhat-boilerplate/hardhat.config.js @@ -21,7 +21,7 @@ module.exports = { chainId: 0x5afe, }, 'sapphire-testnet': { - url: "https://testnet.sapphire.oasis.dev", + url: "https://testnet.sapphire.oasis.io", accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : [], diff --git a/examples/hardhat/hardhat.config.ts b/examples/hardhat/hardhat.config.ts index d8fe4142..1a4b922f 100644 --- a/examples/hardhat/hardhat.config.ts +++ b/examples/hardhat/hardhat.config.ts @@ -24,7 +24,7 @@ const config: HardhatUserConfig = { chainId: 0x5afe }, 'sapphire-testnet': { - url: 'https://testnet.sapphire.oasis.dev', + url: 'https://testnet.sapphire.oasis.io', accounts: process.env.PRIVATE_KEY ? [process.env.PRIVATE_KEY] : [], diff --git a/examples/onchain-signer/hardhat.config.ts b/examples/onchain-signer/hardhat.config.ts index fea71e1b..f2021a73 100644 --- a/examples/onchain-signer/hardhat.config.ts +++ b/examples/onchain-signer/hardhat.config.ts @@ -27,7 +27,7 @@ const config: HardhatUserConfig = { accounts, }, 'sapphire-testnet': { - url: 'https://testnet.sapphire.oasis.dev', + url: 'https://testnet.sapphire.oasis.io', chainId: 0x5aff, accounts, }, diff --git a/integrations/graph/docker-compose.yml b/integrations/graph/docker-compose.yml index fb7223aa..47de843f 100644 --- a/integrations/graph/docker-compose.yml +++ b/integrations/graph/docker-compose.yml @@ -4,7 +4,7 @@ services: restart: always build: . environment: - RPC: 'https://testnet.sapphire.oasis.dev' + RPC: 'https://testnet.sapphire.oasis.io' graph-node: image: graphprotocol/graph-node ports: From 6689603fa901ed1eae313b132e71a36a5a6d8781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matev=C5=BE=20Jekovec?= Date: Mon, 11 Mar 2024 14:53:15 +0100 Subject: [PATCH 3/3] deps: Bump snow to 0.9.6 and eyre to 0.6.12 --- runtime/Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime/Cargo.lock b/runtime/Cargo.lock index 3c99820f..c5fc818e 100644 --- a/runtime/Cargo.lock +++ b/runtime/Cargo.lock @@ -1110,9 +1110,9 @@ dependencies = [ [[package]] name = "eyre" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" dependencies = [ "indenter", "once_cell", @@ -3217,9 +3217,9 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "snow" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58021967fd0a5eeeb23b08df6cc244a4d4a5b4aec1d27c9e02fad1a58b4cd74e" +checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85" dependencies = [ "aes-gcm", "blake2",