Merge pull request #1549 from nervosnetwork/testnet

Deploy to mainnet
nervosnetwork · Jan 2, 2024 · 5377096 · 5377096
2 parents 7c006dc + 94473da
commit 5377096
Show file tree

Hide file tree

Showing 280 changed files with 632 additions and 3,083 deletions.
diff --git a/Gemfile b/Gemfile
@@ -46,8 +46,7 @@ gem "redis" # , "~> 4.2.0"
 gem "hiredis-client"
 gem "digest-crc"
 
-# Backgroud Jobs
-
+# Background Jobs
 gem "sidekiq"
 gem "rufus-scheduler"
 # bulk insertion of data into database using ActiveRecord

diff --git a/README.md b/README.md
@@ -35,9 +35,9 @@ $ bin/setup
 ## Create & Setup database
 
 ```shell
-bundle exec rake db:create                 # (create db for development and test)
-bundle exec rake db:migrate                # (run migration for development db)
-bundle exec rake db:migrate RAILS_ENV=test # (run migration for test db)
+bundle exec rake db:create                     # (create db for development and test)
+bundle exec rake db:schema:load                # (run migration for development db)
+bundle exec rake db:schema:load RAILS_ENV=test # (run migration for test db)
 ```
 
 ## Running Test

diff --git a/app/models/ckb_sync/new_node_data_processor.rb b/app/models/ckb_sync/new_node_data_processor.rb
@@ -782,7 +782,7 @@ def build_cells_and_locks!(
           if contract
             temp_hash = temp_hash.merge is_contract: true, contract_id: contract.id
           else
-            contract = Contract.create code_hash: lock_script.script_hash
+            contract = Contract.create code_hash: lock_script.code_hash
             temp_hash = temp_hash.merge contract_id: contract.id
           end
           script = Script.find_or_create_by temp_hash
@@ -796,7 +796,7 @@ def build_cells_and_locks!(
         type_script_ids.each do |type_script_id|
           type_script = TypeScript.find(type_script_id)
           temp_hash = { script_hash: type_script&.script_hash, is_contract: false }
-          contract = Contract.find_by code_hash: type_script.code_hash
+          contract = Contract.find_by code_hash: type_script.script_hash
 
           if contract
             temp_hash = temp_hash.merge is_contract: true, contract_id: contract.id

diff --git a/app/serializers/ckb_transaction_serializer.rb b/app/serializers/ckb_transaction_serializer.rb
@@ -11,7 +11,7 @@ class CkbTransactionSerializer
   end
 
   attribute :cell_deps do |o|
-    o.cell_dependencies.explicit.includes(:cell_output).to_a.map(&:to_raw)
+    o.cell_dependencies.explicit.order("id asc").includes(:cell_output).to_a.map(&:to_raw)
   end
 
   attribute :header_deps do |o|

diff --git a/db/migrate/20190327073533_create_blocks.rb b/db/migrate/20190327073533_create_blocks.rb
diff --git a/db/migrate/20190327073646_create_uncle_blocks.rb b/db/migrate/20190327073646_create_uncle_blocks.rb
diff --git a/db/migrate/20190327073737_create_ckb_transactions.rb b/db/migrate/20190327073737_create_ckb_transactions.rb
diff --git a/db/migrate/20190327073848_create_addresses.rb b/db/migrate/20190327073848_create_addresses.rb
diff --git a/db/migrate/20190327073920_create_account_books.rb b/db/migrate/20190327073920_create_account_books.rb
diff --git a/db/migrate/20190327073948_create_cell_inputs.rb b/db/migrate/20190327073948_create_cell_inputs.rb
diff --git a/db/migrate/20190327074009_create_cell_outputs.rb b/db/migrate/20190327074009_create_cell_outputs.rb
diff --git a/db/migrate/20190327074053_create_lock_scripts.rb b/db/migrate/20190327074053_create_lock_scripts.rb
diff --git a/db/migrate/20190327074129_create_type_scripts.rb b/db/migrate/20190327074129_create_type_scripts.rb
diff --git a/db/migrate/20190327074238_create_sync_infos.rb b/db/migrate/20190327074238_create_sync_infos.rb
diff --git a/db/migrate/20190428084336_add_status_to_cell_output.rb b/db/migrate/20190428084336_add_status_to_cell_output.rb
diff --git a/db/migrate/20190428094733_add_address_id_to_cell_output.rb b/db/migrate/20190428094733_add_address_id_to_cell_output.rb
diff --git a/db/migrate/20190505080010_add_display_input_and_fee_status_to_ckb_transaction.rb b/db/migrate/20190505080010_add_display_input_and_fee_status_to_ckb_transaction.rb
diff --git a/db/migrate/20190507083006_add_block_id_to_cell_outputs.rb b/db/migrate/20190507083006_add_block_id_to_cell_outputs.rb
diff --git a/db/migrate/20190507085943_add_index_to_address_id_on_cell_outputs.rb b/db/migrate/20190507085943_add_index_to_address_id_on_cell_outputs.rb
diff --git a/db/migrate/20190520025819_change_unique_index_scope.rb b/db/migrate/20190520025819_change_unique_index_scope.rb
diff --git a/db/migrate/20190521045538_add_address_ids_to_block.rb b/db/migrate/20190521045538_add_address_ids_to_block.rb
diff --git a/db/migrate/20190521075501_add_index_on_status_to_cell_outputs.rb b/db/migrate/20190521075501_add_index_on_status_to_cell_outputs.rb
diff --git a/db/migrate/20190522092518_add_tx_hash_and_cell_index_to_cell_outputs.rb b/db/migrate/20190522092518_add_tx_hash_and_cell_index_to_cell_outputs.rb
diff --git a/db/migrate/20190522093025_add_previous_cell_output_id_to_cell_inputs.rb b/db/migrate/20190522093025_add_previous_cell_output_id_to_cell_inputs.rb
diff --git a/db/migrate/20190527105726_add_from_cell_base_to_cell_inputs.rb b/db/migrate/20190527105726_add_from_cell_base_to_cell_inputs.rb
diff --git a/db/migrate/20190528014728_update_from_cell_base_for_exist_cell_inputs.rb b/db/migrate/20190528014728_update_from_cell_base_for_exist_cell_inputs.rb
diff --git a/db/migrate/20190530090537_add_lock_hash_to_address.rb b/db/migrate/20190530090537_add_lock_hash_to_address.rb
diff --git a/db/migrate/20190531030940_remove_unique_index_on_address_hash_from_address.rb b/db/migrate/20190531030940_remove_unique_index_on_address_hash_from_address.rb
diff --git a/db/migrate/20190604062236_add_is_cellbase_to_ckb_transactions.rb b/db/migrate/20190604062236_add_is_cellbase_to_ckb_transactions.rb
diff --git a/db/migrate/20190606083952_remove_args_from_cell_inputs.rb b/db/migrate/20190606083952_remove_args_from_cell_inputs.rb
diff --git a/db/migrate/20190612034620_add_index_on_status_to_blocks.rb b/db/migrate/20190612034620_add_index_on_status_to_blocks.rb
diff --git a/db/migrate/20190617015612_remove_indexes_from_blocks.rb b/db/migrate/20190617015612_remove_indexes_from_blocks.rb
diff --git a/db/migrate/20190617015805_add_index_on_number_to_blocks.rb b/db/migrate/20190617015805_add_index_on_number_to_blocks.rb
diff --git a/db/migrate/20190618154208_remove_tx_hash_and_status_index_on_ckb_transactions.rb b/db/migrate/20190618154208_remove_tx_hash_and_status_index_on_ckb_transactions.rb
diff --git a/db/migrate/20190618154444_add_index_on_block_timestamp_to_ckb_transactions.rb b/db/migrate/20190618154444_add_index_on_block_timestamp_to_ckb_transactions.rb
diff --git a/db/migrate/20190625075829_add_reward_status_to_blocks.rb b/db/migrate/20190625075829_add_reward_status_to_blocks.rb
diff --git a/db/migrate/20190625093219_add_received_tx_fee_status_to_blocks.rb b/db/migrate/20190625093219_add_received_tx_fee_status_to_blocks.rb
diff --git a/db/migrate/20190625093335_add_received_tx_fee_to_blocks.rb b/db/migrate/20190625093335_add_received_tx_fee_to_blocks.rb