Skip to content
This repository has been archived by the owner on Jan 19, 2024. It is now read-only.

Update to use new reference contracts repo and fix wrong path in previous system contract deployment #24

Merged
merged 1 commit into from
Sep 9, 2022
Merged

Update to use new reference contracts repo and fix wrong path in previous system contract deployment #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ This will install the boot contract to the `eosio` account and activate all prot

**--bootstrap-system-full**
This will install the boot contract to the `eosio` account and activate all protocol features.
It will also create all the accounts needed by the core, token, and multisig contracts from [eos-system-contracts](https://github.com/eosnetworkfoundation/eos-system-contracts) and deploy those three contracts to their corresponding accounts. Note that the core contract will replace the boot contract on the `eosio` account.
It will also create all the accounts needed by the core, token, and multisig contracts from [reference-contracts](https://github.com/AntelopeIO/reference-contracts) and deploy those three contracts to their corresponding accounts. Note that the core contract will replace the boot contract on the `eosio` account.

---
**--send-acton**
Expand Down Expand Up @@ -510,7 +510,7 @@ $ dune --bootstrap-system-full
```

This will do the same as `--bootstrap-system` but additionally set the contracts
from [eos-system-contracts](https://github.com/eosnetworkfoundation/eos-system-contracts)
from [reference-contracts](https://github.com/AntelopeIO/reference-contracts)
and create the correct accounts needed for those.

## System-level commands
Expand Down
6 changes: 3 additions & 3 deletions scripts/bootstrap_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ else
apt install ./cdt_${CDT_VERSION}_arm64.deb
fi

git clone https://github.com/eosnetworkfoundation/eos-system-contracts
cd eos-system-contracts
git checkout main
git clone https://github.com/${ORG}/reference-contracts
cd reference-contracts
git checkout 074bc11394d13395e82015f6c41db32a67170d73
mkdir build
cd build
cmake ..
Expand Down
6 changes: 3 additions & 3 deletions src/dune/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,13 @@
dune_sys.deploy_contract(dune_sys._docker.abs_host_path(args.deploy[0]), args.deploy[1])

elif args.set_bios_contract != None:
dune_sys.deploy_contract( '/home/www-data/eos-system-contracts/build/contracts/eosio.bios', args.set_bios_contract)
dune_sys.deploy_contract( '/app/reference-contracts/build/contracts/eosio.bios', args.set_bios_contract)

elif args.set_core_contract != None:
dune_sys.deploy_contract( '/home/www-data/eos-system-contracts/build/contracts/eosio.system', args.set_core_contract)
dune_sys.deploy_contract( '/app/reference-contracts/build/contracts/eosio.system', args.set_core_contract)

elif args.set_token_contract != None:
dune_sys.deploy_contract( '/home/www-data/eos-system-contracts/build/contracts/eosio.token', args.set_token_contract)
dune_sys.deploy_contract( '/app/reference-contracts/build/contracts/eosio.token', args.set_token_contract)

elif args.bootstrap_system:
dune_sys.bootstrap_system(False)
Expand Down
10 changes: 5 additions & 5 deletions src/dune/dune.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ def features(self):
def activate_feature(self, code_name, preactivate=False):
if preactivate:
self.preactivate_feature()
self.deploy_contract('/home/www-data/eos-system-contracts/build/contracts/eosio.boot', 'eosio')
self.deploy_contract('/app/reference-contracts/build/contracts/eosio.boot', 'eosio')

if code_name == "KV_DATABASE":
self.send_action('activate', 'eosio', '["825ee6288fb1373eab1b5187ec2f04f6eacb39cb3a97f356a07c91622dd61d16"]', 'eosio@active')
Expand Down Expand Up @@ -444,15 +444,15 @@ def bootstrap_system(self, full):
self.create_account('eosio.rex', 'eosio')

# activate features
self.deploy_contract('/home/www-data/eos-system-contracts/build/contracts/eosio.boot', 'eosio')
self.deploy_contract('/app/reference-contracts/build/contracts/eosio.boot', 'eosio')

for f in self.features():
self.activate_feature(f)

if full:
self.deploy_contract('/home/www-data/eos-system-contracts/build/contracts/eosio.msig', 'eosio.msig')
self.deploy_contract('/home/www-data/eos-system-contracts/build/contracts/eosio.token', 'eosio.token')
self.deploy_contract('/home/www-data/eos-system-contracts/build/contracts/eosio.system', 'eosio')
self.deploy_contract('/app/reference-contracts/build/contracts/eosio.msig', 'eosio.msig')
self.deploy_contract('/app/reference-contracts/build/contracts/eosio.token', 'eosio.token')
self.deploy_contract('/app/reference-contracts/build/contracts/eosio.system', 'eosio')

def start_webapp(self, dir):
#TODO readdress after the launch
Expand Down