Skip to content

Commit 94b49f1

Browse files
authored
Merge pull request #112 from provable-things/solidity-0.8.x
feat(ethereum-api): <- adds version targeting solc 0.8.x
2 parents c655c52 + 3dc1dc4 commit 94b49f1

33 files changed

+12682
-144
lines changed

.ci/drone.yml

Lines changed: 0 additions & 120 deletions
This file was deleted.

.github/workflows/test.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Node.js CI
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
14+
strategy:
15+
matrix:
16+
node-version: [16.x]
17+
18+
steps:
19+
- uses: actions/checkout@v2
20+
- name: Use Node.js ${{ matrix.node-version }}
21+
uses: actions/setup-node@v2
22+
with:
23+
node-version: ${{ matrix.node-version }}
24+
cache: 'npm'
25+
cache-dependency-path: ./package-lock.json
26+
- run: npm run test

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
*.sw*
2+
**/node_modules
3+
**/cache
4+
**/artifacts

README.md

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,34 @@ In Solidity it is as simple as inheriting the __`usingProvable`__ contract that
88

99
This will provide your contract with functions like __`provable_query(...)`__, which make it trivial for you to leverage our oracle technology straight away.
1010

11-
If you're using the __[Remix IDE](http://remix.ethereum.org)__ it's even easier still - simply import __Provable__ into your contract like so:
11+
If you're using the __[Remix IDE](http://remix.ethereum.org)__ it's even easier still - simply import the latest version of __Provable__ into your contract like so:
1212

1313
```solidity
1414
15-
import "github.com/oraclize/ethereum-api/provableAPI.sol";
15+
import "github.com/provable-things/ethereum-api/provableAPI.sol";
1616
1717
```
1818

19-
To learn more about the Provable technology, please refer to our __[documentation here](https://docs.oraclize.it)__.
19+
Or if you need a specific version of the API, import that directly via:
20+
21+
```solidity
22+
23+
import "github.com/provable-things/ethereum-api/contracts/solc-v0.8.x/provableAPI.sol";
24+
25+
```
26+
27+
28+
There are versions of the API targetting the following `solc` compilers:
29+
30+
```
31+
solc-v0.4.25
32+
solc-v0.5.x
33+
solc-v0.6.x
34+
solc-v0.8.x
35+
36+
```
37+
38+
To learn more about the Provable technology, please refer to our __[documentation here](https://docs.provable.xyz)__.
2039

2140
&nbsp;
2241

@@ -26,9 +45,9 @@ To learn more about the Provable technology, please refer to our __[documentatio
2645

2746
### :computer: See It In Action!
2847

29-
For working examples of how to integrate the __Provable__ API into your own smart-contracts, head on over to the __[Provable Ethereum Examples](https://github.com/oraclize/ethereum-examples)__ repository. Here you'll find various examples that use __Provable__ to feed smart-contracts with data from a variety of external sources.
48+
For working examples of how to integrate the __Provable__ API into your own smart-contracts, head on over to the __[Provable Ethereum Examples](https://github.com/provable-things/ethereum-examples)__ repository. Here you'll find various examples that use __Provable__ to feed smart-contracts with data from a variety of external sources.
3049

31-
There are even __[some examples here](https://github.com/oraclize/ethereum-examples/tree/master/solidity/truffle-examples)__ showing you how you can use __Provable__ in a local Truffle development environment!
50+
There are even __[some examples here](https://github.com/provable-things/ethereum-examples/tree/master/solidity/truffle-examples)__ showing you how you can use __Provable__ in a local Truffle development environment!
3251

3352
&nbsp;
3453

@@ -56,10 +75,6 @@ __❍__ Plus a __[Github](https://github.com/provable-things)__
5675

5776
&nbsp;
5877

59-
### :hourglass_flowing_sand: __Notice about Oraclize rebranding to Provable:__
60-
61-
Please use the __`provableAPI_0.X.sol`__ contracts going forward. We will continue supporting the oraclize-named versions for a limited time, but they should be considered deprecated and to be removed in the coming months.
62-
6378
### :radioactive: __A Note Regarding Serpent:__
6479

6580
:skull: __CAUTION__: It is highly recommended to avoid using Serpent, especially in production. The serpent version of the __Provable__ API herein remains for historical reasons but support for it is no longer maintained. Serpent is considered outdated and audits have shown it to be flawed. Use it at your own risk!
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

provableAPI_0.6.sol renamed to contracts/solc-v0.6.x/provableAPI.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1333,4 +1333,4 @@ contract usingProvable {
13331333
}
13341334
}
13351335
}
1336-
// </provableAPI>
1336+
// </provableAPI>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// SPDX-License-Identifier: MIT
2+
pragma solidity >= 0.8.0 < 0.9.0;
3+
4+
interface OracleAddrResolverI {
5+
function getAddress() external returns (address _address);
6+
}

0 commit comments

Comments
 (0)