Skip to content

Commit

Permalink
fix rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@fridrik01
fridrik01 committed Jan 25, 2024
1 parent ee3e823 commit 2386c7d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 13 deletions.
12 changes: 5 additions & 7 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,19 +94,17 @@ libp2p = { version = "0.53", default-features = false, features = [
] }
libp2p-mplex = { version = "0.41" }
# libp2p-bitswap = "0.25.1"
multihash = { version = "0.18.1", default-features = false, features = [
"sha2",
<<<<<<< HEAD
"sha3",
=======
>>>>>>> d3664c63 (Integrate chainmetadata actor in begin callback + use amt)
] }libp2p-bitswap = { git = "https://github.com/consensus-shipyard/libp2p-bitswap.git", branch = "chore-upgrade-libipld" } # Updated to libipld 0.16
libp2p-bitswap = { git = "https://github.com/consensus-shipyard/libp2p-bitswap.git", branch = "chore-upgrade-libipld" } # Updated to libipld 0.16
libsecp256k1 = "0.7"
literally = "0.1.3"
log = "0.4"
lru_time_cache = "0.11"
merkle-tree-rs = "0.1.0"
multiaddr = "0.18"
multihash = { version = "0.18.1", default-features = false, features = [
"sha2",
"sha3",
] }
num-bigint = "0.4"
num-derive = "0.3"
num-traits = "0.2"
Expand Down
2 changes: 1 addition & 1 deletion fendermint/testing/contracts/Greeter.bin
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
608060405234801562000010575f80fd5b5060405162000cc338038062000cc383398181016040528101906200003691906200020c565b805f908162000046919062000492565b507fad181ee258ff92d26bf7ed2e6b571ef1cba3afc45f028b863b0f02adaffc2f0681604051620000789190620005c6565b60405180910390a150620005e8565b5f604051905090565b5f80fd5b5f80fd5b5f80fd5b5f80fd5b5f601f19601f8301169050919050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b620000e882620000a0565b810181811067ffffffffffffffff821117156200010a5762000109620000b0565b5b80604052505050565b5f6200011e62000087565b90506200012c8282620000dd565b919050565b5f67ffffffffffffffff8211156200014e576200014d620000b0565b5b6200015982620000a0565b9050602081019050919050565b5f5b838110156200018557808201518184015260208101905062000168565b5f8484015250505050565b5f620001a6620001a08462000131565b62000113565b905082815260208101848484011115620001c557620001c46200009c565b5b620001d284828562000166565b509392505050565b5f82601f830112620001f157620001f062000098565b5b81516200020384826020860162000190565b91505092915050565b5f6020828403121562000224576200022362000090565b5b5f82015167ffffffffffffffff81111562000244576200024362000094565b5b6200025284828501620001da565b91505092915050565b5f81519050919050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52602260045260245ffd5b5f6002820490506001821680620002aa57607f821691505b602082108103620002c057620002bf62000265565b5b50919050565b5f819050815f5260205f209050919050565b5f6020601f8301049050919050565b5f82821b905092915050565b5f60088302620003247fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82620002e7565b620003308683620002e7565b95508019841693508086168417925050509392505050565b5f819050919050565b5f819050919050565b5f6200037a620003746200036e8462000348565b62000351565b62000348565b9050919050565b5f819050919050565b62000395836200035a565b620003ad620003a48262000381565b848454620002f3565b825550505050565b5f90565b620003c3620003b5565b620003d08184846200038a565b505050565b5b81811015620003f757620003eb5f82620003b9565b600181019050620003d6565b5050565b601f82111562000446576200041081620002c6565b6200041b84620002d8565b810160208510156200042b578190505b620004436200043a85620002d8565b830182620003d5565b50505b505050565b5f82821c905092915050565b5f620004685f19846008026200044b565b1980831691505092915050565b5f62000482838362000457565b9150826002028217905092915050565b6200049d826200025b565b67ffffffffffffffff811115620004b957620004b8620000b0565b5b620004c5825462000292565b620004d2828285620003fb565b5f60209050601f83116001811462000508575f8415620004f3578287015190505b620004ff858262000475565b8655506200056e565b601f1984166200051886620002c6565b5f5b8281101562000541578489015182556001820191506020850194506020810190506200051a565b868310156200056157848901516200055d601f89168262000457565b8355505b6001600288020188555050505b505050505050565b5f82825260208201905092915050565b5f62000592826200025b565b6200059e818562000576565b9350620005b081856020860162000166565b620005bb81620000a0565b840191505092915050565b5f6020820190508181035f830152620005e0818462000586565b905092915050565b6106cd80620005f65f395ff3fe608060405234801561000f575f80fd5b5060043610610034575f3560e01c8063a413686214610038578063cfae321714610054575b5f80fd5b610052600480360381019061004d9190610241565b610072565b005b61005c6100bb565b6040516100699190610302565b60405180910390f35b805f90816100809190610525565b507fad181ee258ff92d26bf7ed2e6b571ef1cba3afc45f028b863b0f02adaffc2f06816040516100b09190610302565b60405180910390a150565b60605f6001436100cb9190610621565b409050806040516020016100df919061067d565b60405160208183030381529060405291505090565b5f604051905090565b5f80fd5b5f80fd5b5f80fd5b5f80fd5b5f601f19601f8301169050919050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b6101538261010d565b810181811067ffffffffffffffff821117156101725761017161011d565b5b80604052505050565b5f6101846100f4565b9050610190828261014a565b919050565b5f67ffffffffffffffff8211156101af576101ae61011d565b5b6101b88261010d565b9050602081019050919050565b828183375f83830152505050565b5f6101e56101e084610195565b61017b565b90508281526020810184848401111561020157610200610109565b5b61020c8482856101c5565b509392505050565b5f82601f83011261022857610227610105565b5b81356102388482602086016101d3565b91505092915050565b5f60208284031215610256576102556100fd565b5b5f82013567ffffffffffffffff81111561027357610272610101565b5b61027f84828501610214565b91505092915050565b5f81519050919050565b5f82825260208201905092915050565b5f5b838110156102bf5780820151818401526020810190506102a4565b5f8484015250505050565b5f6102d482610288565b6102de8185610292565b93506102ee8185602086016102a2565b6102f78161010d565b840191505092915050565b5f6020820190508181035f83015261031a81846102ca565b905092915050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52602260045260245ffd5b5f600282049050600182168061036657607f821691505b60208210810361037957610378610322565b5b50919050565b5f819050815f5260205f209050919050565b5f6020601f8301049050919050565b5f82821b905092915050565b5f600883026103db7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff826103a0565b6103e586836103a0565b95508019841693508086168417925050509392505050565b5f819050919050565b5f819050919050565b5f61042961042461041f846103fd565b610406565b6103fd565b9050919050565b5f819050919050565b6104428361040f565b61045661044e82610430565b8484546103ac565b825550505050565b5f90565b61046a61045e565b610475818484610439565b505050565b5b818110156104985761048d5f82610462565b60018101905061047b565b5050565b601f8211156104dd576104ae8161037f565b6104b784610391565b810160208510156104c6578190505b6104da6104d285610391565b83018261047a565b50505b505050565b5f82821c905092915050565b5f6104fd5f19846008026104e2565b1980831691505092915050565b5f61051583836104ee565b9150826002028217905092915050565b61052e82610288565b67ffffffffffffffff8111156105475761054661011d565b5b610551825461034f565b61055c82828561049c565b5f60209050601f83116001811461058d575f841561057b578287015190505b610585858261050a565b8655506105ec565b601f19841661059b8661037f565b5f5b828110156105c25784890151825560018201915060208501945060208101905061059d565b868310156105df57848901516105db601f8916826104ee565b8355505b6001600288020188555050505b505050505050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b5f61062b826103fd565b9150610636836103fd565b925082820390508181111561064e5761064d6105f4565b5b92915050565b5f819050919050565b5f819050919050565b61067761067282610654565b61065d565b82525050565b5f6106888284610666565b6020820191508190509291505056fea264697066735822122098f137451cea7782e8a11348afe4317b303951305ba886ff7ed210a3b613babc64736f6c63430008170033
608060405234801562000010575f80fd5b5060405162000c7638038062000c7683398181016040528101906200003691906200020c565b805f908162000046919062000492565b507fad181ee258ff92d26bf7ed2e6b571ef1cba3afc45f028b863b0f02adaffc2f0681604051620000789190620005c6565b60405180910390a150620005e8565b5f604051905090565b5f80fd5b5f80fd5b5f80fd5b5f80fd5b5f601f19601f8301169050919050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b620000e882620000a0565b810181811067ffffffffffffffff821117156200010a5762000109620000b0565b5b80604052505050565b5f6200011e62000087565b90506200012c8282620000dd565b919050565b5f67ffffffffffffffff8211156200014e576200014d620000b0565b5b6200015982620000a0565b9050602081019050919050565b5f5b838110156200018557808201518184015260208101905062000168565b5f8484015250505050565b5f620001a6620001a08462000131565b62000113565b905082815260208101848484011115620001c557620001c46200009c565b5b620001d284828562000166565b509392505050565b5f82601f830112620001f157620001f062000098565b5b81516200020384826020860162000190565b91505092915050565b5f6020828403121562000224576200022362000090565b5b5f82015167ffffffffffffffff81111562000244576200024362000094565b5b6200025284828501620001da565b91505092915050565b5f81519050919050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52602260045260245ffd5b5f6002820490506001821680620002aa57607f821691505b602082108103620002c057620002bf62000265565b5b50919050565b5f819050815f5260205f209050919050565b5f6020601f8301049050919050565b5f82821b905092915050565b5f60088302620003247fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82620002e7565b620003308683620002e7565b95508019841693508086168417925050509392505050565b5f819050919050565b5f819050919050565b5f6200037a620003746200036e8462000348565b62000351565b62000348565b9050919050565b5f819050919050565b62000395836200035a565b620003ad620003a48262000381565b848454620002f3565b825550505050565b5f90565b620003c3620003b5565b620003d08184846200038a565b505050565b5b81811015620003f757620003eb5f82620003b9565b600181019050620003d6565b5050565b601f82111562000446576200041081620002c6565b6200041b84620002d8565b810160208510156200042b578190505b620004436200043a85620002d8565b830182620003d5565b50505b505050565b5f82821c905092915050565b5f620004685f19846008026200044b565b1980831691505092915050565b5f62000482838362000457565b9150826002028217905092915050565b6200049d826200025b565b67ffffffffffffffff811115620004b957620004b8620000b0565b5b620004c5825462000292565b620004d2828285620003fb565b5f60209050601f83116001811462000508575f8415620004f3578287015190505b620004ff858262000475565b8655506200056e565b601f1984166200051886620002c6565b5f5b8281101562000541578489015182556001820191506020850194506020810190506200051a565b868310156200056157848901516200055d601f89168262000457565b8355505b6001600288020188555050505b505050505050565b5f82825260208201905092915050565b5f62000592826200025b565b6200059e818562000576565b9350620005b081856020860162000166565b620005bb81620000a0565b840191505092915050565b5f6020820190508181035f830152620005e0818462000586565b905092915050565b61068080620005f65f395ff3fe608060405234801561000f575f80fd5b5060043610610034575f3560e01c8063a413686214610038578063cfae321714610054575b5f80fd5b610052600480360381019061004d9190610297565b610072565b005b61005c6100bb565b6040516100699190610358565b60405180910390f35b805f9081610080919061057b565b507fad181ee258ff92d26bf7ed2e6b571ef1cba3afc45f028b863b0f02adaffc2f06816040516100b09190610358565b60405180910390a150565b60605f80546100c9906103a5565b80601f01602080910402602001604051908101604052809291908181526020018280546100f5906103a5565b80156101405780601f1061011757610100808354040283529160200191610140565b820191905f5260205f20905b81548152906001019060200180831161012357829003601f168201915b5050505050905090565b5f604051905090565b5f80fd5b5f80fd5b5f80fd5b5f80fd5b5f601f19601f8301169050919050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b6101a982610163565b810181811067ffffffffffffffff821117156101c8576101c7610173565b5b80604052505050565b5f6101da61014a565b90506101e682826101a0565b919050565b5f67ffffffffffffffff82111561020557610204610173565b5b61020e82610163565b9050602081019050919050565b828183375f83830152505050565b5f61023b610236846101eb565b6101d1565b9050828152602081018484840111156102575761025661015f565b5b61026284828561021b565b509392505050565b5f82601f83011261027e5761027d61015b565b5b813561028e848260208601610229565b91505092915050565b5f602082840312156102ac576102ab610153565b5b5f82013567ffffffffffffffff8111156102c9576102c8610157565b5b6102d58482850161026a565b91505092915050565b5f81519050919050565b5f82825260208201905092915050565b5f5b838110156103155780820151818401526020810190506102fa565b5f8484015250505050565b5f61032a826102de565b61033481856102e8565b93506103448185602086016102f8565b61034d81610163565b840191505092915050565b5f6020820190508181035f8301526103708184610320565b905092915050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52602260045260245ffd5b5f60028204905060018216806103bc57607f821691505b6020821081036103cf576103ce610378565b5b50919050565b5f819050815f5260205f209050919050565b5f6020601f8301049050919050565b5f82821b905092915050565b5f600883026104317fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff826103f6565b61043b86836103f6565b95508019841693508086168417925050509392505050565b5f819050919050565b5f819050919050565b5f61047f61047a61047584610453565b61045c565b610453565b9050919050565b5f819050919050565b61049883610465565b6104ac6104a482610486565b848454610402565b825550505050565b5f90565b6104c06104b4565b6104cb81848461048f565b505050565b5b818110156104ee576104e35f826104b8565b6001810190506104d1565b5050565b601f82111561053357610504816103d5565b61050d846103e7565b8101602085101561051c578190505b610530610528856103e7565b8301826104d0565b50505b505050565b5f82821c905092915050565b5f6105535f1984600802610538565b1980831691505092915050565b5f61056b8383610544565b9150826002028217905092915050565b610584826102de565b67ffffffffffffffff81111561059d5761059c610173565b5b6105a782546103a5565b6105b28282856104f2565b5f60209050601f8311600181146105e3575f84156105d1578287015190505b6105db8582610560565b865550610642565b601f1984166105f1866103d5565b5f5b82811015610618578489015182556001820191506020850194506020810190506105f3565b868310156106355784890151610631601f891682610544565b8355505b6001600288020188555050505b50505050505056fea264697066735822122016f2baf93879d1f50483aa9b26b1323ba354fd1a58899568601512441cffe1c364736f6c63430008170033
Loading

0 comments on commit 2386c7d

Please sign in to comment.