-
- 
-
-
-
-
-
-
-
-
-
-
- 
- Network
-
- Docs
-
+
-
- Network
-
- Docs
-
+
- 
-
-
-
+
-
-
-
- %%content%%
-
-
-
-
+
-
diff --git a/public/index.js b/public/index.js
index c109688..b667e34 100644
--- a/public/index.js
+++ b/public/index.js
@@ -1,11 +1,22 @@
import "regenerator-runtime";
import { h, app } from 'hyperapp';
import styled from 'hyperapp-styled-components';
-import importRegex from 'esm-import-regex';
-window.importRegex = importRegex;
+// set the defualt rinkeby url for transactions to use in the v1.1.0/Getting Started
window.rinkebyTx = 'https://rinkeby.fuel.sh/tx/';
+// fix table squashing on mobile by wrapping with overflow scrolling
+const tables = document.getElementsByTagName('table');
+for (let index = 0; index < tables.length; index += 1){
+ const table = tables[index];
+ const tableWrapper = document.createElement("div");
+ tableWrapper.classList.add("table_wrapper");
+ const parent = table.parentNode;
+ parent.replaceChild(tableWrapper, table);
+ tableWrapper.appendChild(table);
+}
+
+// for the rinkeby script in docs
function linkify(text) {
var urlRegex =/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig;
return text.replace(urlRegex, function(url) {
@@ -13,6 +24,7 @@ function linkify(text) {
});
}
+// for the rinkeby script
window.consoleLog = (...args) => {
document.getElementById('run-console').innerHTML += `
- 
%%backTitle%%${args.map((arg) => {
@@ -51,7 +63,6 @@ const title = file => normalize(file.split('/').pop())
.replace('.md', '')
.replace('.html', '');
-
function tree(list = []) {
let result = [];
let level = {result};
@@ -69,7 +80,7 @@ function tree(list = []) {
return result;
}
-const isOpen = (path, dir) => path.split('%20').join(' ').indexOf(dir) !== -1;
+const isOpen = (path, dir) => (path || '').split('%20').join(' ').indexOf(dir) !== -1;
// TODO if there's a space in the hierarchy then this doesn't work properly
const arrow = require('./arrow.svg');
@@ -100,80 +111,70 @@ const treeToPanel2 = (_tree, state = {}) => _tree
{title(v.name)}
));
-/*
-
-
-
-
-hljs.initHighlightingOnLoad();
-
-
-
-document
- .getElementById('search')
- .addEventListener("keyup", event => {
- event.preventDefault();
- if (event.keyCode === 13) {
- search(event.target.value);
- }
-});
-*/
-
-const filterVersion = (_tree, version = 'v1.0.0') => _tree.filter(v => v.name === version)[0].children;
+const filterVersion = (_tree, version = 'v1.1.0') => _tree.filter(v => v.name === version)[0].children;
// TODO fix search
-function search(pattern) {
+async function search(pattern) {
document.getElementById('content').innerHTML = '
);
const start = window.location.pathname === '/'
- ? '/v1.0.0/Introduction/Welcome.html'
+ ? '/v1.1.0/Introduction/Welcome.html'
: window.location.pathname;
app({
diff --git a/src/v1.0.0/1. Introduction/1. Welcome.md b/src/v1.1.0/1. Introduction/1. Welcome.md
similarity index 89%
rename from src/v1.0.0/1. Introduction/1. Welcome.md
rename to src/v1.1.0/1. Introduction/1. Welcome.md
index 658ba24..beab9e0 100644
--- a/src/v1.0.0/1. Introduction/1. Welcome.md
+++ b/src/v1.1.0/1. Introduction/1. Welcome.md
@@ -3,9 +3,7 @@ Welcome
**Before we begin:**
-Try out our live interactive [🕹️ Fuel Plays Pokémon demo](https://fuelplayspokemon.com)!
-
-Check out the [⚡ Block Explorer](https://rinkeby.fuel.sh/network).
+Check out the [⚡ Block Explorer](https://mainnet.fuel.sh/network).
Use the one-click [💻 Wallet SDK Example](../2.%20Getting%20Started/1.%20One-Click%20Example.md).
@@ -21,7 +19,7 @@ Fuel's Features
- Completely decentralized: non-custodial, censorship resistant, and permissionless
- The most scalable optimistic rollup in the world, with unique UTXO-based design
-- 500 TPS maximum on-chain throughput (1,500-2,000 with BLS aggregate signatures)
+- 500 TPS maximum on-chain throughput (4300 with BLS aggregate signatures)
- Up to 10,000 TPS surge intake capacity
- Send and receive using any Ethereum address, no registration required
- ETH and all ERC-20 tokens are supported
@@ -42,7 +40,6 @@ What Makes Fuel Different
- No burdensome proof generation with high latency (unlike ZK rollups and Validium)
- No exotic cryptography (unlike ZK rollups and Validium)
- No trusted setup (unlike SNARK-based ZK rollups and Validium)
-- No worse-than-useless protocol-specific token (unlike...too many to count)
- Care and attention to user-level issues
- Can deposit using simple transfers from any account (including exchange accounts) using Funnel contracts
- Can use a smart contract wallet to authorize transactions on Fuel
diff --git a/src/v1.0.0/1. Introduction/2. Benchmarks.md b/src/v1.1.0/1. Introduction/2. Benchmarks.md
similarity index 95%
rename from src/v1.0.0/1. Introduction/2. Benchmarks.md
rename to src/v1.1.0/1. Introduction/2. Benchmarks.md
index 588e3f8..f0cc831 100644
--- a/src/v1.0.0/1. Introduction/2. Benchmarks.md
+++ b/src/v1.1.0/1. Introduction/2. Benchmarks.md
@@ -113,5 +113,4 @@ Contract deployed at [`0x232113aaC91Bab5b6351016497f966dA8C1BfB9C`](https://rops
Audits
---
-- An audit with [Hashcloak](https://hashcloak.com) is currently underway.
-- An audit with [Trail of Bits](https://www.trailofbits.com) is scheduled.
+- 2 independant audits with [Hashcloak](https://hashcloak.com) have been completed.
diff --git a/src/v1.0.0/1. Introduction/3. Use Cases.md b/src/v1.1.0/1. Introduction/3. Use Cases.md
similarity index 83%
rename from src/v1.0.0/1. Introduction/3. Use Cases.md
rename to src/v1.1.0/1. Introduction/3. Use Cases.md
index 5321adb..bed777b 100644
--- a/src/v1.0.0/1. Introduction/3. Use Cases.md
+++ b/src/v1.1.0/1. Introduction/3. Use Cases.md
@@ -52,6 +52,13 @@ This is allows for cheap, care-free subscriptions for magazines, blogs, forums,
For further reading, please see [Subscriptions](../4.%20Tools%20and%20Applications/2.%20Subscriptions.md).
+Escrow
+---
+
+Fuel has a transaction system which allows for hash-time-lock contracts (HTLC’s). One use-case for this, is allowing for third-party escrow release, where a trusted third-party provides a digest hash and two parties agree over a time-period and the provided digest.
+
+If all is well, the funds will be released to the intended owner after the dispute period times out, however if there is a dispute, the third-party can release the pre-image and return the funds back to sender, or withhold the pre-image if the recipient depending on what outcome is reached on the dispute.
+
Burning
---
diff --git a/src/v1.0.0/2. Getting Started/0. Using the Wallet SDK.md b/src/v1.1.0/2. Getting Started/0. Using the Wallet SDK.md
similarity index 100%
rename from src/v1.0.0/2. Getting Started/0. Using the Wallet SDK.md
rename to src/v1.1.0/2. Getting Started/0. Using the Wallet SDK.md
diff --git a/src/v1.0.0/2. Getting Started/1. One-Click Example.md b/src/v1.1.0/2. Getting Started/1. One-Click Example.md
similarity index 96%
rename from src/v1.0.0/2. Getting Started/1. One-Click Example.md
rename to src/v1.1.0/2. Getting Started/1. One-Click Example.md
index 6b2968c..f2b73b6 100644
--- a/src/v1.0.0/2. Getting Started/1. One-Click Example.md
+++ b/src/v1.1.0/2. Getting Started/1. One-Click Example.md
@@ -11,7 +11,6 @@ Below is our one-click **Wallet SDK example** using the Fuel test faucet on *Rin
width: 100%;
font: 13px/normal 'Ubuntu Mono', 'Monaco', 'Menlo', 'Consolas', 'source-code-pro', monospace!important;
}
-
.ace_scroller {
border-radius: 4px!important;
border: 1px solid #F1F1F1!important;
@@ -96,7 +95,8 @@ Below is our one-click **Wallet SDK example** using the Fuel test faucet on *Rin
-Search Results
'; + document.getElementById('panel-wrapper').classList.toggle("panel-open"); + document.getElementById('content').classList.toggle("panel-closed"); + document.getElementById('hamburger').classList.toggle("is-active"); + const queries = []; + let numberOfResults = 0; for (const file of window.files.map(normalize)) { - window.axios.get('https://docs.fuel.sh' + file + '.md') - .then(function (response) { - - const fuse = new Fuse([{ - title: response.config.url, - content: response.data, - }], { - keys: [ - "title", - "content", - ], - }); - - let result = fuse.search(pattern); - const clean = v => v.replace('https://docs.fuel.sh/v1.0.0/', '') - .split('__').join(': ').split('_').join(' '); - - if (result.length === 0 && response.data.indexOf(pattern) !== -1) { - result.push({ item: { + queries.push(window.axios.get('https://docs.fuel.sh' + file + '.md') + .then(function (response) { + + const fuse = new Fuse([{ title: response.config.url, content: response.data, - }}); - } - - if (result.length) { - result.map(({ item }) => { - const itemHTML = ` -
-
- `;
-
- document.getElementById('content').innerHTML += itemHTML;
+ }], {
+ keys: [
+ "title",
+ "content",
+ ],
});
- }
- })
- .catch(function (error) {
- // handle error
- console.log(error);
- });
+
+ let result = fuse.search(pattern);
+ const clean = v => v.replace('https://docs.fuel.sh/v1.1.0/', '')
+ .split('__').join(': ').split('_').join(' ');
+
+ if (result.length === 0 && response.data.indexOf(pattern) !== -1) {
+ result.push({ item: {
+ title: response.config.url,
+ content: response.data,
+ }});
+ }
+
+ if (result.length) {
+ numberOfResults += 1;
+ result.map(({ item }) => {
+ const itemHTML = `
+ - ${clean(item.title - .replace('.md', '') - .replace('.html', '') - .split('___') - .slice(-1)[0])} -
-${item.content.slice(0, 500)}...
-
+
+ `;
+
+ document.getElementById('content').innerHTML += itemHTML;
+ });
+ }
+
+ return Promise.resolve();
+ }));
+ }
+
+ await Promise.all(queries);
+
+ if (!numberOfResults) {
+ document.getElementById('content').innerHTML += `+ ${clean(item.title + .replace('.md', '') + .replace('.html', '') + .split('___') + .slice(-1)[0])} +
+${item.content.slice(0, 500)}...
+Hmm, looks like we couldn't find anything.
`;
}
}
@@ -189,28 +190,24 @@ const view = state => (
Fuel
+
{treeToPanel2(filterVersion(tree(window.files)), state)}
-
- {
- event.preventDefault();
+ {
if (event.keyCode === 13) {
search(event.target.value);
}
return state;
- }} onkeypress={(state, event) => {
- if (event.keyCode === 13) {
- search(event.target.value);
- }
}} />
v 1.0.0
+ v 1.1.0
await import('https://unpkg.com/@fuel-js/wallet@latest/umd/fuel.umd.min.js');
+
// import fuel from "@fuel-js/wallet"
+await import('https://unpkg.com/@fuel-js/wallet@latest/umd/fuel.umd.min.js');
// Create a new wallet with a new key
// Tip: try setting `null` to `web3.currentProvider` to run with MetaMask
@@ -151,8 +151,6 @@ console.log('check out your tx: ' + window.rinkebyTx + tx.transactionId);
document.getElementById('run-message').innerHTML = 'running...';
- const regex1 = window.importRegex();
-
(async () => {
try {
diff --git a/src/v1.0.0/2. Getting Started/2. Running a Node.md b/src/v1.1.0/2. Getting Started/2. Running a Node.md
similarity index 52%
rename from src/v1.0.0/2. Getting Started/2. Running a Node.md
rename to src/v1.1.0/2. Getting Started/2. Running a Node.md
index 5d2ff76..0594997 100644
--- a/src/v1.0.0/2. Getting Started/2. Running a Node.md
+++ b/src/v1.1.0/2. Getting Started/2. Running a Node.md
@@ -1,7 +1,11 @@
Running a Node
===
+[](https://opensource.org/licenses/Apache-2.0)
+
+
The Fuel client can be used to sync with Fuel and fully validate the chain.
@@ -16,29 +20,41 @@ Running from Command Line
Download a release ([above](#releases)) and use an available network specifier and RPC endpoint to get started.
```bash
-fuel --network="rinkeby" --rpc="https://localhost:8545"
+fuel --network="mainnet" --rpc="https://localhost:8545"
```
### Additional Parameters
```bash
-⚡ fuel [options]
+ ⚡ fuel [options]
+
Options:
-n, --network the ethereum network "rinkeby"; default "rinkeby"
-r, --rpc a standard Ethereum RPC provider (i.e. local go-ethereum)
-i, --infura an Infura service API key (--network must also be specified)
-es, --etherscan an Etherscan service API key (--network must also be specified)
- -e, --environment use the environment variables to specify node parameters
- -o, --operators a comma-separated list or seed phrase of Ethereum private keys used for block, root, and fraud commitments
+ -e, --environment use the environment variables to specify node paramaters
+ -w, --wallet path to a pbkdf2 encrypted Ethers wallet JSON file; default ".fuel-wallet.json"
+ -c, --clear clears the leveldb store
+ -s, --serve starts a local Fuel RPC server on http://localhost:3000; default false
+ -p, --port specify the Fuel RPC server port; default 3000
+ -o, --oracle start a price feed oracle for stablecoins and ether
+ -f, --faucet start a test network faucet
Examples:
- $ fuel --network="ropsten" --rpc="http://localhost:8545"
+ $ fuel --network="rinkeby" --rpc="http://localhost:8545"
+
```
-Running from GUI
----
+### Connecting the Fuel Wallet
+
+```js
+import fuel from '@fuel-js/wallet';
-Coming Soon™...
+const wallet = new fuel.Wallet(null, {
+ path: 'http://localhost:3000',
+});
+```
\ No newline at end of file
diff --git a/src/v1.0.0/2. SDK/1. Wallet.md b/src/v1.1.0/2. SDK/1. Wallet.md
similarity index 93%
rename from src/v1.0.0/2. SDK/1. Wallet.md
rename to src/v1.1.0/2. SDK/1. Wallet.md
index 2e5c34e..2f529a1 100644
--- a/src/v1.0.0/2. SDK/1. Wallet.md
+++ b/src/v1.1.0/2. SDK/1. Wallet.md
@@ -73,8 +73,7 @@ Ethereum **gasPrice** and **gasLimit** options are only needed when using the **
- **provider** : ***Web3Provider*** | ***EthersProvider***; a web3 or ethers `Provider` object
- **options** : ***Object***
-
- - **privateKey** : `Hex` | `Uint8Array` | `SignerKey`; the override 32 byte Ethereum standard private key used for signing transactions. Used instead of the provider signing using `eth_signTypedData_v4`
+ - **privateKey** : `Hex` | `Uint8Array` | `SigningKey`; the override 32 byte Ethereum standard private key used for signing transactions. Used instead of the provider signing using `eth_signTypedData_v4`. If you would like to resolve a mnemonic seed phrase, use [`new ethers.Wallet.fromMnemonic`](https://docs.ethers.io/v5/single-page/#/v5/api/signer/-%23-Wallet.fromMnemonic)
- **gasPrice** : `Hex` | `BigNumber`; the Ethereum gas price for forced transactions
- **gasLimit** : `Hex` | `BigNumber`; the Ethereum gas limit for forced transactions
- **address** : `Hex`; the read-only 20-byte hex string address for watching balances
@@ -192,6 +191,9 @@ await wallet.transfer(daiAddress, someAddress, 250000, {
// gasPrice: ..., // only used if forcing a tx
// gasLimit: ..., // only used if forcing a tx
// force: true, // will attempt for force tx on-chain
+ // htlc: true, // will create an HTLC transfer
+ // preImage: '0x....', // a 32 byte sha256 pre-image for the transfer
+ // expiry: 5000000, // the Ethereum block number which the HTLC will expire
});
```
@@ -230,12 +232,13 @@ await wallet.withdraw(daiAddress, 250000, {
retrieve
---
-**_wallet_ . retrieve** ( [options] ) => Promise<[`TransactionResponse`](#transactionresponse)>
+**_wallet_ . retrieve** ( tokenId, [options] ) => Promise<[`TransactionResponse`](#transactionresponse)>
### Description
This will complete finalized withdrawals. Withdrawals must first be started using [`withdraw`](#withdraw).
### Params
+- **tokenId** : `Hex`; `Number`; `BigNumber`;
- **options** : [`OptionsObject`](#optionsobject)
### Returns
@@ -248,7 +251,7 @@ This method returns a [`TransactionResponse`](#transactionresponse) object.
```js
// after 2 weeks...
-await wallet.retrieve({
+await wallet.retrieve(0, {
// inputs: [], // specify explicit array of utxo hashes to retrieve
// from: '0x....',
// gasPrice: ..., // only used if forcing a tx
@@ -304,7 +307,7 @@ fee
**_wallet_ . fee** ( token ) => Promise<`BigNumber`>
### Description
-Get the current feerate for an ERC-20 token.
+Get the current feerate for an ERC-20 token per byte.
### Params
- **token** : `Hex`; `Number`; `BigNumber`; the 20-byte ERC-20 token address or ID number
diff --git a/src/v1.0.0/3. Concepts/0. Fundamentals/1. Fuel Overview.md b/src/v1.1.0/3. Concepts/0. Fundamentals/1. Fuel Overview.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/0. Fundamentals/1. Fuel Overview.md
rename to src/v1.1.0/3. Concepts/0. Fundamentals/1. Fuel Overview.md
diff --git a/src/v1.0.0/3. Concepts/0. Fundamentals/2. Security Analysis.md b/src/v1.1.0/3. Concepts/0. Fundamentals/2. Security Analysis.md
similarity index 99%
rename from src/v1.0.0/3. Concepts/0. Fundamentals/2. Security Analysis.md
rename to src/v1.1.0/3. Concepts/0. Fundamentals/2. Security Analysis.md
index 4284154..008e55b 100644
--- a/src/v1.0.0/3. Concepts/0. Fundamentals/2. Security Analysis.md
+++ b/src/v1.1.0/3. Concepts/0. Fundamentals/2. Security Analysis.md
@@ -287,7 +287,7 @@ Along the same vein, a common talking point in favor is ZK rollups is that a use
In addition, we must consider the following facts:
- In May of 2019, [an attacker stole approximately 7000 BTC from the Binance exchange](https://www.blockchain.com/btc/tx/e8b406091959700dbffcff30a60b190133721e5c39e89bb5fe23c5a554ab05ea) (worth approximately $40M at the time). A bounty [could have been put up to incentivize miners to re-organize the Bitcoin blockchain](https://twitter.com/JeremyRubin/status/1125919526485254144), however was met with community uproar. Miners did not even get the chance to decide on whether to take the bounty or not, because it was never put up.
- In June of 2020, [a bounty of at least $5M (at least two separate $2.5M bounties) was put up to re-organize the Ethereum blockchain even a single block](https://twitter.com/jadler0/status/1270766562870509569). No miner took the bounty.
-- In August 2020, approximately $4.5B (4M ETH) [was locked up in Decentralized Finance (DeFi) on Ethereum](https://defipulse.com/). A vast majority of DeFi protocols rely on primitives with timeouts, and assume censorship-resistance of layer-1 to function correctly. Primitives include: oracles, auctions, liquidations, and more. If miners censored Ethereum for any meaningful length of time, they could destroy the equivalent of the economy of a small nation _today_.
+- In August 2020, approximately $4.5B (4M ETH) [was locked up in Decentralized Finance (DeFi) on Ethereum](https://defipulse.com). A vast majority of DeFi protocols rely on primitives with timeouts, and assume censorship-resistance of layer-1 to function correctly. Primitives include: oracles, auctions, liquidations, and more. If miners censored Ethereum for any meaningful length of time, they could destroy the equivalent of the economy of a small nation _today_.
In terms of scalability, as mentioned [in the analysis of ZK rollups](#zk-rollups), the specific use of validity proofs provides no scalability. We must consider the worst-case failure mode of all the ZK rollup block producers disappearing or otherwise refusing to produce new blocks, at which point users must apply all state transitions themselves, for which the validity proofs do not help at all. Signature verification is not a bottleneck, so it's all a wash between validating signatures and verifying the validity proofs.
diff --git a/src/v1.0.0/3. Concepts/0. Fundamentals/3. Block Architecture.md b/src/v1.1.0/3. Concepts/0. Fundamentals/3. Block Architecture.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/0. Fundamentals/3. Block Architecture.md
rename to src/v1.1.0/3. Concepts/0. Fundamentals/3. Block Architecture.md
diff --git a/src/v1.0.0/3. Concepts/0. Fundamentals/4. Transaction Architecture.md b/src/v1.1.0/3. Concepts/0. Fundamentals/4. Transaction Architecture.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/0. Fundamentals/4. Transaction Architecture.md
rename to src/v1.1.0/3. Concepts/0. Fundamentals/4. Transaction Architecture.md
diff --git a/src/v1.0.0/3. Concepts/0. Fundamentals/5. Serialization.md b/src/v1.1.0/3. Concepts/0. Fundamentals/5. Serialization.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/0. Fundamentals/5. Serialization.md
rename to src/v1.1.0/3. Concepts/0. Fundamentals/5. Serialization.md
diff --git a/src/v1.0.0/3. Concepts/0. Fundamentals/6. System Description Primer.md b/src/v1.1.0/3. Concepts/0. Fundamentals/6. System Description Primer.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/0. Fundamentals/6. System Description Primer.md
rename to src/v1.1.0/3. Concepts/0. Fundamentals/6. System Description Primer.md
diff --git a/src/v1.0.0/3. Concepts/0. Fundamentals/7. Deployment Parameters.md b/src/v1.1.0/3. Concepts/0. Fundamentals/7. Deployment Parameters.md
similarity index 67%
rename from src/v1.0.0/3. Concepts/0. Fundamentals/7. Deployment Parameters.md
rename to src/v1.1.0/3. Concepts/0. Fundamentals/7. Deployment Parameters.md
index 0cd7d51..db8d874 100644
--- a/src/v1.0.0/3. Concepts/0. Fundamentals/7. Deployment Parameters.md
+++ b/src/v1.1.0/3. Concepts/0. Fundamentals/7. Deployment Parameters.md
@@ -29,21 +29,52 @@ In any optimistic rollup, finalization delay is a critical security parameter. A
We recommend 1 week at the minimum, or 2 weeks on the higher end, to protect against both chain congestion attacks and censorship attacks.
+Mainnet
+---
+
+Contract address: [0x6880f6Fd960D1581C2730a451A22EED1081cfD72](https://etherscan.io/address/0x6880f6Fd960D1581C2730a451A22EED1081cfD72)
+
+Name: `mainnent`s
+
+| field name | value |
+| --------------------- | --------------------------------------------------------------------------------- |
+| **operator** | `0xfa990ea3cc8f1ec066986477edf457ffbad6e39c` |
+| **finalizationDelay** | `186092` (two weeks) |
+| **submissionDelay** | `33230` (five days) |
+| **penaltyDelay** | `16615` (half day) |
+| **bondSize** | `500000000000000000` (0.5 ETH) |
+| **name** | `Fuel` |
+| **version** | `1.1.0` |
+| **chainId** | `1` |
+| **genesis** | `0x9299da6c73e6dc03eeabcce242bb347de3f5f56cd1c70926d76526d7ed199b8b` (special hash of Fuel contributors) |
+
+
Rinkeby Testnet
---
-Contract address: [0x669c63dDD6050838faf496F46EEb7378bff05d77](https://rinkeby.etherscan.io/address/0x669c63dDD6050838faf496F46EEb7378bff05d77)
+Contract address: [0xb171b7202A833D97A3D69412AA365DE4AB6e4545](https://rinkeby.etherscan.io/address/0xb171b7202A833D97A3D69412AA365DE4AB6e4545)
Name: `rinkeby`
| field name | value |
| --------------------- | --------------------------------------------------------------------------------- |
-| **operator** | `0x0ea6b5edc8905c85514b3676703f1bfe6ec260ad` |
-| **finalizationDelay** | `93046` (one week) |
-| **submissionDelay** | `6646` (one day) |
+| **operator** | `0xc97aaaDd5Adb5924c7eBC96267C2B599f1C38aB4` |
+| **finalizationDelay** | `186092` (two weeks) |
+| **submissionDelay** | `33230` (five days) |
| **penaltyDelay** | `0` (zero) |
| **bondSize** | `100000000000000000` (0.1 ETH) |
| **name** | `Fuel` |
-| **version** | `1.0.0` |
+| **version** | `1.1.0` |
| **chainId** | `4` |
-| **genesis** | `0x0000000000000000000000000000000000000000000000000000000000000000` (empty hash) |
+| **genesis** | `0x9299da6c73e6dc03eeabcce242bb347de3f5f56cd1c70926d76526d7ed199b8b` (special hash of Fuel contributors) |
+
+
+Verifying Mainnet Contracts
+---
+
+```bash
+git clone https://github.com/FuelLabs/fuel
+cd client
+npm install
+npm run verify-mainnet
+```
\ No newline at end of file
diff --git a/src/v1.1.0/3. Concepts/0. Fundamentals/8. Fees.md b/src/v1.1.0/3. Concepts/0. Fundamentals/8. Fees.md
new file mode 100644
index 0000000..94c66f9
--- /dev/null
+++ b/src/v1.1.0/3. Concepts/0. Fundamentals/8. Fees.md
@@ -0,0 +1,25 @@
+Fees
+===
+
+Structure
+---
+
+The Fuel priority aggregator will charge a fee based upon two factors:
+1. Transaction size in bytes
+2. A base USD target price per byte
+
+Operated ORU's will target a USD price range between less than 1 cent to 3 cents per transaction.
+
+If the token has no well established market value you may pay the fee in any token that does, we prefer Dai / USDC or Ether for these purposes or work out a price using our [Enterprise Structuring](#enterprisestructuring)
+
+
+Competitive Rates
+---
+
+We will always try to reduce fees to as close to base operating cost as possible.
+
+
+Enterprise Structuring
+---
+
+If our fee structures don't work for your project, contact [enterprise@fuel.sh](mailto:enterprise@fuel.sh).
diff --git a/src/v1.0.0/3. Concepts/1. Data Structures/Addresses.md b/src/v1.1.0/3. Concepts/1. Data Structures/Addresses.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/1. Data Structures/Addresses.md
rename to src/v1.1.0/3. Concepts/1. Data Structures/Addresses.md
diff --git a/src/v1.0.0/3. Concepts/1. Data Structures/Blocks.md b/src/v1.1.0/3. Concepts/1. Data Structures/Blocks.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/1. Data Structures/Blocks.md
rename to src/v1.1.0/3. Concepts/1. Data Structures/Blocks.md
diff --git a/src/v1.0.0/3. Concepts/1. Data Structures/Deposits.md b/src/v1.1.0/3. Concepts/1. Data Structures/Deposits.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/1. Data Structures/Deposits.md
rename to src/v1.1.0/3. Concepts/1. Data Structures/Deposits.md
diff --git a/src/v1.0.0/3. Concepts/1. Data Structures/Inputs.md b/src/v1.1.0/3. Concepts/1. Data Structures/Inputs.md
similarity index 99%
rename from src/v1.0.0/3. Concepts/1. Data Structures/Inputs.md
rename to src/v1.1.0/3. Concepts/1. Data Structures/Inputs.md
index ae2ad43..015a6b4 100644
--- a/src/v1.0.0/3. Concepts/1. Data Structures/Inputs.md
+++ b/src/v1.1.0/3. Concepts/1. Data Structures/Inputs.md
@@ -6,7 +6,7 @@ Inputs indicate which state elements (usually: UTXOs) are consumed by a [transac
InputType
---
-```
+```js
enum InputType : uint8 {
Transfer = 0,
Deposit = 1,
diff --git a/src/v1.0.0/3. Concepts/1. Data Structures/Metadata.md b/src/v1.1.0/3. Concepts/1. Data Structures/Metadata.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/1. Data Structures/Metadata.md
rename to src/v1.1.0/3. Concepts/1. Data Structures/Metadata.md
diff --git a/src/v1.0.0/3. Concepts/1. Data Structures/Outputs.md b/src/v1.1.0/3. Concepts/1. Data Structures/Outputs.md
similarity index 99%
rename from src/v1.0.0/3. Concepts/1. Data Structures/Outputs.md
rename to src/v1.1.0/3. Concepts/1. Data Structures/Outputs.md
index 9b35428..669f80d 100644
--- a/src/v1.0.0/3. Concepts/1. Data Structures/Outputs.md
+++ b/src/v1.1.0/3. Concepts/1. Data Structures/Outputs.md
@@ -6,7 +6,7 @@ Outputs define which state elements (usually: UTXOs) are produced by a [transact
OutputType
---
-```
+```js
enum OutputType : uint8 {
Transfer = 0,
Withdraw = 1,
diff --git a/src/v1.0.0/3. Concepts/1. Data Structures/Roots.md b/src/v1.1.0/3. Concepts/1. Data Structures/Roots.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/1. Data Structures/Roots.md
rename to src/v1.1.0/3. Concepts/1. Data Structures/Roots.md
diff --git a/src/v1.0.0/3. Concepts/1. Data Structures/Tokens.md b/src/v1.1.0/3. Concepts/1. Data Structures/Tokens.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/1. Data Structures/Tokens.md
rename to src/v1.1.0/3. Concepts/1. Data Structures/Tokens.md
diff --git a/src/v1.0.0/3. Concepts/1. Data Structures/Transactions.md b/src/v1.1.0/3. Concepts/1. Data Structures/Transactions.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/1. Data Structures/Transactions.md
rename to src/v1.1.0/3. Concepts/1. Data Structures/Transactions.md
diff --git a/src/v1.0.0/3. Concepts/1. Data Structures/Withdrawals.md b/src/v1.1.0/3. Concepts/1. Data Structures/Withdrawals.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/1. Data Structures/Withdrawals.md
rename to src/v1.1.0/3. Concepts/1. Data Structures/Withdrawals.md
diff --git a/src/v1.0.0/3. Concepts/1. Data Structures/Witness.md b/src/v1.1.0/3. Concepts/1. Data Structures/Witness.md
similarity index 99%
rename from src/v1.0.0/3. Concepts/1. Data Structures/Witness.md
rename to src/v1.1.0/3. Concepts/1. Data Structures/Witness.md
index 24edd4d..1f2a101 100644
--- a/src/v1.0.0/3. Concepts/1. Data Structures/Witness.md
+++ b/src/v1.1.0/3. Concepts/1. Data Structures/Witness.md
@@ -4,7 +4,7 @@ Witness
WitnessType
---
-```
+```js
enum WitnessType : uint8 {
Signature = 0,
Caller = 1,
diff --git a/src/v1.0.0/3. Concepts/2. Verifiers/Block Header.md b/src/v1.1.0/3. Concepts/2. Verifiers/Block Header.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/2. Verifiers/Block Header.md
rename to src/v1.1.0/3. Concepts/2. Verifiers/Block Header.md
diff --git a/src/v1.0.0/3. Concepts/2. Verifiers/Data.md b/src/v1.1.0/3. Concepts/2. Verifiers/Data.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/2. Verifiers/Data.md
rename to src/v1.1.0/3. Concepts/2. Verifiers/Data.md
diff --git a/src/v1.0.0/3. Concepts/2. Verifiers/Inputs.md b/src/v1.1.0/3. Concepts/2. Verifiers/Inputs.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/2. Verifiers/Inputs.md
rename to src/v1.1.0/3. Concepts/2. Verifiers/Inputs.md
diff --git a/src/v1.0.0/3. Concepts/2. Verifiers/Merkle Proof.md b/src/v1.1.0/3. Concepts/2. Verifiers/Merkle Proof.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/2. Verifiers/Merkle Proof.md
rename to src/v1.1.0/3. Concepts/2. Verifiers/Merkle Proof.md
diff --git a/src/v1.0.0/3. Concepts/2. Verifiers/Transaction Proof.md b/src/v1.1.0/3. Concepts/2. Verifiers/Transaction Proof.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/2. Verifiers/Transaction Proof.md
rename to src/v1.1.0/3. Concepts/2. Verifiers/Transaction Proof.md
diff --git a/src/v1.0.0/3. Concepts/2. Verifiers/Witness.md b/src/v1.1.0/3. Concepts/2. Verifiers/Witness.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/2. Verifiers/Witness.md
rename to src/v1.1.0/3. Concepts/2. Verifiers/Witness.md
diff --git a/src/v1.0.0/3. Concepts/3. Provers/Double Spend.md b/src/v1.1.0/3. Concepts/3. Provers/Double Spend.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/3. Provers/Double Spend.md
rename to src/v1.1.0/3. Concepts/3. Provers/Double Spend.md
diff --git a/src/v1.0.0/3. Concepts/3. Provers/Invalid Input.md b/src/v1.1.0/3. Concepts/3. Provers/Invalid Input.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/3. Provers/Invalid Input.md
rename to src/v1.1.0/3. Concepts/3. Provers/Invalid Input.md
diff --git a/src/v1.0.0/3. Concepts/3. Provers/Invalid Sum.md b/src/v1.1.0/3. Concepts/3. Provers/Invalid Sum.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/3. Provers/Invalid Sum.md
rename to src/v1.1.0/3. Concepts/3. Provers/Invalid Sum.md
diff --git a/src/v1.0.0/3. Concepts/3. Provers/Invalid Transaction.md b/src/v1.1.0/3. Concepts/3. Provers/Invalid Transaction.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/3. Provers/Invalid Transaction.md
rename to src/v1.1.0/3. Concepts/3. Provers/Invalid Transaction.md
diff --git a/src/v1.0.0/3. Concepts/3. Provers/Invalid Witness.md b/src/v1.1.0/3. Concepts/3. Provers/Invalid Witness.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/3. Provers/Invalid Witness.md
rename to src/v1.1.0/3. Concepts/3. Provers/Invalid Witness.md
diff --git a/src/v1.0.0/3. Concepts/3. Provers/Malformed Block.md b/src/v1.1.0/3. Concepts/3. Provers/Malformed Block.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/3. Provers/Malformed Block.md
rename to src/v1.1.0/3. Concepts/3. Provers/Malformed Block.md
diff --git a/src/v1.0.0/3. Concepts/4. Additional Modules/Funnels.md b/src/v1.1.0/3. Concepts/4. Additional Modules/Funnels.md
similarity index 100%
rename from src/v1.0.0/3. Concepts/4. Additional Modules/Funnels.md
rename to src/v1.1.0/3. Concepts/4. Additional Modules/Funnels.md
diff --git a/src/v1.0.0/4. Tools and Applications/0. Fast Withdrawals.md b/src/v1.1.0/4. Tools and Applications/0. Fast Withdrawals.md
similarity index 100%
rename from src/v1.0.0/4. Tools and Applications/0. Fast Withdrawals.md
rename to src/v1.1.0/4. Tools and Applications/0. Fast Withdrawals.md
diff --git a/src/v1.0.0/4. Tools and Applications/1. Token Minting.md b/src/v1.1.0/4. Tools and Applications/1. Token Minting.md
similarity index 100%
rename from src/v1.0.0/4. Tools and Applications/1. Token Minting.md
rename to src/v1.1.0/4. Tools and Applications/1. Token Minting.md
diff --git a/src/v1.0.0/4. Tools and Applications/2. Subscriptions.md b/src/v1.1.0/4. Tools and Applications/2. Subscriptions.md
similarity index 100%
rename from src/v1.0.0/4. Tools and Applications/2. Subscriptions.md
rename to src/v1.1.0/4. Tools and Applications/2. Subscriptions.md
diff --git a/src/v1.0.0/4. Tools and Applications/3. Non-Custodial Exchanges.md b/src/v1.1.0/4. Tools and Applications/3. Non-Custodial Exchanges.md
similarity index 100%
rename from src/v1.0.0/4. Tools and Applications/3. Non-Custodial Exchanges.md
rename to src/v1.1.0/4. Tools and Applications/3. Non-Custodial Exchanges.md
diff --git a/src/v1.0.0/5. Future Roadmap/1. Planned Features.md b/src/v1.1.0/5. Future Roadmap/1. Planned Features.md
similarity index 75%
rename from src/v1.0.0/5. Future Roadmap/1. Planned Features.md
rename to src/v1.1.0/5. Future Roadmap/1. Planned Features.md
index e73a65e..ab9cd34 100644
--- a/src/v1.0.0/5. Future Roadmap/1. Planned Features.md
+++ b/src/v1.1.0/5. Future Roadmap/1. Planned Features.md
@@ -14,12 +14,10 @@ Features:
- [Burner wallet integration](https://medium.com/@fuellabs/burner-wallet-fuel-7b8ce8e54aff)
- [Reddit community points transfer and swap demo](https://reddit.com/r/CryptoCurrency/comments/gonjm3/tldr_moons_and_bricks_go_brrr/)
-Fuel v1
+Fuel v1.0
---
-Current release, as testnet.
-
-[Source code](https://github.com/FuelLabs/fuel).
+[Source code](https://github.com/FuelLabs/fuel/commit/49c35e8de752200175174a08b6a8eae42796790d).
Features in addition to [v0](#fuel-v0):
- Optimize transaction format, reducing transaction sizes by ~50%
@@ -31,22 +29,26 @@ Features in addition to [v0](#fuel-v0):
- liquidity provider for fast withdrawals
- non-custodial exchange
-Fuel v1.5
+Fuel v1.1
---
-Future release, expected EOY 2020.
+Current release.
-Features in addition to [v1](#fuel-v1):
-- BLS signature aggregation (bringing TPS to 1,500-2,000)
-- Native NFT support
-- Optimistic mass migration
+Features in addition to [v0](#fuel-v0):
+
+[Source code](https://github.com/FuelLabs/fuel).
+- Sha256 HTLC support
+- Bitcoin, Cosmos, Polkadot atomic swaps
+- Block Explorer enhancements
+- Broader support for USDC, USDT
-Fuel v2
+Fuel v2.0
---
Future released, expected 2021.
-Features in addition to [v1.5](#fuel-v15):
+Features in addition to [v1.1](#fuel-v15):
+- Interoperable smart-contracts
- Predicate scripting
- Covenants
- Configurable state introspection (for Ethereum-style smart contracts)
diff --git a/vercel.json b/vercel.json
new file mode 100644
index 0000000..177e6f7
--- /dev/null
+++ b/vercel.json
@@ -0,0 +1,9 @@
+{
+ "redirects": [
+ {
+ "source": "/",
+ "destination": "https://docs.fuel.sh/v1.1.0/Introduction/Welcome.html",
+ "permanent": true
+ }
+ ]
+ }
\ No newline at end of file