Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion KIP-14/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# OKExChain 2-way payment system
# OEC 2-way payment system

## Framework : [squeezer.io](https://squeezer.io)
## Documentation : [docs.squeezer.io](https://docs.squeezer.io/)
Expand Down
2 changes: 1 addition & 1 deletion KIP-14/services/wallet/types/squeezer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ swagger:
example: 'OKt'
info:
type: string
example: Okchain wallet.
example: OEC wallet.
2 changes: 1 addition & 1 deletion KIP-27 from Ankr Network
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
OkChain one-button node deployment tool from Ankr Network
OEC one-button node deployment tool from Ankr Network
https://www.ankr.com/
2 changes: 1 addition & 1 deletion KIP-31 OkChain Node Deployment from Ankr Network
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OkChain one-button node deployment tool from Ankr Network
OEC one-button node deployment tool from Ankr Network

Link: https://www.ankr.com/
Youtube video: https://www.youtube.com/watch?v=eaDu-rl9a3I
Expand Down
2 changes: 1 addition & 1 deletion KIP-31 from Ankr Network
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OkChain one-button node deployment tool from Ankr Network
OEC one-button node deployment tool from Ankr Network

Link: https://www.ankr.com/
Youtube video: https://www.youtube.com/watch?v=eaDu-rl9a3I
Expand Down
6 changes: 3 additions & 3 deletions docs/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# OKExChain Improvement Proposals (KIPs)
OKExChain Improvement Proposals (KIPs) describe standards for the OKExChain platform, including core protocol specifications, client APIs, and contract standards.
# OEC Improvement Proposals (KIPs)
OEC Improvement Proposals (KIPs) describe standards for the OEC platform, including core protocol specifications, client APIs, and contract standards.

# Contributing
1. Review KIP-1.
2. Fork the repository by clicking "Fork" in the top right.
3. Add your KIP to your fork of the repository.
4. Submit a Pull Request to OKExChain's KIPs repository.
4. Submit a Pull Request to OEC's KIPs repository.

Once your first PR is merged, we have a bot that helps out by automatically merging PRs to draft KIPs. For this to work, it has to be able to tell that you own the draft being edited. Make sure that the 'author' line of your KIP contains either your GitHub username or your email address inside.

