From e37dd12d087640a797d5e4fd29f250f3cd4d33ec Mon Sep 17 00:00:00 2001 From: folex <0xdxdy@gmail.com> Date: Thu, 4 Apr 2019 23:59:08 +0300 Subject: [PATCH] Update contract address for new devnet (#605) --- cli/Cargo.lock | 2 +- cli/Cargo.toml | 2 +- cli/README.md | 4 +- dashboard/README.md | 64 +++++++++---------- dashboard/src/fluence/deployable/index.ts | 28 +++++++- docs/src/nodes.md | 2 +- docs/src/quickstart/web.md | 4 +- .../tendermint/rpc/TendermintRpc.scala | 6 +- tools/deploy/scripts/contract.txt | 2 +- 9 files changed, 70 insertions(+), 44 deletions(-) diff --git a/cli/Cargo.lock b/cli/Cargo.lock index 6d852c8a64..573469eb92 100644 --- a/cli/Cargo.lock +++ b/cli/Cargo.lock @@ -610,7 +610,7 @@ dependencies = [ [[package]] name = "fluence" -version = "0.1.5" +version = "0.1.6" dependencies = [ "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 41da967aea..8ab2e4ef57 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fluence" -version = "0.1.5" +version = "0.1.6" authors = ["Fluence Labs"] publish=false edition = "2018" diff --git a/cli/README.md b/cli/README.md index 81256ba30c..8b40b19bbe 100644 --- a/cli/README.md +++ b/cli/README.md @@ -55,7 +55,7 @@ Use `setup` command to enter main arguments into a config file. It will allow no ``` Contract address, Ethereum, and Swarm node addresses have defaults, but account address and credentials (secret key or Ethereum keystore and password) should be filled for correct transaction sending. Arguments description and examples: -- `0xf008c29bb1fabd1eb1ea73b2410f523a5c213f19` is a contract address, register transaction will be sent there +- `0xeFF91455de6D4CF57C141bD8bF819E5f873c1A01` is a contract address, register transaction will be sent there - `http://data.fluence.one:8545` is an URL to Ethereum node - `http://data.fluence.one:8500` is an URL to Swarm node - `0x4180fc65d613ba7e1a385181a219f1dbfe7bf11d` will be used as Ethereum account for issuing transactions. _Use your Ethereum account here_ @@ -261,7 +261,7 @@ There is a flag `--contract_address` to use all commands to interact with non-de ```bash ./fluence ... - --contract_address 0xf008c29bb1fabd1eb1ea73b2410f523a5c213f19 \ + --contract_address 0xeFF91455de6D4CF57C141bD8bF819E5f873c1A01 \ ... ``` diff --git a/dashboard/README.md b/dashboard/README.md index ccbb9eca6a..daa9880107 100644 --- a/dashboard/README.md +++ b/dashboard/README.md @@ -1,32 +1,32 @@ -## IMPORTANT: Client and README are under heavy development and can be outdated. Ask a question in gitter or file an issue. - -## Fluence Dashboard - -## Build - -- Install project: - -`npm install` - -- Build production files: - -`npm run build` - -Then look at `build` directory - -## Development - -- Install project: - -`npm install` - -- Start dev server: - -`npm run watch` - -## Configuration - -Address of Fluence contract can be configured in -- dashboard/src/constants.ts, see defaultContractAddress constant -- `data-contract` attribute of dashboard index.html body tag for example: `` -- passed in querystring, `/?contract=0xf008c29bb1fabd1eb1ea73b2410f523a5c213f19` \ No newline at end of file +## IMPORTANT: Client and README are under heavy development and can be outdated. Ask a question in gitter or file an issue. + +## Fluence Dashboard + +## Build + +- Install project: + +`npm install` + +- Build production files: + +`npm run build` + +Then look at `build` directory + +## Development + +- Install project: + +`npm install` + +- Start dev server: + +`npm run watch` + +## Configuration + +Address of Fluence contract can be configured in +- dashboard/src/constants.ts, see defaultContractAddress constant +- `data-contract` attribute of dashboard index.html body tag for example: `` +- passed in querystring, `/?contract=0xeFF91455de6D4CF57C141bD8bF819E5f873c1A01` \ No newline at end of file diff --git a/dashboard/src/fluence/deployable/index.ts b/dashboard/src/fluence/deployable/index.ts index 425cf394b5..a0b9c079b8 100644 --- a/dashboard/src/fluence/deployable/index.ts +++ b/dashboard/src/fluence/deployable/index.ts @@ -22,7 +22,7 @@ export interface DeployableApp { clusterSize: number, } -export const deployableAppIds: [DeployableAppId] = ["llamadb"]; +export const deployableAppIds: DeployableAppId[] = ["llamadb", "dice", "guess", "tictactoe"]; export const deployableApps: { [key: string]: DeployableApp } = { "llamadb": { @@ -31,7 +31,31 @@ export const deployableApps: { [key: string]: DeployableApp } = { storageHash: "0x090A9B7CCA9D55A9632BBCC3A30A57F2DB1D1FD688659CFF95AB8D1F904AD74B", storageType: StorageType.Ipfs, clusterSize: 4 - } + }, + "dice": { + // {"Name":"dice_game.wasm","Hash":"QmNsWcjoeMSjnVdBt4uGpwqEs24sQWjopP4wZyHsJ2CyMs","Size":"471184"} + name: "Dice Game", + shortName: "Dice Game", + storageHash: "0x07E7DAD4A8C553BE9773C6E6FF9AECB70A46D84FE9B7EE379577AEE6A174C982", + storageType: StorageType.Ipfs, + clusterSize: 4 + }, + "guess": { + // {"Name":"guessing_game.wasm","Hash":"QmPKt1idN3xDYC28sBbrCfQu3ZZShwvqGMTCAjmHodVAt5","Size":"242001"} + name: "Guessing Game", + shortName: "Guessing Game", + storageHash: "0x0EA9260B083F8312DEDB4B37FFA40EA73E12E08E788A932C8D1B02B843A47936", + storageType: StorageType.Ipfs, + clusterSize: 4 + }, + "tictactoe": { + // {"Name":"tic_tac_toe.wasm","Hash":"QmQw2qEJvCrgpH29PcNduzsTcmYYcGWcn9XRi6G5NroUri","Size":"508346"} + name: "Tic Tac Toe", + shortName: "Tic Tac Toe", + storageHash: "0x268622BE3A3CB9473E764C229BE02ED9228170FF61F876CA3634590D748E1CEF", + storageType: StorageType.Ipfs, + clusterSize: 4 + }, }; // Sends a signed transaction to Ethereum diff --git a/docs/src/nodes.md b/docs/src/nodes.md index e8722c1099..d3e0194097 100644 --- a/docs/src/nodes.md +++ b/docs/src/nodes.md @@ -92,7 +92,7 @@ $ fab deploy At the end of the successful deployment you should see something like the following: ``` -[53.42.31.20] out: CONTRACT_ADDRESS=0xf008c29bb1fabd1eb1ea73b2410f523a5c213f19 +[53.42.31.20] out: CONTRACT_ADDRESS=0xeFF91455de6D4CF57C141bD8bF819E5f873c1A01 [53.42.31.20] out: NAME=fluence-node-1 [53.42.31.20] out: HOST_IP=53.42.31.20 [53.42.31.20] out: EXTERNAL_HOST_IP=53.42.31.20 diff --git a/docs/src/quickstart/web.md b/docs/src/quickstart/web.md index 807df1a49b..82948eceab 100644 --- a/docs/src/quickstart/web.md +++ b/docs/src/quickstart/web.md @@ -22,11 +22,11 @@ Let's take a look at `index.js`: ```javascript // the address of the Fluence smart contract on Ethereum -let contractAddress = "0xf008c29bb1fabd1eb1ea73b2410f523a5c213f19"; +let contractAddress = "0xeFF91455de6D4CF57C141bD8bF819E5f873c1A01"; // the address of the Ethereum node // MetaMask is used to send transactions if this address is set to `undefined`, -let ethUrl = "http://207.154.240.52:8545/"; +let ethUrl = "http://data.fluence.one:8545/"; // the backend appId as seen in the Fluence smart contract let appId = "6"; diff --git a/effects/tendermint-rpc/src/main/scala/fluence/effects/tendermint/rpc/TendermintRpc.scala b/effects/tendermint-rpc/src/main/scala/fluence/effects/tendermint/rpc/TendermintRpc.scala index 59e79f61ed..0c20b8bca7 100644 --- a/effects/tendermint-rpc/src/main/scala/fluence/effects/tendermint/rpc/TendermintRpc.scala +++ b/effects/tendermint-rpc/src/main/scala/fluence/effects/tendermint/rpc/TendermintRpc.scala @@ -116,7 +116,7 @@ object TendermintRpc extends slogging.LazyLogging { reqT: RequestT[Id, String, Nothing] )(implicit sttpBackend: SttpBackend[F, Nothing]): EitherT[F, RpcError, String] = EitherT - .pure(logger.debug(s"TendermintRpc request $reqT")) + .pure(logger.debug(s"TendermintRpc request ${reqT.uri}")) .flatMap( _ => reqT @@ -127,7 +127,9 @@ object TendermintRpc extends slogging.LazyLogging { val eitherResp = resp.body .leftMap[RpcError](RpcRequestErrored(resp.code, _)) - logger.debug(s"TendermintRpc response(${resp.code}): $eitherResp") + // Print just the first line of response + logger.debug(s"TendermintRpc response code ${resp.code}") + logger.trace(s"TendermintRpc full response: $eitherResp") eitherResp } ) diff --git a/tools/deploy/scripts/contract.txt b/tools/deploy/scripts/contract.txt index 95884ce874..0def39d4c5 100644 --- a/tools/deploy/scripts/contract.txt +++ b/tools/deploy/scripts/contract.txt @@ -1 +1 @@ -0xf008c29bb1fabd1eb1ea73b2410f523a5c213f19 \ No newline at end of file +0xeFF91455de6D4CF57C141bD8bF819E5f873c1A01 \ No newline at end of file