Expand Down
36 changes: 18 additions & 18 deletions docs/active/KIP-1.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/draft/KIP-10.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ Web Site:[https://www.chainsguard.com/](https://www.chainsguard.com/)

## 2. Summary

This KIP aims to provide a secure mobile wallet solution for OKExChain ecology.
This KIP aims to provide a secure mobile wallet solution for OEC ecology.

## 3. Proposal

ChainsGuard is going to provide an open source, secure, and convenient cold wallet mobile application to solve the needs of OKExChain eco-users to make transfer transactions and contract calls on the mobile side. The wallet app use Beijing ChainsGuard security components to protect users' assets.
ChainsGuard is going to provide an open source, secure, and convenient cold wallet mobile application to solve the needs of OEC eco-users to make transfer transactions and contract calls on the mobile side. The wallet app use Beijing ChainsGuard security components to protect users' assets.

## 4. Sources Code
[chainsguard-wallet](https://github.com/i11m20n/chainsguard-wallet)
Expand Down
6 changes: 3 additions & 3 deletions docs/draft/KIP-11.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# KIP-11: OKExChain Rust SDK
# KIP-11: OEC Rust SDK

| Author | Jihui Zheng (@zjhmale) |
| :------- | ---------------------- |
Expand All @@ -11,7 +11,7 @@

Rust is widely used in cryptocurrency world including blockchain system, exchange matching engine, smart contract etc.

This KIP is intend to develop a fully functional SDK for OKExChain base on Rust.
This KIP is intend to develop a fully functional SDK for OEC base on Rust.

The project:

Expand All @@ -23,7 +23,7 @@ Video demo:

## Proposal

Basiclly, the development will follow [OKExChain HTTP API](https://documenter.getpostman.com/view/1112175/SzS5u6bE?version=latest#f5bc92c9-4e8c-40f5-b3fe-d9635c418402).
Basiclly, the development will follow [OEC HTTP API](https://documenter.getpostman.com/view/1112175/SzS5u6bE?version=latest#f5bc92c9-4e8c-40f5-b3fe-d9635c418402).

Additionally, will use the existed Go and Java SDK as references.

Expand Down
24 changes: 12 additions & 12 deletions docs/draft/KIP-12.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# OKExChain/BitSong Partnership Proposal
# OEC/BitSong Partnership Proposal

| Author | Angelo Recca (@bitsongofficial) |
| -------- | ------------------------------- |
Expand All @@ -12,7 +12,7 @@ BitSong is an open source blockchain born in December 2017. Our mission is to si

Based on Cosmos-SDK/Tendermint, BitSong is an interoperable and cross-chain blockchain.

OKExChain: https://www.okex.com/okexchain
OEC: https://www.okex.com/oec
BitSong:
https://bitsong.io
https://github.com/bitsongofficial
Expand All @@ -25,21 +25,21 @@ Through the BitSong api, any user can build their own decentralized music player

## Proposal

Our aim is to choose a solid and reliable partner such as OKExChain and give users and artists the opportunity to trade their own music productions.
Our aim is to choose a solid and reliable partner such as OEC and give users and artists the opportunity to trade their own music productions.

There are many ways to transfer tokens, the simplest and most intuitive is to use IBC for the transfer of NFTs and then use OKExChain for decentralized trading. In this way, all participants in the BitSong ecosystem will be able to take advantage of the opportunities that OKExChain makes available, just as OKExChain users will be able to enter BitSong much more easily and be part of its ecosystem.
There are many ways to transfer tokens, the simplest and most intuitive is to use IBC for the transfer of NFTs and then use OEC for decentralized trading. In this way, all participants in the BitSong ecosystem will be able to take advantage of the opportunities that OEC makes available, just as OEC users will be able to enter BitSong much more easily and be part of its ecosystem.

**BTSG** the native BitSong Blockchain token, will also be listed on the OKExChain DEX.
**BTSG** the native BitSong Blockchain token, will also be listed on the OEC DEX.

Considering that BitSong is an **OKExChain validator node**, synergies could also be created from the rewards generated.
Considering that BitSong is an **OEC validator node**, synergies could also be created from the rewards generated.

In order to avoid confusion within the decentralized exchange, a quick and easy solution would be to fork **OKDex** and build a version dedicated only to the **OKExChain/BitSong** partnership, therefore with only music tokens.
In order to avoid confusion within the decentralized exchange, a quick and easy solution would be to fork **OKDex** and build a version dedicated only to the **OEC/BitSong** partnership, therefore with only music tokens.

## Integration

The implementation of the proposal will require close collaboration with the developers of OKExChain and BitSong. The major milestones to work towards are:
The implementation of the proposal will require close collaboration with the developers of OEC and BitSong. The major milestones to work towards are:

- Create a bridge between OKExChain and BitSong to freely move assets. If both chains adopt the IBC module, it will be the easiest but other solutions are available.
- OKExChain will need to approve BitSong assets to move onto the DEX.
- BTSG get listed on the OKExChain DEX.
- OKExChain specifies the derivative products it wants to offer and collaborates with BitSong to get the appropriate data it needs.
- Create a bridge between OEC and BitSong to freely move assets. If both chains adopt the IBC module, it will be the easiest but other solutions are available.
- OEC will need to approve BitSong assets to move onto the DEX.
- BTSG get listed on the OEC DEX.
- OEC specifies the derivative products it wants to offer and collaborates with BitSong to get the appropriate data it needs.
8 changes: 4 additions & 4 deletions docs/draft/KIP-13.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

## Introduction

**OKDex** is the first _Decentralized Exchange_ based on **OKExChain**, built and made open source by **BitSong**.
**OKDex** is the first _Decentralized Exchange_ based on **OEC**, built and made open source by **BitSong**.

**OKDex** is an open source project, its mission is to facilitate the adoption and implementation of more decentralized exchanges based on **OKExChain**.
**OKDex** is an open source project, its mission is to facilitate the adoption and implementation of more decentralized exchanges based on **OEC**.

Thanks to the use of **Cosmos-SDK**, **OKExChain** sets the foundations to become one of the most interoperable decentralized and open source exchanges.
Thanks to the use of **Cosmos-SDK**, **OEC** sets the foundations to become one of the most interoperable decentralized and open source exchanges.

## Demo

Expand All @@ -30,7 +30,7 @@ Through **OKDex** it is possible doing decentralized trading (through different
### Staking

- Manage the staking activity
- Analyze the OKExChain validators
- Analyze the OEC validators

### Token

Expand Down
10 changes: 5 additions & 5 deletions docs/draft/KIP-14.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# KIP-14: OKExChain & Squeezer Partnership proposal
# KIP-14: OEC & Squeezer Partnership proposal

| Author | Squeezer.IO (@SqueezerIO) |
| :------- | ---------------------- |
Expand Down Expand Up @@ -31,15 +31,15 @@ Squeezer:
- https://squeezer.io
- https://github.com/SqueezerIO

### About OKExChain
### About OEC

[OKExChain](https://www.okex.com/okexchain) is a public blockchain and independently developed by the world-leading digital asset exchange OKEX. It was 100% open-sourced on April 16, 2020.
[OEC](https://www.okex.com/oec) is a public blockchain and independently developed by the world-leading digital asset exchange OKEX. It was 100% open-sourced on April 16, 2020.

OKExChain: https://www.okex.com/okexchain
OEC: https://www.okex.com/oec

## Details of Plan

Use Squeezer to develop 2-way payment systems for inbound/outbound transactions on the top of OKExChain for different crypto assets.
Use Squeezer to develop 2-way payment systems for inbound/outbound transactions on the top of OEC for different crypto assets.

### Where does a two-way payment system fit in?

Expand Down
10 changes: 5 additions & 5 deletions docs/draft/KIP-16.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# KIP-(16): OKExChain & Cosmostation Validator Partership Proposal
# KIP-(16): OEC & Cosmostation Validator Partership Proposal

| Author | Cosmostation (@cosmostation) |
| :------- | ---------------------- |
Expand All @@ -26,18 +26,18 @@ Cosmostation:
## Partnership Proposal


### OKExChain intergartion with Cosmostation Mobile Wallet (iOS & Android)
### OEC intergartion with Cosmostation Mobile Wallet (iOS & Android)


#### 1.1 Overview
Cosmostation develops, operates, and maintains all of its services in the spirit of the Cypherpunk manifesto. Cosmostation iOS & Android are developed with a heavy focus on the end-user's convenience. Cosmostaiton Mobile is the wallet of choice for the majority of users within the Cosmos SDK & Tendermint ecosystem.

Integrating OKExChain to Cosmostation Mobile Wallet will allow for OKExChain users to access the blockchain with a intuitive and secure user interface, allowing for more accessibility and usability. Cosmostation Mobile Wallet is specifically designed in a way that the application can support custom modules specific to each blockchain in a comprehensible UI/UX.
Integrating OEC to Cosmostation Mobile Wallet will allow for OEC users to access the blockchain with a intuitive and secure user interface, allowing for more accessibility and usability. Cosmostation Mobile Wallet is specifically designed in a way that the application can support custom modules specific to each blockchain in a comprehensible UI/UX.


#### 1.2 Integration Details
Both the iOS & Android applications currently support the Cosmos Hub, Kava Network, Binance Chain, Iris Hub, and Band Protocol. Adding OKExChain to Cosmostation Mobile Wallet will expose OKExChain to the wider Cosmos SDK community who are actively using the Cosmostation Application.
Both the iOS & Android applications currently support the Cosmos Hub, Kava Network, Binance Chain, Iris Hub, and Band Protocol. Adding OEC to Cosmostation Mobile Wallet will expose OEC to the wider Cosmos SDK community who are actively using the Cosmostation Application.

Integration work will first begin with simple withdrawal & deposit of tokens, and will sequentially be updated to support custom modules specific to OKExChain such as delegation, undelegation, claim rewards, redelegation, etc.
Integration work will first begin with simple withdrawal & deposit of tokens, and will sequentially be updated to support custom modules specific to OEC such as delegation, undelegation, claim rewards, redelegation, etc.


14 changes: 7 additions & 7 deletions docs/draft/KIP-17.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# KIP-17:ONE mobile wallet for OKExChain by OneChain
# KIP-17:ONE mobile wallet for OEC by OneChain

| Author | onechainone (@onechainone) |
| -------- | ------------------------ |
Expand All @@ -25,16 +25,16 @@ Trading: Integrated multiple dexchanges, Now supported: OneChain DEX, Newdex, Bi

[ONE App Download](http://app.onechain.one/appstart.html)

## Proposal for OKExChain
## Proposal for OEC

ONE App new version has supported OKExChain's testnet, social support OKExChain users communication, wallet support OKExChain all tokens, trade support OKExChain all pairs, at the same time, support OKExChain's stake voting, convenient user participation in OKExChain ecology.
ONE App new version has supported OEC's testnet, social support OEC users communication, wallet support OEC all tokens, trade support OEC all pairs, at the same time, support OEC's stake voting, convenient user participation in OEC ecology.

Wallet:
- Add/Remove Token
- Transfer/Receive Token
- Transaction history
- Stake voting
- OKExChain explorer
- OEC explorer

Trade:
- Open/Cancel order
Expand All @@ -44,12 +44,12 @@ Trade:
- kline view
- Order book view

[ONE Demo for OKExChain](http://app1.haoduobi.cn/android/one320.apk)
[ONE Demo for OEC](http://app1.haoduobi.cn/android/one320.apk)

[User guide of ONE Demo for OKExChain](https://github.com/onechainone/KIPs/wiki)
[User guide of ONE Demo for OEC](https://github.com/onechainone/KIPs/wiki)

[OneChain Video](https://m.youtube.com/watch?v=_KgYfgbazFk)


## Status
ONE wallet already supported OKExChain's testnet, after OKExChain's mainnet go live, It will be released for the first time.
ONE wallet already supported OEC's testnet, after OEC's mainnet go live, It will be released for the first time.
Loading